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

package/node_modules/@agentclientprotocol/sdk/schema/v2/schema.unstable.json

@@ -313,15 +313,6 @@
                         "$ref": "#/$defs/ExtResponse"
                       }
                     ]
-                  },
-                  {
-                    "title": "MessageMcpResponse",
-                    "description": "Successful result returned by an MCP-over-ACP `mcp/message` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/MessageMcpResponse"
-                      }
-                    ]
                   }
                 ]
               }
@@ -449,24 +440,6 @@
                       }
                     ]
                   },
-                  {
-                    "title": "ConnectMcpResponse",
-                    "description": "Successful result returned for a `mcp/connect` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/ConnectMcpResponse"
-                      }
-                    ]
-                  },
-                  {
-                    "title": "DisconnectMcpResponse",
-                    "description": "Successful result returned for a `mcp/disconnect` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/DisconnectMcpResponse"
-                      }
-                    ]
-                  },
                   {
                     "title": "MessageMcpResponse",
                     "description": "Successful result returned by an MCP-over-ACP `mcp/message` request.",
@@ -600,15 +573,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "ConnectMcpRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nOpens an MCP-over-ACP connection.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/ConnectMcpRequest"
-                    }
-                  ]
-                },
                 {
                   "title": "MessageMcpRequest",
                   "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nExchanges an MCP-over-ACP message.",
@@ -618,15 +582,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "DisconnectMcpRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCloses an MCP-over-ACP connection.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DisconnectMcpRequest"
-                    }
-                  ]
-                },
                 {
                   "title": "ExtMethodRequest",
                   "description": "Handles extension method requests from the agent.\n\nAllows the Agent to send an arbitrary request that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
@@ -3010,42 +2965,23 @@
       ],
       "required": ["elicitationId", "url"]
     },
-    "ConnectMcpRequest": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for `mcp/connect`.",
+    "MessageMcpRequest": {
+      "description": "**UNSTABLE**\n\nRequest parameters for `mcp/message`, sent from consumer to provider.",
       "type": "object",
       "properties": {
         "serverId": {
-          "description": "The ACP MCP server ID that was provided by the component declaring the MCP server.",
+          "description": "The declared ACP MCP server receiving this request.",
           "allOf": [
             {
               "$ref": "#/$defs/McpServerAcpId"
             }
           ]
         },
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
-        }
-      },
-      "required": ["serverId"],
-      "x-side": "client",
-      "x-method": "mcp/connect"
-    },
-    "McpServerAcpId": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an MCP server using the ACP transport.\n\nThe value is opaque and generated by the ACP component providing the MCP server. It is\nused by `mcp/connect` to route connection requests back to the component that declared the\nserver.",
-      "type": "string"
-    },
-    "MessageMcpRequest": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for `mcp/message`.",
-      "type": "object",
-      "properties": {
-        "connectionId": {
-          "description": "The MCP-over-ACP connection this message is sent on.",
+        "requestId": {
+          "description": "The caller-generated identifier for the inner MCP request.",
           "allOf": [
             {
-              "$ref": "#/$defs/McpConnectionId"
+              "$ref": "#/$defs/McpRequestId"
             }
           ]
         },
@@ -3054,47 +2990,28 @@
           "type": "string"
         },
         "params": {
-          "description": "Optional inner MCP params.\n\nIf omitted or set to `null`, the inner MCP message has no params.",
+          "description": "Optional inner MCP params; null is equivalent to omission.",
           "type": ["object", "null"],
           "additionalProperties": true
         },
         "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "description": "ACP extension metadata (not inner MCP params._meta); null is equivalent to omission.",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
         }
       },
-      "required": ["connectionId", "method"],
-      "x-side": "both",
+      "required": ["serverId", "requestId", "method"],
+      "x-side": "client",
       "x-method": "mcp/message"
     },
-    "McpConnectionId": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA unique identifier for an active MCP-over-ACP connection.",
+    "McpServerAcpId": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nUnique identifier for an MCP server using the ACP transport.\n\nThe value is opaque and generated by the ACP component providing the MCP server. It is\nused by `mcp/message` to route requests to the component that declared the server.",
       "type": "string"
     },
