cursor-opencode-provider 0.8.0 → 0.8.1

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" },
@@ -1347,10 +1378,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 +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
@@ -1401,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: [
@@ -1413,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
@@ -1701,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" },
@@ -1714,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

@@ -37,6 +37,11 @@ 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).

package/dist/protocol/request.js

@@ -47,6 +47,8 @@ export function buildRunRequest(input) {
         text: input.text,
         message_id: msgId,
     };
+    if (input.mode !== undefined)
+        userMessage.mode = input.mode;
     if (input.images?.length) {
         userMessage.selected_context = {
             selected_images: input.images.map((image) => ({

package/dist/protocol/switch-mode.d.ts

@@ -17,18 +17,18 @@
  * through the Question service and, on "Yes", injects a synthetic user message
  * carrying `agent: "plan" | "build"`, which `createUserMessage` turns into a
  * `setAgentModel` primary-agent switch (opencode `tool/plan.ts`,
- * `session/prompt.ts`). A provider cannot reach `setAgentModel`, but the two
- * observable halves — the approval gate and the behavioural contract — are both
- * reachable, so the protocol bridge degrades instead of refusing when the host
- * tool is missing. OpenCode 2 additionally exposes `session.switchAgent`; its
+ * `session/prompt.ts`). OpenCode 2 exposes `session.switchAgent`; its
  * entrypoint installs a structural callback that selects the native `plan` or
  * `build` primary agent after the owning Cursor Run becomes terminal:
  *
  * - entering plan/spec needs no host tool at all — approve immediately and let
  *   the injected <system_reminder> carry the contract, exactly as Cursor CLI's
  *   own plan mode is prompt-enforced.
- * - leaving plan mode is the gate the user must actually see, so it falls back
- *   to the host `question` tool and only rejects when that is absent too.
+ * - leaving the host's own `plan` agent without its `plan_exit` goes through
+ *   CreatePlan, whose `question` prompt is the execution approval, so the
+ *   request is rejected with a pointer there (or, with no `question`, to the
+ *   user's agent switch); a Cursor-only plan mode has nothing on the host to
+ *   leave and is approved.
  *
  * Resolution is keyed solely on the advertised catalog under canonical
  * OpenCode tool names — never on any external identity or model id.
@@ -36,7 +36,6 @@
  * CLI reject reason for user declines: "Mode switch rejected by user"
  * (chunk-7076/dist/ui.js onSwitchModeReject).
  */
-import { type OpencodeQuestionInput } from "./ask-question.js";
 /**
  * `PendingExec.resultField` for a held-open SwitchMode InteractionQuery.
  * Continuation writes an InteractionResponse, not an ExecClientMessage.
@@ -58,10 +57,16 @@ export declare const MISSING_TARGET_REASON = "Missing targetModeId";
  * even though the next Run will succeed. CreatePlan already soft-acks the same
  * case; SwitchMode must match.
  */
-export declare const PLAN_EXIT_UNAVAILABLE_REASON: string;
-/** Upstream `PlanExitTool` wording, minus a plan path the provider cannot verify. */
-export declare const SWITCH_MODE_EXIT_QUESTION = "Planning is complete. Would you like to switch to the build agent and start implementing?";
-export declare const SWITCH_MODE_EXIT_HEADER = "Build Agent";
+/**
+ * The host's plan agent is active and offers no `plan_exit`: on such a host
+ * the user ends plan mode by switching agents, so the model cannot.
+ */
+export declare const PLAN_EXIT_BY_USER_REASON: string;
+/**
+ * The host's plan agent is active, offers no `plan_exit`, but can ask: leaving
+ * plan mode goes through CreatePlan, whose `question` prompt is the approval.
+ */
+export declare const PLAN_EXIT_VIA_CREATE_PLAN_REASON: string;
 export type SwitchModeHostTool = "plan_enter" | "plan_exit";
 /**
  * How a SwitchMode query is satisfied this turn.
@@ -70,7 +75,6 @@ export type SwitchModeHostTool = "plan_enter" | "plan_exit";
  * - `approve`  entering plan mode needs no host tool — approve immediately.
  * - `ack`      lifecycle turn (`allowTools=false`): approve on the wire without
  *              mutating session mode (same soft-ack pattern as CreatePlan).
- * - `question` leaving plan mode falls back to the host `question` prompt.
  * - `reject`   nothing can satisfy it; `reason` names the real cause.
  */
 export type SwitchModeBridge = {
@@ -80,9 +84,6 @@ export type SwitchModeBridge = {
     kind: "approve";
 } | {
     kind: "ack";
-} | {
-    kind: "question";
-    input: OpencodeQuestionInput;
 } | {
     kind: "reject";
     reason: string;
@@ -114,21 +115,22 @@ export declare function normalizeSwitchModeId(targetModeId: string): string;
  * for CLI-shaped behavioral guidance.
  */
 export declare function mapSwitchModeTarget(targetModeId: string): SwitchModeMapping;
-/** Host `question` input mirroring upstream `PlanExitTool`'s own prompt. */
-export declare function switchModeExitQuestionInput(): OpencodeQuestionInput;
 /**
  * Resolve how this SwitchMode target is satisfied, keyed only on the advertised
  * catalog under canonical tool names.
  *
- * A missing plan tool is not a refusal: entering plan mode needs no host tool,
- * and leaving it degrades to the `question` prompt so the user still approves
- * before any execution starts.
+ * A missing plan tool is not a refusal: entering plan mode needs no host tool.
+ * Leaving the host's own plan agent without `plan_exit` is approved through
+ * CreatePlan (or the user's agent switch when nothing can ask), and a
+ * Cursor-only plan mode (no host plan agent) has nothing on the host to leave.
  */
 export declare function resolveSwitchModeBridge(targetModeId: string, options: {
     allowTools: boolean;
     advertised: ReadonlySet<string> | Iterable<string>;
     /** Cursor unified mode currently recorded for this session, if any. */
     activeModeId?: string;
+    /** Host primary agent of this Run, when the host reported it. */
+    hostAgent?: string;
 }): SwitchModeBridge;
 /** Decode a `switch_mode_request_query` body, or undefined when unusable. */
 export declare function decodeSwitchModeQuery(queryBytes: Uint8Array): DecodedSwitchModeQuery | undefined;
@@ -142,12 +144,6 @@ export declare function switchModeRejectedResult(reason: string): Record<string,
  * Question/permission declines and empty failures use the CLI user-reject string.
  */
 export declare function switchModeResultFromToolOutput(output: string, isError: boolean): Record<string, unknown>;
-/**
- * Host `question` outcome → Cursor SwitchModeRequestResponse, for the emulated
- * plan exit. Only an explicit "Yes" approves; an unanswered or dismissed prompt
- * keeps the model in plan mode rather than silently starting execution.
- */
-export declare function switchModeResultFromQuestionOutput(output: string, isError: boolean): Record<string, unknown>;
 /** Record the approved Cursor mode for later system-reminder injection. */
 export declare function setActiveCursorMode(sessionKey: string | undefined, targetModeId: string, options?: {
     bridgedPlanEntered?: boolean;
@@ -155,8 +151,47 @@ export declare function setActiveCursorMode(sessionKey: string | undefined, targ
 export declare function getActiveCursorMode(sessionKey: string | undefined): string | undefined;
 /** True while the provider has an approved Cursor plan/spec mode for this session. */
 export declare function isCursorPlanModeActive(sessionKey: string | undefined): boolean;
-/** True after a bridged plan/spec Run has observed plan_enter removed by the host. */
+/** True while Cursor plan/spec mode is one the host enforces (see `bridgedPlanEntered`). */
 export declare function isBridgedCursorPlanModeActive(sessionKey: string | undefined): boolean;
+/**
+ * Cursor plan mode follows the host's `plan` primary agent, as Cursor CLI's
+ * mode follows its own mode switch (Shift+Tab, `/plan`).
+ *
+ * - A turn under the host plan agent puts Cursor in plan mode, however the
+ *   host got there (its agent picker, a plan_enter approval).
+ * - The host's own exit from that agent (a plan_exit approval, or an agent
+ *   switch in its UI) ends Cursor plan mode. Only an observed `plan` → other
+ *   transition counts, so Cursor-only modes (debug, ask, …) under the host's
+ *   ordinary agent are kept; the next Run then carries the agent-mode
+ *   reminder instead of a stale "plan mode is still active" one.
+ */
+export declare function followHostPlanAgent(sessionKey: string | undefined, previousHostAgent: string | undefined, hostAgent: string | undefined): "entered" | "left" | undefined;
+/**
+ * `agent.v1.AgentMode` for a Cursor mode id, as Cursor CLI derives
+ * `UserMessage.mode` from its current mode: plan, ask, and debug are their own
+ * modes; every other mode (agent, spec, triage, …) runs as agent.
+ */
+export declare function cursorAgentModeWireValue(modeId: string | undefined): number;
+/**
+ * One-shot translation of the host plan agent's workflow into Cursor terms,
+ * delivered once per Cursor conversation while that agent owns the turn.
+ *
+ * With the host's plan file known, Cursor's native CreatePlan carries out the
+ * host instruction "write the plan file, then call plan_exit" (see the `exit`
+ * CreatePlan bridge), so the model needs no host tool at all. Without it, the
+ * model is given `plan_exit`'s exact call shape from the live schema: the
+ * RequestContext overlay is names-only, and otherwise it must look the tool up
+ * (or guess its arguments) before it can submit the plan.
+ */
+export declare function takeHostPlanAgentNote(sessionKey: string | undefined, conversationId: string, hostAgent: string | undefined, tools: ReadonlyArray<{
+    name: string;
+    inputSchema?: unknown;
+}>, options?: {
+    /** The host's own plan file for this session, when the host defines one. */
+    hostPlanFile?: string;
+    /** MCP server identity the advertised `plan_exit` is called through. */
+    server?: string;
+}): string | undefined;
 export declare function clearActiveCursorMode(sessionKey: string | undefined): void;
 export declare function resetActiveCursorModesForTests(): void;
 /**
@@ -168,6 +203,8 @@ export declare function cursorModeSystemReminder(targetModeId: string, options?:
     firstTurn?: boolean;
     planExitAdvertised?: boolean;
     planStageAdvertised?: boolean;
+    /** The host `question` tool is advertised, so CreatePlan asks to start implementing. */
+    questionAdvertised?: boolean;
 }): string | undefined;
 /**
  * Consume the active-mode reminder for this OpenCode session.
@@ -175,4 +212,6 @@ export declare function cursorModeSystemReminder(targetModeId: string, options?:
  */
 export declare function takeActiveCursorModeReminder(sessionKey: string | undefined, options?: {
     advertisedTools?: ReadonlySet<string> | Iterable<string>;
+    /** Host primary agent of this request; when known it, not the catalog, says whether planning ended. */
+    hostAgent?: string;
 }): string | undefined;