@tickernelz/paperclip-pro-adapter-utils 2026.1016.0 → 2026.1016.2

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

@@ -278,33 +278,6 @@
                       }
                     ]
                   },
-                  {
-                    "title": "StartNesResponse",
-                    "description": "Successful result returned for a `nes/start` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/StartNesResponse"
-                      }
-                    ]
-                  },
-                  {
-                    "title": "SuggestNesResponse",
-                    "description": "Successful result returned for a `nes/suggest` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/SuggestNesResponse"
-                      }
-                    ]
-                  },
-                  {
-                    "title": "CloseNesResponse",
-                    "description": "Successful result returned for a `nes/close` request.",
-                    "allOf": [
-                      {
-                        "$ref": "#/$defs/CloseNesResponse"
-                      }
-                    ]
-                  },
                   {
                     "title": "ExtMethodResponse",
                     "description": "Successful result returned by an extension method outside the core ACP method set.",
@@ -753,7 +726,7 @@
       ]
     },
     "ToolCallUpdate": {
-      "description": "Represents an upsert for a tool call that the language model has requested.\n\nTool calls are actions that the agent executes on behalf of the language model,\nsuch as reading files, executing code, or fetching data from external sources.\n\nOnly [`ToolCallUpdate::tool_call_id`] is required. Other fields have patch semantics:\nomitted fields leave the existing tool call value unchanged, `null` clears or\nunsets the value, and concrete values replace the previous value. For\ncollection fields, concrete arrays replace the previous collection, and both\n`null` and `[]` clear the collection. When a client receives a tool call ID it\nhas not seen before, omitted fields use client defaults.\n\nSee protocol docs: [Tool Calls](https://agentclientprotocol.com/protocol/v2/draft/tool-calls)",
+      "description": "Represents an upsert for a tool call that the language model has requested.\n\nTool calls are actions that the agent executes on behalf of the language model,\nsuch as reading files, executing code, or fetching data from external sources.\n\nOnly [`ToolCallUpdate::tool_call_id`] is required. Other fields have patch semantics:\nomitted fields leave the existing tool call value unchanged, `null` clears or\nunsets the value, and concrete values replace the previous value. For\ncollection fields, concrete arrays replace the previous collection, and both\n`null` and `[]` clear the collection. A concrete `_meta` object instead\npatches the stored metadata by top-level key. When a client receives a tool\ncall ID it has not seen before, omitted fields use client defaults.\n\nSee protocol docs: [Tool Calls](https://agentclientprotocol.com/protocol/v2/draft/tool-calls)",
       "type": "object",
       "properties": {
         "toolCallId": {
@@ -825,7 +798,7 @@
           "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. 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)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -1916,7 +1889,7 @@
       "description": "Text patch format used by [`DiffPatch`].",
       "anyOf": [
         {
-          "description": "One or more `diff --git` sections in Git's `--patch` (`-p`) text format.\n\nPaths MUST be absolute. Surrounding commit metadata and email envelopes\nMUST NOT be included.",
+          "description": "One or more `diff --git` sections in Git's `--patch` (`-p`) text format.\n\nUnlike Git, which writes paths relative to the repository root, every\npath MUST be absolute, including in `rename from`, `rename to`,\n`copy from`, and `copy to` lines, and MUST NOT have a prefix such as\nGit's default `a/` and `b/`. Otherwise paths follow Git: `/dev/null`\nnames the missing side of an added or deleted file in the `---` and\n`+++` lines, and paths with unusual characters are quoted as Git quotes\nthem. Surrounding commit metadata and email envelopes MUST NOT be\nincluded.",
           "type": "string",
           "const": "git_patch"
         },
@@ -2145,7 +2118,7 @@
       ]
     },
     "CreateElicitationRequest": {
-      "description": "Request from the agent to elicit structured user input.\n\nThe agent sends this to the client to request information from the user,\neither via a form or by directing them to a URL.\nElicitations are tied to a session (optionally a tool call) or a request.",
+      "description": "Request from the agent to elicit structured user input.\n\nThe agent sends this to the client to request information from the user,\neither via a form or by directing them to a URL.\nElicitations are tied to a session (optionally a tool call) or a request.\n\nA session-scoped request follows the aggregate foreground-state contract:\nagents SHOULD report `requires_action` when the whole foreground workflow is\nblocked on user action. Once reported, they MUST report `running` when progress\nresumes, or `idle` if work ends without resuming. Independent background requests\nand request-scoped elicitations do not themselves change session state.\nAccepting a URL does not mean the external interaction completed.\n\nAgents SHOULD cancel pending elicitations no longer needed by cancelled work.\nThe request's scope alone does not establish that dependency.\n\nSee protocol docs: [Elicitation](https://agentclientprotocol.com/protocol/v2/draft/elicitation)",
       "type": "object",
       "properties": {
         "message": {
@@ -3161,33 +3134,6 @@
                     }
                   ]
                 },
-                {
-                  "title": "StartNesResponse",
-                  "description": "Successful result returned for a `nes/start` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/StartNesResponse"
-                    }
-                  ]
-                },
-                {
-                  "title": "SuggestNesResponse",
-                  "description": "Successful result returned for a `nes/suggest` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/SuggestNesResponse"
-                    }
-                  ]
-                },
-                {
-                  "title": "CloseNesResponse",
-                  "description": "Successful result returned for a `nes/close` request.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/CloseNesResponse"
-                    }
-                  ]
-                },
                 {
                   "title": "ExtMethodResponse",
                   "description": "Successful result returned by an extension method outside the core ACP method set.",
@@ -3317,7 +3263,7 @@
       "type": "object",
       "properties": {
         "session": {
-          "description": "Session capabilities supported by the agent.\n\nOptional. Omitted or `null` both mean the agent does not support the\n`session/*` method surface. Supplying `{}` means the agent supports the\nbaseline session methods: `session/new`, `session/prompt`,\n`session/cancel`, and `session/update`.",
+          "description": "Session capabilities supported by the agent.\n\nOptional. Omitted or `null` both mean the agent does not support the\n`session/*` method surface. Supplying `{}` means the agent supports the\nbaseline session methods: `session/new`, `session/list`,\n`session/resume`, `session/close`, `session/prompt`, `session/cancel`,\nand `session/update`.",
           "anyOf": [
             {
               "$ref": "#/$defs/SessionCapabilities"
@@ -3352,30 +3298,6 @@
           ],
           "x-deserialize-default-on-error": true
         },
-        "nes": {
-          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNES (Next Edit Suggestions) capabilities supported by the agent.\n\nOptional. Omitted or `null` both mean the agent does not advertise support\nfor NES methods.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "positionEncoding": {
-          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe position encoding selected by the agent from the client's supported encodings.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/PositionEncodingKind"
-            },
-            {
-              "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"],
@@ -3436,6 +3358,18 @@
           ],
           "x-deserialize-default-on-error": true
         },
+        "systemPrompt": {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nWhether the agent supports `systemPrompt` on session lifecycle requests.\n\nOptional. Omitted or `null` both mean the agent does not advertise support.\nSupplying `{}` means the agent supports `systemPrompt` in `append` mode.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SessionSystemPromptCapabilities"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "x-deserialize-default-on-error": true
+        },
         "fork": {
           "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nWhether the agent supports `session/fork`.\n\nOptional. Omitted or `null` both mean the agent does not advertise support.\nSupplying `{}` means the agent supports forking sessions.",
           "anyOf": [
@@ -3648,87 +3582,15 @@
         }
       }
     },
-    "SessionForkCapabilities": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCapabilities for the `session/fork` method.\n\nSupplying `{}` means the agent supports forking sessions.",
-      "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
-        }
-      }
-    },
-    "AgentAuthCapabilities": {
-      "description": "Authentication-related extension capabilities supported by the agent.\n\nThis object does not advertise support for `auth/login` or `auth/logout`.\nThose methods are advertised by a non-empty `authMethods` list in the\n`initialize` response.",
-      "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
-        }
-      }
-    },
-    "ProvidersCapabilities": {
-      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nProvider configuration capabilities supported by the agent.\n\nSupplying `{}` means the agent supports provider configuration methods.",
-      "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
-        }
-      }
-    },
-    "NesCapabilities": {
-      "description": "NES capabilities advertised by the agent during initialization.\n\nSupplying `{}` means the agent supports the NES method surface. Omitted or\n`null` both mean the agent does not advertise support for `nes/*` methods.",
-      "type": "object",
-      "properties": {
-        "events": {
-          "description": "Events the agent wants to receive.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesEventCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "context": {
-          "description": "Context the agent wants attached to each suggestion request.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesContextCapabilities"
-            },
-            {
-              "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
-        }
-      }
-    },
-    "NesEventCapabilities": {
-      "description": "Event capabilities the agent can consume.",
+    "SessionSystemPromptCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCapabilities for client-provided system prompts.\n\nSupplying `{}` means the agent supports `systemPrompt` on session lifecycle\nrequests in `append` mode.",
       "type": "object",
       "properties": {
-        "document": {
-          "description": "Document event capabilities.",
+        "mode": {
+          "description": "Delivery modes the agent supports in addition to `append`.\n\nOptional. Omitted or `null` both mean the agent supports only `append`.",
           "anyOf": [
             {
-              "$ref": "#/$defs/NesDocumentEventCapabilities"
+              "$ref": "#/$defs/SessionSystemPromptModeCapabilities"
             },
             {
               "type": "null"
@@ -3744,63 +3606,15 @@
         }
       }
     },
-    "NesDocumentEventCapabilities": {
-      "description": "Document event capabilities the agent wants to receive.",
+    "SessionSystemPromptModeCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nSystem prompt delivery modes the agent supports in addition to `append`.\n\n`append` has no entry because every agent advertising `session.systemPrompt`\nsupports it.",
       "type": "object",
       "properties": {
-        "didOpen": {
-          "description": "Whether the agent wants `document/didOpen` events.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesDocumentDidOpenCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "didChange": {
-          "description": "Whether the agent wants `document/didChange` events, and the sync kind.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesDocumentDidChangeCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "didClose": {
-          "description": "Whether the agent wants `document/didClose` events.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesDocumentDidCloseCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "didSave": {
-          "description": "Whether the agent wants `document/didSave` events.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesDocumentDidSaveCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "didFocus": {
-          "description": "Whether the agent wants `document/didFocus` events.",
+        "override": {
+          "description": "Whether the agent supports `override` mode.\n\nOptional. Omitted or `null` both mean the agent does not advertise support.\nSupplying `{}` means the agent supports replacing its built-in default\ninstructions with the client-provided system prompt.",
           "anyOf": [
             {
-              "$ref": "#/$defs/NesDocumentDidFocusCapabilities"
+              "$ref": "#/$defs/SessionSystemPromptOverrideCapabilities"
             },
             {
               "type": "null"
@@ -3816,8 +3630,8 @@
         }
       }
     },
-    "NesDocumentDidOpenCapabilities": {
-      "description": "Marker for `document/didOpen` capability support.",
+    "SessionSystemPromptOverrideCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCapabilities for the `override` system prompt mode.\n\nSupplying `{}` means the agent supports replacing its built-in default\ninstructions with the client-provided system prompt.",
       "type": "object",
       "properties": {
         "_meta": {
@@ -3828,44 +3642,8 @@
         }
       }
     },
-    "NesDocumentDidChangeCapabilities": {
-      "description": "Capabilities for `document/didChange` events.",
-      "type": "object",
-      "properties": {
-        "syncKind": {
-          "description": "The sync kind the agent wants: `\"full\"` or `\"incremental\"`.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/TextDocumentSyncKind"
-            }
-          ]
-        },
-        "_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": ["syncKind"]
-    },
-    "TextDocumentSyncKind": {
-      "description": "How the agent wants document changes delivered.",
-      "oneOf": [
-        {
-          "description": "Client sends the entire file content on each change.",
-          "type": "string",
-          "const": "full"
-        },
-        {
-          "description": "Client sends only the changed ranges.",
-          "type": "string",
-          "const": "incremental"
-        }
-      ]
-    },
-    "NesDocumentDidCloseCapabilities": {
-      "description": "Marker for `document/didClose` capability support.",
+    "SessionForkCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCapabilities for the `session/fork` method.\n\nSupplying `{}` means the agent supports forking sessions.",
       "type": "object",
       "properties": {
         "_meta": {
@@ -3876,8 +3654,8 @@
         }
       }
     },
-    "NesDocumentDidSaveCapabilities": {
-      "description": "Marker for `document/didSave` capability support.",
+    "AgentAuthCapabilities": {
+      "description": "Authentication-related extension capabilities supported by the agent.\n\nThis object does not advertise support for `auth/login` or `auth/logout`.\nThose methods are advertised by a non-empty `authMethods` list in the\n`initialize` response.",
       "type": "object",
       "properties": {
         "_meta": {
@@ -3888,8 +3666,8 @@
         }
       }
     },
-    "NesDocumentDidFocusCapabilities": {
-      "description": "Marker for `document/didFocus` capability support.",
+    "ProvidersCapabilities": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nProvider configuration capabilities supported by the agent.\n\nSupplying `{}` means the agent supports provider configuration methods.",
       "type": "object",
       "properties": {
         "_meta": {
@@ -3900,237 +3678,40 @@
         }
       }
     },
-    "NesContextCapabilities": {
-      "description": "Context capabilities the agent wants attached to each suggestion request.",
-      "type": "object",
-      "properties": {
-        "recentFiles": {
-          "description": "Whether the agent wants recent files context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesRecentFilesCapabilities"
-            },
-            {
-              "type": "null"
+    "AuthMethod": {
+      "description": "Describes an available authentication method.\n\nThe `type` field acts as the discriminator in the serialized JSON form.",
+      "anyOf": [
+        {
+          "description": "Client runs the configured agent program as a separate interactive\nprocess, without passing this method to `auth/login`.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "terminal"
             }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "relatedSnippets": {
-          "description": "Whether the agent wants related snippets context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesRelatedSnippetsCapabilities"
-            },
+          },
+          "required": ["type"],
+          "allOf": [
             {
-              "type": "null"
+              "$ref": "#/$defs/AuthMethodTerminal"
             }
-          ],
-          "x-deserialize-default-on-error": true
+          ]
         },
-        "editHistory": {
-          "description": "Whether the agent wants edit history context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesEditHistoryCapabilities"
-            },
-            {
-              "type": "null"
+        {
+          "description": "Agent handles authentication itself through `auth/login`.\n\nThe `type` discriminator value is `agent`.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "agent"
             }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "userActions": {
-          "description": "Whether the agent wants user actions context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesUserActionsCapabilities"
-            },
+          },
+          "required": ["type"],
+          "allOf": [
             {
-              "type": "null"
+              "$ref": "#/$defs/AuthMethodAgent"
             }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "openFiles": {
-          "description": "Whether the agent wants open files context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesOpenFilesCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "diagnostics": {
-          "description": "Whether the agent wants diagnostics context.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesDiagnosticsCapabilities"
-            },
-            {
-              "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
-        }
-      }
-    },
-    "NesRecentFilesCapabilities": {
-      "description": "Capabilities for recent files context.",
-      "type": "object",
-      "properties": {
-        "maxCount": {
-          "description": "Maximum number of recent files the agent can use.",
-          "type": ["integer", "null"],
-          "format": "uint32",
-          "minimum": 0,
-          "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
-        }
-      }
-    },
-    "NesRelatedSnippetsCapabilities": {
-      "description": "Capabilities for related snippets context.",
-      "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
-        }
-      }
-    },
-    "NesEditHistoryCapabilities": {
-      "description": "Capabilities for edit history context.",
-      "type": "object",
-      "properties": {
-        "maxCount": {
-          "description": "Maximum number of edit history entries the agent can use.",
-          "type": ["integer", "null"],
-          "format": "uint32",
-          "minimum": 0,
-          "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
-        }
-      }
-    },
-    "NesUserActionsCapabilities": {
-      "description": "Capabilities for user actions context.",
-      "type": "object",
-      "properties": {
-        "maxCount": {
-          "description": "Maximum number of user actions the agent can use.",
-          "type": ["integer", "null"],
-          "format": "uint32",
-          "minimum": 0,
-          "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
-        }
-      }
-    },
-    "NesOpenFilesCapabilities": {
-      "description": "Capabilities for open files context.",
-      "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
-        }
-      }
-    },
-    "NesDiagnosticsCapabilities": {
-      "description": "Capabilities for diagnostics context.",
-      "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
-        }
-      }
-    },
-    "PositionEncodingKind": {
-      "description": "The encoding used for character offsets in positions.\n\nFollows the same conventions as LSP 3.17. The default is UTF-16.",
-      "oneOf": [
-        {
-          "description": "Character offsets count UTF-16 code units. This is the default.",
-          "type": "string",
-          "const": "utf-16"
-        },
-        {
-          "description": "Character offsets count Unicode code points.",
-          "type": "string",
-          "const": "utf-32"
-        },
-        {
-          "description": "Character offsets count UTF-8 code units (bytes).",
-          "type": "string",
-          "const": "utf-8"
-        }
-      ]
-    },
-    "AuthMethod": {
-      "description": "Describes an available authentication method.\n\nThe `type` field acts as the discriminator in the serialized JSON form.",
-      "anyOf": [
-        {
-          "description": "Client runs the configured agent program as a separate interactive\nprocess, without passing this method to `auth/login`.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "terminal"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/AuthMethodTerminal"
-            }
-          ]
-        },
-        {
-          "description": "Agent handles authentication itself through `auth/login`.\n\nThe `type` discriminator value is `agent`.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "agent"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/AuthMethodAgent"
-            }
-          ]
+          ]
         },
         {
           "title": "other",
@@ -4482,7 +4063,7 @@
       "x-method": "auth/logout"
     },
     "NewSessionResponse": {
-      "description": "Response from creating a new session.\n\nSee protocol docs: [Creating a Session](https://agentclientprotocol.com/protocol/v2/draft/session-setup#creating-a-session)",
+      "description": "Response from creating a new session.\n\nNew sessions default to `idle` until a state update reports otherwise.\nUpdates may arrive before or after this response. Clients MUST NOT overwrite\nan already-reported state when the response arrives.\n\nSee protocol docs: [Creating a Session](https://agentclientprotocol.com/protocol/v2/draft/session-setup#creating-a-session)",
       "type": "object",
       "properties": {
         "sessionId": {
@@ -5039,7 +4620,7 @@
       "x-method": "session/fork"
     },
     "ResumeSessionResponse": {
-      "description": "Response from resuming an existing session.",
+      "description": "Response from resuming an existing session.\n\nThe agent MUST send a current `state_update` after any requested history\nreplay and before this response, even without replay. The update reports\nforeground state after resuming. The response alone does not imply `idle`.\n\nSee protocol docs: [Current-State Synchronization](https://agentclientprotocol.com/protocol/v2/draft/session-setup#current-state-synchronization)",
       "type": "object",
       "properties": {
         "configOptions": {
@@ -5109,7 +4690,7 @@
       "x-method": "session/set_config_option"
     },
     "PromptResponse": {
-      "description": "Response acknowledging that a user prompt was inserted into the ACP conversation.\n\nThis response does not indicate that the prompt was merely received or queued, nor that the\nagent has finished processing it.\nProcessing and completion are reported through `state_update` session updates.\n\nSee protocol docs: [Prompt Accepted](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#2-prompt-accepted)",
+      "description": "Response acknowledging that a user prompt was inserted into the ACP conversation.\n\nThis response does not indicate that the prompt was merely received or queued, nor that the\nagent has finished processing it.\nProcessing and completion are reported through `state_update` session updates.\n\nInsertion is the logical addition of a user message with a message ID and a position\nrelative to other messages in the ACP conversation.\n\nSee protocol docs: [Prompt Accepted](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#2-prompt-accepted)",
       "type": "object",
       "properties": {
         "messageId": {
@@ -5135,231 +4716,168 @@
       "description": "Identifier for a message, unique among messages of the same type within a session.\n\nEach message type, such as user messages, agent messages, and agent thoughts,\nhas its own ID space: messages of different types may share an ID and remain\ndistinct messages.",
       "type": "string"
     },
-    "StartNesResponse": {
-      "description": "Response to `nes/start`.",
+    "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)"
+    },
+    "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",
       "properties": {
-        "sessionId": {
-          "description": "The session ID for the newly started NES session.",
+        "code": {
+          "description": "A number indicating the error type that occurred.\nThis must be an integer as defined in the JSON-RPC specification.",
           "allOf": [
             {
-              "$ref": "#/$defs/SessionId"
+              "$ref": "#/$defs/ErrorCode"
             }
           ]
         },
-        "_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": ["sessionId"],
-      "x-side": "agent",
-      "x-method": "nes/start"
-    },
-    "SuggestNesResponse": {
-      "description": "Response to `nes/suggest`.",
-      "type": "object",
-      "properties": {
-        "suggestions": {
-          "description": "The list of suggestions.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/NesSuggestion"
-          }
+        "message": {
+          "description": "A string providing a short description of the error.\nThe message should be limited to a concise single sentence.",
+          "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
+        "data": {
+          "description": "Optional primitive or structured value that contains additional information about the error.\nThis may include debugging information or context-specific details.",
+          "x-deserialize-default-on-error": true
         }
       },
-      "required": ["suggestions"],
-      "x-side": "agent",
-      "x-method": "nes/suggest"
+      "required": ["code", "message"]
     },
-    "NesSuggestion": {
-      "description": "A suggestion returned by the agent.",
+    "ErrorCode": {
+      "description": "Predefined error codes for common JSON-RPC and ACP-specific errors.\n\nThese codes follow the JSON-RPC 2.0 specification for standard errors\nand use the reserved range (-32000 to -32099) for protocol-specific errors.",
       "anyOf": [
         {
-          "description": "A text edit suggestion.",
-          "type": "object",
-          "properties": {
-            "kind": {
-              "type": "string",
-              "const": "edit"
-            }
-          },
-          "required": ["kind"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesEditSuggestion"
-            }
-          ]
+          "title": "Parse error",
+          "description": "**Parse error**: Invalid JSON was received by the server.\nAn error occurred on the server while parsing the JSON text.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32700
         },
         {
-          "description": "A jump-to-location suggestion.",
-          "type": "object",
-          "properties": {
-            "kind": {
-              "type": "string",
-              "const": "jump"
-            }
-          },
-          "required": ["kind"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesJumpSuggestion"
-            }
-          ]
+          "title": "Invalid request",
+          "description": "**Invalid request**: The JSON sent is not a valid Request object.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32600
         },
         {
-          "description": "A rename symbol suggestion.",
-          "type": "object",
-          "properties": {
-            "kind": {
-              "type": "string",
-              "const": "rename"
-            }
-          },
-          "required": ["kind"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesRenameSuggestion"
-            }
-          ]
+          "title": "Method not found",
+          "description": "**Method not found**: The method does not exist or is not available.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32601
         },
         {
-          "description": "A search-and-replace suggestion.",
-          "type": "object",
-          "properties": {
-            "kind": {
-              "type": "string",
-              "const": "searchAndReplace"
-            }
-          },
-          "required": ["kind"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesSearchAndReplaceSuggestion"
-            }
-          ]
+          "title": "Invalid params",
+          "description": "**Invalid params**: Invalid method parameter(s).",
+          "type": "integer",
+          "format": "int32",
+          "const": -32602
         },
         {
-          "title": "other",
-          "description": "Custom or future NES suggestion.\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 suggestion kind should preserve\nthe raw payload when storing, replaying, proxying, or forwarding\nsuggestions, and otherwise ignore it or display it generically.",
-          "type": "object",
-          "properties": {
-            "kind": {
-              "description": "Custom or future NES suggestion kind.\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"
-            },
-            "suggestionId": {
-              "description": "Unique identifier for accept/reject tracking.",
-              "allOf": [
-                {
-                  "$ref": "#/$defs/NesSuggestionId"
-                }
-              ]
-            }
-          },
-          "required": ["kind", "suggestionId"],
-          "not": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "kind": {
-                    "type": "string",
-                    "const": "edit"
-                  }
-                },
-                "required": ["kind"]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "kind": {
-                    "type": "string",
-                    "const": "jump"
-                  }
-                },
-                "required": ["kind"]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "kind": {
-                    "type": "string",
-                    "const": "rename"
-                  }
-                },
-                "required": ["kind"]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "kind": {
-                    "type": "string",
-                    "const": "searchAndReplace"
-                  }
-                },
-                "required": ["kind"]
-              }
-            ]
-          },
-          "additionalProperties": true
+          "title": "Internal error",
+          "description": "**Internal error**: Internal JSON-RPC error.\nReserved for implementation-defined server errors.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32603
+        },
+        {
+          "title": "Request cancelled",
+          "description": "**Request cancelled**: Execution of the method was aborted either due to a cancellation request from the caller or\nbecause of resource constraints or shutdown.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32800
+        },
+        {
+          "title": "Authentication required",
+          "description": "**Authentication required**: Authentication is required before this operation can be performed.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32000
+        },
+        {
+          "title": "Resource not found",
+          "description": "**Resource not found**: A given resource, such as a file, was not found.",
+          "type": "integer",
+          "format": "int32",
+          "const": -32002
+        },
+        {
+          "title": "Other",
+          "description": "Other undefined error code.",
+          "type": "integer",
+          "format": "int32"
         }
       ]
     },