-    "DisconnectMcpRequest": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequest parameters for `mcp/disconnect`.",
-      "type": "object",
-      "properties": {
-        "connectionId": {
-          "description": "The MCP-over-ACP connection to close.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpConnectionId"
-            }
-          ]
-        },
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
-        }
-      },
-      "required": ["connectionId"],
-      "x-side": "client",
-      "x-method": "mcp/disconnect"
+    "McpRequestId": {
+      "description": "**UNSTABLE**\n\nIdentifies an inner MCP request active against a server on this ACP connection.\nGenerated by the caller and preserved unchanged by proxies, independently of\nthe outer ACP JSON-RPC request ID.",
+      "type": "string"
     },
     "ExtRequest": {
       "description": "Allows for sending an arbitrary request that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)"
@@ -3279,15 +3196,6 @@
                       "$ref": "#/$defs/ExtResponse"
                     }
                   ]
-                },
-                {
-                  "title": "MessageMcpResponse",
-                  "description": "Successful result returned by an MCP-over-ACP `mcp/message` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/MessageMcpResponse"
-                    }
-                  ]
                 }
               ]
             }
@@ -4598,6 +4506,15 @@
           "x-deserialize-default-on-error": true,
           "x-deserialize-skip-invalid-items": true
         },
+        "availableCommands": {
+          "description": "Initial commands the agent can execute in this session.\n\nOptional. Omitted or empty means no initial commands are advertised.\nSenders MUST use an array, not `null`; receivers treat `null` like omission.\nLater `available_commands_update` notifications replace this list.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AvailableCommand"
+          },
+          "x-deserialize-default-on-error": true,
+          "x-deserialize-skip-invalid-items": true
+        },
         "_meta": {
           "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
           "type": ["object", "null"],
@@ -4883,6 +4800,104 @@
       },
       "required": ["currentValue"]
     },
+    "AvailableCommand": {
+      "description": "Information about a command.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Command name (e.g., `create_plan`, `research_codebase`).",
+          "type": "string"
+        },
+        "description": {
+          "description": "Human-readable description of what the command does.",
+          "type": "string"
+        },
+        "input": {
+          "description": "Input for the command if required",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/AvailableCommandInput"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "_meta": {
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      },
+      "required": ["name", "description"]
+    },
+    "AvailableCommandInput": {
+      "description": "The input specification for a command.",
+      "anyOf": [
+        {
+          "description": "All text that was typed after the command name is provided as input.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "text"
+            }
+          },
+          "required": ["type"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/TextCommandInput"
+            }
+          ]
+        },
+        {
+          "title": "other",
+          "description": "Custom or future command input specification.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.\n\nClients that do not understand this input type should preserve the raw\npayload when storing, replaying, proxying, or forwarding command\nmetadata, and otherwise ignore the input specification or display the\ncommand without structured input.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "description": "Custom or future command input type.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
+              "type": "string"
+            }
+          },
+          "required": ["type"],
+          "not": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "text"
+                  }
+                },
+                "required": ["type"]
+              }
+            ]
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
+    "TextCommandInput": {
+      "description": "All text that was typed after the command name is provided as input.",
+      "type": "object",
+      "properties": {
+        "hint": {
+          "description": "A hint to display when the input hasn't been provided yet",
+          "type": "string"
+        },
+        "_meta": {
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      },
+      "required": ["hint"]
+    },
     "ListSessionsResponse": {
       "description": "Response from listing sessions.",
       "type": "object",
@@ -5007,6 +5022,15 @@
           "x-deserialize-default-on-error": true,
           "x-deserialize-skip-invalid-items": true
         },
+        "availableCommands": {
+          "description": "Initial commands the agent can execute in this session.\n\nOptional. Omitted or empty means no initial commands are advertised.\nSenders MUST use an array, not `null`; receivers treat `null` like omission.\nLater `available_commands_update` notifications replace this list.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AvailableCommand"
+          },
+          "x-deserialize-default-on-error": true,
+          "x-deserialize-skip-invalid-items": true
+        },
         "_meta": {
           "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
           "type": ["object", "null"],
@@ -5031,6 +5055,15 @@
           "x-deserialize-default-on-error": true,
           "x-deserialize-skip-invalid-items": true
         },
