Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

agent: Use pairs for local terminal environments (#65519)

Ben Brandt735bc10fd0f4
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 108d8eae098..20ef8bc094a 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -7327,7 +7327,7 @@ impl AcpThread {
&self,
command: String,
args: Vec<String>,
- extra_env: Vec<acp_v1::EnvVariable>,
+ extra_env: Vec<(String, String)>,
cwd: Option<PathBuf>,
output_byte_limit: Option<u64>,
sandbox_wrap: Option<SandboxWrap>,
@@ -7346,8 +7346,8 @@ impl AcpThread {
disable_pagers_through_env(&mut env);
- for var in extra_env {
- env.insert(var.name, var.value);
+ for (name, value) in extra_env {
+ env.insert(name, value);
}
env
});
@@ -14157,6 +14157,42 @@ mod tests {
});
}
+ #[cfg(unix)]
+ #[gpui::test]
+ async fn test_terminal_environment_pairs_reach_process(cx: &mut TestAppContext) {
+ init_test(cx);
+ let thread = new_test_thread(cx).await;
+ cx.executor().allow_parking();
+ cx.update(|cx| cx.set_global(::terminal::HeadlessTerminal(true)));
+ let terminal = thread
+ .update(cx, |thread, cx| {
+ thread.create_terminal(
+ r#"[ "$ZED_ACP_PAIR" = 'quote "$literal" héllo' ] &&
+ [ "${ZED_ACP_EMPTY+x}" = x ] && [ -z "$ZED_ACP_EMPTY" ] &&
+ [ "$PAGER" = caller-pager ] && [ "$GIT_PAGER" = cat ]"#
+ .into(),
+ Vec::new(),
+ vec![
+ ("ZED_ACP_PAIR".into(), "overridden".into()),
+ ("ZED_ACP_PAIR".into(), r#"quote "$literal" héllo"#.into()),
+ ("ZED_ACP_EMPTY".into(), String::new()),
+ ("PAGER".into(), "caller-pager".into()),
+ ],
+ None,
+ None,
+ None,
+ cx,
+ )
+ })
+ .await
+ .expect("client process with environment pairs");
+ let exit = terminal
+ .read_with(cx, |terminal, _| terminal.wait_for_exit())
+ .expect("client process exit")
+ .await;
+ assert_eq!(exit.exit_code, Some(0));
+ }
+
#[gpui::test]
async fn test_native_tool_terminal_references_require_client_processes(
cx: &mut TestAppContext,
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 11e36c78e88..89c85f6a54f 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -3392,7 +3392,7 @@ impl ThreadEnvironment for NativeThreadEnvironment {
fn create_terminal(
&self,
command: String,
- extra_env: Vec<acp_v1::EnvVariable>,
+ extra_env: Vec<(String, String)>,
cwd: Option<PathBuf>,
output_byte_limit: Option<u64>,
sandbox_wrap: Option<acp_thread::SandboxWrap>,
@@ -3441,9 +3441,9 @@ impl ThreadEnvironment for NativeThreadEnvironment {
let temp_dir = temp_dir.canonicalize().unwrap_or(temp_dir);
let temp_dir_string = temp_dir.to_string_lossy().into_owned();
extra_env.extend([
- acp_v1::EnvVariable::new("TMPDIR", &temp_dir_string),
- acp_v1::EnvVariable::new("TMP", &temp_dir_string),
- acp_v1::EnvVariable::new("TEMP", &temp_dir_string),
+ ("TMPDIR".into(), temp_dir_string.clone()),
+ ("TMP".into(), temp_dir_string.clone()),
+ ("TEMP".into(), temp_dir_string),
]);
// The command's `$TMPDIR` must live inside the sandbox's
// writable scope. The per-thread temp directory is owned
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index f1bc028d524..e1e97e1b11e 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -4,7 +4,6 @@ use acp_thread::{
ClientUserMessageId, PermissionOptions, ProcessOutput, ThreadStatus,
};
use agent_client_protocol::schema::MaybeUndefined;
-use agent_client_protocol::schema::v1 as acp;
use agent_client_protocol::schema::v2 as acp_v2;
use agent_settings::{AgentProfileId, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT};
use anyhow::Result;
@@ -230,7 +229,7 @@ impl crate::ThreadEnvironment for FakeThreadEnvironment {
fn create_terminal(
&self,
_command: String,
- _extra_env: Vec<acp::EnvVariable>,
+ _extra_env: Vec<(String, String)>,
_cwd: Option<std::path::PathBuf>,
output_byte_limit: Option<u64>,
_sandbox_wrap: Option<acp_thread::SandboxWrap>,
@@ -283,7 +282,7 @@ impl crate::ThreadEnvironment for MultiTerminalEnvironment {
fn create_terminal(
&self,
_command: String,
- _extra_env: Vec<acp::EnvVariable>,
+ _extra_env: Vec<(String, String)>,
_cwd: Option<std::path::PathBuf>,
_output_byte_limit: Option<u64>,
_sandbox_wrap: Option<acp_thread::SandboxWrap>,
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 9ef463fdc75..777933dbc01 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -16,7 +16,6 @@ use crate::sandboxing::{
sandbox_worktree_writable_paths, sandboxing_available_for_project,
sandboxing_enabled_for_project,
};
-use agent_client_protocol::schema::v1 as acp;
use agent_client_protocol::schema::v2 as acp_v2;
use agent_settings::{
AgentProfileId, AgentProfileSettings, AgentSettings, AutoCompactThreshold, COMPACTION_PROMPT,
@@ -781,7 +780,7 @@ pub trait ThreadEnvironment {
fn create_terminal(
&self,
command: String,
- extra_env: Vec<acp::EnvVariable>,
+ extra_env: Vec<(String, String)>,
cwd: Option<PathBuf>,
output_byte_limit: Option<u64>,
sandbox_wrap: Option<acp_thread::SandboxWrap>,