-    "NesSuggestionId": {
-      "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 NES suggestion.",
-      "type": "string"
-    },
-    "NesTextEdit": {
-      "description": "A text edit within a suggestion.",
+    "AgentNotification": {
+      "description": "A JSON-RPC notification object.",
       "type": "object",
       "properties": {
-        "range": {
-          "description": "The range to replace.",
-          "allOf": [
+        "method": {
+          "description": "The notification method name.",
+          "type": "string"
+        },
+        "params": {
+          "description": "Method-specific notification parameters.",
+          "anyOf": [
+            {
+              "description": "All possible notifications that an agent can send to a client.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly.\n\nNotifications do not expect a response.",
+              "anyOf": [
+                {
+                  "title": "UpdateSessionNotification",
+                  "description": "Handles session update notifications from the agent.\n\nThis is a notification endpoint (no response expected) that receives\nupdates about session activity, including message updates, message chunks,\ntool calls, and execution plans.\n\nNote: Clients SHOULD continue accepting tool call updates even after\nsending a `session/cancel` notification, as the agent may send final\nupdates before reporting an idle `state_update` with the cancelled\nstop reason.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/UpdateSessionNotification"
+                    }
+                  ]
+                },
+                {
+                  "title": "CompleteElicitationNotification",
+                  "description": "Notification that a URL-based elicitation has completed.\n\nSee protocol docs: [Elicitation](https://agentclientprotocol.com/protocol/v2/draft/elicitation#url-completion)",
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/CompleteElicitationNotification"
+                    }
+                  ]
+                },
+                {
+                  "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)",
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/ExtNotification"
+                    }
+                  ]
+                }
+              ]
+            },
             {
-              "$ref": "#/$defs/Range"
+              "type": "null"
             }
           ]
-        },
-        "newText": {
-          "description": "The replacement text.",
-          "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": ["range", "newText"]
+      "required": ["method"],
+      "x-docs-ignore": true
     },
