cursor-opencode-provider 0.8.0 → 0.8.3

package/dist/protocol/interactions.js

@@ -2,7 +2,7 @@ import { encodeMessage } from "./messages.js";
 import { readAllFields } from "./struct.js";
 import { decodeAskQuestionQuery, MISSING_ARGS_REASON, MISSING_QUERY_REASON, } from "./ask-question.js";
 import { decodeGenerateImageQuery, } from "./generate-image.js";
-import { CURSOR_PLAN_STAGE_TOOL, createPlanApprovalQuestionInput, decodeCreatePlanQuery, renderPlanReviewMessage, resolveCreatePlanBridge, writeOpencodePlanFile, } from "./create-plan.js";
+import { CURSOR_PLAN_STAGE_TOOL, decodeCreatePlanQuery, createPlanApprovalQuestionInput, renderPlanReviewMessage, resolveCreatePlanBridge, writeOpencodePlanFile, } from "./create-plan.js";
 import { decodeSwitchModeQuery, MISSING_ARGS_REASON as SWITCH_MODE_MISSING_ARGS_REASON, MISSING_QUERY_REASON as SWITCH_MODE_MISSING_QUERY_REASON, resolveSwitchModeBridge, switchModeApprovedResult, } from "./switch-mode.js";
 const HEADLESS_REASON = "This Cursor interaction requires UI approval and is not available through the OpenCode provider.";
 /**
@@ -76,9 +76,9 @@ export function inspectInteractionQueryWire(agentServerPayload) {
  * Bridged / persisted exceptions:
  * - AskQuestion (#3) → OpenCode `question` tool
  * - SwitchMode (#4) → OpenCode `plan_enter` / `plan_exit` when advertised
- * - CreatePlan (#7) → host-calculated plan file via hostPlansDir (project-config
- *   `plans/` in a git worktree, else host global data/plans); empty args still
- *   get the CLI empty-`plan_uri` success ack
+ * - CreatePlan (#7) → the host's plan file (session `Session.plan` file when
+ *   known, else a new file under hostPlansDir); empty args still get the CLI
+ *   empty-`plan_uri` success ack
  * - GenerateImage (#12) → approve when `cursor_image_save` is advertised
  */
 export function handleInteractionQuery(query, agentServerPayload, options = {}) {
@@ -160,7 +160,7 @@ export function handleInteractionQuery(query, agentServerPayload, options = {})
  * non-blocking prompt, and otherwise hold the query open until the user picks.
  */
 function handleAskQuestionQuery(id, variantBytes, options) {
-    const base = { id, variantField: 3, variantName: "ask_question_interaction_query" };
+    const base = { id, variantField: 3, variantName: "ask_question_interaction_query", toolCallId: undefined };
     const reject = (reason) => ({
         ...base,
         outcome: "rejected",
@@ -171,6 +171,7 @@ function handleAskQuestionQuery(id, variantBytes, options) {
     const decoded = decodeAskQuestionQuery(variantBytes);
     if (!decoded)
         return reject(MISSING_ARGS_REASON);
+    base.toolCallId = decoded.toolCallId;
     if (!options.canBridgeAskQuestion)
         return reject(ASK_QUESTION_UNAVAILABLE_REASON);
     return {
@@ -200,7 +201,7 @@ export function buildAskQuestionInteractionReply(id, result) {
  * until the host tool returns, then reply approved{} or rejected{reason}.
  */
 function handleSwitchModeQuery(id, variantBytes, options) {
-    const base = { id, variantField: 4, variantName: "switch_mode_request_query" };
+    const base = { id, variantField: 4, variantName: "switch_mode_request_query", toolCallId: undefined };
     const reject = (reason) => ({
         ...base,
         outcome: "rejected",
@@ -211,10 +212,12 @@ function handleSwitchModeQuery(id, variantBytes, options) {
     const decoded = decodeSwitchModeQuery(variantBytes);
     if (!decoded)
         return reject(SWITCH_MODE_MISSING_ARGS_REASON);
+    base.toolCallId = decoded.toolCallId;
     const bridge = resolveSwitchModeBridge(decoded.args.targetModeId, {
         allowTools: options.allowTools === true,
         advertised: options.advertisedTools ?? [],
         ...(options.activeCursorModeId ? { activeModeId: options.activeCursorModeId } : {}),
+        ...(options.hostAgent ? { hostAgent: options.hostAgent } : {}),
     });
     if (bridge.kind === "reject")
         return reject(bridge.reason);
@@ -243,10 +246,10 @@ function handleSwitchModeQuery(id, variantBytes, options) {
         switchMode: {
             ...decoded,
             bridge,
-            toolName: bridge.kind === "native" ? bridge.toolName : "question",
+            toolName: bridge.toolName,
         },
-        // Keep Cursor waiting until the host tool returns, matching CLI blocking on
-        // the mode-switch approval prompt.
+        // Keep Cursor waiting until the host plan tool returns: the host owns the
+        // mode-switch approval.
         reply: undefined,
     };
 }
@@ -298,7 +301,7 @@ export function buildAsyncAskQuestionCompletion(originalToolCallId, originalArgs
  * written but not accepted, so the model keeps planning.
  */
 function handleCreatePlanQuery(id, variantBytes, options) {
-    const base = { id, variantField: 7, variantName: "create_plan_request_query" };
+    const base = { id, variantField: 7, variantName: "create_plan_request_query", toolCallId: undefined };
     const reply = (result) => ({
         ...base,
         outcome: result.error ? "failed" : "acknowledged",
@@ -315,13 +318,46 @@ function handleCreatePlanQuery(id, variantBytes, options) {
     const decoded = decodeCreatePlanQuery(variantBytes);
     if (!decoded)
         return reply({ success: {}, plan_uri: "" });
+    base.toolCallId = decoded.toolCallId;
     const bridge = resolveCreatePlanBridge({
         allowTools: options.allowTools === true,
         canStage: options.canBridgeCreatePlan === true,
-        planModeActive: options.planModeActive === true,
         advertised: options.advertisedTools ?? [],
+        hostPlanEntryPending: options.hostPlanEntryPending === true,
+        ...(options.hostAgent ? { hostAgent: options.hostAgent } : {}),
+        planModeActive: options.planModeActive === true,
+        ...(options.hostPlanFile ? { hostPlanFile: options.hostPlanFile } : {}),
     });
-    // The host plan-stage tool owns the write and the approval prompt together.
+    // The host's plan agent records and reviews the plan; write nothing here.
+    if (bridge.kind === "defer") {
+        return {
+            ...reply({ error: { error: bridge.reason }, plan_uri: "" }),
+            ...(decoded.toolCallId ? { deferredCreatePlanToolCallId: decoded.toolCallId } : {}),
+        };
+    }
+    // The host plan agent reviews its own plan file: record the plan there and
+    // hand it to the host plan_exit, which asks the user and, on approval,
+    // moves the session to its build agent.
+    if (bridge.kind === "exit") {
+        const written = writeOpencodePlanFile(decoded.args, options.workspaceRoot ?? "", Date.now(), bridge.planPath);
+        if (!written.ok) {
+            return reply({ error: { error: written.error }, plan_uri: "" });
+        }
+        return {
+            ...base,
+            outcome: "bridged",
+            createPlan: {
+                ...decoded,
+                bridge,
+                toolName: "plan_exit",
+                planUri: written.planUri,
+                planPath: written.planPath,
+                planReview: renderPlanReviewMessage(written.markdown, written.planPath),
+            },
+            reply: undefined,
+        };
+    }
+    // The host plan-stage tool owns the write and the review together.
     if (bridge.kind === "stage") {
         return {
             ...base,
@@ -330,25 +366,18 @@ function handleCreatePlanQuery(id, variantBytes, options) {
             reply: undefined,
         };
     }
-    // A lifecycle turn (title generation, compaction) runs alongside the real one
-    // and would otherwise write a second, throwaway plan file for the same
-    // request. Ack it the CLI way instead of persisting anything.
-    if (options.allowTools !== true)
-        return reply({ success: {}, plan_uri: "" });
-    const workspaceRoot = options.workspaceRoot?.trim();
-    if (!workspaceRoot) {
-        return reply({
-            error: { error: "CreatePlan requires a workspace root to write the plan file" },
-            plan_uri: "",
-        });
-    }
-    const written = writeOpencodePlanFile(decoded.args, workspaceRoot);
-    if (!written.ok) {
-        return reply({ error: { error: written.error }, plan_uri: "" });
-    }
-    // The plan is on disk either way; only execution needs the user. Hold Cursor's
-    // query open while the host asks, exactly as the CLI blocks on its own prompt.
     if (bridge.kind === "approve") {
+        const workspaceRoot = options.workspaceRoot?.trim();
+        if (!workspaceRoot) {
+            return reply({
+                error: { error: "CreatePlan requires a workspace root to write the plan file" },
+                plan_uri: "",
+            });
+        }
+        const written = writeOpencodePlanFile(decoded.args, workspaceRoot, Date.now(), options.hostPlanFile);
+        if (!written.ok) {
+            return reply({ error: { error: written.error }, plan_uri: "" });
+        }
         return {
             ...base,
             outcome: "bridged",
@@ -364,6 +393,25 @@ function handleCreatePlanQuery(id, variantBytes, options) {
             reply: undefined,
         };
     }
+    // A lifecycle turn (title generation, compaction) runs alongside the real one
+    // and would otherwise write a second, throwaway plan file for the same
+    // request. Ack it the CLI way instead of persisting anything.
+    if (options.allowTools !== true)
+        return reply({ success: {}, plan_uri: "" });
+    const workspaceRoot = options.workspaceRoot?.trim();
+    if (!workspaceRoot) {
+        return reply({
+            error: { error: "CreatePlan requires a workspace root to write the plan file" },
+            plan_uri: "",
+        });
+    }
+    // The session's own plan file when known, as the host's plan agent uses it.
+    const written = writeOpencodePlanFile(decoded.args, workspaceRoot, Date.now(), options.hostPlanFile);
+    if (!written.ok) {
+        return reply({ error: { error: written.error }, plan_uri: "" });
+    }
+    // Nothing advertised can ask: the plan is recorded where the host keeps
+    // plans. Execution starts only if the user later switches agents.
     return reply({ success: {}, plan_uri: written.planUri });
 }
 /**
@@ -375,7 +423,7 @@ function handleCreatePlanQuery(id, variantBytes, options) {
  * nowhere to go.
  */
 function handleGenerateImageQuery(id, variantBytes, options) {
-    const base = { id, variantField: 12, variantName: "generate_image_request_query" };
+    const base = { id, variantField: 12, variantName: "generate_image_request_query", toolCallId: undefined };
     const reject = (reason) => ({
         ...base,
         outcome: "rejected",
@@ -388,6 +436,7 @@ function handleGenerateImageQuery(id, variantBytes, options) {
     const decoded = decodeGenerateImageQuery(variantBytes);
     if (!decoded)
         return reject("Missing generate image arguments");
+    base.toolCallId = decoded.toolCallId;
     if (!options.canSaveGeneratedImage) {
         return reject("This OpenCode agent cannot save a generated image, so generating one would "
             + "produce nothing. Describe the image in your reply instead.");

package/dist/protocol/messages.js

@@ -28,8 +28,8 @@ export function createMessageTypes() {
     ]);
     addType(root, "Heartbeat", []);
     // Display ToolCall (interaction_update.tool_call_*) — agent.v1 oneof, not
-    // {tool_name,args} strings. Args-only wrappers are enough to bridge into
-    // OpenCode; result payloads are ignored on decode.
+    // {tool_name,args} strings. Decode finalized todo state for mirroring and
+    // MCP errors for diagnostics; other completion results are not replayed.
     root.add(new protobuf.Enum("TodoStatus", {
         TODO_STATUS_UNSPECIFIED: 0,
         TODO_STATUS_PENDING: 1,
@@ -79,7 +79,10 @@ export function createMessageTypes() {
     ]);
     addType(root, "EditToolCall", [{ id: 1, name: "args", type: "EditToolArgs" }]);
     addType(root, "LsToolCall", [{ id: 1, name: "args", type: "LsArgs" }]);
-    addType(root, "McpToolCall", [{ id: 1, name: "args", type: "McpArgs" }]);
+    addType(root, "McpToolCall", [
+        { id: 1, name: "args", type: "McpArgs" },
+        { id: 2, name: "result", type: "McpResult" },
+    ]);
     addType(root, "CreatePlanArgs", [
         { id: 1, name: "plan", type: "string" },
         { id: 2, name: "todos", type: "TodoItem", repeated: true },
@@ -132,6 +135,7 @@ export function createMessageTypes() {
         { id: 4, name: "model", type: "string" },
         { id: 5, name: "resume", type: "string" },
         { id: 6, name: "agent_id", type: "string" },
+        { id: 7, name: "attachments", type: "string", repeated: true },
     ]);
     addType(root, "TaskToolCall", [{ id: 1, name: "args", type: "TaskToolArgs" }]);
     // Native subagent execution is separate from the display-only TaskToolCall.
@@ -389,6 +393,13 @@ export function createMessageTypes() {
         { id: 3, name: "args_text_delta", type: "string" },
         { id: 4, name: "model_call_id", type: "string" },
     ]);
+    // agent.v1 ToolCallDeltaUpdate: keep the nested delta opaque; the pump
+    // needs its presence as generation progress, not its display-only content.
+    addType(root, "ToolCallDeltaUpdate", [
+        { id: 1, name: "call_id", type: "string" },
+        { id: 2, name: "tool_call_delta", type: "bytes" },
+        { id: 3, name: "model_call_id", type: "string" },
+    ]);
     // agent.v1 StepStartedUpdate / StepCompletedUpdate: step_id is uint64 (T:4),
     // not string — wrong type made every step_completed frame throw
     // "index out of range" in decodeMessage.
@@ -399,6 +410,12 @@ export function createMessageTypes() {
         { id: 1, name: "step_id", type: "uint64" },
         { id: 2, name: "step_duration_ms", type: "int64" },
     ]);
+    // agent.v1 ToolRequestsListedUpdate — Cursor lists how many tool calls this
+    // generation will send so the client can place its step boundary (CLI does
+    // not need this; OpenCode's AI SDK step does). Field 27 on InteractionUpdate.
+    addType(root, "ToolRequestsListedUpdate", [
+        { id: 1, name: "call_count", type: "uint32" },
+    ]);
     // InteractionUpdate — the core streaming update message
     addType(root, "InteractionUpdate", [
         { id: 1, name: "text_delta", type: "TextDeltaUpdate" },
@@ -408,9 +425,36 @@ export function createMessageTypes() {
         { id: 7, name: "partial_tool_call", type: "PartialToolCall" },
         { id: 13, name: "heartbeat", type: "Heartbeat" },
         { id: 14, name: "turn_ended", type: "TurnEnded" },
+        { id: 15, name: "tool_call_delta", type: "ToolCallDeltaUpdate" },
         { id: 16, name: "step_started", type: "StepStarted" },
         { id: 17, name: "step_completed", type: "StepCompleted" },
-    ], [{ name: "update", fields: ["text_delta", "tool_call_started", "tool_call_completed", "thinking_delta", "partial_tool_call", "heartbeat", "turn_ended", "step_started", "step_completed"] }]);
+        { id: 23, name: "context_injection_state", type: "ContextInjectionStateUpdate" },
+        { id: 27, name: "tool_requests_listed", type: "ToolRequestsListedUpdate" },
+    ], [{ name: "update", fields: ["text_delta", "tool_call_started", "tool_call_completed", "thinking_delta", "partial_tool_call", "heartbeat", "turn_ended", "tool_call_delta", "step_started", "step_completed", "context_injection_state", "tool_requests_listed"] }]);
+    // Server status for an `inject_context_action` (InteractionUpdate #23).
+    // Cursor CLI only tracks it to show queued steer delivery; it carries no output.
+    addType(root, "ContextInjectionQueued", []);
+    addType(root, "ContextInjectionQueuedForNextTurn", []);
+    addType(root, "ContextInjectionCancelled", []);
+    addType(root, "ContextInjectionDelivered", [
+        { id: 1, name: "step", type: "int32" },
+        { id: 2, name: "delivery_batch_id", type: "string" },
+        { id: 3, name: "delivered_at_ms", type: "int64" },
+    ]);
+    addType(root, "ContextInjectionRejected", [
+        { id: 1, name: "reason", type: "string" },
+    ]);
+    addType(root, "ContextInjectionState", [
+        { id: 1, name: "queued", type: "ContextInjectionQueued" },
+        { id: 2, name: "delivered", type: "ContextInjectionDelivered" },
+        { id: 3, name: "queued_for_next_turn", type: "ContextInjectionQueuedForNextTurn" },
+        { id: 4, name: "cancelled", type: "ContextInjectionCancelled" },
+        { id: 5, name: "rejected", type: "ContextInjectionRejected" },
+    ], [{ name: "state", fields: ["queued", "delivered", "queued_for_next_turn", "cancelled", "rejected"] }]);
+    addType(root, "ContextInjectionStateUpdate", [
+        { id: 1, name: "injection_id", type: "string" },
+        { id: 2, name: "state", type: "ContextInjectionState" },
+    ]);
     // ── Exec channel ──
     // Field numbers match agent.v1. Extra fields we don't use are still declared
     // so protobufjs doesn't drop them on decode.
@@ -447,16 +491,21 @@ export function createMessageTypes() {
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "reason", type: "string" },
     ]);
+    addType(root, "ReadRejected", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "reason", type: "string" },
+    ]);
     addType(root, "ReadResult", [
         { id: 1, name: "success", type: "ReadSuccess" },
         { id: 2, name: "error", type: "ReadError" },
+        { id: 3, name: "rejected", type: "ReadRejected" },
         { id: 4, name: "file_not_found", type: "ReadFileNotFound" },
         { id: 5, name: "permission_denied", type: "ReadPermissionDenied" },
         { id: 6, name: "invalid_file", type: "ReadInvalidFile" },
     ], [
         {
             name: "result",
-            fields: ["success", "error", "file_not_found", "permission_denied", "invalid_file"],
+            fields: ["success", "error", "rejected", "file_not_found", "permission_denied", "invalid_file"],
         },
     ]);
     addType(root, "GrepArgs", [
@@ -536,11 +585,16 @@ export function createMessageTypes() {
         { id: 4, name: "error", type: "string" },
         { id: 5, name: "is_readonly", type: "bool" },
     ]);
+    addType(root, "WriteRejected", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "reason", type: "string" },
+    ]);
     addType(root, "WriteResult", [
         { id: 1, name: "success", type: "WriteSuccess" },
         { id: 3, name: "permission_denied", type: "WritePermissionDenied" },
         { id: 5, name: "error", type: "WriteError" },
-    ], [{ name: "result", fields: ["success", "permission_denied", "error"] }]);
+        { id: 6, name: "rejected", type: "WriteRejected" },
+    ], [{ name: "result", fields: ["success", "permission_denied", "error", "rejected"] }]);
     // agent.v1 Pi exec results. Cursor places Pi requests at ExecServerMessage
     // fields #45..#51 and their corresponding ExecClientMessage results at
     // #46..#52 (the result fields are deliberately offset by one).
@@ -616,10 +670,21 @@ export function createMessageTypes() {
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "error", type: "string" },
     ]);
+    addType(root, "DeletePermissionDenied", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "client_visible_error", type: "string" },
+        { id: 3, name: "is_readonly", type: "bool" },
+    ]);
+    addType(root, "DeleteRejected", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "reason", type: "string" },
+    ]);
     addType(root, "DeleteResult", [
         { id: 1, name: "success", type: "DeleteSuccess" },
+        { id: 4, name: "permission_denied", type: "DeletePermissionDenied" },
+        { id: 6, name: "rejected", type: "DeleteRejected" },
         { id: 7, name: "error", type: "DeleteError" },
-    ], [{ name: "result", fields: ["success", "error"] }]);
+    ], [{ name: "result", fields: ["success", "permission_denied", "rejected", "error"] }]);
     addType(root, "LsArgs", [
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "ignore", type: "string", repeated: true },
@@ -639,10 +704,15 @@ export function createMessageTypes() {
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "error", type: "string" },
     ]);
+    addType(root, "LsRejected", [
+        { id: 1, name: "path", type: "string" },
+        { id: 2, name: "reason", type: "string" },
+    ]);
     addType(root, "LsResult", [
         { id: 1, name: "success", type: "LsSuccess" },
         { id: 2, name: "error", type: "LsError" },
-    ], [{ name: "result", fields: ["success", "error"] }]);
+        { id: 3, name: "rejected", type: "LsRejected" },
+    ], [{ name: "result", fields: ["success", "error", "rejected"] }]);
     addType(root, "ShellArgs", [
         { id: 1, name: "command", type: "string" },
         { id: 2, name: "working_directory", type: "string" },
@@ -652,6 +722,7 @@ export function createMessageTypes() {
         // foreground cancellation deadline from a soft background handoff.
         { id: 13, name: "timeout_behavior", type: "uint32" },
         { id: 14, name: "hard_timeout", type: "uint32" },
+        { id: 15, name: "description", type: "string" },
     ]);
     addType(root, "ShellStreamStart", []); // optional SandboxPolicy only; empty is valid
     addType(root, "ShellStreamStdout", [{ id: 1, name: "data", type: "string" }]);
@@ -722,9 +793,10 @@ export function createMessageTypes() {
         { id: 2, name: "failure", type: "ShellFailure" },
         { id: 3, name: "timeout", type: "ShellTimeout" },
         { id: 4, name: "rejected", type: "ShellRejected" },
+        { id: 7, name: "permission_denied", type: "ShellPermissionDenied" },
         { id: 102, name: "is_background", type: "bool" },
         { id: 104, name: "pid", type: "uint32" },
-    ], [{ name: "result", fields: ["success", "failure", "timeout", "rejected"] }]);
+    ], [{ name: "result", fields: ["success", "failure", "timeout", "rejected", "permission_denied"] }]);
     addType(root, "DiagnosticsError", [
         { id: 1, name: "path", type: "string" },
         { id: 2, name: "error", type: "string" },
@@ -906,6 +978,15 @@ export function createMessageTypes() {
         { id: 3, name: "rejected", type: "ShellRejected" },
         { id: 4, name: "permission_denied", type: "ShellPermissionDenied" },
     ], [{ name: "result", fields: ["success", "error", "rejected", "permission_denied"] }]);
+    // Cursor CLI postToolUse hook context: ExecClientMessage #45 on a unary
+    // result, ShellStream #8 on a shell stream (agent.v1 hook_additional_context).
+    addType(root, "HookAdditionalContext", [
+        { id: 1, name: "hook_event_name", type: "string" },
+        { id: 2, name: "content", type: "string" },
+    ]);
+    addType(root, "ShellStreamHookContext", [
+        { id: 1, name: "hook_additional_contexts", type: "HookAdditionalContext", repeated: true },
+    ]);
     addType(root, "ShellStream", [
         { id: 1, name: "stdout", type: "ShellStreamStdout" },
         { id: 2, name: "stderr", type: "ShellStreamStderr" },
@@ -914,7 +995,8 @@ export function createMessageTypes() {
         { id: 5, name: "rejected", type: "ShellRejected" },
         { id: 6, name: "permission_denied", type: "ShellPermissionDenied" },
         { id: 7, name: "backgrounded", type: "ShellStreamBackgrounded" },
-    ], [{ name: "event", fields: ["stdout", "stderr", "exit", "start", "rejected", "permission_denied", "backgrounded"] }]);
+        { id: 8, name: "hook_context", type: "ShellStreamHookContext" },
+    ], [{ name: "event", fields: ["stdout", "stderr", "exit", "start", "rejected", "permission_denied", "backgrounded", "hook_context"] }]);
     addType(root, "GlobArgs", [
         { id: 1, name: "target_directory", type: "string" },
         { id: 2, name: "glob_pattern", type: "string" },
@@ -934,16 +1016,39 @@ export function createMessageTypes() {
         { id: 5, name: "tool_name", type: "string" },
     ]);
     addType(root, "McpTextContent", [{ id: 1, name: "text", type: "string" }]);
-    addType(root, "McpToolResultContentItem", [{ id: 1, name: "text", type: "McpTextContent" }], [{ name: "content", fields: ["text"] }]);
+    // Cursor CLI 2026.10.01 `agent/v1/mcp_exec_pb.js`: "McpImageContent|1 data 12|2 mime_type 9",
+    // "McpToolResultContentItem|1 text #0 content|2 image #1 content".
+    addType(root, "McpImageContent", [
+        { id: 1, name: "data", type: "bytes" },
+        { id: 2, name: "mime_type", type: "string" },
+    ]);
+    addType(root, "McpToolResultContentItem", [
+        { id: 1, name: "text", type: "McpTextContent" },
+        { id: 2, name: "image", type: "McpImageContent" },
+    ], [{ name: "content", fields: ["text", "image"] }]);
+    addType(root, "McpRejected", [
+        { id: 1, name: "reason", type: "string" },
+        { id: 2, name: "is_readonly", type: "bool" },
+    ]);
+    addType(root, "McpPermissionDenied", [
+        { id: 1, name: "error", type: "string" },
+        { id: 2, name: "is_readonly", type: "bool" },
+    ]);
     addType(root, "McpSuccess", [
         { id: 1, name: "content", type: "McpToolResultContentItem", repeated: true },
         { id: 2, name: "is_error", type: "bool" },
     ]);
-    addType(root, "McpError", [{ id: 1, name: "error", type: "string" }]);
+    addType(root, "McpError", [
+        { id: 1, name: "error", type: "string" },
+        // Server-side CallDynamicTool validation uses a title (#1) and detail (#2).
+        { id: 2, name: "detail", type: "string" },
+    ]);
     addType(root, "McpResult", [
         { id: 1, name: "success", type: "McpSuccess" },
         { id: 2, name: "error", type: "McpError" },
-    ], [{ name: "result", fields: ["success", "error"] }]);
+        { id: 3, name: "rejected", type: "McpRejected" },
+        { id: 4, name: "permission_denied", type: "McpPermissionDenied" },
+    ], [{ name: "result", fields: ["success", "error", "rejected", "permission_denied"] }]);
     // McpToolDefinition — agent.v1 shape for RequestContext.tools (#7) and
     // AgentRunRequest.mcp_tools (#4). Defined early so RequestContext* can
     // reference it.
