@automatalabs/acp-agents 0.15.0 → 0.17.0

package/dist/acp-client.d.ts

@@ -1,4 +1,4 @@
-import { type CreateElicitationResponse, type ContentBlock, type AgentNotificationMethod, type AgentNotificationParamsByMethod, type AgentRequestMethod, type AgentRequestParamsByMethod, type AgentRequestResponsesByMethod, type DeleteSessionRequest, type ListSessionsRequest, type ListSessionsResponse, type PromptRequest, type PromptResponse, type RequestPermissionResponse, type SendRequestOptions, type SessionConfigOption, type SessionModeState, type SessionNotification, type SetSessionConfigOptionRequest, type SetSessionConfigOptionResponse, type SetSessionModeRequest, type SetSessionModeResponse } from "@agentclientprotocol/sdk";
+import { type AuthenticateRequest, type AuthenticateResponse, type AuthMethod, type CreateElicitationResponse, type ContentBlock, type AgentNotificationMethod, type AgentNotificationParamsByMethod, type AgentRequestMethod, type AgentRequestParamsByMethod, type AgentRequestResponsesByMethod, type DeleteSessionRequest, type DisableProviderRequest, type DisableProviderResponse, type ListSessionsRequest, type ListSessionsResponse, type ListProvidersRequest, type ListProvidersResponse, type LogoutRequest, type LogoutResponse, type PromptRequest, type PromptResponse, type RequestPermissionResponse, type SendRequestOptions, type SessionConfigOption, type SessionModeState, type SessionNotification, type SetProviderRequest, type SetProviderResponse, type SetSessionConfigOptionRequest, type SetSessionConfigOptionResponse, type SetSessionModeRequest, type SetSessionModeResponse } from "@agentclientprotocol/sdk";
 import type { TSchema } from "typebox";
 import { type AgentHistoryEntry, type McpServerConfig } from "@automatalabs/shared-types";
 import type { Backend, BackendId, StructuredSource } from "./backend.js";