-    "Range": {
-      "description": "A range in a text document, expressed as start and end positions.",
+    "UpdateSessionNotification": {
+      "description": "Notification containing a session update from the agent.\n\nAgents can send session updates at any point while the session exists.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
       "type": "object",
       "properties": {
-        "start": {
-          "description": "The start position (inclusive).",
+        "sessionId": {
+          "description": "The ID of the session this update pertains to.",
           "allOf": [
             {
-              "$ref": "#/$defs/Position"
+              "$ref": "#/$defs/SessionId"
             }
           ]
         },
-        "end": {
-          "description": "The end position (exclusive).",
+        "update": {
+          "description": "The actual update content.",
           "allOf": [
             {
-              "$ref": "#/$defs/Position"
+              "$ref": "#/$defs/SessionUpdate"
             }
           ]
         },
@@ -5370,581 +4888,212 @@
           "additionalProperties": true
         }
       },
-      "required": ["start", "end"]
-    },
-    "Position": {
-      "description": "A zero-based position in a text document.\n\nThe meaning of `character` depends on the negotiated position encoding.",
-      "type": "object",
-      "properties": {
-        "line": {
-          "description": "Zero-based line number.",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0
-        },
-        "character": {
-          "description": "Zero-based character offset (encoding-dependent).",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0
-        },
-        "_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": ["line", "character"]
+      "required": ["sessionId", "update"],
+      "x-side": "client",
+      "x-method": "session/update"
     },
-    "NesEditSuggestion": {
-      "description": "A text edit suggestion.",
-      "type": "object",
-      "properties": {
-        "suggestionId": {
-          "description": "Unique identifier for accept/reject tracking.",
+    "SessionUpdate": {
+      "description": "Different types of updates that can be sent while a session exists.\n\nThese updates report messages, progress, and other session activity.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
+      "anyOf": [
+        {
+          "description": "A chunk of the user's message being streamed.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "user_message_chunk"
+            }
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/NesSuggestionId"
+              "$ref": "#/$defs/ContentChunk"
             }
           ]
         },
-        "uri": {
-          "description": "The URI of the file to edit.",
-          "type": "string",
-          "format": "uri"
-        },
-        "edits": {
-          "description": "The text edits to apply. Must contain at least one edit.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/NesTextEdit"
-          },
-          "minItems": 1
-        },
-        "cursorPosition": {
-          "description": "Optional suggested cursor position after applying edits.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/Position"
-            },
-            {
-              "type": "null"
+        {
+          "description": "A user message has been created or updated.\n\nAgents can send this when they accept or replay a user message. When a\nclient receives another `user_message` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "user_message"
             }
-          ],
-          "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": ["suggestionId", "uri", "edits"]
-    },
-    "NesJumpSuggestion": {
-      "description": "A jump-to-location suggestion.",
-      "type": "object",
-      "properties": {
-        "suggestionId": {
-          "description": "Unique identifier for accept/reject tracking.",
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/NesSuggestionId"
+              "$ref": "#/$defs/UserMessage"
             }
           ]
         },
-        "uri": {
-          "description": "The file to navigate to.",
-          "type": "string",
-          "format": "uri"
-        },
-        "position": {
-          "description": "The target position within the file.",
+        {
+          "description": "A chunk of the agent's response being streamed.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "agent_message_chunk"
+            }
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/Position"
+              "$ref": "#/$defs/ContentChunk"
             }
           ]
         },
-        "_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": ["suggestionId", "uri", "position"]
-    },
-    "NesRenameSuggestion": {
-      "description": "A rename symbol suggestion.",
-      "type": "object",
-      "properties": {
-        "suggestionId": {
-          "description": "Unique identifier for accept/reject tracking.",
+        {
+          "description": "An agent message has been created or updated.\n\nAgents can send this in addition to streamed chunks. When a client\nreceives another `agent_message` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "agent_message"
+            }
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/NesSuggestionId"
+              "$ref": "#/$defs/AgentMessage"
             }
           ]
         },
-        "uri": {
-          "description": "The file URI containing the symbol.",
-          "type": "string",
-          "format": "uri"
-        },
-        "position": {
-          "description": "The position of the symbol to rename.",
+        {
+          "description": "A chunk of the agent's internal reasoning being streamed.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "agent_thought_chunk"
+            }
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/Position"
+              "$ref": "#/$defs/ContentChunk"
             }
           ]
         },
