ai-space/goose
3
0
Fork 0
mirror of https://github.com/aaif-goose/goose.git synced 2026-06-02 06:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(acp): add auth handshake to ACP provider initialization

Browse Source 
The ACP provider was not advertising auth capabilities or calling
authenticate after initialize, causing claude-agent-acp to return
empty auth methods and spawn subprocesses with null credentials.
This resulted in a silent ~180s timeout with an empty response.

Advertise AuthCapabilities in ClientCapabilities and send an
AuthenticateRequest with the first auth method ID when the agent
returns non-empty auth_methods in its InitializeResponse.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Matt Toohey <contact@matttoohey.com>
This commit is contained in:
Matt Toohey
2026-05-14 16:57:01 +10:00
parent 826cce0257
commit 3ce62e4af1
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose/src/acp/provider.rs
+23 -7
View File
@@ -1,6 +1,7 @@
use agent_client_protocol::schema::{
ClientCapabilities, CloseSessionRequest, ContentBlock, ContentChunk, EnvVariable, HttpHeader,
ImageContent, InitializeRequest, InitializeResponse, McpCapabilities, McpServer, McpServerHttp,
AuthCapabilities, AuthenticateRequest, AuthenticateResponse, ClientCapabilities,
CloseSessionRequest, ContentBlock, ContentChunk, EnvVariable, HttpHeader, ImageContent,
InitializeRequest, InitializeResponse, McpCapabilities, McpServer, McpServerHttp,
McpServerStdio, NewSessionRequest, NewSessionResponse, PromptRequest, PromptResponse,
ProtocolVersion, RequestPermissionOutcome, RequestPermissionRequest, RequestPermissionResponse,
SessionConfigKind, SessionConfigOption, SessionConfigOptionCategory,
@@ -9,8 +10,8 @@ use agent_client_protocol::schema::{
TextContent, ToolCallContent, ToolCallStatus, ToolKind,
};
use agent_client_protocol::{Agent, Client, ConnectionTo};
use agent_client_protocol_schema::Usage as AcpUsage;
use agent_client_protocol_schema::AGENT_METHOD_NAMES;
use agent_client_protocol_schema::Usage as AcpUsage;
use anyhow::{Context, Result};
use async_stream::try_stream;
use futures::future::BoxFuture;
@@ -20,16 +21,16 @@ use std::future::Future;
use std::path::PathBuf;
use std::process::Stdio;
use std::sync::{
atomic::{AtomicBool, Ordering},
Arc, Mutex,
atomic::{AtomicBool, Ordering},
};
use std::thread::JoinHandle;
use tokio::io::AsyncReadExt;
use tokio::process::{Child, Command};
use tokio::sync::{mpsc, oneshot, Mutex as TokioMutex};
use tokio::sync::{Mutex as TokioMutex, mpsc, oneshot};
use tokio_util::compat::{TokioAsyncReadCompatExt as _, TokioAsyncWriteCompatExt as _};
use crate::acp::{map_permission_response, PermissionDecision};
use crate::acp::{PermissionDecision, map_permission_response};
use crate::config::{ExtensionConfig, GooseMode};
use crate::context_mgmt::format_message_for_compacting;
use crate::conversation::message::{Message, MessageContent, TOOL_META_EXTERNAL_DISPATCH_KEY};
@@ -986,7 +987,7 @@ async fn handle_requests(
) -> Result<(), agent_client_protocol::Error> {
let mut init_tx = Some(init_tx);
let client_capabilities = ClientCapabilities::new();
let client_capabilities = ClientCapabilities::new().auth(AuthCapabilities::new());
let init_response: InitializeResponse = cx
.send_request(
InitializeRequest::new(ProtocolVersion::LATEST)
@@ -1002,6 +1003,21 @@ async fn handle_requests(
agent_client_protocol::Error::internal_error().data(message)
})?;
if !init_response.auth_methods.is_empty() {
let method_id = init_response.auth_methods[0].id().clone();
let _auth_response: AuthenticateResponse = cx
.send_request(AuthenticateRequest::new(method_id))
.block_task()
.await
.map_err(|err| {
let message = format!("ACP authenticate failed: {err}");
if let Some(tx) = init_tx.take() {
let _ = tx.send(Err(anyhow::anyhow!(message.clone())));
}
agent_client_protocol::Error::internal_error().data(message)
})?;
}
let supports_close = init_response
.agent_capabilities
.session_capabilities