@tickernelz/paperclip-pro-adapter-utils 2026.1001.2 → 2026.1002.0

package/node_modules/@agentclientprotocol/sdk/dist/v2/schema/types.gen.d.ts

@@ -13,7 +13,7 @@ export type AgentRequest = {
     /**
      * Method-specific request parameters.
      */
-    params?: RequestPermissionRequest | CreateElicitationRequest | ConnectMcpRequest | MessageMcpRequest | DisconnectMcpRequest | ExtRequest | null;
+    params?: RequestPermissionRequest | CreateElicitationRequest | MessageMcpRequest | ExtRequest | null;
 };
 /**
  * JSON RPC Request Id
@@ -1342,74 +1342,31 @@ export type ElicitationUrlMode = (ElicitationSessionScope | ElicitationRequestSc
 /**
  * **UNSTABLE**
  *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
- *
- * Request parameters for `mcp/connect`.
+ * Request parameters for `mcp/message`, sent from consumer to provider.
  *
  * @experimental
  */
-export type ConnectMcpRequest = {
+export type MessageMcpRequest = {
     /**
-     * The ACP MCP server ID that was provided by the component declaring the MCP server.
+     * The declared ACP MCP server receiving this request.
      */
     serverId: McpServerAcpId;
     /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     * The caller-generated identifier for the inner MCP request.
      */
-    _meta?: {
-        [key: string]: unknown;
-    } | null;
-};
-/**
- * **UNSTABLE**
- *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
- *
- * Unique identifier for an MCP server using the ACP transport.
- *
- * The value is opaque and generated by the ACP component providing the MCP server. It is
- * used by `mcp/connect` to route connection requests back to the component that declared the
- * server.
- *
- * @experimental
- */
-export type McpServerAcpId = string;
-/**
- * **UNSTABLE**
- *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
- *
- * Request parameters for `mcp/message`.
- *
- * @experimental
- */
-export type MessageMcpRequest = {
-    /**
-     * The MCP-over-ACP connection this message is sent on.
-     */
-    connectionId: McpConnectionId;
+    requestId: McpRequestId;
     /**
      * The inner MCP method name.
      */
     method: string;
     /**
-     * Optional inner MCP params.
-     *
-     * If omitted or set to `null`, the inner MCP message has no params.
+     * Optional inner MCP params; null is equivalent to omission.
      */
     params?: {
         [key: string]: unknown;
     } | null;
     /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     * ACP extension metadata (not inner MCP params._meta); null is equivalent to omission.
      */
     _meta?: {
         [key: string]: unknown;
@@ -1420,36 +1377,24 @@ export type MessageMcpRequest = {
  *
  * This capability is not part of the spec yet, and may be removed or changed at any point.
  *
- * A unique identifier for an active MCP-over-ACP connection.
+ * Unique identifier for an MCP server using the ACP transport.
+ *
+ * The value is opaque and generated by the ACP component providing the MCP server. It is
+ * used by `mcp/message` to route requests to the component that declared the server.
  *
  * @experimental
  */
-export type McpConnectionId = string;
+export type McpServerAcpId = string;
 /**
  * **UNSTABLE**
  *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
- *
- * Request parameters for `mcp/disconnect`.
+ * Identifies an inner MCP request active against a server on this ACP connection.
+ * Generated by the caller and preserved unchanged by proxies, independently of
+ * the outer ACP JSON-RPC request ID.
  *
  * @experimental
  */
-export type DisconnectMcpRequest = {
-    /**
-     * The MCP-over-ACP connection to close.
-     */
-    connectionId: McpConnectionId;
-    /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
-     */
-    _meta?: {
-        [key: string]: unknown;
-    } | null;
-};
+export type McpRequestId = string;
 /**
  * Allows for sending an arbitrary request that is not part of the ACP spec.
  * Extension methods provide a way to add custom functionality while maintaining
@@ -1469,7 +1414,7 @@ export type AgentResponse = {
     /**
      * Method-specific response data.
      */
-    result: InitializeResponse | LoginAuthResponse | ListProvidersResponse | SetProviderResponse | DisableProviderResponse | LogoutAuthResponse | NewSessionResponse | ListSessionsResponse | DeleteSessionResponse | ForkSessionResponse | ResumeSessionResponse | CloseSessionResponse | SetSessionConfigOptionResponse | PromptResponse | StartNesResponse | SuggestNesResponse | CloseNesResponse | ExtResponse | MessageMcpResponse;
+    result: InitializeResponse | LoginAuthResponse | ListProvidersResponse | SetProviderResponse | DisableProviderResponse | LogoutAuthResponse | NewSessionResponse | ListSessionsResponse | DeleteSessionResponse | ForkSessionResponse | ResumeSessionResponse | CloseSessionResponse | SetSessionConfigOptionResponse | PromptResponse | StartNesResponse | SuggestNesResponse | CloseNesResponse | ExtResponse;
 } | {
     /**
      * The id of the request this response answers.
@@ -2667,6 +2612,14 @@ export type NewSessionResponse = {
      * Initial session configuration options.
      */
     configOptions?: Array<SessionConfigOption>;
+    /**
+     * Initial commands the agent can execute in this session.
+     *
+     * Optional. Omitted or empty means no initial commands are advertised.
+     * Senders MUST use an array, not `null`; receivers treat `null` like omission.
+     * Later `available_commands_update` notifications replace this list.
+     */
+    availableCommands?: Array<AvailableCommand>;
     /**
      * The _meta property is reserved by ACP to allow clients and agents to attach additional
      * metadata to their interactions. Implementations MUST NOT make assumptions about values at
@@ -2827,6 +2780,68 @@ export type SessionConfigBoolean = {
      */
     currentValue: boolean;
 };
+/**
+ * Information about a command.
+ */
+export type AvailableCommand = {
+    /**
+     * Command name (e.g., `create_plan`, `research_codebase`).
+     */
+    name: string;
+    /**
+     * Human-readable description of what the command does.
+     */
+    description: string;
+    /**
+     * Input for the command if required
+     */
+    input?: AvailableCommandInput | null;
+    /**
+     * The _meta property is reserved by ACP to allow clients and agents to attach additional
+     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
+     * these keys.
+     *
+     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
+/**
+ * The input specification for a command.
+ */
+export type AvailableCommandInput = (TextCommandInput & {
+    type: "text";
+}) | {
+    /**
+     * Custom or future command input type.
+     *
+     * Values beginning with `_` are reserved for implementation-specific
+     * extensions. Unknown values that do not begin with `_` are reserved for
+     * future ACP variants.
+     */
+    type: string;
+    [key: string]: unknown;
+};
+/**
+ * All text that was typed after the command name is provided as input.
+ */
+export type TextCommandInput = {
+    /**
+     * A hint to display when the input hasn't been provided yet
+     */
+    hint: string;
+    /**
+     * The _meta property is reserved by ACP to allow clients and agents to attach additional
+     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
+     * these keys.
+     *
+     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
 /**
  * Response from listing sessions.
  */
@@ -2927,6 +2942,14 @@ export type ForkSessionResponse = {
      * Initial session configuration options.
      */
     configOptions?: Array<SessionConfigOption>;
+    /**
+     * Initial commands the agent can execute in this session.
+     *
+     * Optional. Omitted or empty means no initial commands are advertised.
+     * Senders MUST use an array, not `null`; receivers treat `null` like omission.
+     * Later `available_commands_update` notifications replace this list.
+     */
+    availableCommands?: Array<AvailableCommand>;
     /**
      * The _meta property is reserved by ACP to allow clients and agents to attach additional
      * metadata to their interactions. Implementations MUST NOT make assumptions about values at
@@ -2946,6 +2969,14 @@ export type ResumeSessionResponse = {
      * Initial session configuration options.
      */
     configOptions?: Array<SessionConfigOption>;
+    /**
+     * Initial commands the agent can execute in this session.
+     *
+     * Optional. Omitted or empty means no initial commands are advertised.
+     * Senders MUST use an array, not `null`; receivers treat `null` like omission.
+     * Later `available_commands_update` notifications replace this list.
+     */
+    availableCommands?: Array<AvailableCommand>;
     /**
      * The _meta property is reserved by ACP to allow clients and agents to attach additional
      * metadata to their interactions. Implementations MUST NOT make assumptions about values at
@@ -3318,18 +3349,6 @@ export type CloseNesResponse = {
  * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
  */
 export type ExtResponse = unknown;
-/**
- * **UNSTABLE**
- *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
- *
- * Response to `mcp/message`.
- *
- * This is the inner MCP response result payload. Any JSON value is valid.
- *
- * @experimental
- */
-export type MessageMcpResponse = unknown;
 /**
  * JSON-RPC error object.
  *
@@ -3373,7 +3392,7 @@ export type AgentNotification = {
     /**
      * Method-specific notification parameters.
      */
-    params?: UpdateSessionNotification | CompleteElicitationNotification | MessageMcpNotification | ExtNotification | null;
+    params?: UpdateSessionNotification | CompleteElicitationNotification | ExtNotification | null;
 };
 /**
  * Notification containing a session update from the agent.
@@ -3449,6 +3468,12 @@ export type SessionUpdate = (ContentChunk & {
     sessionUpdate: "compaction_update";
 }) | (CompactionSummaryChunk & {
     sessionUpdate: "compaction_summary_chunk";
+}) | (SubagentUpdate & {
+    sessionUpdate: "subagent_update";
+}) | (SessionMessage & {
+    sessionUpdate: "session_message";
+}) | (SessionMessageChunk & {
+    sessionUpdate: "session_message_chunk";
 }) | {
     /**
      * Custom or future session update type.
@@ -3707,6 +3732,33 @@ export type RequiresActionStateUpdate = {
         [key: string]: unknown;
     } | null;
 };
+/**
+ * **UNSTABLE**
+ *
+ * This capability is not part of the spec yet, and may be removed or changed at any point.
+ *
+ * The Agent cannot currently determine foreground activity.
+ *
+ * Report this when activity becomes unobservable, not merely because the session
+ * has been quiet. The Client MUST stop presenting the previous state as confirmed
+ * current activity, but may retain it as last known. A later state replaces this
+ * snapshot normally.
+ *
+ * This is not a task outcome or session closure. It does not cancel work, resolve
+ * pending requests, or revoke capabilities; capabilities are updated separately.
+ *
+ * @experimental
+ */
+export type UnknownStateUpdate = {
+    /**
+     * The _meta property is reserved by ACP for additional metadata.
+     * Implementations MUST NOT make assumptions about values at these keys.
+     * Optional; omitted and `null` mean no metadata for this state snapshot.
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
 /**
  * The state of the agent's foreground work has changed.
  *
@@ -3719,6 +3771,8 @@ export type StateUpdate = (RunningStateUpdate & {
     state: "idle";
 }) | (RequiresActionStateUpdate & {
     state: "requires_action";
+}) | (UnknownStateUpdate & {
+    state: "unknown";
 }) | {
     /**
      * Custom or future session state.
@@ -4076,68 +4130,6 @@ export type PlanRemoved = {
         [key: string]: unknown;
     } | null;
 };
-/**
- * Information about a command.
- */
-export type AvailableCommand = {
-    /**
-     * Command name (e.g., `create_plan`, `research_codebase`).
-     */
-    name: string;
-    /**
-     * Human-readable description of what the command does.
-     */
-    description: string;
-    /**
-     * Input for the command if required
-     */
-    input?: AvailableCommandInput | null;
-    /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
-     */
-    _meta?: {
-        [key: string]: unknown;
-    } | null;
-};
-/**
- * The input specification for a command.
- */
-export type AvailableCommandInput = (TextCommandInput & {
-    type: "text";
-}) | {
-    /**
-     * Custom or future command input type.
-     *
-     * Values beginning with `_` are reserved for implementation-specific
-     * extensions. Unknown values that do not begin with `_` are reserved for
-     * future ACP variants.
-     */
-    type: string;
-    [key: string]: unknown;
-};
-/**
- * All text that was typed after the command name is provided as input.
- */
-export type TextCommandInput = {
-    /**
-     * A hint to display when the input hasn't been provided yet
-     */
-    hint: string;
-    /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
-     */
-    _meta?: {
-        [key: string]: unknown;
-    } | null;
-};
 /**
  * Available commands are ready or have changed
  */
@@ -4391,19 +4383,131 @@ export type CompactionSummaryChunk = {
     } | null;
 };
 /**
- * Notification sent by the agent when a URL-based elicitation is complete.
+ * **UNSTABLE**
+ *
+ * This capability is not part of the spec yet, and may be removed or changed at any point.
+ *
+ * Client-initiated session mutations permitted for a specific subagent session.
+ *
+ * A mutation requires an explicit per-child capability; support for the method
+ * on ordinary sessions does not grant support on a child.
+ *
+ * @experimental
  */
-export type CompleteElicitationNotification = {
+export type SubagentSessionCapabilities = {
     /**
-     * The ID of the elicitation that completed.
+     * Permits the client to cancel this child's current work without ending
+     * the session. Omitted or `null` means unsupported; an object (including
+     * `{}`) means supported.
      */
-    elicitationId: ElicitationId;
+    cancel?: SessionCancelCapabilities | null;
+    /**
+     * The _meta property is reserved by ACP to allow clients and agents to attach additional
+     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
+     * these keys.
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
+/**
+ * **UNSTABLE**
+ *
+ * This capability is not part of the spec yet, and may be removed or changed at any point.
+ *
+ * Capability to cancel work in a subagent session without ending that session.
+ *
+ * Supplying `{}` advertises support; an omitted or `null` `cancel` does not.
+ *
+ * @experimental
+ */
+export type SessionCancelCapabilities = {
     /**
      * The _meta property is reserved by ACP to allow clients and agents to attach additional
      * metadata to their interactions. Implementations MUST NOT make assumptions about values at
      * these keys.
      *
-     * Optional. Omitted and `null` are equivalent and mean no metadata.
+     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
+/**
+ * **UNSTABLE**
+ *
+ * This capability is not part of the spec yet, and may be removed or changed at any point.
+ *
+ * Notification that the enclosing parent session created and owns a child session.
+ *
+ * Later updates modify the existing association's metadata, not its ownership.
+ *
+ * Sent on the immediate parent session. The first update for an unknown
+ * [`SubagentUpdate::session_id`] announces the child and MUST be sent
+ * before any live request or notification bearing the child's session ID,
+ * including messages naming it as sender or recipient. Child events are
+ * delivered automatically; no separate child load, resume, or subscription is needed.
+ * Understanding this update, registering child sessions, and applying their
+ * operation restrictions are baseline v2 requirements; no Client capability
+ * is required.
+ *
+ * Only [`SubagentUpdate::session_id`] is required. Other fields have
+ * patch semantics: omitted fields leave the stored value unchanged, `null`
+ * clears or unsets the value, and concrete values replace it. For `state`,
+ * `null` removes the current state report and leaves activity unconfirmed;
+ * it does not report idle or cancellation. A child whose capabilities are
+ * unset permits no Client-initiated session mutations.
+ *
+ * The title and description provide the parent's display metadata for the
+ * child. Agents SHOULD mirror known child state changes in the parent's
+ * [`SubagentUpdate::state`] using the same [`StateUpdate`] snapshot as the
+ * ordinary `state_update` notification on the child session. This reports
+ * child state, not a separate parent-owned lifecycle. Consumers should
+ * treat duplicate reports idempotently.
+ * Completing or cancelling work does not end the association: the parent may
+ * message the same child again. Individual messages and their outcomes do not
+ * change this association.
+ *
+ * @experimental
+ */
+export type SubagentUpdate = {
+    /**
+     * The opaque session ID identifying the child in all ACP messages.
+     */
+    sessionId: SessionId;
+    /**
+     * The parent's human-readable display title for this child. It need not be unique.
+     *
+     * Optional and nullable. Omitted means unchanged; `null` clears it. If no
+     * title is set, the Client chooses a fallback presentation.
+     */
+    title?: string | null;
+    /**
+     * The parent's human-readable description of the child's role or purpose.
+     *
+     * Optional and nullable. Omitted means unchanged; `null` clears it. This is
+     * current display metadata, not the history of instructions sent to the child.
+     */
+    description?: string | null;
+    /**
+     * Client-initiated session mutations permitted for this subagent session.
+     *
+     * Read-only operations retain their normal protocol semantics and
+     * capability requirements.
+     */
+    capabilities?: SubagentSessionCapabilities | null;
+    /**
+     * The child's current foreground state, mirrored onto its parent association.
+     *
+     * Optional and nullable. Omitted means unchanged; `null` removes the
+     * current report and leaves activity unconfirmed (not idle or cancelled).
+     * A concrete [`StateUpdate`] replaces the entire previous snapshot.
+     */
+    state?: StateUpdate | null;
+    /**
+     * The _meta property is reserved by ACP to allow clients and agents to attach additional
+     * metadata to their interactions. Omitted means no metadata update; `null` is an
+     * explicit clear signal. Implementations MUST NOT make assumptions about values at these keys.
      *
      * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
      */
@@ -4416,35 +4520,87 @@ export type CompleteElicitationNotification = {
  *
  * This capability is not part of the spec yet, and may be removed or changed at any point.
  *
- * Notification parameters for `mcp/message`.
+ * An upsert for an inter-session message.
  *
- * This is used when the wrapped MCP message is a notification and the outer JSON-RPC
- * envelope has no `id`.
+ * @experimental
+ */
+export type SessionMessage = {
+    /**
+     * Identifier of this message within the enclosing session's transcript.
+     */
+    messageId: MessageId;
+    /**
+     * Optional sending session identity; omission or `null` retains a known value.
+     */
+    senderSessionId?: SessionId | null;
+    /**
+     * Optional receiving session identity; omission or `null` retains a known value.
+     */
+    recipientSessionId?: SessionId | null;
+    /**
+     * Omitted leaves content unchanged; `null` clears it; a concrete array
+     * replaces the whole content collection.
+     */
+    content?: Array<ContentBlock> | null;
+    /**
+     * Omitted leaves metadata unchanged; `null` clears it.
+     *
+     * Implementations MUST NOT make assumptions about values in `_meta`.
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
+/**
+ * **UNSTABLE**
+ *
+ * This capability is not part of the spec yet, and may be removed or changed at any point.
+ *
+ * A streamed content block of an inter-session message.
  *
  * @experimental
  */
-export type MessageMcpNotification = {
+export type SessionMessageChunk = {
     /**
-     * The MCP-over-ACP connection this message is sent on.
+     * Identifier of this message within the enclosing session's transcript.
      */
-    connectionId: McpConnectionId;
+    messageId: MessageId;
     /**
-     * The inner MCP method name.
+     * Optional sending session identity; omission or `null` retains a known value.
      */
-    method: string;
+    senderSessionId?: SessionId | null;
+    /**
+     * Optional receiving session identity; omission or `null` retains a known value.
+     */
+    recipientSessionId?: SessionId | null;
+    /**
+     * A single content block appended to the message.
+     */
+    content: ContentBlock;
     /**
-     * Optional inner MCP params.
+     * Optional and nullable chunk-scoped metadata; omitted or `null` means none.
      *
-     * If omitted or set to `null`, the inner MCP message has no params.
+     * Implementations MUST NOT make assumptions about values in `_meta`.
      */
-    params?: {
+    _meta?: {
         [key: string]: unknown;
     } | null;
+};
+/**
+ * Notification sent by the agent when a URL-based elicitation is complete.
+ */
+export type CompleteElicitationNotification = {
+    /**
+     * The ID of the elicitation that completed.
+     */
+    elicitationId: ElicitationId;
     /**
      * The _meta property is reserved by ACP to allow clients and agents to attach additional
      * metadata to their interactions. Implementations MUST NOT make assumptions about values at
      * these keys.
      *
+     * Optional. Omitted and `null` are equivalent and mean no metadata.
+     *
      * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
      */
     _meta?: {
@@ -4474,7 +4630,7 @@ export type ClientRequest = {
     /**
      * Method-specific request parameters.
      */
-    params?: InitializeRequest | LoginAuthRequest | ListProvidersRequest | SetProviderRequest | DisableProviderRequest | LogoutAuthRequest | NewSessionRequest | ListSessionsRequest | DeleteSessionRequest | ForkSessionRequest | ResumeSessionRequest | CloseSessionRequest | SetSessionConfigOptionRequest | PromptRequest | StartNesRequest | SuggestNesRequest | CloseNesRequest | MessageMcpRequest | ExtRequest | null;
+    params?: InitializeRequest | LoginAuthRequest | ListProvidersRequest | SetProviderRequest | DisableProviderRequest | LogoutAuthRequest | NewSessionRequest | ListSessionsRequest | DeleteSessionRequest | ForkSessionRequest | ResumeSessionRequest | CloseSessionRequest | SetSessionConfigOptionRequest | PromptRequest | StartNesRequest | SuggestNesRequest | CloseNesRequest | ExtRequest | null;
 };
 /**
  * Request parameters for the initialize method.
@@ -5006,7 +5162,7 @@ export type McpServerHttp = {
  * ACP transport configuration for MCP.
  *
  * The MCP server is provided by an ACP component and communicates over the ACP channel
- * using `mcp/connect`, `mcp/message`, and `mcp/disconnect`.
+ * using `mcp/message`.
  *
  * @experimental
  */
@@ -5750,7 +5906,7 @@ export type ClientResponse = {
     /**
      * Method-specific response data.
      */
-    result: RequestPermissionResponse | CreateElicitationResponse | ConnectMcpResponse | DisconnectMcpResponse | MessageMcpResponse | ExtResponse;
+    result: RequestPermissionResponse | CreateElicitationResponse | MessageMcpResponse | ExtResponse;
 } | {
     /**
      * The id of the request this response answers.
@@ -5868,23 +6024,35 @@ export type ElicitationAcceptAction = {
 /**
  * **UNSTABLE**
  *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
+ * The successful outer ACP `mcp/message` response carries exactly one
+ * inner MCP outcome: an opaque result (including JSON null), or an MCP error.
+ * Outer ACP errors are reserved for binding and runtime failures.
  *
- * Response to `mcp/connect`.
+ * Both branches require their carrier key. An error must be a non-null object.
+ * Unknown outer fields are ignored; inner result and error fields are preserved.
+ * Carrier `_meta` is optional; null or invalid values are treated as absent.
+ * Senders must include exactly one outcome; receivers prefer `result` if both are present.
  *
  * @experimental
  */
-export type ConnectMcpResponse = {
+export type MessageMcpResponse = {
     /**
-     * The unique identifier for this MCP-over-ACP connection.
+     * Required, even if JSON null.
      */
-    connectionId: McpConnectionId;
+    result: unknown;
     /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     * Optional ACP carrier metadata.
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+} | {
+    /**
+     * Required, non-null MCP error object.
+     */
+    error: McpError;
+    /**
+     * Optional ACP carrier metadata.
      */
     _meta?: {
         [key: string]: unknown;
@@ -5893,23 +6061,27 @@ export type ConnectMcpResponse = {
 /**
  * **UNSTABLE**
  *
- * This capability is not part of the spec yet, and may be removed or changed at any point.
+ * An inner MCP error, distinct from an outer ACP binding or runtime error.
  *
- * Response to `mcp/disconnect`.
+ * `code` and `message` are required and non-null. `data` is optional;
+ * explicit `null` is preserved separately from an omitted key.
  *
  * @experimental
  */
-export type DisconnectMcpResponse = {
+export type McpError = {
     /**
-     * The _meta property is reserved by ACP to allow clients and agents to attach additional
-     * metadata to their interactions. Implementations MUST NOT make assumptions about values at
-     * these keys.
-     *
-     * See protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)
+     * Inner MCP error code; never an ACP error code.
      */
-    _meta?: {
-        [key: string]: unknown;
-    } | null;
+    code: number;
+    /**
+     * Inner MCP error message.
+     */
+    message: string;
+    /**
+     * Optional error data; explicit null is retained.
+     */
+    data?: unknown;
+    [key: string]: unknown;
 };
 /**
  * A JSON-RPC notification object.
@@ -6172,6 +6344,40 @@ export type RejectNesNotification = {
  * The reason a suggestion was rejected.
  */
 export type NesRejectReason = "rejected" | "ignored" | "replaced" | "cancelled" | string;
+/**
+ * **UNSTABLE**
+ *
+ * Notification for an active request, sent from provider to consumer.
+ * Includes subscription acknowledgements and updates.
+ *
+ * @experimental
+ */
+export type MessageMcpNotification = {
+    /**
+     * The declared ACP MCP server handling the associated request.
+     */
+    serverId: McpServerAcpId;
+    /**
+     * The identifier of the active inner MCP request.
+     */
+    requestId: McpRequestId;
+    /**
+     * The inner MCP method name.
+     */
+    method: string;
+    /**
+     * Optional inner MCP params; null is equivalent to omission.
+     */
+    params?: {
+        [key: string]: unknown;
+    } | null;
+    /**
+     * ACP extension metadata (not inner MCP params._meta); null is equivalent to omission.
+     */
+    _meta?: {
+        [key: string]: unknown;
+    } | null;
+};
 /**
  * A JSON-RPC notification object.
  */