-        "newName": {
-          "description": "The new name for the symbol.",
-          "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": ["suggestionId", "uri", "position", "newName"]
-    },
-    "NesSearchAndReplaceSuggestion": {
-      "description": "A search-and-replace suggestion.",
-      "type": "object",
-      "properties": {
-        "suggestionId": {
-          "description": "Unique identifier for accept/reject tracking.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesSuggestionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The file URI to search within.",
-          "type": "string",
-          "format": "uri"
-        },
-        "search": {
-          "description": "The text or pattern to find.",
-          "type": "string"
-        },
-        "replace": {
-          "description": "The replacement text.",
-          "type": "string"
-        },
-        "isRegex": {
-          "description": "Whether `search` is a regular expression. Defaults to `false`.",
-          "type": ["boolean", "null"]
-        },
-        "_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": ["suggestionId", "uri", "search", "replace"]
-    },
-    "CloseNesResponse": {
-      "description": "Response from closing an NES session.",
-      "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
-        }
-      },
-      "x-side": "agent",
-      "x-method": "nes/close"
-    },
-    "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)"
-    },
-    "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",
-      "properties": {
-        "code": {
-          "description": "A number indicating the error type that occurred.\nThis must be an integer as defined in the JSON-RPC specification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/ErrorCode"
-            }
-          ]
-        },
-        "message": {
-          "description": "A string providing a short description of the error.\nThe message should be limited to a concise single sentence.",
-          "type": "string"
-        },
-        "data": {
-          "description": "Optional primitive or structured value that contains additional information about the error.\nThis may include debugging information or context-specific details.",
-          "x-deserialize-default-on-error": true
-        }
-      },
-      "required": ["code", "message"]
-    },
-    "ErrorCode": {
-      "description": "Predefined error codes for common JSON-RPC and ACP-specific errors.\n\nThese codes follow the JSON-RPC 2.0 specification for standard errors\nand use the reserved range (-32000 to -32099) for protocol-specific errors.",
-      "anyOf": [
-        {
-          "title": "Parse error",
-          "description": "**Parse error**: Invalid JSON was received by the server.\nAn error occurred on the server while parsing the JSON text.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32700
-        },
-        {
-          "title": "Invalid request",
-          "description": "**Invalid request**: The JSON sent is not a valid Request object.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32600
-        },
-        {
-          "title": "Method not found",
-          "description": "**Method not found**: The method does not exist or is not available.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32601
-        },
-        {
-          "title": "Invalid params",
-          "description": "**Invalid params**: Invalid method parameter(s).",
-          "type": "integer",
-          "format": "int32",
-          "const": -32602
-        },
-        {
-          "title": "Internal error",
-          "description": "**Internal error**: Internal JSON-RPC error.\nReserved for implementation-defined server errors.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32603
-        },
-        {
-          "title": "Request cancelled",
-          "description": "**Request cancelled**: Execution of the method was aborted either due to a cancellation request from the caller or\nbecause of resource constraints or shutdown.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32800
-        },
-        {
-          "title": "Authentication required",
-          "description": "**Authentication required**: Authentication is required before this operation can be performed.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32000
-        },
-        {
-          "title": "Resource not found",
-          "description": "**Resource not found**: A given resource, such as a file, was not found.",
-          "type": "integer",
-          "format": "int32",
-          "const": -32002
-        },
         {
-          "title": "Other",
-          "description": "Other undefined error code.",
-          "type": "integer",
-          "format": "int32"
-        }
-      ]
-    },
-    "AgentNotification": {
-      "description": "A JSON-RPC notification object.",
-      "type": "object",
-      "properties": {
-        "method": {
-          "description": "The notification method name.",
-          "type": "string"
-        },
-        "params": {
-          "description": "Method-specific notification parameters.",
-          "anyOf": [
-            {
-              "description": "All possible notifications that an agent can send to a client.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly.\n\nNotifications do not expect a response.",
-              "anyOf": [
-                {
-                  "title": "UpdateSessionNotification",
-                  "description": "Handles session update notifications from the agent.\n\nThis is a notification endpoint (no response expected) that receives\nupdates about session activity, including message updates, message chunks,\ntool calls, and execution plans.\n\nNote: Clients SHOULD continue accepting tool call updates even after\nsending a `session/cancel` notification, as the agent may send final\nupdates before reporting an idle `state_update` with the cancelled\nstop reason.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/UpdateSessionNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "CompleteElicitationNotification",
-                  "description": "Notification that a URL-based elicitation has completed.\n\nSee protocol docs: [Elicitation](https://agentclientprotocol.com/protocol/v2/draft/elicitation#url-completion)",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/CompleteElicitationNotification"
-                    }
-                  ]
-                },
-                {
-                  "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)",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/ExtNotification"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "required": ["method"],
-      "x-docs-ignore": true
-    },
-    "UpdateSessionNotification": {
-      "description": "Notification containing a session update from the agent.\n\nAgents can send session updates at any point while the session exists.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The ID of the session this update pertains to.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
+          "description": "An agent thought or reasoning message has been created or updated.\n\nAgents can send this in addition to streamed chunks. When a client\nreceives another `agent_thought` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "type": "object",
+          "properties": {
+            "sessionUpdate": {
+              "type": "string",
+              "const": "agent_thought"
             }
-          ]
-        },
-        "update": {
-          "description": "The actual update content.",
+          },
+          "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/SessionUpdate"
+              "$ref": "#/$defs/AgentThought"
             }
           ]
         },
-        "_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": ["sessionId", "update"],
-      "x-side": "client",
-      "x-method": "session/update"
-    },
-    "SessionUpdate": {
-      "description": "Different types of updates that can be sent while a session exists.\n\nThese updates report messages, progress, and other session activity.\n\nSee protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#3-agent-reports-output)",
-      "anyOf": [
         {
-          "description": "A chunk of the user's message being streamed.",
+          "description": "A snapshot of the session's aggregate foreground activity.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "user_message_chunk"
+              "const": "state_update"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/ContentChunk"
+              "$ref": "#/$defs/StateUpdate"
             }
           ]
         },
         {
-          "description": "A user message has been created or updated.\n\nAgents can send this when they accept or replay a user message. When a\nclient receives another `user_message` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "description": "A chunk of tool-call content being streamed.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "user_message"
+              "const": "tool_call_content_chunk"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/UserMessage"
+              "$ref": "#/$defs/ToolCallContentChunk"
             }
           ]
         },
         {
-          "description": "A chunk of the agent's response being streamed.",
+          "description": "A tool call has been created or updated.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "agent_message_chunk"
+              "const": "tool_call_update"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/ContentChunk"
+              "$ref": "#/$defs/ToolCallUpdate"
             }
           ]
         },
         {
-          "description": "An agent message has been created or updated.\n\nAgents can send this in addition to streamed chunks. When a client\nreceives another `agent_message` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "description": "An agent-owned terminal has been created or updated.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "agent_message"
+              "const": "terminal_update"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/AgentMessage"
+              "$ref": "#/$defs/TerminalUpdate"
             }
           ]
         },
         {
-          "description": "A chunk of the agent's internal reasoning being streamed.",
+          "description": "A chunk of bytes appended to an agent-owned terminal's output.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "agent_thought_chunk"
+              "const": "terminal_output_chunk"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/ContentChunk"
+              "$ref": "#/$defs/TerminalOutputChunk"
             }
           ]
         },
         {
-          "description": "An agent thought or reasoning message has been created or updated.\n\nAgents can send this in addition to streamed chunks. When a client\nreceives another `agent_thought` update with the same `messageId`,\nfields in the new update patch the previous fields for that message.",
+          "description": "A content update for a plan identified by ID.\nSee protocol docs: [Agent Plan](https://agentclientprotocol.com/protocol/v2/draft/agent-plan)",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "agent_thought"
+              "const": "plan_update"
             }
           },
           "required": ["sessionUpdate"],
           "allOf": [
             {
-              "$ref": "#/$defs/AgentThought"
+              "$ref": "#/$defs/PlanUpdate"
             }
           ]
         },
         {
-          "description": "The state of the agent's foreground work has changed.",
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRemoval notice for a plan identified by ID.",
           "type": "object",
           "properties": {
             "sessionUpdate": {
               "type": "string",
-              "const": "state_update"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/StateUpdate"
-            }
-          ]
-        },
-        {
-          "description": "A chunk of tool-call content being streamed.",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "tool_call_content_chunk"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/ToolCallContentChunk"
-            }
-          ]
-        },
-        {
-          "description": "A tool call has been created or updated.",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "tool_call_update"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/ToolCallUpdate"
-            }
-          ]
-        },
-        {
-          "description": "An agent-owned terminal has been created or updated.",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "terminal_update"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/TerminalUpdate"
-            }
-          ]
-        },
-        {
-          "description": "A chunk of bytes appended to an agent-owned terminal's output.",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "terminal_output_chunk"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/TerminalOutputChunk"
-            }
-          ]
-        },
-        {
-          "description": "A content update for a plan identified by ID.\nSee protocol docs: [Agent Plan](https://agentclientprotocol.com/protocol/v2/draft/agent-plan)",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "plan_update"
-            }
-          },
-          "required": ["sessionUpdate"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/PlanUpdate"
-            }
-          ]
-        },
-        {
-          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRemoval notice for a plan identified by ID.",
-          "type": "object",
-          "properties": {
-            "sessionUpdate": {
-              "type": "string",
-              "const": "plan_removed"
+              "const": "plan_removed"
             }
           },
           "required": ["sessionUpdate"],
@@ -6414,7 +5563,7 @@
           "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. Omitted means no metadata update; `null` is an explicit clear signal.\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 leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -6444,7 +5593,7 @@
           "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. Omitted means no metadata update; `null` is an explicit clear signal.\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 leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -6474,7 +5623,7 @@
           "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. Omitted means no metadata update; `null` is an explicit clear signal.\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 leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -6565,7 +5714,7 @@
       "required": ["totalTokens", "inputTokens", "outputTokens"]
     },
     "IdleStateUpdate": {
-      "description": "The agent is ready to process a new prompt.\n\nAgents SHOULD include a `stopReason` when the idle transition ends foreground\nwork. An omitted, `null`, or malformed `stopReason` means the agent is not\nreporting one.",
+      "description": "No foreground work is active. Background activity may continue.\n\nAgents SHOULD include a `stopReason` when the idle transition ends foreground\nwork. An idle update that does not end foreground work need not include one.\nReceivers treat an omitted, `null`, or malformed `stopReason` as the agent not\nreporting one.\nRepeated or resume snapshots may carry the last stop reason for context.\nThey MUST NOT be counted as new completions, cancellations, or additional usage.",
       "type": "object",
       "properties": {
         "usage": {
@@ -6594,7 +5743,7 @@
       },
       "anyOf": [
         {
-          "description": "The active work ended successfully.",
+          "description": "The active work ended successfully.\nIncludes locally handled commands that required no model call.",
           "type": "object",
           "properties": {
             "stopReason": {
@@ -6638,7 +5787,7 @@
           "required": ["stopReason"]
         },
         {
-          "description": "Active session work was cancelled by the client via `session/cancel`.\n\nAgents should report this stop reason on an idle `state_update` session update\nwhen cancellation succeeds, even if cancellation causes exceptions in\nunderlying operations.",
+          "description": "Active session work was cancelled by the client via `session/cancel`.\n\nAgents MUST report this stop reason on an idle `state_update` when\ncancellation ends active foreground work, even if aborting causes\nexceptions. Agents MUST catch these errors and report `cancelled`, not\n`error`.",
           "type": "object",
           "properties": {
             "stopReason": {
@@ -6649,7 +5798,7 @@
           "required": ["stopReason"]
         },
         {
-          "description": "The active work ended because something failed.\n\nFor work started by a prompt, this covers failures after the user message\nwas inserted; earlier failures are an error response to `session/prompt`.",
+          "description": "The active work ended because something failed.\n\nThis includes pre-insertion foreground work. A prompt failure before\ninsertion also requires an error response to `session/prompt`; after\ninsertion, the prompt's response remains successful.",
           "type": "object",
           "properties": {
             "stopReason": {
@@ -6754,7 +5903,7 @@
       ]
     },
     "RequiresActionStateUpdate": {
-      "description": "Foreground work is blocked on user action.",
+      "description": "The foreground workflow as a whole is blocked on user action.\n\nAgents SHOULD report this state when foreground work cannot progress without\nuser action. Pending permissions or elicitations alone do not imply this\nstate if other foreground work can progress, or if the requests belong only\nto independent background activity. Once reported, agents MUST report\n`running` when progress resumes, or `idle` if the work ends without resuming.\nResponding to one request does not itself imply `running`.",
       "type": "object",
       "properties": {
         "_meta": {
@@ -6778,7 +5927,7 @@
       }
     },
     "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.",
+      "description": "A snapshot of the session's aggregate foreground activity.\n\nForeground work is the agent's active response or workflow in the session,\nincluding model processing, tool execution, and waiting for user action needed\nto continue that work. It can start with a prompt or be agent-initiated, for\nexample to pursue an ongoing goal or follow up on a completed background task.\nEither way, the agent MUST report `running` when foreground work starts,\nor `requires_action` if it starts blocked on user action, and `idle` when it\nends. The agent SHOULD include a stop reason on that idle update.\nAgent-initiated work does not require a prompt request or a synthetic user\nmessage.\n\n`running` may precede user-message insertion, for example during a foreground\nhook. It is not acknowledgment of insertion, and rejecting a prompt does not\nitself end foreground work.\n\nBackground activity can continue and emit other `session/update` notifications\nwhile `idle`. Those notifications, including a detached task's progress or\ncompletion, do not by themselves change this state. A permission request only\nwarrants `requires_action` when foreground work is blocked on user action.\n\nThe agent SHOULD report `requires_action` when the foreground workflow as a\nwhole cannot progress without user action, including permissions or elicitations.\nOnce reported, it MUST report `running` when progress resumes, or `idle` when\nwork ends without resuming.\nIf other foreground work can progress, the state remains `running`. Resolving\none of several requests does not itself change the state. Agents SHOULD ignore\nresponses for work that has already ended rather than use them to resume it.\n\nA new session defaults to idle until a state update reports otherwise.\nResume MUST send a current-state snapshot after any replay and before its\nresponse. The snapshot reports foreground state after resuming.\nThe response alone does not imply idle.\nRepeated snapshots are idempotent, not additional work, completions, or usage.\nA repeated state may carry updated information without another state transition.\nThe agent MUST report `idle` when no foreground activity remains. Completing\nan individual activity while other foreground work continues does not require\nan idle boundary. Local commands use the same lifecycle even without model work.\n\nSee protocol docs: [Session States](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#session-states)",
       "anyOf": [
         {
           "description": "Foreground work is in progress.",
@@ -6797,7 +5946,7 @@
           ]
         },
         {
-          "description": "The agent is ready to process a new prompt.",
+          "description": "No foreground work is active. Background activity may continue.",
           "type": "object",
           "properties": {
             "state": {
@@ -6975,7 +6124,7 @@
       }
     },
     "TerminalUpdate": {
-      "description": "An upsert for the stored state of an agent-owned terminal.\n\nOnly [`TerminalUpdate::terminal_id`] is required. Other fields have patch\nsemantics: omitted fields leave the stored value unchanged, `null` clears\nit, and concrete values replace it. When the terminal ID is new, omitted\nfields start unknown.",
+      "description": "An upsert for the stored state of an agent-owned terminal.\n\nOnly [`TerminalUpdate::terminal_id`] is required. Other fields have patch\nsemantics: omitted fields leave the stored value unchanged, `null` clears\nit, and concrete values replace it. A concrete `_meta` object instead\npatches the stored metadata by top-level key. When the terminal ID is new,\nomitted fields start unknown.",
       "type": "object",
       "properties": {
         "terminalId": {
@@ -7028,7 +6177,7 @@
           "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. 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)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -7430,7 +6579,7 @@
       "required": ["configOptions"]
     },
     "SessionInfoUpdate": {
-      "description": "Update to session metadata. All fields are optional to support partial updates.\n\nAgents send this notification to update session information like title or custom metadata.\nThis allows clients to display dynamic session names and track session state changes.\n\nOmitted fields leave the existing session info unchanged. `null` clears the\ncorresponding value.",
+      "description": "Update to session metadata. All fields are optional to support partial updates.\n\nAgents send this notification to update session information like title or custom metadata.\nThis allows clients to display dynamic session names and track session state changes.\n\nOmitted fields leave the existing session info unchanged. `null` clears the\ncorresponding value. A concrete `_meta` object patches the stored metadata by\ntop-level key.",
       "type": "object",
       "properties": {
         "title": {
@@ -7445,7 +6594,7 @@
           "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. 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)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -7603,7 +6752,7 @@
       ]
     },
     "CompactionUpdate": {
-      "description": "A context compaction upsert. The first notification fixes the compaction's\ntimeline position. Later updates with the same ID patch that entity in place.\n\n`summary`, `error`, and `_meta` have patch semantics: omission leaves the\nstored value unchanged, `null` clears it, and a concrete value replaces it.\n`summary: []` also clears the summary.",
+      "description": "A context compaction upsert. The first notification fixes the compaction's\ntimeline position. Later updates with the same ID patch that entity in place.\n\n`summary`, `error`, and `_meta` have patch semantics: omission leaves the\nstored value unchanged, `null` clears it, and a concrete value replaces it.\n`summary: []` also clears the summary. A concrete `_meta` object patches the\nstored metadata by top-level key instead of replacing it.",
       "type": "object",
       "properties": {
         "compactionId": {
@@ -7637,7 +6786,7 @@
           "x-deserialize-default-on-error": true
         },
         "_meta": {
-          "description": "Extensible metadata patch for this compaction.",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -7711,7 +6860,7 @@
       }
     },
     "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.",
+      "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. A concrete\n`_meta` object instead patches the stored metadata by top-level key. For\n`state`, `null` removes the current state report and leaves activity\nunconfirmed; it 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": {
@@ -7757,7 +6906,7 @@
           "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. 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)",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -7811,7 +6960,7 @@
           "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`.",
+          "description": "The _meta property is reserved by ACP to allow clients and agents to attach additional\nmetadata to their interactions. Omitted leaves the stored metadata unchanged; `null`\nclears it. An object patches the stored metadata by top-level key: keys it omits are\nunchanged, a key set to `null` is removed, and any other value replaces that key's\nstored value without merging nested objects. Beyond this patch rule, implementations\nMUST NOT make assumptions about values at these keys.\n\nSee protocol docs: [Metadata Patches](https://agentclientprotocol.com/protocol/v2/draft/extensibility#metadata-patches)",
           "type": ["object", "null"],
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
@@ -7873,7 +7022,7 @@
       "required": ["messageId", "content"]
     },
     "CompleteElicitationNotification": {
-      "description": "Notification sent by the agent when a URL-based elicitation is complete.",
+      "description": "Notification sent by the agent when a URL-based elicitation is complete.\n\nThis notification is not a foreground state update.",
       "type": "object",
       "properties": {
         "elicitationId": {
@@ -8003,7 +7152,7 @@
                 },
                 {
                   "title": "ForkSessionRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nForks an existing session to create a new independent session.\n\nThis method is only available if the agent advertises the `session.fork` capability.\n\nThe agent should create a new session with the same conversation context as the\noriginal, allowing operations like generating summaries without affecting the\noriginal session's history.",
+                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nForks an existing session to create a new independent session.\n\nThis method is only available if the agent advertises the `session.fork` capability.\n\nThe agent should create a new session with the same conversation context as the\noriginal, allowing operations like generating summaries without affecting the\noriginal session's history.\n\nAs with `session/new`, the forked session is active once the agent responds,\nset up with the request's `cwd`, `additionalDirectories`, and `mcpServers`.\nThe client can prompt it without calling `session/resume` first.",
                   "allOf": [
                     {
                       "$ref": "#/$defs/ForkSessionRequest"
@@ -8039,40 +7188,13 @@
                 },
                 {
                   "title": "PromptRequest",
-                  "description": "Processes a user prompt within a session.\n\nAcceptance means insertion into the ACP conversation:\n- Receives user messages with optional context (files, images, etc.)\n- Returns the inserted user message's ID without waiting for processing to finish\n\nThe Agent reports the user message with the same ID through `session/update`;\nthis notification may arrive before or after the response. Processing state,\noutput, tool calls, and completion are also reported through session updates.\n\nAn error response means the user message was not inserted. Once it is\ninserted, the Agent MUST NOT answer with an error, even if the work fails\nbefore the response is sent; it ends that work with the `error` stop reason.\n\nSee protocol docs: [Prompt Lifecycle](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle)",
+                  "description": "Processes a user prompt within a session.\n\nAcceptance means adding a logical user message with an ID and a position\nrelative to other messages in the ACP conversation, not receipt or queueing.\nThe Agent MUST return the inserted message's ID without waiting for\nprocessing to finish.\n\nThe Agent reports the user message with the same ID through `session/update`;\nthis notification may arrive before or after the response, but neither may\nprecede insertion. Processing state, output, tool calls, and completion are\nalso reported through session updates.\n\nAn error response means the user message was not inserted. Once it is\ninserted, the Agent MUST NOT answer with an error, even if the work fails\nbefore the response is sent; it ends that work with the `error` stop reason.\n\nA rejected submission produces no user-message updates. Foreground state\nfollows its normal lifecycle independently of the request outcome:\n`running` may precede insertion, and rejection alone does not imply `idle`.\n\nSee protocol docs: [Prompt Lifecycle](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle)",
                   "allOf": [
                     {
                       "$ref": "#/$defs/PromptRequest"
                     }
                   ]
                 },
-                {
-                  "title": "StartNesRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nStarts an NES session.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/StartNesRequest"
-                    }
-                  ]
-                },
-                {
-                  "title": "SuggestNesRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nRequests a code suggestion.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/SuggestNesRequest"
-                    }
-                  ]
-                },
-                {
-                  "title": "CloseNesRequest",
-                  "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nCloses an active NES session and frees up any resources associated with it.\n\nThe agent must cancel any ongoing work and then free up any resources\nassociated with the NES session.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/CloseNesRequest"
-                    }
-                  ]
-                },
                 {
                   "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)",
@@ -8162,27 +7284,6 @@
           ],
           "x-deserialize-default-on-error": true
         },
-        "nes": {
-          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nNES (Next Edit Suggestions) capabilities supported by the client.\n\nOptional. Omitted or `null` both mean the client does not advertise any\nNES suggestion-kind extensions.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/ClientNesCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "positionEncodings": {
-          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nThe position encodings supported by the client, in order of preference.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/PositionEncodingKind"
-          },
-          "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"],
@@ -8199,497 +7300,13 @@
           "description": "Whether the client supports `terminal` authentication methods.\n\nOptional. Omitted or `null` both mean the client does not advertise support.\nThe client should supply `{}` only when it can reproduce the configured\nagent invocation in an interactive terminal. Supplying `{}` means the\nagent may include `terminal` entries in its authentication methods.",
           "anyOf": [
             {
-              "$ref": "#/$defs/TerminalAuthCapabilities"
-            },
-            {
-              "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
-        }
-      }
-    },
-    "TerminalAuthCapabilities": {
-      "description": "Capabilities for terminal authentication methods.\n\nSupplying `{}` means the client can reproduce the configured agent\ninvocation in an interactive terminal and supports terminal authentication\nmethods.",
-      "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
-        }
-      }
-    },
-    "ElicitationCapabilities": {
-      "description": "Elicitation capabilities supported by the client.",
-      "type": "object",
-      "properties": {
-        "form": {
-          "description": "Whether the client supports form-based elicitation.\n\nOptional. Omitted and `null` are equivalent and mean form support is not advertised.\nSupplying `{}` explicitly advertises form support.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/ElicitationFormCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "url": {
-          "description": "Whether the client supports URL-based elicitation.\n\nOptional. Omitted or `null` both mean the client does not advertise support.\nSupplying `{}` means the client supports URL-based elicitation.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/ElicitationUrlCapabilities"
-            },
-            {
-              "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)",
-          "type": ["object", "null"],
-          "x-deserialize-default-on-error": true,
-          "additionalProperties": true
-        }
-      }
-    },
-    "ElicitationFormCapabilities": {
-      "description": "Form-based elicitation capabilities.\n\nSupplying `{}` means the client supports form-based elicitation.",
-      "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\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
-        }
-      }
-    },
-    "ElicitationUrlCapabilities": {
-      "description": "URL-based elicitation capabilities.\n\nSupplying `{}` means the client supports URL-based elicitation.",
-      "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\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
-        }
-      }
-    },
-    "ClientNesCapabilities": {
-      "description": "NES capabilities advertised by the client during initialization.",
-      "type": "object",
-      "properties": {
-        "jump": {
-          "description": "Whether the client supports the `jump` suggestion kind.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesJumpCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "rename": {
-          "description": "Whether the client supports the `rename` suggestion kind.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesRenameCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "searchAndReplace": {
-          "description": "Whether the client supports the `searchAndReplace` suggestion kind.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesSearchAndReplaceCapabilities"
-            },
-            {
-              "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
-        }
-      }
-    },
-    "NesJumpCapabilities": {
-      "description": "Marker for jump suggestion support.",
-      "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
-        }
-      }
-    },
-    "NesRenameCapabilities": {
-      "description": "Marker for rename suggestion support.",
-      "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
-        }
-      }
-    },
-    "NesSearchAndReplaceCapabilities": {
-      "description": "Marker for search and replace suggestion support.",
-      "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
-        }
-      }
-    },
-    "LoginAuthRequest": {
-      "description": "Request parameters for the `auth/login` method.\n\nSpecifies which authentication method to use.\n\nAgents MUST support this method when their `initialize` response advertised\nat least one valid authentication method. Clients MUST NOT call this method\nwhen `authMethods` was omitted or empty.",
-      "type": "object",
-      "properties": {
-        "methodId": {
-          "description": "The ID of the authentication method to use.\nMust be one of the methods advertised in the initialize response.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/AuthMethodId"
-            }
-          ]
-        },
-        "_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": ["methodId"],
-      "x-side": "agent",
-      "x-method": "auth/login"
-    },
-    "ListProvidersRequest": {
-      "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 `providers/list`.",
-      "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
-        }
-      },
-      "x-side": "agent",
-      "x-method": "providers/list"
-    },
-    "SetProviderRequest": {
-      "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 `providers/set`.\n\nReplaces the full configuration for one provider ID.",
-      "type": "object",
-      "properties": {
-        "providerId": {
-          "description": "Provider ID to configure.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/ProviderId"
-            }
-          ]
-        },
-        "apiType": {
-          "description": "Protocol type for this provider.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/LlmProtocol"
-            }
-          ]
-        },
-        "baseUrl": {
-          "description": "Base URL for requests sent through this provider.",
-          "type": "string",
-          "format": "uri"
-        },
-        "headers": {
-          "description": "Full headers map for this provider.\nMay include authorization, routing, or other integration-specific headers.",
-          "type": "object",
-          "additionalProperties": {
-            "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": ["providerId", "apiType", "baseUrl"],
-      "x-side": "agent",
-      "x-method": "providers/set"
-    },
-    "DisableProviderRequest": {
-      "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 `providers/disable`.",
-      "type": "object",
-      "properties": {
-        "providerId": {
-          "description": "Provider ID to disable.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/ProviderId"
-            }
-          ]
-        },
-        "_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": ["providerId"],
-      "x-side": "agent",
-      "x-method": "providers/disable"
-    },
-    "LogoutAuthRequest": {
-      "description": "Request parameters for the `auth/logout` method.\n\nTerminates the current authenticated session.\n\nAgents MUST support this method when their `initialize` response advertised\nat least one valid authentication method. Clients MUST NOT call this method\nwhen `authMethods` was omitted or empty.",
-      "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
-        }
-      },
-      "x-side": "agent",
-      "x-method": "auth/logout"
-    },
-    "NewSessionRequest": {
-      "description": "Request parameters for creating a new session.\n\nSee protocol docs: [Creating a Session](https://agentclientprotocol.com/protocol/v2/draft/session-setup#creating-a-session)",
-      "type": "object",
-      "properties": {
-        "cwd": {
-          "description": "The working directory for this session. Must be an absolute path.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/AbsolutePath"
-            }
-          ]
-        },
-        "additionalDirectories": {
-          "description": "Additional workspace roots for this session. Each path must be absolute.\n\nThese expand the session's workspace scope without changing `cwd`, which\nremains the base for relative paths. When omitted or empty, no\nadditional roots are activated for the new session.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/AbsolutePath"
-          }
-        },
-        "mcpServers": {
-          "description": "List of MCP (Model Context Protocol) servers the agent should connect to.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/McpServer"
-          }
-        },
-        "_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": ["cwd"],
-      "x-side": "agent",
-      "x-method": "session/new"
-    },
-    "McpServer": {
-      "description": "Configuration for connecting to an MCP (Model Context Protocol) server.\n\nMCP servers provide tools and context that the agent can use when\nprocessing prompts.\n\nSee protocol docs: [MCP Servers](https://agentclientprotocol.com/protocol/v2/draft/session-setup#mcp-servers)",
-      "anyOf": [
-        {
-          "description": "HTTP transport configuration\n\nOnly available when the Agent capabilities include `session.mcp.http`.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "http"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpServerHttp"
-            }
-          ]
-        },
-        {
-          "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\n\nOnly available when the Agent capabilities include `session.mcp.acp`.\nThe MCP server is provided by an ACP component and communicates over the ACP channel.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "acp"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpServerAcp"
-            }
-          ]
-        },
-        {
-          "description": "Stdio transport configuration\n\nOnly available when the Agent capabilities include `session.mcp.stdio`.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "stdio"
-            }
-          },
-          "required": ["type"],
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpServerStdio"
-            }
-          ]
-        },
-        {
-          "title": "other",
-          "description": "Custom or future MCP server transport configuration.\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 transport should preserve the raw\npayload when storing, replaying, proxying, or forwarding session setup\ndata, and otherwise ignore it or reject the server configuration.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "description": "Custom or future MCP server transport 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": "http"
-                  }
-                },
-                "required": ["type"]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "type": {
-                    "type": "string",
-                    "const": "stdio"
-                  }
-                },
-                "required": ["type"]
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "type": {
-                    "type": "string",
-                    "const": "acp"
-                  }
-                },
-                "required": ["type"]
-              }
-            ]
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "HttpHeader": {
-      "description": "An HTTP header to set when making requests to the MCP server.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "The name of the HTTP header.",
-          "type": "string"
-        },
-        "value": {
-          "description": "The value to set for the HTTP header.",
-          "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": ["name", "value"]
-    },
-    "McpServerHttp": {
-      "description": "HTTP transport configuration for MCP.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Human-readable name identifying this MCP server.",
-          "type": "string"
-        },
-        "url": {
-          "description": "URL to the MCP server.",
-          "type": "string",
-          "format": "uri"
-        },
-        "headers": {
-          "description": "HTTP headers to set when making requests to the MCP server.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/HttpHeader"
-          }
-        },
-        "_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", "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/message`.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Human-readable name identifying this MCP server.",
-          "type": "string"
-        },
-        "serverId": {
-          "description": "Unique identifier for this MCP server, generated by the component providing it.\n\nProviders MUST NOT reuse an ID for multiple ACP-transport MCP servers that are visible\non the same ACP connection.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/McpServerAcpId"
+              "$ref": "#/$defs/TerminalAuthCapabilities"
+            },
+            {
+              "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)",
@@ -8697,141 +7314,92 @@
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
         }
