cursor-opencode-provider 0.7.6 → 0.8.1

package/dist/protocol/interactions.d.ts

@@ -14,6 +14,8 @@ export type HandledInteraction = {
     variantField: number;
     variantName: string;
     outcome: "rejected" | "acknowledged" | "failed" | "bridged" | "approved";
+    /** Decoded model call id, including refusals and lifecycle acknowledgments. */
+    toolCallId?: string;
     /**
      * Immediate reply for this query. Absent for bridged *synchronous* AskQuestion
      * or SwitchMode: Cursor blocks until the host tool returns, exactly as its own
@@ -31,24 +33,29 @@ export type HandledInteraction = {
      */
     switchMode?: DecodedSwitchModeQuery & {
         bridge: SwitchModeBridge;
-        toolName?: SwitchModeHostTool | "question";
+        toolName?: SwitchModeHostTool;
     };
     /**
-     * Present when CreatePlan needs a host tool: either a native plan stage that
-     * owns the write *and* the approval, or the emulated `question` prompt the
-     * provider raises after writing the plan itself. `planUri` is set only for
-     * the emulated path, where the provider already knows the file it wrote.
+     * Present when CreatePlan needs a host tool: a host plan-stage tool that
+     * owns the write *and* the review, the host's `plan_exit` review of the
+     * plan file the provider just wrote (`planUri` / `planPath` set), or the
+     * emulated `question` prompt after that write.
      */
     createPlan?: DecodedCreatePlanQuery & {
         bridge: CreatePlanBridge;
-        toolName: typeof CURSOR_PLAN_STAGE_TOOL | "question";
+        toolName: typeof CURSOR_PLAN_STAGE_TOOL | "plan_exit" | "question";
         planUri?: string;
-        /** Filesystem path of the plan the provider just wrote (emulated path). */
+        /** Filesystem path of the plan the provider just wrote. */
         planPath?: string;
         questionInput?: ReturnType<typeof createPlanApprovalQuestionInput>;
-        /** The plan to show the user before they approve it (emulated path only). */
+        /** The plan to show the user before the host review. */
         planReview?: string;
     };
+    /**
+     * Cursor tool call id of a CreatePlan the host plan agent will record
+     * instead. Nothing was written, so its display must not be mirrored as a plan.
+     */
+    deferredCreatePlanToolCallId?: string;
     /** Present when an image generation was approved: the target to expect. */
     generateImage?: DecodedGenerateImageQuery;
 };
@@ -81,16 +88,18 @@ export type HandleInteractionQueryOptions = {
     workspaceRoot?: string;
     /** True when the advertised host plan-stage tool is available. */
     canBridgeCreatePlan?: boolean;
-    /**
-     * True when the provider has recorded an approved Cursor plan/spec mode for
-     * this session. A written plan then ends with an execution-approval prompt,
-     * which is the transition out of planning; outside plan mode there is none.
-     */
+    /** An approved switch into the host `plan` agent waits for this Run to end. */
+    hostPlanEntryPending?: boolean;
+    /** Host primary agent this Run executes under, when the host reported it. */
+    hostAgent?: string;
+    /** Provider-recorded Cursor plan/spec mode for the CreatePlan execution gate. */
     planModeActive?: boolean;
+    /** The host's own plan file for this session, when the host defines one. */
+    hostPlanFile?: string;
     /**
      * Cursor unified mode currently recorded for this session. A SwitchMode to
      * the mode already in effect needs no approval, matching Cursor's own IDE
-     * handler and keeping the plan-approval prompt from firing twice.
+     * handler and keeping the host's plan review from running twice.
      */
     activeCursorModeId?: string;
 };
@@ -112,9 +121,9 @@ export declare function inspectInteractionQueryWire(agentServerPayload: Uint8Arr
  * 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 declare function handleInteractionQuery(query: Record<string, unknown>, agentServerPayload: Uint8Array, options?: HandleInteractionQueryOptions): HandledInteraction;

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 },
@@ -389,6 +392,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 +409,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 +424,11 @@ 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: 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", "tool_requests_listed"] }]);
     // ── Exec channel ──
     // Field numbers match agent.v1. Extra fields we don't use are still declared
     // so protobufjs doesn't drop them on decode.
@@ -934,12 +952,25 @@ 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, "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" },
@@ -1062,9 +1093,27 @@ export function createMessageTypes() {
         { id: 20, name: "is_working_dir_home_dir", type: "bool" },
         { id: 21, name: "process_working_directory", type: "string" },
     ]);
