cursor-opencode-provider 0.7.1 → 0.7.3

package/dist/model-config.js

@@ -154,9 +154,13 @@ export function modelInfoToConfig(mi, options = {}) {
     // tier is a variant parameter. Long-context choices are therefore emitted as
     // separate OpenCode entries by modelsToConfig.
     const documentedContext = getDocumentedCursorModelContext(mi.id);
+    // Cursor Auto (`default`) has no static maxContext on the model list, but
+    // live checkpoints report 256k for the base tier — the previous 200k
+    // fallback made the host context meter disagree with Cursor.
+    const fallbackContext = mi.id === "default" ? 256_000 : 200_000;
     const context = contextTier === "long"
         ? (mi.maxContextForMaxMode ?? documentedContext?.maxContextForMaxMode ?? 1_000_000)
-        : (mi.maxContext ?? documentedContext?.maxContext ?? 200_000);
+        : (mi.maxContext ?? documentedContext?.maxContext ?? fallbackContext);
     // OpenCode's overflow/compaction/UI use limit.context; generation and
     // thinking budgets use limit.output. models.dev 1M peers advertise
     // 64k–128k output — a tiny cap makes long-context sessions feel broken

package/dist/plugin-opencode2.js

@@ -9,6 +9,7 @@ import { captureCursorShellResult, cursorShellEnvForCommand, prepareCursorShellA
 import { applyCursorProviderInventory, CURSOR_INTEGRATION_ID } from "./opencode2/catalog.js";
 import { applyCursorIntegration, resolveCursorAccessToken } from "./opencode2/integration.js";
 import { registerTodoTools } from "./opencode2/todo-tools.js";
+import { OPENCODE_2_TOOL_DIALECT } from "./protocol/tools.js";
 import { clearSessionTodos } from "./todo-store.js";
 import { markCompactionSession } from "./compaction-marker.js";
 import { markSessionDirectory } from "./session-directory.js";
@@ -213,11 +214,14 @@ const plugin = {
                 ...(token ? { accessToken: token } : {}),
                 // Static fallback only. This hook fires once per model/package, not
                 // per session, and 2.0 runs one daemon across many projects — the
-                // real per-request directory comes from the session.context hook
-                // below via `getSessionDirectory`, which `language-model.ts` prefers.
+                // real per-request directory comes from `x-opencode-directory` and
+                // the session.context hook below via `getSessionDirectory`.
                 workspaceRoot,
                 cacheDir,
                 ...event.options,
+                // Keep after `event.options` so the OC2 plugin always selects the
+                // `path`/`shell` dialect when advertised schemas are opaque.
+                defaultDialect: OPENCODE_2_TOOL_DIALECT,
             });
         }));
         await track(ctx.aisdk.hook("language", (event) => {
@@ -324,8 +328,10 @@ const plugin = {
         }
         const rememberSessionDirectory = async (sessionID) => {
             try {
-                const info = await ctx.session.get({ sessionID });
-                markSessionDirectory(sessionID, info.location?.directory);
+                const info = (await ctx.session.get({ sessionID }));
+                // OpenCode 2.0 stable exposes a flat `directory`; older shapes nest it
+                // under `location.directory`. Prefer the flat field when both exist.
+                markSessionDirectory(sessionID, info.directory ?? info.location?.directory);
             }
             catch {
                 // Best effort — falls back to the static workspaceRoot above.

package/dist/plugin.js

@@ -17,6 +17,7 @@ import { sessionActivity } from "./activity.js";
 import { createOpenCodeWebSearchTool, openCodeWebSearchTool } from "./web-search-tool.js";
 import { createCursorImageSaveTool, cursorImageSaveTool } from "./image-save-tool.js";
 import { createPlanExecutionKickoffText, setPlanExecutionKickoff, } from "./plan-execution-kickoff.js";
+import { dispatchHostEventBridge } from "./host-event-bridge.js";
 const MODULE_URL = new URL("./index.js", import.meta.url).href;
 export async function loadClassicTools(options = {}) {
     const configDir = options.configDirs?.[0] ?? opencodeGlobalConfigDirs()[0];
@@ -56,21 +57,25 @@ export async function CursorPlugin(input) {
     const cacheDir = opencodeGlobalCacheDir();
     const apiBaseURL = cursorApiBaseURL();
     const classicTools = await loadClassicTools();
-    // After CreatePlan Yes, queue OpenCode's plan_exit-shaped synthetic turn so
-    // implementation starts. Failures stay in the kickoff module (trace only).
-    setPlanExecutionKickoff(async ({ sessionID, planPath }) => {
-        await input.client.session.promptAsync({
-            path: { id: sessionID },
-            body: {
-                agent: "build",
-                parts: [{
-                        type: "text",
-                        text: createPlanExecutionKickoffText(planPath),
-                        synthetic: true,
-                    }],
-            },
-        });
-    });
+    // Install the OpenCode plan-exit-shaped kickoff only when the OpenCode client
+    // exposes that structural API. Without it, no synthetic kickoff is registered.
+    const sessionClient = input.client?.session;
+    const promptAsync = sessionClient?.promptAsync;
+    setPlanExecutionKickoff(typeof promptAsync === "function"
+        ? async ({ sessionID, planPath }) => {
+            await promptAsync.call(sessionClient, {
+                path: { id: sessionID },
+                body: {
+                    agent: "build",
+                    parts: [{
+                            type: "text",
+                            text: createPlanExecutionKickoffText(planPath),
+                            synthetic: true,
+                        }],
+                },
+            });
+        }
+        : undefined);
     // Last access token successfully resolved in this plugin instance. Config's
     // loadModels can only read OpenCode's durable store (auth.json /
     // OPENCODE_AUTH_CONTENT); auth.loader gets live credentials via getAuth().
@@ -217,6 +222,12 @@ export async function CursorPlugin(input) {
                     sessionActivity.recordActivity(event.properties.part.sessionID);
                     break;
             }
+            await dispatchHostEventBridge({
+                event,
+                client: input.client,
+                directory: input.directory,
+                serverUrl: input.serverUrl,
+            });
         },
         async "tool.execute.before"(hookInput, output) {
             if (hookInput.tool !== "bash")

package/dist/pricing-data.d.ts

@@ -55,6 +55,12 @@ export declare const CURSOR_MODEL_COSTS: {
         readonly cache_read: 0.5;
         readonly cache_write: 6.25;
     };
+    readonly "claude-opus-5-5": {
+        readonly input: 4;
+        readonly output: 20;
+        readonly cache_read: 0.2;
+        readonly cache_write: 5;
+    };
     readonly "claude-sonnet-4": {
         readonly input: 3;
         readonly output: 15;
@@ -241,6 +247,26 @@ export declare const CURSOR_MODEL_COSTS: {
         readonly output: 12;
         readonly cache_read: 1;
     };
+    readonly "grok-4.7": {
+        readonly input: 2;
+        readonly output: 6;
+        readonly cache_read: 0.5;
+        readonly context_over_200k: {
+            readonly input: 4;
+            readonly output: 12;
+            readonly cache_read: 1;
+        };
+    };
+    readonly "grok-4.7-fast": {
+        readonly input: 4;
+        readonly output: 12;
+        readonly cache_read: 1;
+        readonly context_over_200k: {
+            readonly input: 6;
+            readonly output: 18;
+            readonly cache_read: 1.5;
+        };
+    };
     readonly "kimi-k2.7-code": {
         readonly input: 0.95;
         readonly output: 4;
@@ -289,6 +315,10 @@ export declare const CURSOR_MODEL_CONTEXTS: {
         readonly maxContext: 300000;
         readonly maxContextForMaxMode: 1000000;
     };
+    readonly "claude-opus-5-5": {
+        readonly maxContext: 300000;
+        readonly maxContextForMaxMode: 1000000;
+    };
     readonly "claude-sonnet-4": {
         readonly maxContext: 200000;
         readonly maxContextForMaxMode: 1000000;
@@ -383,6 +413,10 @@ export declare const CURSOR_MODEL_CONTEXTS: {
     readonly "grok-4.6": {
         readonly maxContext: 256000;
     };
+    readonly "grok-4.7": {
+        readonly maxContext: 256000;
+        readonly maxContextForMaxMode: 500000;
+    };
     readonly "kimi-k2.7-code": {
         readonly maxContext: 262000;
     };
@@ -420,6 +454,9 @@ export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "claude-opus-5": {
         readonly supportsImages: true;
     };
+    readonly "claude-opus-5-5": {
+        readonly supportsImages: true;
+    };
     readonly "claude-sonnet-4": {
         readonly supportsImages: true;
     };
@@ -498,6 +535,9 @@ export declare const CURSOR_MODEL_CAPABILITIES: {
     readonly "grok-4.6": {
         readonly supportsImages: false;
     };
+    readonly "grok-4.7": {
+        readonly supportsImages: false;
+    };
     readonly "kimi-k2.7-code": {
         readonly supportsImages: true;
     };

package/dist/pricing-data.js

@@ -55,6 +55,12 @@ export const CURSOR_MODEL_COSTS = {
         "cache_read": 0.5,
         "cache_write": 6.25
     },
+    "claude-opus-5-5": {
+        "input": 4,
+        "output": 20,
+        "cache_read": 0.2,
+        "cache_write": 5
+    },
     "claude-sonnet-4": {
         "input": 3,
         "output": 15,
@@ -241,6 +247,26 @@ export const CURSOR_MODEL_COSTS = {
         "output": 12,
         "cache_read": 1
     },
+    "grok-4.7": {
+        "input": 2,
+        "output": 6,
+        "cache_read": 0.5,
+        "context_over_200k": {
+            "input": 4,
+            "output": 12,
+            "cache_read": 1
+        }
+    },
+    "grok-4.7-fast": {
+        "input": 4,
+        "output": 12,
+        "cache_read": 1,
+        "context_over_200k": {
+            "input": 6,
+            "output": 18,
+            "cache_read": 1.5
+        }
+    },
     "kimi-k2.7-code": {
         "input": 0.95,
         "output": 4,
@@ -289,6 +315,10 @@ export const CURSOR_MODEL_CONTEXTS = {
         "maxContext": 300000,
         "maxContextForMaxMode": 1000000
     },
+    "claude-opus-5-5": {
+        "maxContext": 300000,
+        "maxContextForMaxMode": 1000000
+    },
     "claude-sonnet-4": {
         "maxContext": 200000,
         "maxContextForMaxMode": 1000000
@@ -383,6 +413,10 @@ export const CURSOR_MODEL_CONTEXTS = {
     "grok-4.6": {
         "maxContext": 256000
     },
+    "grok-4.7": {
+        "maxContext": 256000,
+        "maxContextForMaxMode": 500000
+    },
     "kimi-k2.7-code": {
         "maxContext": 262000
     },
@@ -420,6 +454,9 @@ export const CURSOR_MODEL_CAPABILITIES = {
     "claude-opus-5": {
         "supportsImages": true
     },
+    "claude-opus-5-5": {
+        "supportsImages": true
+    },
     "claude-sonnet-4": {
         "supportsImages": true
     },
@@ -498,6 +535,9 @@ export const CURSOR_MODEL_CAPABILITIES = {
     "grok-4.6": {
         "supportsImages": false
     },
+    "grok-4.7": {
+        "supportsImages": false
+    },
     "kimi-k2.7-code": {
         "supportsImages": true
     },

package/dist/protocol/ask-question.d.ts

@@ -9,7 +9,7 @@
  * and fall back to prose instead of ever calling the advertised host tool.
  *
  * Every rule below mirrors Cursor CLI, decompiled at
- * `~/Projects/cursor-mock-server/cursor/cli{,-local}`:
+ * `<cursor-cli-checkout>/cursor/cli{,-local}`:
  *
  * - `src/utils/interaction-utils.ts` — `BU` (freeform option id), `Q7` (display
  *   options), `iX` (selection → success), `N$` (rejection + default reason).
@@ -98,19 +98,18 @@ export declare function rejectedResult(reason?: string): AskQuestionResultMessag
 /** `AskQuestionResult{async}` — the immediate reply for `run_async` queries. */
 export declare function asyncResult(): AskQuestionResultMessage;
 /**
- * Pull each question's answer text out of OpenCode's `question` tool output.
+ * Pull each question's answer text out of a host `question` tool output.
  *
- * The tool returns prose, not structured data (`metadata.answers` does not
- * cross the AI SDK boundary):
+ * OpenCode returns prose (`metadata.answers` does not cross the AI SDK
+ * boundary):
  *
  *   User has answered your questions: "<q1>"="<a, b>", "<q2>"="Unanswered". You
  *   can now continue with the user's answers in mind.
  *
- * The provider authored the question strings, so each answer is located by its
- * own `"<question>"="` anchor scanning forward — robust against commas, quotes
- * and `"="` inside question or answer text, and against duplicate questions.
- * Returns undefined for a question whose anchor is absent, which is treated as
- * unanswered rather than guessed at.
+ * The prose is located by its `"<question>"="` anchor — robust
+ * against commas, quotes and `"="` inside question or answer text, and against
+ * duplicate questions. Returns undefined for a question whose anchor is
+ * absent, which is treated as unanswered rather than guessed at.
  */
 export declare function parseAnswerSegments(questions: readonly CursorAskQuestionItem[], output: string): Array<string | undefined>;
 /**

package/dist/protocol/ask-question.js

@@ -9,7 +9,7 @@
  * and fall back to prose instead of ever calling the advertised host tool.
  *
  * Every rule below mirrors Cursor CLI, decompiled at
- * `~/Projects/cursor-mock-server/cursor/cli{,-local}`:
+ * `<cursor-cli-checkout>/cursor/cli{,-local}`:
  *
  * - `src/utils/interaction-utils.ts` — `BU` (freeform option id), `Q7` (display
  *   options), `iX` (selection → success), `N$` (rejection + default reason).
@@ -218,19 +218,18 @@ export function asyncResult() {
     return { async: {} };
 }
 /**
- * Pull each question's answer text out of OpenCode's `question` tool output.
+ * Pull each question's answer text out of a host `question` tool output.
  *
- * The tool returns prose, not structured data (`metadata.answers` does not
- * cross the AI SDK boundary):
+ * OpenCode returns prose (`metadata.answers` does not cross the AI SDK
+ * boundary):
  *
  *   User has answered your questions: "<q1>"="<a, b>", "<q2>"="Unanswered". You
  *   can now continue with the user's answers in mind.
  *
- * The provider authored the question strings, so each answer is located by its
- * own `"<question>"="` anchor scanning forward — robust against commas, quotes
- * and `"="` inside question or answer text, and against duplicate questions.
- * Returns undefined for a question whose anchor is absent, which is treated as
- * unanswered rather than guessed at.
+ * The prose is located by its `"<question>"="` anchor — robust
+ * against commas, quotes and `"="` inside question or answer text, and against
+ * duplicate questions. Returns undefined for a question whose anchor is
+ * absent, which is treated as unanswered rather than guessed at.
  */
 export function parseAnswerSegments(questions, output) {
     const answers = [];

package/dist/protocol/conversation-bind.js

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { clearCheckpoint } from "./checkpoint.js";
 import { clearConversationBlobs } from "./blob-store.js";
-import { clearFrozenRequestContext, transferFrozenRequestContext, } from "../context/frozen.js";
+import { transferFrozenRequestContext, } from "../context/frozen.js";
 /**
  * OpenCode session key → active Cursor conversation_id.
  *
@@ -11,8 +11,15 @@ import { clearFrozenRequestContext, transferFrozenRequestContext, } from "../con
  * cached conversation against OpenCode's newly compacted prompt.
  */
 const activeBySession = new Map();
+// A compaction id cannot be reconstructed from its host session key. Keep its
+// tiny binding even when the recent-session index soft-evicts that session.
+const remintedBySession = new Map();
 export const MAX_ACTIVE_CONVERSATION_BINDINGS = 256;
 function rememberConversation(sessionKey, conversationId) {
+    if (conversationId === sessionIdToUuid(sessionKey))
+        remintedBySession.delete(sessionKey);
+    else
+        remintedBySession.set(sessionKey, conversationId);
     // Map insertion order is the LRU order. Refresh existing sessions on use.
     activeBySession.delete(sessionKey);
     activeBySession.set(sessionKey, conversationId);
@@ -21,19 +28,21 @@ function rememberConversation(sessionKey, conversationId) {
         if (!oldest)
             break;
         activeBySession.delete(oldest[0]);
-        clearCheckpoint(oldest[1]);
-        clearConversationBlobs(oldest[1]);
-        clearFrozenRequestContext(oldest[1]);
+        // Evict only the lookup pointer. The checkpoint may still be needed by a
+        // held Run, and a returning session can hydrate its durable binding before
+        // resolving another turn. Compaction/reset owns deletion of opaque state.
     }
 }
 export function resetConversationBindingsForTests() {
     activeBySession.clear();
+    remintedBySession.clear();
 }
 export function hasConversationBinding(sessionKey) {
-    return activeBySession.has(sessionKey);
+    return activeBySession.has(sessionKey) || remintedBySession.has(sessionKey);
 }
 export function isActiveConversationBinding(sessionKey, conversationId) {
-    return activeBySession.get(sessionKey) === conversationId;
+    return (activeBySession.get(sessionKey) ?? remintedBySession.get(sessionKey)
+        ?? sessionIdToUuid(sessionKey)) === conversationId;
 }
 /** Restore a validated durable binding before resolving the next Run. */
 export function restoreConversationBinding(sessionKey, conversationId) {
@@ -63,7 +72,7 @@ export function resolveConversationGroupId(sessionKey, conversationId) {
 }
 /** Current Cursor conversation_id for an OpenCode session key, creating the default binding if needed. */
 export function peekConversationId(sessionKey) {
-    let id = activeBySession.get(sessionKey);
+    let id = activeBySession.get(sessionKey) ?? remintedBySession.get(sessionKey);
     if (!id) {
         id = sessionIdToUuid(sessionKey);
     }
@@ -83,7 +92,8 @@ export function bindConversationId(sessionKey, opts) {
         return { conversationId: crypto.randomUUID(), reset: !!opts?.reset };
     }
     if (opts?.reset) {
-        const previousId = activeBySession.get(sessionKey) ?? sessionIdToUuid(sessionKey);
+        const previousId = activeBySession.get(sessionKey) ?? remintedBySession.get(sessionKey)
+            ?? sessionIdToUuid(sessionKey);
         const conversationId = crypto.randomUUID();
         clearCheckpoint(previousId);
         clearConversationBlobs(previousId);

package/dist/protocol/create-plan.d.ts

@@ -54,9 +54,10 @@ export type CursorPlanStageInput = {
  * How a CreatePlan query is satisfied this turn. Keyed only on the advertised
  * catalog and the provider's own plan-mode state — never on host identity.
  *
- * - `stage`   a host plan-stage tool is advertised; the host writes the plan
- *             *and* owns the execution-approval prompt, and its tool result is
- *             the approval outcome (success = approved, error = not approved).
+ * - `stage`   a host plan-stage tool is advertised; the host writes the plan.
+ *             Its tool result is the approval outcome (success = approved,
+ *             error = not approved). The result may name the host's own
+ *             follow-up approval call. This provider does not invent that prompt.
  * - `approve` no such tool, but the host advertises `question`: the provider
  *             writes the plan itself and then asks the same thing with upstream
  *             `PlanExitTool`'s own prompt.
@@ -95,10 +96,8 @@ export declare function createPlanApprovalQuestionInput(planLabel: string): Open
 /**
  * True when the emulated approval prompt came back as an explicit "Yes".
  * An unanswered, dismissed, or failed prompt keeps the model planning rather
- * than silently starting execution.
- *
- * `question` must be the exact prompt that was asked — the host echoes it back
- * verbatim, and it is the anchor the answer is parsed from.
+ * than silently starting execution. OpenCode prose is anchored on the exact
+ * prompt text. Every other result shape fails closed.
  */
 export declare function createPlanApproved(output: string, isError: boolean, question: string): boolean;
 /** Decode a `create_plan_request_query` body, or undefined when unusable. */

package/dist/protocol/create-plan.js

@@ -156,16 +156,15 @@ export function createPlanApprovalQuestionInput(planLabel) {
 /**
  * True when the emulated approval prompt came back as an explicit "Yes".
  * An unanswered, dismissed, or failed prompt keeps the model planning rather
- * than silently starting execution.
- *
- * `question` must be the exact prompt that was asked — the host echoes it back
- * verbatim, and it is the anchor the answer is parsed from.
+ * than silently starting execution. OpenCode prose is anchored on the exact
+ * prompt text. Every other result shape fails closed.
  */
 export function createPlanApproved(output, isError, question) {
     if (isError)
         return false;
     const [segment] = parseAnswerSegments([createPlanApprovalItem(question)], output);
-    return (segment ?? "").trim().toLowerCase() === CREATE_PLAN_APPROVAL_YES.toLowerCase();
+    const answer = (segment ?? "").trim().toLowerCase();
+    return answer === CREATE_PLAN_APPROVAL_YES.toLowerCase();
 }
 function asRecord(value) {
     return value && typeof value === "object" && !Array.isArray(value)

package/dist/protocol/messages.js

@@ -287,7 +287,22 @@ export function createMessageTypes() {
         { id: 3, name: "pattern", type: "string" },
         { id: 4, name: "tool_call_id", type: "string" },
     ]);
-    addType(root, "GetMcpToolsToolCall", [{ id: 1, name: "args", type: "GetMcpToolsArgs" }]);
+    // agent.v1 GetMcpToolsToolCall is args + result. Cursor's agent fills result
+    // locally (GetDynamicTools / GetMcpTools); large catalogs spill through
+    // write_args and put the spill path on GetMcpToolsSuccess.output_file_path.
+    addType(root, "GetMcpToolsSuccess", [
+        { id: 1, name: "content", type: "string" },
+        { id: 2, name: "output_file_path", type: "string" },
+    ]);
+    addType(root, "GetMcpToolsError", [{ id: 1, name: "error", type: "string" }]);
+    addType(root, "GetMcpToolsAgentResult", [
+        { id: 1, name: "success", type: "GetMcpToolsSuccess" },
+        { id: 2, name: "error", type: "GetMcpToolsError" },
+    ], [{ name: "result", fields: ["success", "error"] }]);
+    addType(root, "GetMcpToolsToolCall", [
+        { id: 1, name: "args", type: "GetMcpToolsArgs" },
+        { id: 2, name: "result", type: "GetMcpToolsAgentResult" },
+    ]);
     addType(root, "GenerateImageToolArgs", [
         { id: 1, name: "description", type: "string" },
         { id: 2, name: "file_path", type: "string" },
@@ -472,6 +487,8 @@ export function createMessageTypes() {
         { id: 1, name: "matches", type: "GrepFileMatch", repeated: true },
         { id: 2, name: "total_lines", type: "int32" },
         { id: 3, name: "total_matched_lines", type: "int32" },
+        { id: 4, name: "client_truncated", type: "bool" },
+        { id: 5, name: "ripgrep_truncated", type: "bool" },
     ]);
     addType(root, "GrepUnionResult", [
         { id: 2, name: "files", type: "GrepFilesResult" },

package/dist/protocol/struct.js

@@ -249,7 +249,7 @@ export function encodeJsonAsValue(v) {
     }
     else if (typeof v === "object") {
         const st = [];
-        for (const [key, val] of Object.entries(v).sort(([left], [right]) => left.localeCompare(right))) {
+        for (const [key, val] of Object.entries(v).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0)) {
             if (val === undefined)
                 continue;
             const entry = [];

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

@@ -30,10 +30,8 @@
  * - 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.
  *
- * Resolution is keyed solely on the advertised catalog under canonical tool
- * names — never on host identity or model id. A compatibility layer may restate
- * alternate host vocabulary under canonical names before the provider sees the
- * catalog, so the bridge itself remains OpenCode-shaped.
+ * Resolution is keyed solely on the advertised catalog under canonical
+ * OpenCode tool names — never on any external identity or model id.
  *
  * CLI reject reason for user declines: "Mode switch rejected by user"
  * (chunk-7076/dist/ui.js onSwitchModeReject).
@@ -169,6 +167,7 @@ export declare function resetActiveCursorModesForTests(): void;
 export declare function cursorModeSystemReminder(targetModeId: string, options?: {
     firstTurn?: boolean;
     planExitAdvertised?: boolean;
+    planStageAdvertised?: boolean;
 }): string | undefined;
 /**
  * Consume the active-mode reminder for this OpenCode session.

package/dist/protocol/switch-mode.js

@@ -30,10 +30,8 @@
  * - 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.
  *
- * Resolution is keyed solely on the advertised catalog under canonical tool
- * names — never on host identity or model id. A compatibility layer may restate
- * alternate host vocabulary under canonical names before the provider sees the
- * catalog, so the bridge itself remains OpenCode-shaped.
+ * Resolution is keyed solely on the advertised catalog under canonical
+ * OpenCode tool names — never on any external identity or model id.
  *
  * CLI reject reason for user declines: "Mode switch rejected by user"
  * (chunk-7076/dist/ui.js onSwitchModeReject).
@@ -295,12 +293,15 @@ export function cursorModeSystemReminder(targetModeId, options = {}) {
     if (!id)
         return undefined;
     const first = options.firstTurn !== false;
-    // Without a host plan_exit, recording the plan is itself the gate: the
-    // provider persists it and then asks the user whether to start implementing.
-    // Naming an unavailable tool would strand the model.
-    const leavePlan = options.planExitAdvertised === false
-        ? "record the finished plan (Cursor CreatePlan). Writing it needs no approval, and the user is then asked whether to start implementing; if they decline, refine the plan and record it again"
-        : "record the finished plan, then call OpenCode `plan_exit` so the user can approve leaving plan mode";
+    // A host plan-stage tool writes the artifact and its result names the
+    // follow-up that requests approval. plan_exit only leaves plan mode.
+    // Without either tool, recording the plan is the gate and the provider asks
+    // whether to start implementing. Naming an unavailable tool would strand the model.
+    const leavePlan = options.planStageAdvertised
+        ? "record the finished plan with Cursor CreatePlan. The host stage tool waits for the host plan review and does not return until the user accepts or declines. Do not call `plan_exit` to submit or skip that review, and do not implement until the tool returns success"
+        : options.planExitAdvertised === false
+            ? "record the finished plan (Cursor CreatePlan). Writing it needs no approval, and the user is then asked whether to start implementing; if they decline, refine the plan and record it again"
+            : "record the finished plan, then call OpenCode `plan_exit` so the user can approve leaving plan mode";
     if (id === "plan" || id === "spec") {
         return wrapReminder(first
             ? `Plan mode is active. The user does not want execution yet -- you MUST NOT make edits, run non-readonly tools (including changing configs or making commits), or otherwise modify system state. This supersedes any conflicting instruction.
@@ -389,9 +390,12 @@ Your mandate is to convert user intent into a correct, high-quality implementati
     return wrapReminder(first
         ? `Agent mode is active (OpenCode build / agents). You have left plan mode and may implement: edit files, run tools, and execute the agreed approach.
 
+The plan-mode restriction is over. An earlier reminder that forbade edits no longer applies.
+
+- Change file contents with the advertised \`write\` and \`edit\` tools.
 - Prefer making progress with the advertised host tools.
 - If the task is large or ambiguous again, switch back to plan mode (OpenCode \`plan_enter\` / SwitchMode target plan) before a large rewrite.`
-        : `Agent mode is still active. Continue implementing with the advertised host tools. Switch back to plan mode only when a new large/ambiguous design decision appears.`);
+        : `Agent mode is still active. Continue implementing with the advertised host tools, and change file contents with \`write\` and \`edit\`. Switch back to plan mode only when a new large/ambiguous design decision appears.`);
 }
 /**
  * Consume the active-mode reminder for this OpenCode session.
@@ -417,7 +421,12 @@ export function takeActiveCursorModeReminder(sessionKey, options = {}) {
     }
     const reminder = cursorModeSystemReminder(state.modeId, {
         firstTurn: state.firstTurn,
-        ...(advertised ? { planExitAdvertised: advertised.has("plan_exit") } : {}),
+        ...(advertised
+            ? {
+                planExitAdvertised: advertised.has("plan_exit"),
+                planStageAdvertised: advertised.has("cursor_plan_stage"),
+            }
+            : {}),
     });
     if (state.firstTurn)
         state.firstTurn = false;

package/dist/protocol/tool-call-bridge.d.ts

@@ -1,3 +1,4 @@
+import { type HostToolDialect } from "./tools.js";
 /**
  * Cursor's interaction_update.tool_call_* carries a typed ToolCall oneof
  * (shell_tool_call, update_todos_tool_call, mcp_tool_call, …). Some of those
@@ -19,6 +20,8 @@ export type BridgedOpenCodeToolCall = {
     callId: string;
     variant: string;
 };
+/** Display variants Cursor executes itself (mcp_state + optional write spill). */
+export declare function isNativeDisplayToolCall(variant: string): boolean;
 /**
  * Normalize a full todo snapshot for `mirroredTodos` storage. Returns
  * undefined when the input is not a todo array (nothing to learn). Drops the
@@ -55,7 +58,7 @@ export declare function parseDisplayToolCall(callId: string, toolCall: Record<st
  * Pick an advertised OpenCode tool for a display call, remapping args as needed.
  * Returns undefined when nothing compatible is advertised this turn.
  */
-export declare function resolveBridgedOpenCodeToolCall(display: DisplayToolCall, advertised: Iterable<string>): BridgedOpenCodeToolCall | undefined;
+export declare function resolveBridgedOpenCodeToolCall(display: DisplayToolCall, advertised: Iterable<string>, dialect?: HostToolDialect): BridgedOpenCodeToolCall | undefined;
 /** Advertised OpenCode tool ids from Cursor McpToolDefinition descriptors. */
 export declare function advertisedToolNamesFromDescriptors(descriptors: Array<Record<string, unknown>>): string[];
 /** Walk a protobuf message and return top-level field numbers present. */