+        "availableCommands": {
+          "description": "Initial commands the agent can execute in this session.\n\nOptional. Omitted or empty means no initial commands are advertised.\nSenders MUST use an array, not `null`; receivers treat `null` like omission.\nLater `available_commands_update` notifications replace this list.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AvailableCommand"
+          },
+          "x-deserialize-default-on-error": true,
+          "x-deserialize-skip-invalid-items": true
+        },
         "_meta": {
           "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
           "type": ["object", "null"],
@@ -5541,11 +5574,6 @@
     "ExtResponse": {
       "description": "Allows for sending an arbitrary response to an [`ExtRequest`] that is not part of the ACP spec.\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)"
     },
-    "MessageMcpResponse": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse to `mcp/message`.\n\nThis is the inner MCP response result payload. Any JSON value is valid.",
-      "x-side": "both",
-      "x-method": "mcp/message"
-    },
     "Error": {
       "description": "JSON-RPC error object.\n\nRepresents an error that occurred during method execution, following the\nJSON-RPC 2.0 error object specification with optional additional data.\n\nSee protocol docs: [JSON-RPC Error Object](https://www.jsonrpc.org/specification#error_object)",
       "type": "object",
@@ -5668,15 +5696,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "MessageMcpNotification",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nReceives an MCP-over-ACP notification.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/MessageMcpNotification"
-                    }
-                  ]
-                },
                 {
                   "title": "ExtNotification",
                   "description": "Handles extension notifications from the agent.\n\nAllows the Agent to send an arbitrary notification that is not part of the ACP spec.\nExtension notifications provide a way to send one-way messages for custom functionality\nwhile maintaining protocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
@@ -6051,6 +6070,54 @@
             }
           ]
         },
+        {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nAnnounces a child session created and owned by this session, or updates\nthat ownership association's metadata.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "subagent_update"
+            }
+          },
+          "required": ["sessionUpdate"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/SubagentUpdate"
+            }
+          ]
+        },
+        {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA message upsert observed in this session's transcript, sent to or\nreceived from another session.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "session_message"
+            }
+          },
+          "required": ["sessionUpdate"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/SessionMessage"
+            }
+          ]
+        },
+        {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nOne content block appended to a sent or received session message.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "session_message_chunk"
+            }
+          },
+          "required": ["sessionUpdate"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/SessionMessageChunk"
+            }
+          ]
+        },
         {
           "title": "other",
           "description": "Custom or future session update.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.\n\nReceivers that do not understand this update type should preserve the\nraw payload when storing, replaying, proxying, or forwarding session\nhistory, and otherwise ignore it or display it generically.",
@@ -6263,12 +6330,42 @@
                   }
                 },
                 "required": ["sessionUpdate"]
-              }
-            ]
-          },
-          "additionalProperties": true
-        }
-      ]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "sessionUpdate": {
+                    "type": "string",
+                    "const": "subagent_update"
+                  }
+                },
+                "required": ["sessionUpdate"]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "sessionUpdate": {
+                    "type": "string",
+                    "const": "session_message"
+                  }
+                },
+                "required": ["sessionUpdate"]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "sessionUpdate": {
+                    "type": "string",
+                    "const": "session_message_chunk"
+                  }
+                },
+                "required": ["sessionUpdate"]
+              }
+            ]
+          },
+          "additionalProperties": true
+        }
+      ]
     },
     "ContentChunk": {
       "description": "A streamed item of message content.",
@@ -6536,6 +6633,18 @@
         }
       }
     },