-      },
-      "required": ["name", "serverId"]
+      }
     },
-    "McpServerStdio": {
-      "description": "Stdio transport configuration for MCP.",
+    "TerminalAuthCapabilities": {
+      "description": "Capabilities for terminal authentication methods.\n\nSupplying `{}` means the client can reproduce the configured agent\ninvocation in an interactive terminal and supports terminal authentication\nmethods.",
       "type": "object",
       "properties": {
-        "name": {
-          "description": "Human-readable name identifying this MCP server.",
-          "type": "string"
-        },
-        "command": {
-          "description": "Absolute path to the MCP server executable.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/AbsolutePath"
-            }
-          ]
-        },
-        "args": {
-          "description": "Command-line arguments to pass to the MCP server.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "env": {
-          "description": "Environment variables to set when launching the MCP server.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/EnvVariable"
-          }
-        },
         "_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", "command"]
+      }
     },
-    "ListSessionsRequest": {
-      "description": "Request parameters for listing existing sessions.",
+    "ElicitationCapabilities": {
+      "description": "Elicitation capabilities supported by the client.",
       "type": "object",
       "properties": {
-        "cwd": {
-          "description": "Filter sessions by working directory. Must be an absolute path.",
+        "form": {
+          "description": "Whether the client supports form-based elicitation.\n\nOptional. Omitted and `null` are equivalent and mean form support is not advertised.\nSupplying `{}` explicitly advertises form support.",
           "anyOf": [
             {
-              "$ref": "#/$defs/AbsolutePath"
+              "$ref": "#/$defs/ElicitationFormCapabilities"
             },
             {
               "type": "null"
             }
-          ]
+          ],
+          "x-deserialize-default-on-error": true
         },
-        "cursor": {
-          "description": "Opaque cursor token from a previous response's nextCursor field for cursor-based pagination",
+        "url": {
+          "description": "Whether the client supports URL-based elicitation.\n\nOptional. Omitted or `null` both mean the client does not advertise support.\nSupplying `{}` means the client supports URL-based elicitation.",
           "anyOf": [
             {
-              "$ref": "#/$defs/SessionListCursor"
+              "$ref": "#/$defs/ElicitationUrlCapabilities"
             },
             {
               "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)",
+          "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
         }
-      },
-      "x-side": "agent",
-      "x-method": "session/list"
+      }
     },
-    "DeleteSessionRequest": {
-      "description": "Request parameters for deleting an existing session from `session/list`.\n\nOnly available if the Agent supports the `session.delete` capability.",
+    "ElicitationFormCapabilities": {
+      "description": "Form-based elicitation capabilities.\n\nSupplying `{}` means the client supports form-based elicitation.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to delete.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
         "_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": ["sessionId"],
-      "x-side": "agent",
-      "x-method": "session/delete"
+      }
     },
-    "ForkSessionRequest": {
-      "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 forking an existing session.\n\nCreates a new session based on the context of an existing one, allowing\noperations like generating summaries without affecting the original session's history.\n\nOnly available if the Agent supports the `session.fork` capability.",
+    "ElicitationUrlCapabilities": {
+      "description": "URL-based elicitation capabilities.\n\nSupplying `{}` means the client supports URL-based elicitation.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to fork.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "cwd": {
-          "description": "The working directory for this session. Must be an absolute path.",
+        "_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)",
+          "type": ["object", "null"],
+          "x-deserialize-default-on-error": true,
+          "additionalProperties": true
+        }
+      }
+    },
+    "LoginAuthRequest": {
+      "description": "Request parameters for the `auth/login` method.\n\nSpecifies which authentication method to use.\n\nAgents MUST support this method when their `initialize` response advertised\nat least one valid authentication method. Clients MUST NOT call this method\nwhen `authMethods` was omitted or empty.",
+      "type": "object",
+      "properties": {
+        "methodId": {
+          "description": "The ID of the authentication method to use.\nMust be one of the methods advertised in the initialize response.",
           "allOf": [
             {
-              "$ref": "#/$defs/AbsolutePath"
+              "$ref": "#/$defs/AuthMethodId"
             }
           ]
         },
-        "additionalDirectories": {
-          "description": "Additional workspace roots to activate for this session. Each path must be absolute.\n\nWhen omitted or empty, no additional roots are activated. When non-empty,\nthis is the complete resulting additional-root list for the forked\nsession.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/AbsolutePath"
-          }
-        },
-        "mcpServers": {
-          "description": "List of MCP servers to connect to for this session.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/McpServer"
-          }
-        },
         "_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"],
@@ -8839,55 +7407,14 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId", "cwd"],
+      "required": ["methodId"],
       "x-side": "agent",
-      "x-method": "session/fork"
+      "x-method": "auth/login"
     },
-    "ResumeSessionRequest": {
-      "description": "Request parameters for resuming an existing session.\n\nResumes an existing session and optionally replays retained conversation\nhistory according to `replayFrom`.",
+    "ListProvidersRequest": {
+      "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 `providers/list`.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to resume.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "cwd": {
-          "description": "The working directory for this session. Must be an absolute path.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/AbsolutePath"
-            }
-          ]
-        },
-        "additionalDirectories": {
-          "description": "Additional workspace roots to activate for this session. Each path must be absolute.\n\nWhen omitted or empty, no additional roots are activated. When non-empty,\nthis is the complete resulting additional-root list for the resumed\nsession. It may differ from any previously used or reported list as long as\nthe request `cwd` matches the session's `cwd`.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/AbsolutePath"
-          }
-        },
-        "mcpServers": {
-          "description": "List of MCP servers to connect to for this session.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/McpServer"
-          }
-        },
-        "replayFrom": {
-          "description": "Inclusive cursor describing where conversation replay should begin.\n\nOptional. Omitted or `null` both mean the Agent should resume without\nreplaying previous conversation history. Replay cursors are inclusive:\nreplay includes the position identified by the cursor. Supplying\n`{ \"type\": \"start\" }` means the Agent should replay all retained\nconversation history before responding.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/ReplayFrom"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
         "_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"],
@@ -8895,85 +7422,61 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId", "cwd"],
       "x-side": "agent",
-      "x-method": "session/resume"
+      "x-method": "providers/list"
     },
