From e91be9e98e78e02983d1ef7d246735463edb9dd7 Mon Sep 17 00:00:00 2001
From: Richard Feldman <richard@zed.dev>
Date: Thu, 13 Nov 2025 13:13:09 -0500
Subject: [PATCH] Fix ACP CLI login via remote (#42647)

Release Notes:

- Fixed logging into Gemini CLI and Claude Code when remoting and
authenticating via CLI

Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
---
 crates/project/src/agent_server_store.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
index d3c078ffa101c8c66d1c5ab75fb8b59d7748127a..67d3a0b8132be1db487fe347f3b79e42a8b5910d 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 serde::{Deserialize, Serialize};
 use settings::{RegisterSetting, SettingsStore};
-use task::Shell;
+use task::{Shell, SpawnInTerminal};
 use util::{ResultExt as _, debug_panic};
 
 use crate::ProjectEnvironment;
@@ -1010,7 +1010,7 @@ impl ExternalAgentServer for RemoteExternalAgentServer {
                     env: Some(command.env),
                 },
                 root_dir,
-                None,
+                response.login.map(SpawnInTerminal::from_proto),
             ))
         })
     }