+    "UnknownStateUpdate": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe Agent cannot currently determine foreground activity.\n\nReport this when activity becomes unobservable, not merely because the session\nhas been quiet. The Client MUST stop presenting the previous state as confirmed\ncurrent activity, but may retain it as last known. A later state replaces this\nsnapshot normally.\n\nThis is not a task outcome or session closure. It does not cancel work, resolve\npending requests, or revoke capabilities; capabilities are updated separately.",
+      "type": "object",
+      "properties": {
+        "_meta": {
+          "description": "The _meta property is reserved by ACP for additional metadata.\nImplementations MUST NOT make assumptions about values at these keys.\nOptional; omitted and `null` mean no metadata for this state snapshot.",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      }
+    },
     "StateUpdate": {
       "description": "The state of the agent's foreground work has changed.\n\nBackground activity can continue and emit other `session/update` notifications\nwhile `idle`. Those notifications do not change this state.",
       "anyOf": [
@@ -6587,6 +6696,22 @@
             }
           ]
         },
+        {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe Agent cannot currently determine foreground activity.\nThis replaces previously confirmed activity without ending the work or session.",
+          "type": "object",
+          "properties": {
+            "state": {
+              "type": "string",
+              "const": "unknown"
+            }
+          },
+          "required": ["state"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/UnknownStateUpdate"
+            }
+          ]
+        },
         {
           "title": "other",
           "description": "Custom or future session state.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
@@ -6629,6 +6754,16 @@
                   }
                 },
                 "required": ["state"]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "state": {
+                    "type": "string",
+                    "const": "unknown"
+                  }
+                },
+                "required": ["state"]
               }
             ]
           },
@@ -7118,104 +7253,6 @@
       },
       "required": ["planId"]
     },
-    "AvailableCommand": {
-      "description": "Information about a command.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Command name (e.g., `create_plan`, `research_codebase`).",
-          "type": "string"
-        },
-        "description": {
-          "description": "Human-readable description of what the command does.",
-          "type": "string"
-        },
-        "input": {
-          "description": "Input for the command if required",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/AvailableCommandInput"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
-        }
-      },
-      "required": ["name", "description"]
-    },
-    "AvailableCommandInput": {
-      "description": "The input specification for a command.",
-      "anyOf": [
-        {
-          "description": "All text that was typed after the command name is provided as input.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "text"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/TextCommandInput"
-            }
-          ]
-        },
-        {
-          "title": "other",
-          "description": "Custom or future command input specification.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.\n\nClients that do not understand this input type should preserve the raw\npayload when storing, replaying, proxying, or forwarding command\nmetadata, and otherwise ignore the input specification or display the\ncommand without structured input.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "description": "Custom or future command input type.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
-              "type": "string"
-            }
-          },
-          "required": ["type"],
-          "not": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "type": {
-                    "type": "string",
-                    "const": "text"
-                  }
-                },
-                "required": ["type"]
-              }
-            ]
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "TextCommandInput": {
-      "description": "All text that was typed after the command name is provided as input.",
-      "type": "object",
-      "properties": {
-        "hint": {
-          "description": "A hint to display when the input hasn't been provided yet",
-          "type": "string"
-        },
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
-        }
-      },
-      "required": ["hint"]
-    },
     "AvailableCommandsUpdate": {
       "description": "Available commands are ready or have changed",
       "type": "object",
@@ -7505,61 +7542,226 @@
       },
       "required": ["compactionId", "content"]
     },