-    "ReplayFrom": {
-      "description": "Inclusive cursor describing where replayed session history should begin.\n\nReplay includes the position identified by the cursor.",
-      "anyOf": [
-        {
-          "description": "Replay all retained conversation history from its first replayable entry.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "type": "string",
-              "const": "start"
-            }
-          },
-          "required": ["type"],
+    "SetProviderRequest": {
+      "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 `providers/set`.\n\nReplaces the full configuration for one provider ID.",
+      "type": "object",
+      "properties": {
+        "providerId": {
+          "description": "Provider ID to configure.",
           "allOf": [
             {
-              "$ref": "#/$defs/ReplayFromStart"
+              "$ref": "#/$defs/ProviderId"
             }
           ]
         },
-        {
-          "title": "other",
-          "description": "Custom or future replay cursor.\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 cursor should preserve the raw\npayload when storing, replaying, proxying, or forwarding requests, and\notherwise reject the request rather than guessing where to replay from.",
-          "type": "object",
-          "properties": {
-            "type": {
-              "description": "Custom or future replay cursor 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"
-            },
-            "_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
+        "apiType": {
+          "description": "Protocol type for this provider.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/LlmProtocol"
             }
-          },
-          "required": ["type"],
-          "not": {
-            "anyOf": [
-              {
-                "type": "object",
-                "properties": {
-                  "type": {
-                    "type": "string",
-                    "const": "start"
-                  }
-                },
-                "required": ["type"]
-              }
-            ]
-          },
-          "additionalProperties": true
-        }
-      ]
-    },
-    "ReplayFromStart": {
-      "description": "Inclusive replay cursor requesting replay from the start of retained conversation history.",
-      "type": "object",
-      "properties": {
+          ]
+        },
+        "baseUrl": {
+          "description": "Base URL for requests sent through this provider.",
+          "type": "string",
+          "format": "uri"
+        },
+        "headers": {
+          "description": "Full headers map for this provider.\nMay include authorization, routing, or other integration-specific headers.",
+          "type": "object",
+          "additionalProperties": {
+            "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": ["providerId", "apiType", "baseUrl"],
+      "x-side": "agent",
+      "x-method": "providers/set"
     },
-    "CloseSessionRequest": {
-      "description": "Request parameters for closing an active session.\n\nThe agent **must** cancel any ongoing work related to the session (treat it\nas if `session/cancel` was called) and then free up any resources associated\nwith the session.",
+    "DisableProviderRequest": {
+      "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 `providers/disable`.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to close.",
+        "providerId": {
+          "description": "Provider ID to disable.",
           "allOf": [
             {
-              "$ref": "#/$defs/SessionId"
+              "$ref": "#/$defs/ProviderId"
             }
           ]
         },
@@ -8984,27 +7487,58 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId"],
+      "required": ["providerId"],
       "x-side": "agent",
-      "x-method": "session/close"
+      "x-method": "providers/disable"
     },
-    "SetSessionConfigOptionRequest": {
-      "description": "Request parameters for setting a session configuration option.",
+    "LogoutAuthRequest": {
+      "description": "Request parameters for the `auth/logout` method.\n\nTerminates the current authenticated session.\n\nAgents MUST support this method when their `initialize` response advertised\nat least one valid authentication method. Clients MUST NOT call this method\nwhen `authMethods` was omitted or empty.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to set the configuration option for.",
+        "_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
+        }
+      },
+      "x-side": "agent",
+      "x-method": "auth/logout"
+    },
+    "NewSessionRequest": {
+      "description": "Request parameters for creating a new session.\n\nSee protocol docs: [Creating a Session](https://agentclientprotocol.com/protocol/v2/draft/session-setup#creating-a-session)",
+      "type": "object",
+      "properties": {
+        "cwd": {
+          "description": "The working directory for this session. Must be an absolute path.",
           "allOf": [
             {
-              "$ref": "#/$defs/SessionId"
+              "$ref": "#/$defs/AbsolutePath"
             }
           ]
         },
-        "configId": {
-          "description": "The ID of the configuration option to set.",
-          "allOf": [
+        "additionalDirectories": {
+          "description": "Additional workspace roots for this session. Each path must be absolute.\n\nThese expand the session's workspace scope without changing `cwd`, which\nremains the base for relative paths. When omitted or empty, no\nadditional roots are activated for the new session.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AbsolutePath"
+          }
+        },
+        "mcpServers": {
+          "description": "List of MCP (Model Context Protocol) servers the agent should connect to.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/McpServer"
+          }
+        },
+        "systemPrompt": {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nSystem-level instructions for the new session.\n\nOptional. Omitted and `null` are equivalent and mean the Agent uses its\nown default instructions. Clients MUST only send this when the Agent\nadvertises `session.systemPrompt`.",
+          "anyOf": [
             {
-              "$ref": "#/$defs/SessionConfigId"
+              "$ref": "#/$defs/SystemPrompt"
+            },
+            {
+              "type": "null"
             }
           ]
         },
@@ -9015,56 +7549,72 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId", "configId"],
+      "required": ["cwd"],
+      "x-side": "agent",
+      "x-method": "session/new"
+    },
+    "McpServer": {
+      "description": "Configuration for connecting to an MCP (Model Context Protocol) server.\n\nMCP servers provide tools and context that the agent can use when\nprocessing prompts.\n\nSee protocol docs: [MCP Servers](https://agentclientprotocol.com/protocol/v2/draft/session-setup#mcp-servers)",
       "anyOf": [
         {
-          "description": "A [`SessionConfigValueId`] string value (`type: \"id\"`).",
+          "description": "HTTP transport configuration\n\nOnly available when the Agent capabilities include `session.mcp.http`.",
           "type": "object",
           "properties": {
-            "value": {
-              "description": "The value ID.",
-              "allOf": [
-                {
-                  "$ref": "#/$defs/SessionConfigValueId"
-                }
-              ]
-            },
             "type": {
               "type": "string",
-              "const": "id"
+              "const": "http"
             }
           },
-          "required": ["type", "value"]
+          "required": ["type"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/McpServerHttp"
+            }
+          ]
         },
         {
-          "description": "A boolean value (`type: \"boolean\"`).",
+          "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\n\nOnly available when the Agent capabilities include `session.mcp.acp`.\nThe MCP server is provided by an ACP component and communicates over the ACP channel.",
           "type": "object",
           "properties": {
-            "value": {
-              "description": "The boolean value.",
-              "type": "boolean"
-            },
             "type": {
               "type": "string",
-              "const": "boolean"
+              "const": "acp"
             }
           },
-          "required": ["type", "value"]
+          "required": ["type"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/McpServerAcp"
+            }
+          ]
+        },
+        {
+          "description": "Stdio transport configuration\n\nOnly available when the Agent capabilities include `session.mcp.stdio`.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "stdio"
+            }
+          },
+          "required": ["type"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/McpServerStdio"
+            }
+          ]
         },
         {
           "title": "other",
-          "description": "Custom or future session configuration option value payload.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
+          "description": "Custom or future MCP server transport configuration.\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 transport should preserve the raw\npayload when storing, replaying, proxying, or forwarding session setup\ndata, and otherwise ignore it or reject the server configuration.",
           "type": "object",
           "properties": {
             "type": {
-              "description": "Custom or future session configuration option value type.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
+              "description": "Custom or future MCP server transport 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"
-            },
-            "value": {
-              "description": "Raw value payload for the custom or future value type."
             }
           },
-          "required": ["type", "value"],
+          "required": ["type"],
           "not": {
             "anyOf": [
               {
@@ -9072,7 +7622,7 @@
                 "properties": {
                   "type": {
                     "type": "string",
-                    "const": "id"
+                    "const": "http"
                   }
                 },
                 "required": ["type"]
@@ -9082,7 +7632,17 @@
                 "properties": {
                   "type": {
                     "type": "string",
-                    "const": "boolean"
+                    "const": "stdio"
+                  }
+                },
+                "required": ["type"]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "acp"
                   }
                 },
                 "required": ["type"]
@@ -9091,28 +7651,19 @@
           },
           "additionalProperties": true
         }
-      ],
-      "x-side": "agent",
-      "x-method": "session/set_config_option"
+      ]
     },
-    "PromptRequest": {
-      "description": "Request parameters for sending a user prompt to the agent.\n\nContains the user's message and any additional context.\n\nSee protocol docs: [User Message](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#1-user-message)",
+    "HttpHeader": {
+      "description": "An HTTP header to set when making requests to the MCP server.",
       "type": "object",
       "properties": {
-        "sessionId": {
-          "description": "The ID of the session to send this user message to",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
+        "name": {
+          "description": "The name of the HTTP header.",
+          "type": "string"
         },
-        "prompt": {
-          "description": "The blocks of content that compose the user's message.\n\nAs a baseline, the Agent MUST support [`ContentBlock::Text`] and [`ContentBlock::ResourceLink`],\nwhile other variants are optionally enabled via [`PromptCapabilities`].\n\nThe Client MUST adapt its interface according to [`PromptCapabilities`].\n\nThe client MAY include referenced pieces of context as either\n[`ContentBlock::Resource`] or [`ContentBlock::ResourceLink`].\n\nWhen available, [`ContentBlock::Resource`] is preferred\nas it avoids extra round-trips and allows the message to include\npieces of context from sources the agent may not have access to.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/ContentBlock"
-          }
+        "value": {
+          "description": "The value to set for the HTTP header.",
+          "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)",
@@ -9121,38 +7672,52 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId", "prompt"],
-      "x-side": "agent",
-      "x-method": "session/prompt"
+      "required": ["name", "value"]
     },
-    "StartNesRequest": {
-      "description": "Request to start an NES session.",
+    "McpServerHttp": {
+      "description": "HTTP transport configuration for MCP.",
       "type": "object",
       "properties": {
-        "workspaceUri": {
-          "description": "The root URI of the workspace.",
-          "type": ["string", "null"],
-          "format": "uri",
-          "x-deserialize-default-on-error": true
+        "name": {
+          "description": "Human-readable name identifying this MCP server.",
+          "type": "string"
         },
-        "workspaceFolders": {
-          "description": "The workspace folders.",
-          "type": ["array", "null"],
+        "url": {
+          "description": "URL to the MCP server.",
+          "type": "string",
+          "format": "uri"
+        },
+        "headers": {
+          "description": "HTTP headers to set when making requests to the MCP server.",
+          "type": "array",
           "items": {
-            "$ref": "#/$defs/WorkspaceFolder"
+            "$ref": "#/$defs/HttpHeader"
           }
         },
-        "repository": {
-          "description": "Repository metadata, if the workspace is a git repository.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesRepository"
-            },
+        "_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", "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/message`.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Human-readable name identifying this MCP server.",
+          "type": "string"
+        },
+        "serverId": {
+          "description": "Unique identifier for this MCP server, generated by the component providing it.\n\nProviders MUST NOT reuse an ID for multiple ACP-transport MCP servers that are visible\non the same ACP connection.",
+          "allOf": [
             {
-              "type": "null"
+              "$ref": "#/$defs/McpServerAcpId"
             }
-          ],
-          "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)",
@@ -9161,22 +7726,38 @@
           "additionalProperties": true
         }
       },
-      "x-side": "agent",
-      "x-method": "nes/start"
+      "required": ["name", "serverId"]
     },
-    "WorkspaceFolder": {
-      "description": "A workspace folder.",
+    "McpServerStdio": {
+      "description": "Stdio transport configuration for MCP.",
       "type": "object",
       "properties": {
-        "uri": {
-          "description": "The URI of the folder.",
-          "type": "string",
-          "format": "uri"
-        },
         "name": {
-          "description": "The display name of the folder.",
+          "description": "Human-readable name identifying this MCP server.",
           "type": "string"
         },
+        "command": {
+          "description": "Absolute path to the MCP server executable.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/AbsolutePath"
+            }
+          ]
+        },
+        "args": {
+          "description": "Command-line arguments to pass to the MCP server.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "env": {
+          "description": "Environment variables to set when launching the MCP server.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/EnvVariable"
+          }
+        },
         "_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"],
@@ -9184,23 +7765,26 @@
           "additionalProperties": true
         }
       },
-      "required": ["uri", "name"]
+      "required": ["name", "command"]
     },
-    "NesRepository": {
-      "description": "Repository metadata for an NES session.",
+    "SystemPrompt": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nClient-provided system-level instructions for a session.\n\nClients MUST only send this when the Agent advertises\n`session.systemPrompt`. Agents that cannot apply it, for example because of\nan unadvertised mode or an unsupported content block type, MUST return an\nerror instead of creating, resuming, or forking the session.",
       "type": "object",
       "properties": {
-        "name": {
-          "description": "The repository name.",
-          "type": "string"
-        },
-        "owner": {
-          "description": "The repository owner.",
-          "type": "string"
+        "mode": {
+          "description": "How the Agent combines `content` with its own instructions.\n\nRequired on the wire, so every request states its mode. In Rust,\n[`SystemPrompt::new`] starts it as [`SystemPromptMode::Append`]. Unknown\nvalues parse as [`SystemPromptMode::Other`]; Agents MUST return an error\nfor modes they do not support.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/SystemPromptMode"
+            }
+          ]
         },
-        "remoteUrl": {
-          "description": "The remote URL of the repository.",
-          "type": "string"
+        "content": {
+          "description": "The system prompt content.\n\nAgents advertising the capability MUST accept [`ContentBlock::Text`].\nClients MUST NOT send other content block types until a future\ncapability allows them, and Agents MUST return an error for content\nblocks they do not support, including unknown types preserved as\n[`ContentBlock::Other`].",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/ContentBlock"
+          }
         },
         "_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)",
@@ -9209,62 +7793,48 @@
           "additionalProperties": true
         }
       },
-      "required": ["name", "owner", "remoteUrl"]
+      "required": ["mode", "content"]
     },