@@ -1228,6 +1333,7 @@ export function createMessageTypes() {
         { id: 49, name: "pi_grep_args", type: "PiGrepToolArgs" },
         { id: 50, name: "pi_find_args", type: "PiFindToolArgs" },
         { id: 51, name: "pi_ls_args", type: "PiLsToolArgs" },
+        { id: 55, name: "accept_hook_additional_contexts", type: "bool" },
     ], [{ name: "args", fields: [
                 "shell_args", "write_args", "delete_args", "grep_args", "read_args", "ls_args",
                 "request_context_args", "mcp_args", "shell_stream_args", "background_shell_spawn_args",
@@ -1241,6 +1347,7 @@ export function createMessageTypes() {
         { id: 1, name: "id", type: "uint32" },
         { id: 15, name: "exec_id", type: "string" },
         { id: 39, name: "local_execution_time_ms", type: "uint64" },
+        { id: 45, name: "hook_additional_contexts", type: "HookAdditionalContext", repeated: true },
         { id: 2, name: "shell_result", type: "ShellResult" },
         { id: 3, name: "write_result", type: "WriteResult" },
         { id: 4, name: "delete_result", type: "DeleteResult" },
@@ -1347,10 +1454,23 @@ export function createMessageTypes() {
     addType(root, "SelectedContext", [
         { id: 1, name: "selected_images", type: "SelectedImage", repeated: true },
     ]);
+    // agent.v1.AgentMode — the client's current mode, sent on every user message.
+    root.add(new protobuf.Enum("AgentMode", {
+        AGENT_MODE_UNSPECIFIED: 0,
+        AGENT_MODE_AGENT: 1,
+        AGENT_MODE_ASK: 2,
+        AGENT_MODE_PLAN: 3,
+        AGENT_MODE_DEBUG: 4,
+        AGENT_MODE_TRIAGE: 5,
+        AGENT_MODE_PROJECT: 6,
+        AGENT_MODE_MULTITASK: 7,
+        AGENT_MODE_CUSTOM: 8,
+    }));
     addType(root, "UserMessage", [
         { id: 1, name: "text", type: "string" },
         { id: 2, name: "message_id", type: "string" },
         { id: 3, name: "selected_context", type: "SelectedContext" },
+        { id: 4, name: "mode", type: "AgentMode" },
     ]);
     // RequestContext — UserMessageAction #2. Slim mcp_meta_tool_options names
     // the advertised catalog; AgentRunRequest.mcp_tools (#4) is empty on real turns.
@@ -1390,7 +1510,8 @@ export function createMessageTypes() {
         { id: 2, name: "request_context", type: "RequestContext" },
     ]);
     addType(root, "CancelAction", [
-        { id: 1, name: "conversation_id", type: "string" },
+        // Cursor CLI CancelAction field #1 is the interruption reason, not an id.
+        { id: 1, name: "reason", type: "string" },
     ]);
     // Deferred answers for an AskQuestion the client already replied to with
     // `async`. `original_args` is kept as raw bytes so the exact AskQuestionArgs
@@ -1401,11 +1522,30 @@ export function createMessageTypes() {
         { id: 2, name: "original_args", type: "bytes" },
         { id: 3, name: "result", type: "AskQuestionResult" },
     ]);
+    // Cursor CLI 2026.10.01 descriptors: system context is
+    // injected into the current Run without submitting another user turn.
+    addType(root, "SystemContextInjection", [
+        { id: 1, name: "producer", type: "string" },
+        { id: 2, name: "content", type: "string" },
+    ]);
+    // Cursor SDK `Run.steer` / CLI steering payload: a user message added to the
+    // running turn. `request_context` is optional and unused by the SDK.
+    addType(root, "UserContextInjection", [
+        { id: 1, name: "user_message", type: "UserMessage" },
+        { id: 2, name: "request_context", type: "RequestContext" },
+    ]);
+    addType(root, "InjectContextAction", [
+        { id: 1, name: "injection_id", type: "string" },
+        { id: 2, name: "expected_run_id", type: "string" },
+        { id: 3, name: "user_context", type: "UserContextInjection" },
+        { id: 4, name: "system_context", type: "SystemContextInjection" },
+    ]);
     addType(root, "ConversationAction", [
         { id: 1, name: "user_message_action", type: "UserMessageAction" },
         { id: 2, name: "resume_action", type: "ResumeAction" },
         { id: 3, name: "cancel_action", type: "CancelAction" },
         { id: 8, name: "async_ask_question_completion_action", type: "AsyncAskQuestionCompletionAction" },
+        { id: 19, name: "inject_context_action", type: "InjectContextAction" },
     ], [{
             name: "action",
             fields: [
@@ -1413,6 +1553,7 @@ export function createMessageTypes() {
                 "resume_action",
                 "cancel_action",
                 "async_ask_question_completion_action",
+                "inject_context_action",
             ],
         }]);
     // Seed ConversationStateStructure for turn 1 (system prompt as JSON strings
@@ -1701,11 +1842,11 @@ export function createMessageTypes() {
         { id: 2, name: "value", type: "string" },
     ]);
     addType(root, "AvailableModelVariant", [
-        { id: 1, name: "display_name", type: "string" },
-        { id: 2, name: "is_max_mode", type: "bool" },
-        { id: 3, name: "is_default_max_config", type: "bool" },
-        { id: 4, name: "is_default_non_max_config", type: "bool" },
-        { id: 5, name: "parameter_values", type: "AvailableModelParameterValue", repeated: true },
+        { id: 1, name: "parameter_values", type: "AvailableModelParameterValue", repeated: true },
+        { id: 2, name: "display_name", type: "string" },
+        { id: 3, name: "is_max_mode", type: "bool" },
+        { id: 4, name: "is_default_max_config", type: "bool" },
+        { id: 5, name: "is_default_non_max_config", type: "bool" },
     ]);
     addType(root, "AvailableModelEntry", [
         { id: 1, name: "name", type: "string" },
@@ -1714,14 +1855,16 @@ export function createMessageTypes() {
         { id: 9, name: "supports_thinking", type: "bool" },
         { id: 10, name: "supports_images", type: "bool" },
         { id: 14, name: "supports_max_mode", type: "bool" },
-        { id: 15, name: "context_token_limit", type: "uint32" },
+        { id: 15, name: "context_token_limit", type: "int32" },
+        { id: 16, name: "context_token_limit_for_max_mode", type: "int32" },
         { id: 17, name: "client_display_name", type: "string" },
         { id: 18, name: "server_model_name", type: "string" },
         { id: 29, name: "parameter_definitions", type: "AvailableModelParameterDefinition", repeated: true },
         { id: 30, name: "variants", type: "AvailableModelVariant", repeated: true },
     ]);
     addType(root, "AvailableModelsResponse", [
-        { id: 1, name: "models", type: "AvailableModelEntry", repeated: true },
+        { id: 1, name: "model_names", type: "string", repeated: true },
+        { id: 2, name: "models", type: "AvailableModelEntry", repeated: true },
     ]);
     return root;
 }