-    "CompleteElicitationNotification": {
-      "description": "Notification sent by the agent when a URL-based elicitation is complete.",
+    "SubagentSessionCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nClient-initiated session mutations permitted for a specific subagent session.\n\nA mutation requires an explicit per-child capability; support for the method\non ordinary sessions does not grant support on a child.",
       "type": "object",
       "properties": {
-        "elicitationId": {
-          "description": "The ID of the elicitation that completed.",
+        "cancel": {
+          "description": "Permits the client to cancel this child's current work without ending\nthe session. Omitted or `null` means unsupported; an object (including\n`{}`) means supported.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionCancelCapabilities"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "_meta": {
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      }
+    },
+    "SessionCancelCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCapability to cancel work in a subagent session without ending that session.\n\nSupplying `{}` advertises support; an omitted or `null` `cancel` does not.",
+      "type": "object",
+      "properties": {
+        "_meta": {
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      }
+    },
+    "SubagentUpdate": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNotification that the enclosing parent session created and owns a child session.\n\nLater updates modify the existing association's metadata, not its ownership.\n\nSent on the immediate parent session. The first update for an unknown\n[`SubagentUpdate::session_id`] announces the child and MUST be sent\nbefore any live request or notification bearing the child's session ID,\nincluding messages naming it as sender or recipient. Child events are\ndelivered automatically; no separate child load, resume, or subscription is needed.\nUnderstanding this update, registering child sessions, and applying their\noperation restrictions are baseline v2 requirements; no Client capability\nis required.\n\nOnly [`SubagentUpdate::session_id`] is required. Other fields have\npatch semantics: omitted fields leave the stored value unchanged, `null`\nclears or unsets the value, and concrete values replace it. For `state`,\n`null` removes the current state report and leaves activity unconfirmed;\nit does not report idle or cancellation. A child whose capabilities are\nunset permits no Client-initiated session mutations.\n\nThe title and description provide the parent's display metadata for the\nchild. Agents SHOULD mirror known child state changes in the parent's\n[`SubagentUpdate::state`] using the same [`StateUpdate`] snapshot as the\nordinary `state_update` notification on the child session. This reports\nchild state, not a separate parent-owned lifecycle. Consumers should\ntreat duplicate reports idempotently.\nCompleting or cancelling work does not end the association: the parent may\nmessage the same child again. Individual messages and their outcomes do not\nchange this association.",
+      "type": "object",
+      "properties": {
+        "sessionId": {
+          "description": "The opaque session ID identifying the child in all ACP messages.",
           "allOf": [
             {
-              "$ref": "#/$defs/ElicitationId"
+              "$ref": "#/$defs/SessionId"
             }
           ]
         },
+        "title": {
+          "description": "The parent's human-readable display title for this child. It need not be unique.\n\nOptional and nullable. Omitted means unchanged; `null` clears it. If no\ntitle is set, the Client chooses a fallback presentation.",
+          "type": ["string", "null"],
+          "x-deserialize-default-on-error": true
+        },
+        "description": {
+          "description": "The parent's human-readable description of the child's role or purpose.\n\nOptional and nullable. Omitted means unchanged; `null` clears it. This is\ncurrent display metadata, not the history of instructions sent to the child.",
+          "type": ["string", "null"],
+          "x-deserialize-default-on-error": true
+        },
+        "capabilities": {
+          "description": "Client-initiated session mutations permitted for this subagent session.\n\nRead-only operations retain their normal protocol semantics and\ncapability requirements.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SubagentSessionCapabilities"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "state": {
+          "description": "The child's current foreground state, mirrored onto its parent association.\n\nOptional and nullable. Omitted means unchanged; `null` removes the\ncurrent report and leaves activity unconfirmed (not idle or cancelled).\nA concrete [`StateUpdate`] replaces the entire previous snapshot.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/StateUpdate"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
         "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nOptional. Omitted and `null` are equivalent and mean no metadata.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted means no metadata update; `null` is an\nexplicit clear signal. Implementations MUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
         }
       },
-      "required": ["elicitationId"],
-      "x-side": "client",
-      "x-method": "elicitation/complete"
+      "required": ["sessionId"]
     },
-    "MessageMcpNotification": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNotification parameters for `mcp/message`.\n\nThis is used when the wrapped MCP message is a notification and the outer JSON-RPC\nenvelope has no `id`.",
+    "SessionMessage": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nAn upsert for an inter-session message.",
       "type": "object",
       "properties": {
-        "connectionId": {
-          "description": "The MCP-over-ACP connection this message is sent on.",
+        "messageId": {
+          "description": "Identifier of this message within the enclosing session's transcript.",
           "allOf": [
             {
-              "$ref": "#/$defs/McpConnectionId"
+              "$ref": "#/$defs/MessageId"
             }
           ]
         },
-        "method": {
-          "description": "The inner MCP method name.",
-          "type": "string"
+        "senderSessionId": {
+          "description": "Optional sending session identity; omission or `null` retains a known value.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
         },
-        "params": {
-          "description": "Optional inner MCP params.\n\nIf omitted or set to `null`, the inner MCP message has no params.",
+        "recipientSessionId": {
+          "description": "Optional receiving session identity; omission or `null` retains a known value.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "content": {
+          "description": "Omitted leaves content unchanged; `null` clears it; a concrete array\nreplaces the whole content collection.",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/$defs/ContentBlock"
+          },
+          "x-deserialize-default-on-error": true,
+          "x-deserialize-skip-invalid-items": true
+        },
+        "_meta": {
+          "description": "Omitted leaves metadata unchanged; `null` clears it.\n\nImplementations MUST NOT make assumptions about values in `_meta`.",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      },
+      "required": ["messageId"]
+    },
+    "SessionMessageChunk": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nA streamed content block of an inter-session message.",
+      "type": "object",
+      "properties": {
+        "messageId": {
+          "description": "Identifier of this message within the enclosing session's transcript.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/MessageId"
+            }
+          ]
+        },
+        "senderSessionId": {
+          "description": "Optional sending session identity; omission or `null` retains a known value.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "recipientSessionId": {
+          "description": "Optional receiving session identity; omission or `null` retains a known value.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
+        "content": {
+          "description": "A single content block appended to the message.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/ContentBlock"
+            }
+          ]
+        },
+        "_meta": {
+          "description": "Optional and nullable chunk-scoped metadata; omitted or `null` means none.\n\nImplementations MUST NOT make assumptions about values in `_meta`.",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
+        }
+      },
+      "required": ["messageId", "content"]
+    },
+    "CompleteElicitationNotification": {
+      "description": "Notification sent by the agent when a URL-based elicitation is complete.",
+      "type": "object",
+      "properties": {
+        "elicitationId": {
+          "description": "The ID of the elicitation that completed.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/ElicitationId"
+            }
+          ]
         },
         "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nOptional. Omitted and `null` are equivalent and mean no metadata.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
         }
       },