-    "SuggestNesRequest": {
-      "description": "Request for a code suggestion.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this request.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the document to suggest for.",
+    "SystemPromptMode": {
+      "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nHow the Agent combines a client-provided system prompt with its own instructions.\n\nUnknown modes parse as [`SystemPromptMode::Other`] so they can be stored,\nproxied, or forwarded. An Agent MUST return an error for a mode it does not\nsupport rather than treating it as `append` or `override`.",
+      "anyOf": [
+        {
+          "description": "Add the content to the Agent's own instructions rather than replacing them.\n\nEvery Agent that advertises `session.systemPrompt` supports this mode.\nAgents SHOULD give the content system-level precedence, for example in the\nmodel's system prompt or developer instructions rather than in user-turn\ncontent. Where it is placed and how it is formatted is implementation-defined.",
           "type": "string",
-          "format": "uri"
+          "const": "append"
         },
-        "version": {
-          "description": "The version number of the document.",
-          "type": "integer",
-          "format": "int64"
-        },
-        "position": {
-          "description": "The current cursor position.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/Position"
-            }
-          ]
+        {
+          "description": "Replace the Agent's built-in default instructions with the content.\n\nThis does not change tool availability, MCP servers, permissions, or session\nconfiguration. Context the Agent supplies from the workspace or environment\nMAY still be included. Clients that use this mode take responsibility for any\ntool guidance or safety instructions the Agent's default instructions\nprovided, and MUST only use it when the Agent advertises\n`session.systemPrompt.mode.override`.",
+          "type": "string",
+          "const": "override"
         },
-        "selection": {
-          "description": "The current text selection range, if any.",
+        {
+          "title": "other",
+          "description": "Custom or future system prompt mode.\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"
+        }
+      ]
+    },
+    "ListSessionsRequest": {
+      "description": "Request parameters for listing existing sessions.",
+      "type": "object",
+      "properties": {
+        "cwd": {
+          "description": "Filter sessions by working directory. Must be an absolute path.",
           "anyOf": [
             {
-              "$ref": "#/$defs/Range"
+              "$ref": "#/$defs/AbsolutePath"
             },
             {
               "type": "null"
             }
           ]
         },
-        "triggerKind": {
-          "description": "What triggered this suggestion request.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesTriggerKind"
-            }
-          ]
-        },
-        "context": {
-          "description": "Context for the suggestion, included based on agent capabilities.",
+        "cursor": {
+          "description": "Opaque cursor token from a previous response's nextCursor field for cursor-based pagination",
           "anyOf": [
             {
-              "$ref": "#/$defs/NesSuggestContext"
+              "$ref": "#/$defs/SessionListCursor"
             },
             {
               "type": "null"
@@ -9278,80 +7848,20 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId", "uri", "version", "position", "triggerKind"],
       "x-side": "agent",
-      "x-method": "nes/suggest"
-    },
-    "NesTriggerKind": {
-      "description": "What triggered the suggestion request.",
-      "anyOf": [
-        {
-          "description": "Triggered by user typing or cursor movement.",
-          "type": "string",
-          "const": "automatic"
-        },
-        {
-          "description": "Triggered by a diagnostic appearing at or near the cursor.",
-          "type": "string",
-          "const": "diagnostic"
-        },
-        {
-          "description": "Triggered by an explicit user action (keyboard shortcut).",
-          "type": "string",
-          "const": "manual"
-        },
-        {
-          "title": "Other",
-          "description": "Custom or future suggestion trigger kind.\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"
-        }
-      ]
+      "x-method": "session/list"
     },
-    "NesSuggestContext": {
-      "description": "Context attached to a suggestion request.",
+    "DeleteSessionRequest": {
+      "description": "Request parameters for deleting an existing session from `session/list`.\n\nOnly available if the Agent supports the `session.delete` capability.",
       "type": "object",
       "properties": {
-        "recentFiles": {
-          "description": "Recently accessed files.",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesRecentFile"
-          }
-        },
-        "relatedSnippets": {
-          "description": "Related code snippets.",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesRelatedSnippet"
-          }
-        },
-        "editHistory": {
-          "description": "Recent edit history.",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesEditHistoryEntry"
-          }
-        },
-        "userActions": {
-          "description": "Recent user actions (typing, navigation, etc.).",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesUserAction"
-          }
-        },
-        "openFiles": {
-          "description": "Currently open files in the editor.",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesOpenFile"
-          }
-        },
-        "diagnostics": {
-          "description": "Current diagnostics (errors, warnings).",
-          "type": ["array", "null"],
-          "items": {
-            "$ref": "#/$defs/NesDiagnostic"
-          }
+        "sessionId": {
+          "description": "The ID of the session to delete.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            }
+          ]
         },
         "_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)",
@@ -9359,24 +7869,55 @@
           "x-deserialize-default-on-error": true,
           "additionalProperties": true
         }
-      }
+      },
+      "required": ["sessionId"],
+      "x-side": "agent",
+      "x-method": "session/delete"
     },
-    "NesRecentFile": {
-      "description": "A recently accessed file.",
+    "ForkSessionRequest": {
+      "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 forking an existing session.\n\nCreates a new session based on the context of an existing one, allowing\noperations like generating summaries without affecting the original session's history.\n\nOnly available if the Agent supports the `session.fork` capability.",
       "type": "object",
       "properties": {
-        "uri": {
-          "description": "The URI of the file.",
-          "type": "string",
-          "format": "uri"
+        "sessionId": {
+          "description": "The ID of the session to fork.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            }
+          ]
         },
-        "languageId": {
-          "description": "The language identifier.",
-          "type": "string"
+        "cwd": {
+          "description": "The working directory for this session. Must be an absolute path.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/AbsolutePath"
+            }
+          ]
         },
-        "text": {
-          "description": "The full text content of the file.",
-          "type": "string"
+        "additionalDirectories": {
+          "description": "Additional workspace roots to activate for this session. Each path must be absolute.\n\nWhen omitted or empty, no additional roots are activated. When non-empty,\nthis is the complete resulting additional-root list for the forked\nsession.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AbsolutePath"
+          }
+        },
+        "mcpServers": {
+          "description": "List of MCP servers to connect to for this session.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/McpServer"
+          }
+        },
+        "systemPrompt": {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nSystem-level instructions for the forked session.\n\nOptional. Omitted and `null` are equivalent; the Agent may then keep a\nsystem prompt it stored with the source session or use its default\ninstructions. Clients MUST only send this when the Agent advertises\n`session.systemPrompt`, and SHOULD send the same value they used for the\nsource session.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SystemPrompt"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "_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)",
@@ -9385,24 +7926,66 @@
           "additionalProperties": true
         }
       },
-      "required": ["uri", "languageId", "text"]
+      "required": ["sessionId", "cwd"],
+      "x-side": "agent",
+      "x-method": "session/fork"
     },
-    "NesRelatedSnippet": {
-      "description": "A related code snippet from a file.",
+    "ResumeSessionRequest": {
+      "description": "Request parameters for resuming an existing session.\n\nResumes an existing session and optionally replays retained conversation\nhistory according to `replayFrom`.",
       "type": "object",
       "properties": {
-        "uri": {
-          "description": "The URI of the file containing the snippets.",
-          "type": "string",
-          "format": "uri"
+        "sessionId": {
+          "description": "The ID of the session to resume.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/SessionId"
+            }
+          ]
+        },
+        "cwd": {
+          "description": "The working directory for this session. Must be an absolute path.",
+          "allOf": [
+            {
+              "$ref": "#/$defs/AbsolutePath"
+            }
+          ]
+        },
+        "additionalDirectories": {
+          "description": "Additional workspace roots to activate for this session. Each path must be absolute.\n\nWhen omitted or empty, no additional roots are activated. When non-empty,\nthis is the complete resulting additional-root list for the resumed\nsession. It may differ from any previously used or reported list as long as\nthe request `cwd` matches the session's `cwd`.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/AbsolutePath"
+          }
         },
-        "excerpts": {
-          "description": "The code excerpts.",
+        "mcpServers": {
+          "description": "List of MCP servers to connect to for this session.",
           "type": "array",
           "items": {
-            "$ref": "#/$defs/NesExcerpt"
+            "$ref": "#/$defs/McpServer"
           }
         },
+        "replayFrom": {
+          "description": "Inclusive cursor describing where conversation replay should begin.\n\nOptional. Omitted or `null` both mean the Agent should resume without\nreplaying previous conversation history. Replay cursors are inclusive:\nreplay includes the position identified by the cursor. Supplying\n`{ \"type\": \"start\" }` means the Agent should replay all retained\nconversation history before responding.\n\nAgents MUST reject unsupported cursor types or malformed cursor values\nwith `-32602` (Invalid params), rather than substituting another cursor\nor resuming without replay.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ReplayFrom"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "systemPrompt": {
+          "description": "**UNSTABLE**\n\nThis capability is not part of the spec yet, and may be removed or changed at any point.\n\nSystem-level instructions for the resumed session.\n\nOptional. Omitted and `null` are equivalent; the Agent may then keep a\nsystem prompt it stored with the session or use its default instructions.\nClients MUST only send this when the Agent advertises\n`session.systemPrompt`, and SHOULD send the same value they used when the\nsession was created.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/SystemPrompt"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "_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"],
@@ -9410,127 +7993,88 @@
           "additionalProperties": true
         }
       },
-      "required": ["uri", "excerpts"]
+      "required": ["sessionId", "cwd"],
+      "x-side": "agent",
+      "x-method": "session/resume"
     },
-    "NesExcerpt": {
-      "description": "A code excerpt from a file.",
-      "type": "object",
-      "properties": {
-        "startLine": {
-          "description": "The start line of the excerpt (zero-based).",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0
-        },
-        "endLine": {
-          "description": "The end line of the excerpt (zero-based).",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0
-        },
-        "text": {
-          "description": "The text content of the excerpt.",
-          "type": "string"
+    "ReplayFrom": {
+      "description": "Inclusive cursor describing where replayed session history should begin.\n\nReplay includes the position identified by the cursor.",
+      "anyOf": [
+        {
+          "description": "Replay all retained conversation history from its first replayable entry.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string",
+              "const": "start"
+            }
+          },
+          "required": ["type"],
+          "allOf": [
+            {
+              "$ref": "#/$defs/ReplayFromStart"
+            }
+          ]
         },
-        "_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,
+        {
+          "title": "other",
+          "description": "Custom or future replay cursor.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.\n\nIntermediaries SHOULD preserve the raw payload when storing, replaying,\nproxying, or forwarding requests. Agents that do not support this cursor\nMUST reject the request with `-32602` (Invalid params), rather than\nsubstituting another cursor or resuming without replay.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "description": "Custom or future replay cursor 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"
+            },
+            "_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": ["type"],
+          "not": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "start"
+                  }
+                },
+                "required": ["type"]
+              }
+            ]
+          },
           "additionalProperties": true
         }
-      },
-      "required": ["startLine", "endLine", "text"]
+      ]
     },
-    "NesEditHistoryEntry": {
-      "description": "An entry in the edit history.",
+    "ReplayFromStart": {
+      "description": "Inclusive replay cursor requesting replay from the start of retained conversation history.",
       "type": "object",
       "properties": {
-        "uri": {
-          "description": "The URI of the edited file.",
-          "type": "string",
-          "format": "uri"
-        },
-        "diff": {
-          "description": "A diff representing the edit.",
-          "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": ["uri", "diff"]
+      }
     },
-    "NesUserAction": {
-      "description": "A user action (typing, cursor movement, etc.).",
+    "CloseSessionRequest": {
+      "description": "Request parameters for closing an active session.\n\nThe agent **must** cancel any ongoing work related to the session (treat it\nas if `session/cancel` was called) and then free up any resources associated\nwith the session.\n\nWhen closing cancels active foreground work, the Agent MUST send the final\nupdates for that work and the idle `state_update` with `stopReason: \"cancelled\"`\nbefore responding successfully to `session/close`. Closing an idle session\ndoes not itself require another idle update.\n\nClosing may also cancel pending `session/prompt` requests, including queued\nprompts. If closing prevents a prompt's user message from being inserted, the\nAgent MUST answer that request with `-32800` (Request Cancelled). If the message\nhas already been inserted, the Agent MUST respond successfully with its\n`messageId`. Prompt responses need not precede the close response.",
       "type": "object",
       "properties": {
-        "action": {
-          "description": "The kind of action (e.g., \"insertChar\", \"cursorMovement\").",
-          "type": "string"
-        },
-        "uri": {
-          "description": "The URI of the file where the action occurred.",
-          "type": "string",
-          "format": "uri"
-        },
-        "position": {
-          "description": "The position where the action occurred.",
+        "sessionId": {
+          "description": "The ID of the session to close.",
           "allOf": [
             {
-              "$ref": "#/$defs/Position"
+              "$ref": "#/$defs/SessionId"
             }
           ]
         },
-        "timestampMs": {
-          "description": "Timestamp in milliseconds since epoch.",
-          "type": "integer",
-          "format": "uint64",
-          "minimum": 0
-        },
-        "_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": ["action", "uri", "position", "timestampMs"]
-    },
-    "NesOpenFile": {
-      "description": "An open file in the editor.",
-      "type": "object",
-      "properties": {
-        "uri": {
-          "description": "The URI of the file.",
-          "type": "string",
-          "format": "uri"
-        },
-        "languageId": {
-          "description": "The language identifier.",
-          "type": "string"
-        },
-        "visibleRange": {
-          "description": "The visible range in the editor, if any.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/Range"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "x-deserialize-default-on-error": true
-        },
-        "lastFocusedMs": {
-          "description": "Timestamp in milliseconds since epoch of when the file was last focused.",
-          "type": ["integer", "null"],
-          "format": "uint64",
-          "minimum": 0,
-          "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"],
@@ -9538,37 +8082,30 @@
           "additionalProperties": true
         }
       },
-      "required": ["uri", "languageId"]
+      "required": ["sessionId"],
+      "x-side": "agent",
+      "x-method": "session/close"
     },
-    "NesDiagnostic": {
-      "description": "A diagnostic (error, warning, etc.).",
+    "SetSessionConfigOptionRequest": {
+      "description": "Request parameters for setting a session configuration option.",
       "type": "object",
       "properties": {
-        "uri": {
-          "description": "The URI of the file containing the diagnostic.",
-          "type": "string",
-          "format": "uri"
-        },
-        "range": {
-          "description": "The range of the diagnostic.",
+        "sessionId": {
+          "description": "The ID of the session to set the configuration option for.",
           "allOf": [
             {
-              "$ref": "#/$defs/Range"
+              "$ref": "#/$defs/SessionId"
             }
           ]
         },
-        "severity": {
-          "description": "The severity of the diagnostic.",
+        "configId": {
+          "description": "The ID of the configuration option to set.",
           "allOf": [
             {
-              "$ref": "#/$defs/NesDiagnosticSeverity"
+              "$ref": "#/$defs/SessionConfigId"
             }
           ]
         },
-        "message": {
-          "description": "The diagnostic message.",
-          "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"],
@@ -9576,50 +8113,105 @@
           "additionalProperties": true
         }
       },
-      "required": ["uri", "range", "severity", "message"]
-    },
-    "NesDiagnosticSeverity": {
-      "description": "Severity of a diagnostic.",
+      "required": ["sessionId", "configId"],
       "anyOf": [
         {
-          "description": "An error.",
-          "type": "string",
-          "const": "error"
-        },
-        {
-          "description": "A warning.",
-          "type": "string",
-          "const": "warning"
-        },
-        {
-          "description": "An informational message.",
-          "type": "string",
-          "const": "information"
+          "description": "A [`SessionConfigValueId`] string value (`type: \"id\"`).",
+          "type": "object",
+          "properties": {
+            "value": {
+              "description": "The value ID.",
+              "allOf": [
+                {
+                  "$ref": "#/$defs/SessionConfigValueId"
+                }
+              ]
+            },
+            "type": {
+              "type": "string",
+              "const": "id"
+            }
+          },
+          "required": ["type", "value"]
         },
         {
-          "description": "A hint.",
-          "type": "string",
-          "const": "hint"
+          "description": "A boolean value (`type: \"boolean\"`).",
+          "type": "object",
+          "properties": {
+            "value": {
+              "description": "The boolean value.",
+              "type": "boolean"
+            },
+            "type": {
+              "type": "string",
+              "const": "boolean"
+            }
+          },
+          "required": ["type", "value"]
         },
         {
-          "title": "Other",
-          "description": "Custom or future diagnostic severity.\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"
+          "title": "other",
+          "description": "Custom or future session configuration option value payload.\n\nValues beginning with `_` are reserved for implementation-specific\nextensions. Unknown values that do not begin with `_` are reserved for\nfuture ACP variants.",
+          "type": "object",
+          "properties": {
+            "type": {
+              "description": "Custom or future session configuration option value 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"
+            },
+            "value": {
+              "description": "Raw value payload for the custom or future value type."
+            }
+          },
+          "required": ["type", "value"],
+          "not": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "id"
+                  }
+                },
+                "required": ["type"]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "boolean"
+                  }
+                },
+                "required": ["type"]
+              }
+            ]
+          },
+          "additionalProperties": true
         }
-      ]
+      ],
+      "x-side": "agent",
+      "x-method": "session/set_config_option"
     },