+    // Cursor applies a rule by its type: `global` is the CLI's `alwaysApply: true`
+    // (its AGENTS.md / CLAUDE.md default). An untyped rule is only attachable on
+    // request, so its content never reaches the model on its own.
+    addType(root, "CursorRuleTypeGlobal", []);
+    addType(root, "CursorRuleTypeFileGlobs", [
+        { id: 1, name: "globs", type: "string", repeated: true },
+    ]);
+    addType(root, "CursorRuleTypeAgentFetched", [
+        { id: 1, name: "description", type: "string" },
+    ]);
+    addType(root, "CursorRuleTypeManuallyAttached", []);
+    addType(root, "CursorRuleType", [
+        { id: 1, name: "global", type: "CursorRuleTypeGlobal" },
+        { id: 2, name: "file_globbed", type: "CursorRuleTypeFileGlobs" },
+        { id: 3, name: "agent_fetched", type: "CursorRuleTypeAgentFetched" },
+        { id: 4, name: "manually_attached", type: "CursorRuleTypeManuallyAttached" },
+    ], [{ name: "type", fields: ["global", "file_globbed", "agent_fetched", "manually_attached"] }]);
     addType(root, "CursorRule", [
         { id: 1, name: "full_path", type: "string" },
         { id: 2, name: "content", type: "string" },
+        { id: 3, name: "type", type: "CursorRuleType" },
     ]);
     addType(root, "RepositoryIndexingInfo", [
         { id: 1, name: "relative_workspace_path", type: "string" },
@@ -1151,8 +1200,8 @@ export function createMessageTypes() {
         { id: 1, name: "success", type: "RequestContextSuccess" },
     ]);
     // Cursor probes MCP server availability before emitting an MCP-backed tool
-    // call. OpenCode owns those servers, so answer from the descriptors already
-    // advertised in RequestContext rather than surfacing this as a user tool.
+    // call. OpenCode owns those servers, so answer from the live host catalog
+    // rather than surfacing this as a user tool.
     addType(root, "McpStateExecArgs", [
         { id: 1, name: "server_identifiers", type: "string", repeated: true },
         { id: 2, name: "kick_only", type: "bool" },
@@ -1329,13 +1378,26 @@ 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. Live per-turn tools go here
-    // (AgentRunRequest.mcp_tools #4 is prewarm-only / empty on real turns).
+    // RequestContext — UserMessageAction #2. Slim mcp_meta_tool_options names
+    // the advertised catalog; AgentRunRequest.mcp_tools (#4) is empty on real turns.
     addType(root, "RequestContext", [
         { id: 2, name: "rules", type: "CursorRule", repeated: true },
         { id: 4, name: "env", type: "RequestContextEnv" },
@@ -1372,7 +1434,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
@@ -1383,11 +1446,23 @@ 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" },
+    ]);
+    addType(root, "InjectContextAction", [
+        { id: 1, name: "injection_id", type: "string" },
+        { id: 2, name: "expected_run_id", type: "string" },
+        { 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: [
@@ -1395,6 +1470,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
@@ -1683,11 +1759,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" },
@@ -1696,14 +1772,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;
 }

package/dist/protocol/request.d.ts

@@ -1,4 +1,4 @@
-import { type OpencodeToolDef } from "./tools.js";
+import type { OpencodeToolDef } from "./tools.js";
 import type { CursorImageInput } from "../image-input.js";
 export type SeedHistoryMessage = {
     role: "system" | "user" | "assistant";
@@ -11,7 +11,6 @@ export type RunRequestInput = {
     conversationId: string;
     /** Stable parent group; unlike conversationId, this survives compaction/rebase. */
     conversationGroupId?: string;
-    systemPrompt?: string;
     /**
      * Prior chat turns for a seed ConversationStateStructure (no checkpoint).
      * Tool outputs, when required for compaction/recovery, are represented as
@@ -22,7 +21,7 @@ export type RunRequestInput = {
      * Opaque ConversationStateStructure bytes from the last
      * conversation_checkpoint_update for this conversation_id. When set, echoed
      * as AgentRunRequest.conversation_state (CLI parity). When absent, a seed
-     * state with the system prompt (or empty) is built for turn 1.
+     * state carrying only `history` (or empty) is built for turn 1.
      */
     conversationState?: Uint8Array;
     parameterValues?: Array<{
@@ -38,23 +37,31 @@ export type RunRequestInput = {
     requestContext?: Record<string, unknown>;
     /** Resume the supplied checkpoint instead of submitting another user turn. */
     action?: "user" | "resume";
+    /**
+     * Cursor mode of this user turn (`UserMessage.mode`, an `agent.v1.AgentMode`
+     * value). Cursor CLI sends its current mode on every user message.
+     */
+    mode?: number;
 };
 /**
  * Seed ConversationStateStructure for the first turn (no checkpoint yet).
  *
- * OpenCode needs a system prompt channel; we put it in root_prompt_messages_json
- * as a JSON chat message. After the first checkpoint arrives we stop inventing
- * state and echo the server's opaque structure instead (CLI behavior).
+ * After the first checkpoint arrives we stop inventing state and echo the
+ * server's opaque structure instead (CLI behavior). Compaction resets and
+ * rebases also use this seed, with `history` carrying OpenCode's prompt turns
+ * so Cursor can continue without the old checkpoint.
  *
- * Compaction resets also use this seed, with `history` carrying OpenCode's
- * compacted prompt turns so Cursor can summarize without the old checkpoint.
+ * No `system` entry is seeded: Cursor does not follow a client-authored
+ * `system` root message, and neither Cursor client writes
+ * `root_prompt_messages_json`. Host system context travels as the
+ * system-instructions rule in RequestContext (`systemInstructionsRule`), so
+ * `system` history entries are dropped here rather than duplicated.
  *
  * We deliberately do NOT use `AgentRunRequest.custom_system_prompt` (#8): that
  * field is the internal `--system-prompt` CLI override and the server rejects
  * it for normal accounts.
  */
 export declare function buildSeedConversationState(input?: {
-    systemPrompt?: string;
     history?: SeedHistoryMessage[];
 }): Uint8Array;
 /**