@@ -21,6 +21,7 @@ declare class SessionState {
     readonly elicitationResolver?: ElicitationResolver | undefined;
     readonly label?: string | undefined;
     readonly runId?: string | undefined;
+    readonly mcpServerIds: readonly string[];
     private readonly retainSessionLog;
     readonly textChunks: string[];
     readonly history: AgentHistoryEntry[];
@@ -28,12 +29,13 @@ declare class SessionState {
     readonly pendingPermissions: Set<(outcome: RequestPermissionResponse) => void>;
     readonly pendingElicitations: Set<(outcome: CreateElicitationResponse) => void>;
     readonly urlElicitationIds: Set<string>;
+    readonly mcpConnectionIds: Set<string>;
     rawResultSuccess: RawResultSuccess | undefined;
     modes: SessionModeState | null | undefined;
     private turnStartIndex;
     /** `label`/`runId` are carried here ONLY so the MultiplexClient can stamp them onto emitted
      *  events as context — they never affect routing or the wire request. */
-    constructor(cwd: string, policy: ToolPolicy, permissionResolver?: PermissionResolver | undefined, elicitationResolver?: ElicitationResolver | undefined, label?: string | undefined, runId?: string | undefined, modes?: SessionModeState | null, retainSessionLog?: boolean);
+    constructor(cwd: string, policy: ToolPolicy, permissionResolver?: PermissionResolver | undefined, elicitationResolver?: ElicitationResolver | undefined, label?: string | undefined, runId?: string | undefined, modes?: SessionModeState | null, mcpServerIds?: readonly string[], retainSessionLog?: boolean);
     /** Mark the start of a new turn so currentTurnText()/structured_output read only this turn.
      *  Long-lived interactive sessions can opt out of retaining old text/history because hosts
      *  stream live events and keep their own transcript; clearing here prevents dead logs from
@@ -145,6 +147,7 @@ export declare class PooledConnection {
     private assertSupportedMcpServers;
     private sessionRequestMeta;
     private assertLifecycleSupported;
+    private assertAuthProviderSupported;
     /** Mark this connection dead exactly once, then ask the pool to evict it. Idempotent. */
     private die;
     private stderrSuffix;
@@ -168,6 +171,18 @@ export declare class PooledConnection {
     listSessions(request: ListSessionsRequest, label?: string): Promise<ListSessionsResponse>;
     /** session/delete on a dedicated connection, gated on the initialize advertisement. */
     deleteSession(request: DeleteSessionRequest, label?: string): Promise<void>;
+    /** Authentication methods advertised in initialize, available without opening a session. */
+    authMethods(): Promise<AuthMethod[]>;
+    /** authenticate has no AgentCapabilities gate; authMethods advertises choices, not method support. */
+    authenticate(request: AuthenticateRequest, label?: string): Promise<AuthenticateResponse | void>;
+    /** providers/list on a dedicated connection, gated on the unstable providers advertisement. */
+    listProviders(request: ListProvidersRequest, label?: string): Promise<ListProvidersResponse>;
+    /** providers/set on a dedicated connection, gated on the unstable providers advertisement. */
+    setProvider(request: SetProviderRequest, label?: string): Promise<SetProviderResponse | void>;
+    /** providers/disable on a dedicated connection, gated on the unstable providers advertisement. */
+    disableProvider(request: DisableProviderRequest, label?: string): Promise<DisableProviderResponse | void>;
+    /** logout on a dedicated connection, gated on agentCapabilities.auth.logout. */
+    logout(request: LogoutRequest, label?: string): Promise<LogoutResponse | void>;
     /** session/prompt on this connection, raced against process death. */
     prompt(request: PromptRequest): Promise<PromptResponse>;
     /** session/set_config_option on this connection, raced against process death. */
@@ -219,6 +234,8 @@ export declare class SessionHandle implements StructuredSource {
     get text(): string;
     /** Agent-advertised session mode catalog plus the currently active mode, if supported. */
     get modes(): SessionModeState | null | undefined;
+    /** The connection-level initialize response parsed before this session was opened. */
+    get capabilities(): NegotiatedCapabilities | undefined;
     /**
      * Select the model for this session from the agent-advertised config options (§5.4).
      * Returns `matched:false` (the caller fires onModelFallback) when the catalog has no value

package/dist/acp-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-client.d.ts","sourceRoot":"","sources":["../src/acp-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acp-client.d.ts","sourceRoot":"","sources":["../src/acp-client.ts"],"names":[],"mappings":"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"}

package/dist/acp-client.js

@@ -24,11 +24,11 @@ import { spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
 import { AGENT_METHODS, client, CLIENT_METHODS, ndJsonStream, PROTOCOL_VERSION, RequestError, } from "@agentclientprotocol/sdk";
 import { META_KEYS, WorkflowError, WorkflowErrorCode, } from "@automatalabs/shared-types";
-import { adaptPromptContent, describeLifecycleAdvertisement, gateCustomMeta, isSupportedProtocolVersion, negotiateCapabilities, unsupportedMcpServer, } from "./capabilities.js";
+import { adaptPromptContent, describeAuthProviderAdvertisement, describeLifecycleAdvertisement, gateCustomMeta, isSupportedProtocolVersion, negotiateCapabilities, unsupportedMcpServer, } from "./capabilities.js";
 import { emitSessionUpdate } from "./events.js";
 import { decidePermission, } from "./permissions.js";
 import { UsageAccumulator } from "./usage.js";
-import { clientCapabilitiesFor, } from "./client-handlers.js";
+import { clientCapabilitiesFor, hasFullMcpHandlers, } from "./client-handlers.js";
 /** A benign client identity. NOT JetBrains/IntelliJ 2026.1 — that exact identity makes
  *  codex-acp disable session config options (our model/effort routing channel). */
 const CLIENT_INFO = {
@@ -51,6 +51,10 @@ const GUARDED_STATEFUL_REQUESTS = new Map([
         "no driven wrapper yet; raw forked sessions cannot be routed (permissions auto-cancel)",
     ],
 ]);
+const parseConnectMcpRequest = (params) => params;
+const parseMessageMcpRequest = (params) => params;
+const parseMessageMcpNotification = (params) => params;
+const parseDisconnectMcpRequest = (params) => params;
 /** Per-session accumulator: assistant text, tool history, usage, the Claude raw structured_output,
  *  and the permission policy/resolver used to answer permission requests for THIS session. */
 class SessionState {
@@ -60,6 +64,7 @@ class SessionState {
     elicitationResolver;
     label;
     runId;
+    mcpServerIds;
     retainSessionLog;
     textChunks = [];
     history = [];
@@ -67,18 +72,20 @@ class SessionState {
     pendingPermissions = new Set();
     pendingElicitations = new Set();
     urlElicitationIds = new Set();
+    mcpConnectionIds = new Set();
     rawResultSuccess;
     modes;
     turnStartIndex = 0;
     /** `label`/`runId` are carried here ONLY so the MultiplexClient can stamp them onto emitted
      *  events as context — they never affect routing or the wire request. */
-    constructor(cwd, policy, permissionResolver, elicitationResolver, label, runId, modes, retainSessionLog = true) {
+    constructor(cwd, policy, permissionResolver, elicitationResolver, label, runId, modes, mcpServerIds = [], retainSessionLog = true) {
         this.cwd = cwd;
         this.policy = policy;
         this.permissionResolver = permissionResolver;
         this.elicitationResolver = elicitationResolver;
         this.label = label;
         this.runId = runId;
+        this.mcpServerIds = mcpServerIds;
         this.retainSessionLog = retainSessionLog;
         this.modes = modes;
     }
@@ -172,6 +179,8 @@ class MultiplexClient {
     elicitationResolver;
     sessions = new Map();
     urlElicitationContexts = new Map();
+    mcpServerSessions = new Map();
+    mcpConnectionSessions = new Map();
     /** Recently unregistered sessions kept ONLY for the teardown window: ACP agents may
      *  legitimately release terminals (or finish fs/terminal cleanup) after this client releases
      *  the session because session/close is cancel + free resources and the Agent owns terminal
@@ -208,14 +217,22 @@ class MultiplexClient {
     register(sessionId, state) {
         this.tombstones.delete(sessionId);
         this.sessions.set(sessionId, state);
+        for (const serverId of state.mcpServerIds)
+            this.mcpServerSessions.set(serverId, sessionId);
         this.onEvent?.("session_open", this.contextFor(sessionId, state));
     }
     unregister(sessionId) {
         const state = this.sessions.get(sessionId);
         state?.settlePendingPermissions();
         state?.settlePendingElicitations();
+        if (state)
+            this.disconnectMcpConnectionsForSession(sessionId, state);
         this.sessions.delete(sessionId);
         if (state) {
+            for (const serverId of state.mcpServerIds) {
+                if (this.mcpServerSessions.get(serverId) === sessionId)
+                    this.mcpServerSessions.delete(serverId);
+            }
             for (const elicitationId of state.urlElicitationIds)
                 this.urlElicitationContexts.delete(elicitationId);
             this.tombstones.set(sessionId, {
@@ -248,6 +265,12 @@ class MultiplexClient {
             state.settlePendingElicitations();
         }
     }
+    disconnectAllMcpConnections() {
+        for (const [sessionId, state] of this.sessions) {
+            this.disconnectMcpConnectionsForSession(sessionId, state);
+        }
+        this.mcpServerSessions.clear();
+    }
     requestPermission(params) {
         const state = this.sessions.get(params.sessionId);
         // Unknown/closed session: refuse rather than silently allow a tool we can't attribute.
@@ -373,6 +396,51 @@ class MultiplexClient {
     killTerminal(params) {
         return this.dispatch(params, CLIENT_METHODS.terminal_kill, this.handlers?.terminal?.killTerminal);
     }
+    async mcpConnect(params) {
+        const handler = this.handlers?.mcp?.connect;
+        if (typeof handler !== "function")
+            throw methodNotAdvertised(CLIENT_METHODS.mcp_connect);
+        const sessionId = this.mcpServerSessions.get(params.serverId);
+        if (!sessionId)
+            throw unknownMcpServer(params.serverId);
+        const response = await handler(params, this.handlerContext({ sessionId }));
+        this.mcpConnectionSessions.set(response.connectionId, sessionId);
+        this.sessions.get(sessionId)?.mcpConnectionIds.add(response.connectionId);
+        return response;
+    }
+    async mcpMessage(params) {
+        const handler = this.handlers?.mcp?.message;
+        if (typeof handler !== "function")
+            throw methodNotAdvertised(CLIENT_METHODS.mcp_message);
+        const ctx = this.handlerContext({ sessionId: this.sessionIdForMcpConnection(params.connectionId) });
+        return handler(params, ctx);
+    }
+    mcpMessageNotification(params) {
+        const handler = this.handlers?.mcp?.message;
+        if (typeof handler !== "function")
+            return;
+        const sessionId = this.mcpConnectionSessions.get(params.connectionId);
+        if (!sessionId)
+            return;
+        try {
+            Promise.resolve(handler(params, this.handlerContext({ sessionId }))).catch(() => { });
+        }
+        catch {
+            // Notifications have no response path; teardown remains best-effort and non-fatal.
+        }
+    }
+    async mcpDisconnect(params) {
+        const handler = this.handlers?.mcp?.disconnect;
+        if (typeof handler !== "function")
+            throw methodNotAdvertised(CLIENT_METHODS.mcp_disconnect);
+        const sessionId = this.sessionIdForMcpConnection(params.connectionId);
+        try {
+            return (await handler(params, this.handlerContext({ sessionId }))) ?? {};
+        }
+        finally {
+            this.dropMcpConnection(params.connectionId, sessionId);
+        }
+    }
     sessionUpdate(params) {
         const state = this.sessions.get(params.sessionId);
         // Fold into the accumulator FIRST (the drain contract), THEN bubble the event up unchanged.
@@ -406,10 +474,42 @@ class MultiplexClient {
         this.sessions.get(ctx.sessionId)?.urlElicitationIds.delete(params.elicitationId);
         this.onEvent?.("elicitation_complete", { ...ctx, notification: params });
     }
+    sessionIdForMcpConnection(connectionId) {
+        const sessionId = this.mcpConnectionSessions.get(connectionId);
+        if (!sessionId)
+            throw unknownMcpConnection(connectionId);
+        return sessionId;
+    }
+    dropMcpConnection(connectionId, sessionId) {
+        this.mcpConnectionSessions.delete(connectionId);
+        this.sessions.get(sessionId)?.mcpConnectionIds.delete(connectionId);
+    }
+    disconnectMcpConnectionsForSession(sessionId, state) {
+        const handler = this.handlers?.mcp?.disconnect;
+        const ctx = { sessionId, cwd: state.cwd, label: state.label, runId: state.runId };
+        for (const connectionId of [...state.mcpConnectionIds]) {
+            this.mcpConnectionSessions.delete(connectionId);
+            state.mcpConnectionIds.delete(connectionId);
+            if (typeof handler !== "function")
+                continue;
+            try {
+                Promise.resolve(handler({ connectionId }, ctx)).catch(() => { });
+            }
+            catch {
+                // Best-effort teardown: a broken MCP cleanup hook must not block session release/death.
+            }
+        }
+    }
 }
 function unknownSession(sessionId) {
     return RequestError.invalidParams({ sessionId }, `unknown session: ${sessionId}`);
 }
+function unknownMcpServer(serverId) {
+    return RequestError.invalidParams({ serverId }, `unknown MCP-over-ACP server: ${serverId}`);
+}
+function unknownMcpConnection(connectionId) {
+    return RequestError.invalidParams({ connectionId }, `unknown MCP-over-ACP connection: ${connectionId}`);
+}
 function cancelledPermissionResponse() {
     return { outcome: { outcome: "cancelled" } };
 }
@@ -452,6 +552,18 @@ function lifecycleCapabilityError(backendId, method, capabilities, label) {
         : "initialize did not complete";
     return new WorkflowError(`ACP agent (${backendId}) does not advertise ${method}; advertised lifecycle capabilities: ${advertised}`, WorkflowErrorCode.SCRIPT_VALIDATION_ERROR, { recoverable: false, agentLabel: label });
 }
+function authProviderCapabilityError(backendId, method, capabilities, label) {
+    const advertised = capabilities
+        ? describeAuthProviderAdvertisement(capabilities.agent, capabilities.authMethods)
+        : "initialize did not complete";
+    return new WorkflowError(`ACP agent (${backendId}) does not advertise ${method}; advertised auth/provider capabilities: ${advertised}`, WorkflowErrorCode.SCRIPT_VALIDATION_ERROR, { recoverable: false, agentLabel: label });
+}
+function isMethodNotFound(error) {
+    return Boolean(error && typeof error === "object" && error.code === -32601);
+}
+function agentMethodNotFoundError(backendId, method, label, cause) {
+    return new WorkflowError(`ACP agent (${backendId}) does not implement ${method}: ${thrownMessage(cause)}`, WorkflowErrorCode.SCRIPT_VALIDATION_ERROR, { recoverable: false, agentLabel: label, details: cause });
+}
 function thrownMessage(error) {
     if (error instanceof Error)
         return error.message;
@@ -479,6 +591,11 @@ function layerMeta(...layers) {
         return undefined;
     return Object.assign({}, ...present);
 }
+function acpMcpServerIds(servers) {
+    return servers
+        ?.filter((server) => "type" in server && server.type === "acp")
+        .map((server) => server.serverId) ?? [];
+}
 /** Merge the engine runId correlation stamp into a backend's session/new `_meta`. Returns the
  *  meta unchanged when no runId is given (so a backend that sends no `_meta` keeps sending none). */
 function stampRunId(meta, runId) {
@@ -583,6 +700,10 @@ export class PooledConnection {
             .onRequest(CLIENT_METHODS.terminal_release, ({ params }) => this.client.releaseTerminal(params))
             .onRequest(CLIENT_METHODS.terminal_wait_for_exit, ({ params }) => this.client.waitForTerminalExit(params))
             .onRequest(CLIENT_METHODS.terminal_kill, ({ params }) => this.client.killTerminal(params))
+            .onRequest(CLIENT_METHODS.mcp_connect, parseConnectMcpRequest, ({ params }) => this.client.mcpConnect(params))
+            .onRequest(CLIENT_METHODS.mcp_message, parseMessageMcpRequest, ({ params }) => this.client.mcpMessage(params))
+            .onRequest(CLIENT_METHODS.mcp_disconnect, parseDisconnectMcpRequest, ({ params }) => this.client.mcpDisconnect(params))
+            .onNotification(CLIENT_METHODS.mcp_message, parseMessageMcpNotification, ({ params }) => this.client.mcpMessageNotification(params))
             .connect(stream);
         // Death detection. The connection's `signal` aborts the INSTANT the underlying stream closes
         // (process crash or our own dispose) — in the SAME close() that rejects pending requests — so
@@ -622,10 +743,16 @@ export class PooledConnection {
     }
     assertSupportedMcpServers(opts) {
         const unsupported = this.negotiated
-            ? unsupportedMcpServer(opts.mcpServers, this.negotiated.agent)
+            ? unsupportedMcpServer(opts.mcpServers, this.negotiated.agent, {
+                clientCanServeAcp: hasFullMcpHandlers(this.clientHandlers?.mcp),
+            })
             : undefined;
         if (!unsupported)
             return;
+        if (unsupported.reason === "client") {
+            throw new WorkflowError(`MCP server "${unsupported.name}" uses the "acp" transport, but this runner has no ` +
+                "complete clientHandlers.mcp implementation to serve it", WorkflowErrorCode.SCRIPT_VALIDATION_ERROR, { recoverable: false, agentLabel: opts.label });
+        }
         throw new WorkflowError(`MCP server "${unsupported.name}" uses the "${unsupported.transport}" transport, which the ` +
             `${this.backendId} agent does not support`, WorkflowErrorCode.SCRIPT_VALIDATION_ERROR, { recoverable: false, agentLabel: opts.label });
     }
@@ -649,6 +776,18 @@ export class PooledConnection {
             return;
         throw lifecycleCapabilityError(this.backendId, method, this.negotiated, label);
     }
+    assertAuthProviderSupported(method, label) {
+        const supported = method === AGENT_METHODS.logout
+            ? this.negotiated?.supportsLogout
+            : method === AGENT_METHODS.providers_list ||
+                method === AGENT_METHODS.providers_set ||
+                method === AGENT_METHODS.providers_disable
+                ? this.negotiated?.supportsProviders
+                : true;
+        if (supported)
+            return;
+        throw authProviderCapabilityError(this.backendId, method, this.negotiated, label);
+    }
     /** Mark this connection dead exactly once, then ask the pool to evict it. Idempotent. */
     die(error) {
         if (!this._alive)
@@ -658,6 +797,7 @@ export class PooledConnection {
         this.resolveDead();
         this.client.settleAllPendingPermissions();
         this.client.settleAllPendingElicitations();
+        this.client.disconnectAllMcpConnections();
         // A crash (not a graceful dispose) is worth surfacing for observability; the engine still
         // handles it by retrying the run on a fresh process. Best-effort, after death is recorded.
         if (this.onEvent && !this.disposing) {
@@ -754,7 +894,7 @@ export class PooledConnection {
                 ...(meta ? { _meta: meta } : {}),
             };
             const response = await this.race(this.connection.agent.request(AGENT_METHODS.session_new, request));
-            const state = new SessionState(opts.cwd, opts.policy, opts.permissionResolver, opts.elicitationResolver, opts.label, opts.runId, response.modes, opts.retainSessionLog ?? true);
+            const state = new SessionState(opts.cwd, opts.policy, opts.permissionResolver, opts.elicitationResolver, opts.label, opts.runId, response.modes, acpMcpServerIds(opts.mcpServers), opts.retainSessionLog ?? true);
             this.client.register(response.sessionId, state);
             return new SessionHandle(this, response.sessionId, state, response.configOptions ?? [], opts);
         }
@@ -772,16 +912,17 @@ export class PooledConnection {
         return this.reattachSession(AGENT_METHODS.session_resume, sessionId, opts);
     }
     rawAgentRequest(method, params) {
-        // SDK 1.2.0 still maps session/load through emptyObjectResponse in ClientContext.request(),
-        // but both supported adapters return configOptions/modes there and the driven wrapper must
-        // adopt them. This bypasses only the SDK response mapper, not JSON-RPC validation/racing.
+        // Some SDK ClientContext convenience methods collapse responses through emptyObjectResponse
+        // (session/load in 1.2.0, plus auth/provider methods with optional _meta). Driven wrappers
+        // need the wire response as-is. This bypasses only the SDK response mapper, not JSON-RPC
+        // validation/racing.
         const agent = this.connection.agent;
         return this.race(agent.sendRequest(method, params));
     }
     async reattachSession(method, sessionId, opts) {
         this._activeSessions += 1;
         let registered = false;
-        const state = new SessionState(opts.cwd, opts.policy, opts.permissionResolver, opts.elicitationResolver, opts.label, opts.runId, undefined, opts.retainSessionLog ?? true);
+        const state = new SessionState(opts.cwd, opts.policy, opts.permissionResolver, opts.elicitationResolver, opts.label, opts.runId, undefined, acpMcpServerIds(opts.mcpServers), opts.retainSessionLog ?? true);
         try {
             await this.ready;
             this.assertLifecycleSupported(method, opts.label);
@@ -828,6 +969,76 @@ export class PooledConnection {
         this.assertLifecycleSupported(AGENT_METHODS.session_delete, label);
         await this.race(this.connection.agent.request(AGENT_METHODS.session_delete, request));
     }
+    /** Authentication methods advertised in initialize, available without opening a session. */
+    async authMethods() {
+        await this.ready;
+        return [...(this.negotiated?.authMethods ?? [])];
+    }
+    /** authenticate has no AgentCapabilities gate; authMethods advertises choices, not method support. */
+    async authenticate(request, label) {
+        await this.ready;
+        try {
+            return await this.rawAgentRequest(AGENT_METHODS.authenticate, request);
+        }
+        catch (error) {
+            if (isMethodNotFound(error))
+                throw agentMethodNotFoundError(this.backendId, AGENT_METHODS.authenticate, label, error);
+            throw error;
+        }
+    }
+    /** providers/list on a dedicated connection, gated on the unstable providers advertisement. */
+    async listProviders(request, label) {
+        await this.ready;
+        this.assertAuthProviderSupported(AGENT_METHODS.providers_list, label);
+        try {
+            return await this.rawAgentRequest(AGENT_METHODS.providers_list, request);
+        }
+        catch (error) {
+            if (isMethodNotFound(error))
+                throw agentMethodNotFoundError(this.backendId, AGENT_METHODS.providers_list, label, error);
+            throw error;
+        }
+    }
+    /** providers/set on a dedicated connection, gated on the unstable providers advertisement. */
+    async setProvider(request, label) {
+        await this.ready;
+        this.assertAuthProviderSupported(AGENT_METHODS.providers_set, label);
+        try {
+            return await this.rawAgentRequest(AGENT_METHODS.providers_set, request);
+        }
+        catch (error) {
+            if (isMethodNotFound(error))
+                throw agentMethodNotFoundError(this.backendId, AGENT_METHODS.providers_set, label, error);
+            throw error;
+        }
+    }
+    /** providers/disable on a dedicated connection, gated on the unstable providers advertisement. */
+    async disableProvider(request, label) {
+        await this.ready;
+        this.assertAuthProviderSupported(AGENT_METHODS.providers_disable, label);
+        try {
+            return await this.rawAgentRequest(AGENT_METHODS.providers_disable, request);
+        }
+        catch (error) {
+            if (isMethodNotFound(error)) {
+                throw agentMethodNotFoundError(this.backendId, AGENT_METHODS.providers_disable, label, error);
+            }
+            throw error;
+        }
+    }
+    /** logout on a dedicated connection, gated on agentCapabilities.auth.logout. */
+    async logout(request, label) {
+        await this.ready;
+        this.assertAuthProviderSupported(AGENT_METHODS.logout, label);
+        try {
+            return await this.rawAgentRequest(AGENT_METHODS.logout, request);
+        }
+        catch (error) {
+            if (isMethodNotFound(error))
+                throw agentMethodNotFoundError(this.backendId, AGENT_METHODS.logout, label, error);
+            throw error;
+        }
+    }
     /** session/prompt on this connection, raced against process death. */
     prompt(request) {
         return this.race(this.connection.agent.request(AGENT_METHODS.session_prompt, request));
@@ -971,6 +1182,10 @@ export class SessionHandle {
     get modes() {
         return this.state.modes;
     }
+    /** The connection-level initialize response parsed before this session was opened. */
+    get capabilities() {
+        return this.pooled.capabilities;
+    }
     /**
      * Select the model for this session from the agent-advertised config options (§5.4).
      * Returns `matched:false` (the caller fires onModelFallback) when the catalog has no value

package/dist/capabilities.d.ts

@@ -1,4 +1,4 @@
-import { type AgentCapabilities, type ContentBlock, type Implementation, type InitializeResponse } from "@agentclientprotocol/sdk";
+import { type AgentCapabilities, type AuthMethod, type ContentBlock, type Implementation, type InitializeResponse } from "@agentclientprotocol/sdk";
 import { type McpServerConfig } from "@automatalabs/shared-types";
 import type { Backend } from "./backend.js";
 /** The bare `_meta` keys whose emission is gated by Codex's custom-capability advertisement.
@@ -16,6 +16,10 @@ export interface NegotiatedCapabilities {
     agent: AgentCapabilities;
     /** The agent's self-identification, when it sent agentInfo. */
     agentInfo: Implementation | undefined;
+    /** Authentication methods advertised by the agent in initialize, defaulting to [] when absent. */
+    authMethods: AuthMethod[];
+    /** Initialize-response `_meta`, when the agent sent it. */
+    initializeMeta: InitializeResponse["_meta"] | undefined;
     /** Whether session/close is advertised (gates the best-effort release-time close). */
     supportsClose: boolean;
     /** Whether session/load is advertised. The current SDK keeps this as the legacy top-level
@@ -27,6 +31,10 @@ export interface NegotiatedCapabilities {
     supportsDeleteSession: boolean;
     /** Whether session/resume is advertised. */
     supportsResumeSession: boolean;
+    /** Whether logout is advertised under agentCapabilities.auth.logout. */
+    supportsLogout: boolean;
+    /** Whether the unstable provider-configuration block is advertised. */
+    supportsProviders: boolean;
     /** The parsed backend-declared custom-capability block (the namespaced `_meta` object), or
      *  undefined when the backend declared none or the agent did not advertise it — passthrough. */
     customMetaSupport: Record<string, unknown> | undefined;
@@ -38,6 +46,8 @@ export interface NegotiatedCapabilities {
 export declare function negotiateCapabilities(response: InitializeResponse, customCapabilities?: Backend["customCapabilities"]): NegotiatedCapabilities;
 /** Human-readable lifecycle advertisement summary for strict wrapper gate errors. */
 export declare function describeLifecycleAdvertisement(agent: AgentCapabilities): string;
+/** Human-readable auth/provider advertisement summary for strict wrapper gate errors. */
+export declare function describeAuthProviderAdvertisement(agent: AgentCapabilities, authMethods?: readonly AuthMethod[]): string;
 /** True only when the agent selected EXACTLY PROTOCOL_VERSION. This client implements that one wire
  *  version and adapts its behavior to no other, so any other selected version — older or newer —
  *  means close the connection per the ACP spec's SHOULD-close rule. Per the spec the agent echoes
@@ -56,13 +66,16 @@ export declare function gateCustomMeta(meta: Record<string, unknown> | undefined
  *  bracketed text notes so context is never silently lost. Returns the SAME array reference when
  *  no block changes and never mutates the input or any surviving block. */
 export declare function adaptPromptContent(blocks: ContentBlock[], agent: AgentCapabilities, backendId: string): ContentBlock[];
-/** The first client-provided MCP server whose transport the agent did NOT advertise, or undefined
- *  when every server is serviceable. stdio is ALWAYS serviceable (the baseline transport); http/sse
- *  are gated on mcpCapabilities.{http,sse}. Lenient for legacy agents: when the agent advertised no
- *  mcpCapabilities at all we cannot know its transports, so we do not gate (preserving today's
- *  send-and-let-the-agent-decide behavior for minimal/custom servers). */
-export declare function unsupportedMcpServer(servers: McpServerConfig[] | undefined, agent: AgentCapabilities): {
+/** The first client-provided MCP server whose transport cannot be served, or undefined when every
+ *  server is serviceable. stdio is ALWAYS serviceable (the baseline transport); http/sse keep the
+ *  legacy leniency and gate only after any mcpCapabilities block exists. ACP transport is stricter:
+ *  both sides must be explicit because the client is the MCP server host and an unwired declaration
+ *  would otherwise spend tokens before failing at mcp/connect. */
+export declare function unsupportedMcpServer(servers: McpServerConfig[] | undefined, agent: AgentCapabilities, options?: {
+    clientCanServeAcp?: boolean;
+}): {
     name: string;
-    transport: "http" | "sse";
+    transport: "http" | "sse" | "acp";
+    reason?: "client";
 } | undefined;
 //# sourceMappingURL=capabilities.d.ts.map

package/dist/capabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../src/capabilities.ts"],"names":[],"mappings":"AAkBA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQ5C;;;iGAGiG;AACjG,eAAO,MAAM,sBAAsB,EAAE,SAAS,MAAM,EAInD,CAAC;AAEF,qFAAqF;AACrF,MAAM,WAAW,sBAAsB;IACrC;0FACsF;IACtF,eAAe,EAAE,MAAM,CAAC;IACxB;4DACwD;IACxD,KAAK,EAAE,iBAAiB,CAAC;IACzB,+DAA+D;IAC/D,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IACtC,sFAAsF;IACtF,aAAa,EAAE,OAAO,CAAC;IACvB;mGAC+F;IAC/F,mBAAmB,EAAE,OAAO,CAAC;IAC7B,0CAA0C;IAC1C,oBAAoB,EAAE,OAAO,CAAC;IAC9B,4CAA4C;IAC5C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4CAA4C;IAC5C,qBAAqB,EAAE,OAAO,CAAC;IAC/B;oGACgG;IAChG,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IACvD;+EAC2E;IAC3E,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,mFAAmF;AACnF,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACjD,sBAAsB,CAkBxB;AAMD,qFAAqF;AACrF,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAiB/E;AAaD;;;;+DAI+D;AAC/D,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED;;;gEAGgE;AAChE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC5C,SAAS,GAAE,SAAS,MAAM,EAA2B,GACpD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAWrC;AAED;;;;;2EAK2E;AAC3E,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EAAE,EACtB,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,MAAM,GAChB,YAAY,EAAE,CAchB;AAkCD;;;;0EAI0E;AAC1E,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,KAAK,EAAE,iBAAiB,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,GAAG,SAAS,CAYzD"}
+{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../src/capabilities.ts"],"names":[],"mappings":"AAkBA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQ5C;;;iGAGiG;AACjG,eAAO,MAAM,sBAAsB,EAAE,SAAS,MAAM,EAInD,CAAC;AAEF,qFAAqF;AACrF,MAAM,WAAW,sBAAsB;IACrC;0FACsF;IACtF,eAAe,EAAE,MAAM,CAAC;IACxB;4DACwD;IACxD,KAAK,EAAE,iBAAiB,CAAC;IACzB,+DAA+D;IAC/D,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IACtC,kGAAkG;IAClG,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,2DAA2D;IAC3D,cAAc,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IACxD,sFAAsF;IACtF,aAAa,EAAE,OAAO,CAAC;IACvB;mGAC+F;IAC/F,mBAAmB,EAAE,OAAO,CAAC;IAC7B,0CAA0C;IAC1C,oBAAoB,EAAE,OAAO,CAAC;IAC9B,4CAA4C;IAC5C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4CAA4C;IAC5C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wEAAwE;IACxE,cAAc,EAAE,OAAO,CAAC;IACxB,uEAAuE;IACvE,iBAAiB,EAAE,OAAO,CAAC;IAC3B;oGACgG;IAChG,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IACvD;+EAC2E;IAC3E,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,mFAAmF;AACnF,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACjD,sBAAsB,CAsBxB;AAMD,qFAAqF;AACrF,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAiB/E;AAED,yFAAyF;AACzF,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,iBAAiB,EACxB,WAAW,GAAE,SAAS,UAAU,EAAO,GACtC,MAAM,CAOR;AAaD;;;;+DAI+D;AAC/D,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED;;;gEAGgE;AAChE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EACzC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC5C,SAAS,GAAE,SAAS,MAAM,EAA2B,GACpD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAWrC;AAED;;;;;2EAK2E;AAC3E,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,YAAY,EAAE,EACtB,KAAK,EAAE,iBAAiB,EACxB,SAAS,EAAE,MAAM,GAChB,YAAY,EAAE,CAchB;AAkCD;;;;kEAIkE;AAClE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS,EACtC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAAC,MAAM,CAAC,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAkBpF"}

package/dist/capabilities.js

@@ -40,11 +40,15 @@ export function negotiateCapabilities(response, customCapabilities) {
         protocolVersion: response.protocolVersion,
         agent,
         agentInfo: response.agentInfo ?? undefined,
+        authMethods: response.authMethods ?? [],
+        initializeMeta: response._meta ?? undefined,
         supportsClose: advertised(sessionCapabilities?.close),
         supportsLoadSession: agent.loadSession === true || advertised(sessionCapabilities?.load),
         supportsListSessions: advertised(sessionCapabilities?.list),
         supportsDeleteSession: advertised(sessionCapabilities?.delete),
         supportsResumeSession: advertised(sessionCapabilities?.resume),
+        supportsLogout: advertised(agent.auth?.logout),
+        supportsProviders: advertised(agent.providers),
         customMetaSupport: customCapabilities
             ? readCustomNamespace(agent._meta, customCapabilities.namespace)
             : undefined,
@@ -73,6 +77,15 @@ export function describeLifecycleAdvertisement(agent) {
         `sessionCapabilities=${session.length > 0 ? session.join(", ") : "none"}`,
     ].join("; ");
 }
+/** Human-readable auth/provider advertisement summary for strict wrapper gate errors. */
+export function describeAuthProviderAdvertisement(agent, authMethods = []) {
+    const methodIds = authMethods.map((method) => method.id).filter(Boolean);
+    return [
+        `authMethods=${methodIds.length > 0 ? methodIds.join(", ") : "none"}`,
+        `auth.logout=${advertised(agent.auth?.logout) ? "true" : "false"}`,
+        `providers=${advertised(agent.providers) ? "true" : "false"}`,
+    ].join("; ");
+}
 function readCustomNamespace(meta, namespace) {
     if (!meta || typeof meta !== "object")
         return undefined;
@@ -153,22 +166,28 @@ function unsupportedPromptBlockNote(block, agent, backendId) {
             return undefined;
     }
 }
-/** The first client-provided MCP server whose transport the agent did NOT advertise, or undefined
- *  when every server is serviceable. stdio is ALWAYS serviceable (the baseline transport); http/sse
- *  are gated on mcpCapabilities.{http,sse}. Lenient for legacy agents: when the agent advertised no
- *  mcpCapabilities at all we cannot know its transports, so we do not gate (preserving today's
- *  send-and-let-the-agent-decide behavior for minimal/custom servers). */
-export function unsupportedMcpServer(servers, agent) {
+/** The first client-provided MCP server whose transport cannot be served, or undefined when every
+ *  server is serviceable. stdio is ALWAYS serviceable (the baseline transport); http/sse keep the
+ *  legacy leniency and gate only after any mcpCapabilities block exists. ACP transport is stricter:
+ *  both sides must be explicit because the client is the MCP server host and an unwired declaration
+ *  would otherwise spend tokens before failing at mcp/connect. */
+export function unsupportedMcpServer(servers, agent, options = {}) {
     const mcp = agent.mcpCapabilities;
-    if (!mcp || !servers)
+    if (!servers)
         return undefined;
     for (const server of servers) {
-        if ("type" in server && server.type === "http" && mcp.http !== true) {
+        if ("type" in server && server.type === "http" && mcp && mcp.http !== true) {
             return { name: server.name, transport: "http" };
         }
-        if ("type" in server && server.type === "sse" && mcp.sse !== true) {
+        if ("type" in server && server.type === "sse" && mcp && mcp.sse !== true) {
             return { name: server.name, transport: "sse" };
         }
+        if ("type" in server && server.type === "acp" && mcp?.acp !== true) {
+            return { name: server.name, transport: "acp" };
+        }
+        if ("type" in server && server.type === "acp" && options.clientCanServeAcp !== true) {
+            return { name: server.name, transport: "acp", reason: "client" };
+        }
     }
     return undefined;
 }