-      "required": ["connectionId", "method"],
-      "x-side": "both",
-      "x-method": "mcp/message"
+      "required": ["elicitationId"],
+      "x-side": "client",
+      "x-method": "elicitation/complete"
     },
     "ExtNotification": {
       "description": "Allows the Agent to send an arbitrary notification that is not part of the ACP spec.\nExtension notifications provide a way to send one-way messages for custom functionality\nwhile maintaining protocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)"
@@ -7739,15 +7941,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "MessageMcpRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nExchanges an MCP-over-ACP message.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/MessageMcpRequest"
-                    }
-                  ]
-                },
                 {
                   "title": "ExtMethodRequest",
                   "description": "Handles extension method requests from the client.\n\nExtension methods provide a way to add custom functionality while maintaining\nprotocol compatibility.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
@@ -8355,7 +8548,7 @@
       "required": ["name", "url"]
     },
     "McpServerAcp": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nACP transport configuration for MCP.\n\nThe MCP server is provided by an ACP component and communicates over the ACP channel\nusing `mcp/connect`, `mcp/message`, and `mcp/disconnect`.",
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nACP transport configuration for MCP.\n\nThe MCP server is provided by an ACP component and communicates over the ACP channel\nusing `mcp/message`.",
       "type": "object",
       "properties": {
         "name": {
@@ -9356,24 +9549,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "ConnectMcpResponse",
-                  "description": "Successful result returned for a `mcp/connect` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/ConnectMcpResponse"
-                    }
-                  ]
-                },
-                {
-                  "title": "DisconnectMcpResponse",
-                  "description": "Successful result returned for a `mcp/disconnect` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DisconnectMcpResponse"
-                    }
-                  ]
-                },
                 {
                   "title": "MessageMcpResponse",
                   "description": "Successful result returned by an MCP-over-ACP `mcp/message` request.",
@@ -9686,42 +9861,71 @@
         }
       }
     },
