cursor-opencode-provider 0.1.5 → 0.2.2

package/dist/protocol/tools.js

@@ -5,24 +5,56 @@ import { trace } from "../debug.js";
 // probe (ExecServerMessage #10 → ExecClientMessage #10). request/result share a
 // field number for every exec variant, so this is also the result field.
 export const REQUEST_CONTEXT_RESULT_FIELD = 10;
+/** Match OpenCode's McpCatalog.sanitize for config server ids. */
+export function sanitizeMcpServerId(value) {
+    return value.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+/**
+ * Resolve an OpenCode tool id using known MCP server ids from merged config.
+ * Unknown names remain under the synthetic default server: a flattened tool
+ * name alone cannot distinguish plugin/custom tools from `<server>_<tool>`.
+ */
+export function resolveToolServerIdentity(opencodeName, defaultServer = "opencode", knownMcpServers = []) {
+    if (!opencodeName) {
+        return { server: defaultServer, toolName: "mcp", opencodeName: "mcp" };
+    }
+    // Longest first handles configured ids where one is a prefix of another
+    // (e.g. "git" and "git_hub"). OpenCode flattens with the sanitized id.
+    const servers = [...new Set([...knownMcpServers].map(sanitizeMcpServerId).filter(Boolean))]
+        .sort((a, b) => b.length - a.length);
+    for (const server of servers) {
+        const prefix = `${server}_`;
+        if (!opencodeName.startsWith(prefix) || opencodeName.length === prefix.length)
+            continue;
+        return {
+            server,
+            toolName: opencodeName.slice(prefix.length),
+            opencodeName,
+        };
+    }
+    return { server: defaultServer, toolName: opencodeName, opencodeName };
+}
 /**
  * Convert opencode's per-turn tool list into Cursor `McpToolDefinition`
  * entries for `request_context.tools` (#7) and `AgentRunRequest.mcp_tools`.
  *
- * opencode tools are already namespaced (e.g. `read`, `grep`, or
- * `<server>_<tool>` for MCP). We advertise them all under a synthetic
- * `opencode` provider so Cursor routes their calls back to us as
- * `mcp_args` on the exec channel. The composite `name` is what the model
- * calls and what comes back as `McpArgs.name`.
+ * Builtins and unknown plugin/custom tools are advertised under the synthetic
+ * default server (`opencode`). Tools whose prefixes match configured MCP
+ * servers keep those server ids (`github`, …). Composite `name` is
+ * `<server>-<bareTool>`; local execution still uses the full OpenCode id
+ * reconstructed in `mcpRealToolName`.
  */
-export function toolsToDescriptors(tools, providerIdentifier = "opencode") {
-    return tools.map((t) => ({
-        name: `${providerIdentifier}-${t.name}`,
-        description: t.description ?? "",
-        input_schema: encodeJsonAsValue(normalizeInputSchema(t.inputSchema)),
-        provider_identifier: providerIdentifier,
-        tool_name: t.name,
-    }));
+export function toolsToDescriptors(tools, providerIdentifier = "opencode", knownMcpServers = []) {
+    return tools.map((t) => {
+        const id = resolveToolServerIdentity(t.name, providerIdentifier, knownMcpServers);
+        return {
+            name: `${id.server}-${id.toolName}`,
+            description: t.description ?? "",
+            input_schema: encodeJsonAsValue(normalizeInputSchema(t.inputSchema)),
+            provider_identifier: id.server,
+            tool_name: id.toolName,
+        };
+    });
 }
 function normalizeInputSchema(schema) {
     if (schema && typeof schema === "object" && !Array.isArray(schema)) {
@@ -32,31 +64,42 @@ function normalizeInputSchema(schema) {
 }
 /**
  * Build the nested McpFileSystemOptions / McpMetaToolOptions shape used by
- * requestContext.#23 / #34. Groups every tool under one synthetic server so
- * Cursor's IDE-style decoder also sees the list.
+ * requestContext.#23 / #34. One `McpDescriptor` per resolved server (builtins
+ * and unknown tools under the synthetic default; configured MCP tools under
+ * their upstream server id).
  */
-export function toolsToMcpDescriptors(tools, providerIdentifier = "opencode") {
+export function toolsToMcpDescriptors(tools, providerIdentifier = "opencode", knownMcpServers = []) {
     if (tools.length === 0)
         return [];
-    return [
-        {
-            server_name: providerIdentifier,
-            server_identifier: providerIdentifier,
-            tools: tools.map((t) => ({
-                tool_name: t.name,
-                description: t.description ?? "",
-                input_schema: encodeJsonAsValue(normalizeInputSchema(t.inputSchema)),
-            })),
-        },
-    ];
+    const order = [];
+    const byServer = new Map();
+    for (const t of tools) {
+        const id = resolveToolServerIdentity(t.name, providerIdentifier, knownMcpServers);
+        let list = byServer.get(id.server);
+        if (!list) {
+            list = [];
+            byServer.set(id.server, list);
+            order.push(id.server);
+        }
+        list.push({
+            tool_name: id.toolName,
+            description: t.description ?? "",
+            input_schema: encodeJsonAsValue(normalizeInputSchema(t.inputSchema)),
+        });
+    }
+    return order.map((server) => ({
+        server_name: server,
+        server_identifier: server,
+        tools: byServer.get(server),
+    }));
 }
 /**
  * @deprecated Prefer `buildRequestContext` from `../context/build.js`.
  * Kept as a sync tools-only fallback for unit tests that don't need collectors.
  */
-export function buildLiveRequestContext(tools, providerIdentifier = "opencode") {
-    const flat = toolsToDescriptors(tools, providerIdentifier);
-    const nested = toolsToMcpDescriptors(tools, providerIdentifier);
+export function buildLiveRequestContext(tools, providerIdentifier = "opencode", knownMcpServers = []) {
+    const flat = toolsToDescriptors(tools, providerIdentifier, knownMcpServers);
+    const nested = toolsToMcpDescriptors(tools, providerIdentifier, knownMcpServers);
     const cwd = process.cwd();
     return {
         env: {
@@ -94,7 +137,13 @@ export function buildLiveRequestContext(tools, providerIdentifier = "opencode")
 const cursorToolToOpencode = {
     read_args: "read",
     write_args: "write",
+    pi_read_args: "read",
+    pi_bash_args: "bash",
+    pi_edit_args: "edit",
     pi_write_args: "write",
+    pi_grep_args: "grep",
+    pi_find_args: "glob",
+    pi_ls_args: "read",
     grep_args: "grep",
     ls_args: "read",
     delete_args: "bash",
@@ -137,6 +186,17 @@ const CURSOR_INTERNAL_KEYS = new Set([
     "encoding_hint",
     "ignore",
 ]);
+/** Required content fields where an empty string is meaningful (for example, truncating a file). */
+const PRESERVE_EMPTY_STRING_KEYS = new Set([
+    "content",
+    "file_text",
+    "fileText",
+    "stream_content",
+    "oldString",
+    "old_string",
+    "newString",
+    "new_string",
+]);
 export function mapExecServerToToolName(execField) {
     return cursorToolToOpencode[execField];
 }
@@ -150,22 +210,28 @@ export function mapToolNameToExecField(toolName) {
 const execVariantToResultField = {
     read_args: "read_result",
     write_args: "write_result",
-    // Pi write: args #48, result #49 (not the same field number).
+    pi_read_args: "pi_read_result",
+    pi_bash_args: "pi_bash_result",
+    pi_edit_args: "pi_edit_result",
     pi_write_args: "pi_write_result",
+    pi_grep_args: "pi_grep_result",
+    pi_find_args: "pi_find_result",
+    pi_ls_args: "pi_ls_result",
     grep_args: "grep_result",
     ls_args: "ls_result",
     delete_args: "delete_result",
     shell_stream_args: "shell_stream",
     mcp_args: "mcp_result",
 };
-const MCP_PREFIX = "opencode-";
 export function parseExecServerMessage(msg) {
     const id = msg.id;
     if (id === undefined)
         return undefined;
     // Find which args variant is set
     const execVariant = findOneOfVariant(msg, [
-        "read_args", "write_args", "pi_write_args",
+        "read_args", "write_args",
+        "pi_read_args", "pi_bash_args", "pi_edit_args", "pi_write_args",
+        "pi_grep_args", "pi_find_args", "pi_ls_args",
         "grep_args", "ls_args",
         "delete_args", "shell_stream_args", "mcp_args",
     ]);
@@ -187,6 +253,33 @@ export function parseExecServerMessage(msg) {
             resultField,
         };
     }
+    if (execVariant === "pi_edit_args") {
+        const raw = msg.pi_edit_args ?? {};
+        const edits = Array.isArray(raw.edits) ? raw.edits : [];
+        const replacement = edits.length === 1 && edits[0] && typeof edits[0] === "object"
+            ? edits[0]
+            : undefined;
+        const path = str(raw.path);
+        const oldString = replacement ? stringValue(replacement.old_text) : undefined;
+        const newString = replacement ? stringValue(replacement.new_text) : undefined;
+        const args = {};
+        if (path)
+            args.filePath = path;
+        if (oldString !== undefined)
+            args.oldString = oldString;
+        if (newString !== undefined)
+            args.newString = newString;
+        return {
+            id,
+            execId,
+            toolName: "edit",
+            args,
+            resultField,
+            localError: path && oldString && newString !== undefined
+                ? undefined
+                : "Cursor Pi edit cannot be represented safely: expected one non-empty replacement.",
+        };
+    }
     const toolName = cursorToolToOpencode[execVariant];
     if (!toolName)
         return undefined;
@@ -211,8 +304,9 @@ export function mapCursorArgsToOpencode(toolName, raw, execVariant) {
             continue;
         if (CURSOR_INTERNAL_KEYS.has(k))
             continue;
-        // Drop empty strings from optional protobuf defaults.
-        if (typeof v === "string" && v.length === 0)
+        // Drop empty strings from optional protobuf defaults, but retain required
+        // content fields where empty means a valid destructive edit/write.
+        if (typeof v === "string" && v.length === 0 && !PRESERVE_EMPTY_STRING_KEYS.has(k))
             continue;
         cleaned[k] = v;
     }
@@ -250,7 +344,7 @@ export function mapCursorArgsToOpencode(toolName, raw, execVariant) {
             const filePath = str(cleaned.filePath) ?? str(cleaned.path) ?? str(cleaned.file_path);
             if (filePath)
                 args.filePath = filePath;
-            const content = str(cleaned.content) ?? str(cleaned.file_text) ?? str(cleaned.fileText);
+            const content = stringValue(cleaned.content) ?? stringValue(cleaned.file_text) ?? stringValue(cleaned.fileText);
             if (content !== undefined)
                 args.content = content;
             return { toolName: "write", args };
@@ -260,10 +354,10 @@ export function mapCursorArgsToOpencode(toolName, raw, execVariant) {
             const filePath = str(cleaned.filePath) ?? str(cleaned.path) ?? str(cleaned.file_path);
             if (filePath)
                 args.filePath = filePath;
-            const oldString = str(cleaned.oldString) ?? str(cleaned.old_string);
+            const oldString = stringValue(cleaned.oldString) ?? stringValue(cleaned.old_string);
             if (oldString !== undefined)
                 args.oldString = oldString;
-            const newString = str(cleaned.newString) ?? str(cleaned.new_string);
+            const newString = stringValue(cleaned.newString) ?? stringValue(cleaned.new_string);
             if (newString !== undefined)
                 args.newString = newString;
             if (typeof cleaned.replaceAll === "boolean")
@@ -321,6 +415,9 @@ export function mapCursorArgsToOpencode(toolName, raw, execVariant) {
 function str(v) {
     return typeof v === "string" && v.length > 0 ? v : undefined;
 }
+function stringValue(v) {
+    return typeof v === "string" ? v : undefined;
+}
 function num(v) {
     if (typeof v === "number" && Number.isFinite(v))
         return v;
@@ -331,12 +428,35 @@ function num(v) {
 function shellQuote(s) {
     return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-function mcpRealToolName(mcpArgs) {
-    const toolName = mcpArgs.tool_name;
-    if (toolName)
+/**
+ * Map Cursor McpArgs back to the OpenCode tool id.
+ * Prefers provider_identifier + bare tool_name (github + create_pull_request
+ * → github_create_pull_request). Builtins under the default server stay bare.
+ */
+export function mcpRealToolName(mcpArgs, defaultServer = "opencode") {
+    const toolName = typeof mcpArgs.tool_name === "string" ? mcpArgs.tool_name : undefined;
+    const provider = typeof mcpArgs.provider_identifier === "string" ? mcpArgs.provider_identifier : undefined;
+    if (toolName) {
+        if (provider && provider !== defaultServer) {
+            // Already a full OpenCode id (legacy ads or model echo).
+            if (toolName.startsWith(`${provider}_`))
+                return toolName;
+            return `${provider}_${toolName}`;
+        }
         return toolName;
-    const name = mcpArgs.name ?? "";
-    return name.startsWith(MCP_PREFIX) ? name.slice(MCP_PREFIX.length) : name || "mcp";
+    }
+    const name = typeof mcpArgs.name === "string" ? mcpArgs.name : "";
+    const dash = name.indexOf("-");
+    if (dash > 0) {
+        const server = name.slice(0, dash);
+        const bare = name.slice(dash + 1);
+        if (server && bare) {
+            if (server === defaultServer)
+                return bare;
+            return `${server}_${bare}`;
+        }
+    }
+    return name || "mcp";
 }
 function decodeMcpArgs(raw) {
     if (!Array.isArray(raw))
@@ -537,6 +657,18 @@ export function buildTypedExecResult(resultField, output, error, toolName) {
             if (error)
                 return { error: { error } };
             return { success: { output: output || "Wrote file successfully." } };
+        case "pi_read_result":
+            if (error)
+                return { error: { error } };
+            return { success: { output: unwrapReadOutput(output) } };
+        case "pi_bash_result":
+        case "pi_edit_result":
+        case "pi_grep_result":
+        case "pi_find_result":
+        case "pi_ls_result":
+            if (error)
+                return { error: { error } };
+            return { success: { output } };
         case "delete_result":
             if (error)
                 return { error: { path: "", error } };
@@ -639,15 +771,11 @@ export function parseExecIdFromToolCallId(toolCallId) {
         return undefined;
     return { sessionId: match[1], execId };
 }
-// ── Safety net: reply to exec variants we don't map to an opencode tool ──
+// ── Unknown exec diagnostics ──
 //
-// Cursor's real server sends server-initiated exec probes (request_context #10,
-// and potentially diagnostics/smart-mode-classifier/etc.) that are NOT tool
-// calls. opencode owns the tool loop, so these have no opencode tool to route
-// to — but we MUST still reply on the Run stream or the server blocks forever
-// (endless heartbeats, no response). For any unmapped variant we emit an empty
-// result at the SAME field number (request/result field numbers are identical
-// for every exec variant: read #7→#7, mcp #11→#11, request_context #10→#10…).
+// Request/result field numbers are not universally identical (the Pi range is
+// offset by one), so unknown variants must never receive a guessed empty reply.
+// The pump uses this raw detector to report schema drift and fail the Run.
 /**
  * Find the exec variant field number from the raw (gunzipped) AgentServerMessage
  * payload: peel field #2 (exec_server_message), then return the first
@@ -667,29 +795,6 @@ export function detectExecVariantField(agentServerPayload) {
     }
     return undefined;
 }
-/** Build ExecClientMessage{1:id, <resultField>: empty} as raw bytes. */
-export function buildRawEmptyExecReply(execId, resultField) {
-    const inner = [];
-    writeVarintRaw(inner, (1 << 3) | 0); // field 1 (id), wire 0 (varint)
-    writeVarintRaw(inner, execId >>> 0);
-    writeVarintRaw(inner, (resultField << 3) | 2); // field N, wire 2 (length-delimited)
-    writeVarintRaw(inner, 0); // empty submessage
-    // Wrap as AgentClientMessage.exec_client_message (field #2).
-    const acm = [];
-    writeVarintRaw(acm, (2 << 3) | 2);
-    writeVarintRaw(acm, inner.length);
-    for (const b of inner)
-        acm.push(b);
-    return new Uint8Array(acm);
-}
-function writeVarintRaw(out, n) {
-    let v = n >>> 0;
-    while (v > 0x7f) {
-        out.push((v & 0x7f) | 0x80);
-        v >>>= 7;
-    }
-    out.push(v);
-}
 /**
  * Encode exec #10 request_context_result from a prebuilt RequestContext payload.
  */

package/dist/session.d.ts

@@ -19,6 +19,12 @@ export type PendingExec = {
      * mcp_result can unwrap read envelopes even if the prompt omits toolName.
      */
     toolName?: string;
+    /**
+     * True when this pending entry was synthesized from a Cursor display-only
+     * tool_call_* frame (no ExecServerMessage). Continuation must not write an
+     * exec result back to Cursor — just clear pending and keep pumping.
+     */
+    bridged?: boolean;
 };
 export type CursorSession = {
     /**
@@ -35,6 +41,14 @@ export type CursorSession = {
     stream: BidiStream;
     frames: AsyncIterator<Frame>;
     pending: Map<number, PendingExec>;
+    /**
+     * Cursor display tool calls (tool_call_started) awaiting either an exec or a
+     * tool_call_completed. Keyed by call_id. Cleared when exec handles the call
+     * or when we bridge the completed display call into an OpenCode tool-call.
+     */
+    displayToolCalls: Map<string, Record<string, unknown>>;
+    /** Monotonic synthetic exec ids for bridged (display-only) OpenCode tool calls. */
+    nextBridgedExecId: number;
     /** KV blob store: blob_id (hex) → data, for Cursor's out-of-band payload channel. */
     blobs: Map<string, Uint8Array>;
     /** McpToolDefinition list advertised this turn — echoed into the request_context reply. */
@@ -47,6 +61,17 @@ export type CursorSession = {
      * stream instead of emitting tool-call parts OpenCode will reject.
      */
     allowTools: boolean;
+    /**
+     * Best-effort token usage for this held-open Run. Updated from text/tool
+     * activity and replaced by TurnEnded when the turn completes. Emitted on
+     * tool-calls finishes so OpenCode does not store all-zero usage mid-loop.
+     */
+    usageEstimate: {
+        inputTokens: number;
+        outputTokens: number;
+        cacheRead: number;
+        cacheWrite: number;
+    };
     /**
      * True while a doStream pull() is actively reading this session's frames.
      * Prevents a late cancel/abort from a prior ReadableStream from destroying
@@ -63,7 +88,7 @@ export declare class SessionManager {
     constructor(idleTimeoutMs?: number);
     touch(session: CursorSession): void;
     /** Register that `session` is awaiting a result for `execId`. */
-    registerPending(execId: number, session: CursorSession, resultField: string, toolName?: string): void;
+    registerPending(execId: number, session: CursorSession, resultField: string, toolName?: string, bridged?: boolean): void;
     /** The pending exec info for an id on a specific session, if still awaiting it. */
     pendingFor(sessionId: string, execId: number): PendingExec | undefined;
     /** Find the live session awaiting one of the given exec ids. */

package/dist/session.js

@@ -12,8 +12,8 @@ export class SessionManager {
         session.expiresAt = Date.now() + this.idleTimeoutMs;
     }
     /** Register that `session` is awaiting a result for `execId`. */
-    registerPending(execId, session, resultField, toolName) {
-        session.pending.set(execId, { resultField, toolName });
+    registerPending(execId, session, resultField, toolName, bridged = false) {
+        session.pending.set(execId, { resultField, toolName, bridged });
         this.byExecId.set(this.key(session.sessionId, execId), session);
         this.touch(session);
     }

package/dist/shared.d.ts

@@ -2,11 +2,15 @@ export declare const CURSOR_API_HOST = "api2.cursor.sh";
 export declare const CURSOR_WEBSITE_HOST = "cursor.com";
 export declare const FALLBACK_CLIENT_VERSION = "cli-2026.07.09-a3815c0";
 export declare const CURSOR_PROVIDER_ID = "cursor";
+/** Private provider option injected by the OpenCode plugin for summary turns. */
+export declare const CURSOR_COMPACTION_OPTION = "opencodeCompaction";
 export declare const TOKEN_EXPIRY_THRESHOLD_S = 300;
 export declare const RUN_PATH = "/agent.v1.AgentService/Run";
 export declare const AVAILABLE_MODELS_PATH = "/aiserver.v1.AiService/AvailableModels";
 export declare const SERVER_CONFIG_PATH = "/aiserver.v1.ServerConfigService/GetServerConfig";
 export declare const MODEL_CACHE_FILE = "cursor-models.json";
+/** Bumped when the on-disk model cache shape/semantics change (forces refetch). */
+export declare const MODEL_CACHE_SCHEMA_VERSION = 2;
 export declare const MODEL_CACHE_TTL_MS = 86400000;
 export declare const VERSION_CACHE_FILE = "cursor-client-version.json";
 export declare const CONTENT_TYPE_CONNECT_PROTO = "application/connect+proto";

package/dist/shared.js

@@ -2,11 +2,15 @@ export const CURSOR_API_HOST = "api2.cursor.sh";
 export const CURSOR_WEBSITE_HOST = "cursor.com";
 export const FALLBACK_CLIENT_VERSION = "cli-2026.07.09-a3815c0";
 export const CURSOR_PROVIDER_ID = "cursor";
+/** Private provider option injected by the OpenCode plugin for summary turns. */
+export const CURSOR_COMPACTION_OPTION = "opencodeCompaction";
 export const TOKEN_EXPIRY_THRESHOLD_S = 300;
 export const RUN_PATH = "/agent.v1.AgentService/Run";
 export const AVAILABLE_MODELS_PATH = "/aiserver.v1.AiService/AvailableModels";
 export const SERVER_CONFIG_PATH = "/aiserver.v1.ServerConfigService/GetServerConfig";
 export const MODEL_CACHE_FILE = "cursor-models.json";
+/** Bumped when the on-disk model cache shape/semantics change (forces refetch). */
+export const MODEL_CACHE_SCHEMA_VERSION = 2;
 export const MODEL_CACHE_TTL_MS = 86_400_000;
 export const VERSION_CACHE_FILE = "cursor-client-version.json";
 export const CONTENT_TYPE_CONNECT_PROTO = "application/connect+proto";

package/dist/transport/connect.js

@@ -36,7 +36,17 @@ export async function unaryAvailableModels(token, options = {}) {
             "content-type": "application/json",
             accept: "application/json",
         },
-        body: "{}",
+        // AvailableModelsRequest flags (proto aiserver.v1). The IDE sets these
+        // (modelConfigService.js useModelParameters, entry.js includeLongContextModels).
+        // useModelParameters + useCloudAgentEffortModes return parameterized
+        // variants (effort/context/fast). includeLongContextModels may populate
+        // context_token_limit fields; when those stay empty we still derive limits
+        // from each variant's `context` param in mapAvailableModelsResponse.
+        body: JSON.stringify({
+            includeLongContextModels: true,
+            useModelParameters: true,
+            useCloudAgentEffortModes: true,
+        }),
     });
     if (!res.ok) {
         const text = await res.text().catch(() => "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-opencode-provider",
-  "version": "0.1.5",
+  "version": "0.2.2",
   "description": "Use Cursor subscription models from OpenCode via Cursor's Connect-RPC agent protocol",
   "type": "module",
   "license": "MIT",
@@ -40,6 +40,7 @@
   "files": [
     "dist",
     "LICENSE",
+    "DISCLAIMER.md",
     "README.md"
   ],
   "scripts": {
@@ -62,4 +63,4 @@
     "@types/node": "^22.15.3",
     "typescript": "^5.8.3"
   }
-}
+}