awesome-bookmarks/goose
3
0
Fork 0
mirror of https://github.com/block/goose.git synced 2026-07-17 12:56:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: ctrl-C interruption in the CLI (#4057)

Browse Source 
Co-authored-by: Michael Neale <michael.neale@gmail.com>
This commit is contained in:
Jack Amadeo
2025-08-13 10:30:12 -04:00
committed by GitHub
parent f055b051ee
commit 4f3038bcb1
1 changed files with 43 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose/src/agents/extension_manager.rs
+43 -56
View File
@@ -105,6 +105,42 @@ impl Default for ExtensionManager {
}
}
async fn child_process_client(
mut command: Command,
timeout: &Option<u64>,
) -> ExtensionResult<McpClient> {
command.process_group(0);
let (transport, mut stderr) = TokioChildProcess::builder(command)
.stderr(Stdio::piped())
.spawn()?;
let mut stderr = stderr.take().ok_or_else(|| {
ExtensionError::SetupError("failed to attach child process stderr".to_owned())
})?;
let stderr_task = tokio::spawn(async move {
let mut all_stderr = Vec::new();
stderr.read_to_end(&mut all_stderr).await?;
Ok::<String, std::io::Error>(String::from_utf8_lossy(&all_stderr).into())
});
let client_result = McpClient::connect(
transport,
Duration::from_secs(timeout.unwrap_or(crate::config::DEFAULT_EXTENSION_TIMEOUT)),
)
.await;
match client_result {
Ok(client) => Ok(client),
Err(error) => {
let error_task_out = stderr_task.await?;
Err::<McpClient, ExtensionError>(match error_task_out {
Ok(stderr_content) => ProcessExit::new(stderr_content, error).into(),
Err(e) => e.into(),
})
}
}
}
impl ExtensionManager {
/// Create a new ExtensionManager instance
pub fn new() -> Self {
@@ -280,38 +316,7 @@ impl ExtensionManager {
let command = Command::new(cmd).configure(|command| {
command.args(args).envs(all_envs);
});
let (transport, mut stderr) = TokioChildProcess::builder(command)
.stderr(Stdio::piped())
.spawn()?;
let mut stderr = stderr
.take()
.expect("should have a stderr handle because it was requested");
let stderr_task = tokio::spawn(async move {
let mut all_stderr = Vec::new();
stderr.read_to_end(&mut all_stderr).await?;
Ok::<String, std::io::Error>(String::from_utf8_lossy(&all_stderr).into())
});
let client_result = McpClient::connect(
transport,
Duration::from_secs(
timeout.unwrap_or(crate::config::DEFAULT_EXTENSION_TIMEOUT),
),
)
.await;
let client = match client_result {
Ok(client) => Ok(client),
Err(error) => {
let error_task_out = stderr_task.await?;
Err::<McpClient, ExtensionError>(match error_task_out {
Ok(stderr_content) => ProcessExit::new(stderr_content, error).into(),
Err(e) => e.into(),
})
}
}?;
let client = child_process_client(command, timeout).await?;
Box::new(client)
}
ExtensionConfig::Builtin {
@@ -326,19 +331,11 @@ impl ExtensionManager {
.to_str()
.expect("should resolve executable to string path")
.to_string();
let transport = TokioChildProcess::new(Command::new(cmd).configure(|command| {
let command = Command::new(cmd).configure(|command| {
command.arg("mcp").arg(name);
}))?;
Box::new(
McpClient::connect(
transport,
Duration::from_secs(
timeout.unwrap_or(crate::config::DEFAULT_EXTENSION_TIMEOUT),
),
)
.await?,
)
});
let client = child_process_client(command, timeout).await?;
Box::new(client)
}
ExtensionConfig::InlinePython {
name,
@@ -360,21 +357,11 @@ impl ExtensionManager {
command.arg("python").arg(file_path.to_str().unwrap());
});
let transport = TokioChildProcess::new(command)?;
let client = Box::new(
McpClient::connect(
transport,
Duration::from_secs(
timeout.unwrap_or(crate::config::DEFAULT_EXTENSION_TIMEOUT),
),
)
.await?,
);
let client = child_process_client(command, timeout).await?;
self.temp_dirs.insert(sanitized_name.clone(), temp_dir);
client
Box::new(client)
}
_ => unreachable!(),
};