-    "ConnectMcpResponse": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse to `mcp/connect`.",
-      "type": "object",
-      "properties": {
-        "connectionId": {
-          "description": "The unique identifier for this MCP-over-ACP connection.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpConnectionId"
+    "MessageMcpResponse": {
+      "description": "**UNSTABLE**\n\nThe successful outer ACP `mcp/message` response carries exactly one\ninner MCP outcome: an opaque result (including JSON null), or an MCP error.\nOuter ACP errors are reserved for binding and runtime failures.\n\nBoth branches require their carrier key. An error must be a non-null object.\nUnknown outer fields are ignored; inner result and error fields are preserved.\nCarrier `_meta` is optional; null or invalid values are treated as absent.\nSenders must include exactly one outcome; receivers prefer `result` if both are present.",
+      "anyOf": [
+        {
+          "title": "Result",
+          "description": "An opaque inner MCP result.",
+          "type": "object",
+          "properties": {
+            "result": {
+              "description": "Required, even if JSON null."
+            },
+            "_meta": {
+              "description": "Optional ACP carrier metadata.",
+              "type": ["object", "null"],
+              "x-deserialize-default-on-error": true,
+              "additionalProperties": true
             }
-          ]
+          },
+          "required": ["result"]
         },
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
+        {
+          "title": "Error",
+          "description": "A structured inner MCP error.",
+          "type": "object",
+          "properties": {
+            "error": {
+              "description": "Required, non-null MCP error object.",
+              "allOf": [
+                {
+                  "$ref": "#/$defs/McpError"
+                }
+              ]
+            },
+            "_meta": {
+              "description": "Optional ACP carrier metadata.",
+              "type": ["object", "null"],
+              "x-deserialize-default-on-error": true,
+              "additionalProperties": true
+            }
+          },
+          "required": ["error"]
         }
-      },
-      "required": ["connectionId"],
+      ],
       "x-side": "client",
-      "x-method": "mcp/connect"
+      "x-method": "mcp/message"
     },
-    "DisconnectMcpResponse": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nResponse to `mcp/disconnect`.",
+    "McpError": {
+      "description": "**UNSTABLE**\n\nAn inner MCP error, distinct from an outer ACP binding or runtime error.\n\n`code` and `message` are required and non-null. `data` is optional;\nexplicit `null` is preserved separately from an omitted key.",
       "type": "object",
       "properties": {
-        "_meta": {
-          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Implementations MUST NOT make assumptions about values at\nthese keys.\n\nSee protocol docs: [Extensibility](https://agentclientprotocol.com/protocol/v2/draft/extensibility)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
+        "code": {
+          "description": "Inner MCP error code; never an ACP error code.",
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "description": "Inner MCP error message.",
+          "type": "string"
+        },
+        "data": {
+          "description": "Optional error data; explicit null is retained."
         }
       },
-      "x-side": "client",
-      "x-method": "mcp/disconnect"
+      "required": ["code", "message"],
+      "additionalProperties": true
     },
     "ClientNotification": {
       "description": "A JSON-RPC notification object.",
@@ -10181,6 +10385,46 @@
         }
       ]
     },
+    "MessageMcpNotification": {
+      "description": "**UNSTABLE**\n\nNotification for an active request, sent from provider to consumer.\nIncludes subscription acknowledgements and updates.",
+      "type": "object",
+      "properties": {
+        "serverId": {
+          "description": "The declared ACP MCP server handling the associated request.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/McpServerAcpId"
+            }
+          ]
+        },
+        "requestId": {
+          "description": "The identifier of the active inner MCP request.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/McpRequestId"
+            }
+          ]
+        },
+        "method": {
+          "description": "The inner MCP method name.",
+          "type": "string"
+        },
+        "params": {
+          "description": "Optional inner MCP params; null is equivalent to omission.",
+          "type": ["object", "null"],
+          "additionalProperties": true
+        },
+        "_meta": {
+          "description": "ACP extension metadata (not inner MCP params._meta); null is equivalent to omission.",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      },
+      "required": ["serverId", "requestId", "method"],
+      "x-side": "agent",
+      "x-method": "mcp/message"
+    },
     "ProtocolLevelNotification": {
       "description": "A JSON-RPC notification object.",
       "type": "object",