From fb6e41d51ee6eed09088118011ba7c5c25cdc7d7 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Tue, 4 Nov 2025 15:56:24 +0100
Subject: [PATCH] remote_server: Fix panic due to invalid settings access
 (#41904)

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

Release Notes:

- N/A *or* Added/Fixed/Improved ...
---
 crates/project/src/agent_server_store.rs     | 5 +++--
 crates/project/src/environment.rs            | 9 +++++++++
 crates/project/src/project.rs                | 8 +++++---
 crates/remote_server/src/headless_project.rs | 2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index af0c97013e9d66fc01e2f35b03ffafe6d0b4e6a7..8d6781d4eb98b9380d193e2b65c1145bf1bb65a6 100644
--- a/crates/project/src/agent_server_store.rs
+++ b/crates/project/src/agent_server_store.rs
@@ -1821,8 +1821,9 @@ mod extension_agent_tests {
         let fs = fs::FakeFs::new(cx.background_executor.clone());
         let http_client = http_client::FakeHttpClient::with_404_response();
         let worktree_store = cx.new(|_| WorktreeStore::local(false, fs.clone()));
-        let project_environment =
-            cx.new(|cx| crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, cx));
+        let project_environment = cx.new(|cx| {
+            crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, false, cx)
+        });
 
         let agent = LocalExtensionArchiveAgent {
             fs,
diff --git a/crates/project/src/environment.rs b/crates/project/src/environment.rs
index cc14611edbcec922c439cb06c63566036dc64cc6..b6b4f6633b8ae091fc48e66cbbedf8c29ed0ce74 100644
--- a/crates/project/src/environment.rs
+++ b/crates/project/src/environment.rs
@@ -26,6 +26,7 @@ pub struct ProjectEnvironment {
     environment_error_messages_tx: mpsc::UnboundedSender<String>,
     worktree_store: WeakEntity<WorktreeStore>,
     remote_client: Option<WeakEntity<RemoteClient>>,
+    is_remote_project: bool,
     _tasks: Vec<Task<()>>,
 }
 
@@ -40,6 +41,7 @@ impl ProjectEnvironment {
         cli_environment: Option<HashMap<String, String>>,
         worktree_store: WeakEntity<WorktreeStore>,
         remote_client: Option<WeakEntity<RemoteClient>>,
+        is_remote_project: bool,
         cx: &mut Context<Self>,
     ) -> Self {
         let (tx, mut rx) = mpsc::unbounded();
@@ -60,6 +62,7 @@ impl ProjectEnvironment {
             environment_error_messages_tx: tx,
             worktree_store,
             remote_client,
+            is_remote_project,
             _tasks: vec![task],
         }
     }
@@ -128,6 +131,9 @@ impl ProjectEnvironment {
                     cx,
                 )
             }),
+            None if self.is_remote_project => {
+                Some(self.local_directory_environment(&Shell::System, abs_path, cx))
+            }
             None => Some({
                 let shell = TerminalSettings::get(
                     Some(settings::SettingsLocation {
@@ -160,6 +166,9 @@ impl ProjectEnvironment {
                     cx,
                 )
             }),
+            None if self.is_remote_project => {
+                Some(self.local_directory_environment(&Shell::System, abs_path, cx))
+            }
             None => self
                 .worktree_store
                 .read_with(cx, |worktree_store, cx| {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index c65a0b5c3a6e46b4326fecd283736edbb9ec9626..489b72e9c91839a4a2adeaf486343e6e8765418a 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1072,8 +1072,9 @@ impl Project {
             let context_server_store =
                 cx.new(|cx| ContextServerStore::new(worktree_store.clone(), weak_self.clone(), cx));
 
-            let environment =
-                cx.new(|cx| ProjectEnvironment::new(env, worktree_store.downgrade(), None, cx));
+            let environment = cx.new(|cx| {
+                ProjectEnvironment::new(env, worktree_store.downgrade(), None, false, cx)
+            });
             let manifest_tree = ManifestTree::new(worktree_store.clone(), cx);
             let toolchain_store = cx.new(|cx| {
                 ToolchainStore::local(
@@ -1313,6 +1314,7 @@ impl Project {
                     None,
                     worktree_store.downgrade(),
                     Some(remote.downgrade()),
+                    false,
                     cx,
                 )
             });
@@ -1529,7 +1531,7 @@ impl Project {
         })?;
 
         let environment =
-            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, cx))?;
+            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, true, cx))?;
         let breakpoint_store =
             cx.new(|_| BreakpointStore::remote(remote_id, client.clone().into()))?;
         let dap_store = cx.new(|cx| {
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 57d77f3696283d2e8074713ecd69916eaff07cac..355e8a3fe272ce95e1f75f3df0d2a2872ae0a1fe 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -95,7 +95,7 @@ impl HeadlessProject {
         });
 
         let environment =
-            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, cx));
+            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, true, cx));
         let manifest_tree = ManifestTree::new(worktree_store.clone(), cx);
         let toolchain_store = cx.new(|cx| {
             ToolchainStore::local(