-    "CloseNesRequest": {
-      "description": "Request to close an NES session.\n\nThe agent **must** cancel any ongoing work related to the NES session\nand then free up any resources associated with the session.",
+    "PromptRequest": {
+      "description": "Request parameters for sending a user prompt to the agent.\n\nContains the user's message and any additional context.\n\nSee protocol docs: [User Message](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#1-user-message)",
       "type": "object",
       "properties": {
         "sessionId": {
-          "description": "The ID of the NES session to close.",
+          "description": "The ID of the session to send this user message to",
           "allOf": [
             {
               "$ref": "#/$defs/SessionId"
             }
           ]
         },
+        "prompt": {
+          "description": "The blocks of content that compose the user's message.\n\nAs a baseline, the Agent MUST support [`ContentBlock::Text`] and [`ContentBlock::ResourceLink`],\nwhile other variants are optionally enabled via [`PromptCapabilities`].\n\nThe Client MUST adapt its interface according to [`PromptCapabilities`].\n\nThe client MAY include referenced pieces of context as either\n[`ContentBlock::Resource`] or [`ContentBlock::ResourceLink`].\n\nWhen available, [`ContentBlock::Resource`] is preferred\nas it avoids extra round-trips and allows the message to include\npieces of context from sources the agent may not have access to.",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/ContentBlock"
+          }
+        },
         "_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"],
@@ -9627,9 +8219,9 @@
           "additionalProperties": true
         }
       },
-      "required": ["sessionId"],
+      "required": ["sessionId", "prompt"],
       "x-side": "agent",
-      "x-method": "nes/close"
+      "x-method": "session/prompt"
     },
     "ClientResponse": {
       "description": "A JSON-RPC response object.",
@@ -9745,7 +8337,7 @@
       "description": "The outcome of a permission request.",
       "anyOf": [
         {
-          "description": "Active session work was cancelled before the user responded.\n\nWhen a client sends a `session/cancel` notification to cancel active\nsession work, it MUST respond to all pending `session/request_permission`\nrequests with this `Cancelled` outcome.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#cancellation)",
+          "description": "Active session work was cancelled before the user responded.\n\nWhen a client sends a `session/cancel` notification to cancel active\nsession work, it MUST respond to all pending `session/request_permission`\nrequests in that session with this `Cancelled` outcome, without answering\nany request twice. Requests in other sessions are unaffected.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#cancellation)",
           "type": "object",
           "properties": {
             "outcome": {
@@ -10044,91 +8636,28 @@
         }
       },
       "required": ["code", "message"],
-      "additionalProperties": true
-    },
-    "ClientNotification": {
-      "description": "A JSON-RPC notification object.",
-      "type": "object",
-      "properties": {
-        "method": {
-          "description": "The notification method name.",
-          "type": "string"
-        },
-        "params": {
-          "description": "Method-specific notification parameters.",
-          "anyOf": [
-            {
-              "description": "All possible notifications that a client can send to an agent.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly.\n\nNotifications do not expect a response.",
-              "anyOf": [
-                {
-                  "title": "CancelSessionNotification",
-                  "description": "Cancels ongoing operations for a session.\n\nThis is a notification sent by the client to cancel active work in a\nsession.\n\nUpon receiving this notification, the Agent SHOULD:\n- Stop all language model requests as soon as possible\n- Abort all tool call invocations in progress\n- Send any pending `session/update` notifications\n- Report an idle `state_update` with `StopReason::Cancelled` after\n  cancellation succeeds\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#cancellation)",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/CancelSessionNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "DidOpenDocumentNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a file is opened in the editor.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DidOpenDocumentNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "DidChangeDocumentNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a file is edited.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DidChangeDocumentNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "DidCloseDocumentNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a file is closed.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DidCloseDocumentNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "DidSaveDocumentNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a file is saved.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DidSaveDocumentNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "DidFocusDocumentNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a file becomes the active editor tab.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/DidFocusDocumentNotification"
-                    }
-                  ]
-                },
-                {
-                  "title": "AcceptNesNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a suggestion is accepted.",
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/AcceptNesNotification"
-                    }
-                  ]
-                },
+      "additionalProperties": true
+    },
+    "ClientNotification": {
+      "description": "A JSON-RPC notification object.",
+      "type": "object",
+      "properties": {
+        "method": {
+          "description": "The notification method name.",
+          "type": "string"
+        },
+        "params": {
+          "description": "Method-specific notification parameters.",
+          "anyOf": [
+            {
+              "description": "All possible notifications that a client can send to an agent.\n\nThis enum is used internally for routing RPC notifications. You typically won't need\nto use this directly.\n\nNotifications do not expect a response.",
+              "anyOf": [
                 {
-                  "title": "RejectNesNotification",
-                  "description": "**UNSTABLE**\n\nNotification sent when a suggestion is rejected.",
+                  "title": "CancelSessionNotification",
+                  "description": "Cancels ongoing operations for a session.\n\nThis is a notification sent by the client to cancel active work in a\nsession.\n\nUpon receiving this notification, the Agent SHOULD stop all language model\nrequests and all tool call invocations as soon as possible.\n\nAfter all ongoing operations have been successfully aborted and pending\nupdates have been sent, the Agent MUST send an idle `state_update` session\nupdate with the `cancelled` stop reason if cancellation ended active\nforeground work. No additional completion update is required if no\nforeground work was active.\n\nAfter cancellation completes, the Agent SHOULD ignore late answers rather\nthan use them to resume the cancelled work.\n\nAgents MUST catch errors caused by aborting cancelled work and report the\n`cancelled` stop reason, not `error`.\n\nThe Agent MAY send content or tool call updates after receiving\n`session/cancel`, but MUST send them before the idle `state_update` that\nreports cancellation.\n\nSee protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/v2/draft/prompt-lifecycle#cancellation)",
                   "allOf": [
                     {
-                      "$ref": "#/$defs/RejectNesNotification"
+                      "$ref": "#/$defs/CancelSessionNotification"
                     }
                   ]
                 },
@@ -10184,324 +8713,6 @@
       "x-side": "agent",
       "x-method": "session/cancel"
     },
-    "DidOpenDocumentNotification": {
-      "description": "Notification sent when a file is opened in the editor.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the opened document.",
-          "type": "string",
-          "format": "uri"
-        },
-        "languageId": {
-          "description": "The language identifier of the document (e.g., \"rust\", \"python\").",
-          "type": "string"
-        },
-        "version": {
-          "description": "The version number of the document.",
-          "type": "integer",
-          "format": "int64"
-        },
-        "text": {
-          "description": "The full text content of the document.",
-          "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": ["sessionId", "uri", "languageId", "version", "text"],
-      "x-side": "agent",
-      "x-method": "document/didOpen"
-    },
-    "DidChangeDocumentNotification": {
-      "description": "Notification sent when a file is edited.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the changed document.",
-          "type": "string",
-          "format": "uri"
-        },
-        "version": {
-          "description": "The new version number of the document.",
-          "type": "integer",
-          "format": "int64"
-        },
-        "contentChanges": {
-          "description": "The content changes.",
-          "type": "array",
-          "items": {
-            "$ref": "#/$defs/TextDocumentContentChangeEvent"
-          }
-        },
-        "_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": ["sessionId", "uri", "version", "contentChanges"],
-      "x-side": "agent",
-      "x-method": "document/didChange"
-    },
-    "TextDocumentContentChangeEvent": {
-      "description": "A content change event for a document.\n\nWhen `range` is `None`, `text` is the full content of the document.\nWhen `range` is `Some`, `text` replaces the given range.",
-      "type": "object",
-      "properties": {
-        "range": {
-          "description": "The range of the document that changed. If `None`, the entire content is replaced.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/Range"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "text": {
-          "description": "The new text for the range, or the full document content if `range` is `None`.",
-          "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": ["text"]
-    },
-    "DidCloseDocumentNotification": {
-      "description": "Notification sent when a file is closed.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the closed document.",
-          "type": "string",
-          "format": "uri"
-        },
-        "_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": ["sessionId", "uri"],
-      "x-side": "agent",
-      "x-method": "document/didClose"
-    },
-    "DidSaveDocumentNotification": {
-      "description": "Notification sent when a file is saved.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the saved document.",
-          "type": "string",
-          "format": "uri"
-        },
-        "_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": ["sessionId", "uri"],
-      "x-side": "agent",
-      "x-method": "document/didSave"
-    },
-    "DidFocusDocumentNotification": {
-      "description": "Notification sent when a file becomes the active editor tab.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "uri": {
-          "description": "The URI of the focused document.",
-          "type": "string",
-          "format": "uri"
-        },
-        "version": {
-          "description": "The version number of the document.",
-          "type": "integer",
-          "format": "int64"
-        },
-        "position": {
-          "description": "The current cursor position.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/Position"
-            }
-          ]
-        },
-        "visibleRange": {
-          "description": "The portion of the file currently visible in the editor viewport.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/Range"
-            }
-          ]
-        },
-        "_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": ["sessionId", "uri", "version", "position", "visibleRange"],
-      "x-side": "agent",
-      "x-method": "document/didFocus"
-    },
-    "AcceptNesNotification": {
-      "description": "Notification sent when a suggestion is accepted.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "suggestionId": {
-          "description": "The ID of the accepted suggestion.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesSuggestionId"
-            }
-          ]
-        },
-        "_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": ["sessionId", "suggestionId"],
-      "x-side": "agent",
-      "x-method": "nes/accept"
-    },
-    "RejectNesNotification": {
-      "description": "Notification sent when a suggestion is rejected.",
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "description": "The session ID for this notification.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/SessionId"
-            }
-          ]
-        },
-        "suggestionId": {
-          "description": "The ID of the rejected suggestion.",
-          "allOf": [
-            {
-              "$ref": "#/$defs/NesSuggestionId"
-            }
-          ]
-        },
-        "reason": {
-          "description": "The reason for rejection.",
-          "anyOf": [
-            {
-              "$ref": "#/$defs/NesRejectReason"
-            },
-            {
-              "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": ["sessionId", "suggestionId"],
-      "x-side": "agent",
-      "x-method": "nes/reject"
-    },
-    "NesRejectReason": {
-      "description": "The reason a suggestion was rejected.",
-      "anyOf": [
-        {
-          "description": "The user explicitly dismissed the suggestion.",
-          "type": "string",
-          "const": "rejected"
-        },
-        {
-          "description": "The suggestion was shown but the user continued editing without interacting.",
-          "type": "string",
-          "const": "ignored"
-        },
-        {
-          "description": "The suggestion was superseded by a newer suggestion.",
-          "type": "string",
-          "const": "replaced"
-        },
-        {
-          "description": "The request was cancelled before the agent returned a response.",
-          "type": "string",
-          "const": "cancelled"
-        },
-        {
-          "title": "Other",
-          "description": "Custom or future rejection reason.\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"
-        }
-      ]
-    },
     "MessageMcpNotification": {
       "description": "**UNSTABLE**\n\nNotification for an active request, sent from provider to consumer.\nIncludes subscription acknowledgements and updates.",
       "type": "object",