@playwo/opencode-cursor-oauth 0.0.0-dev.4258a6733133 → 0.0.0-dev.628837adf8c9

package/dist/cursor/bidi-session.d.ts

@@ -1,5 +1,4 @@
 import { type CursorBaseRequestOptions } from "./headers";
-export declare function encodeBidiAppendRequest(dataHex: string, requestId: string, appendSeqno: number): Uint8Array;
 export interface CursorSession {
     write: (data: Uint8Array) => void;
     end: () => void;
@@ -8,6 +7,6 @@ export interface CursorSession {
     readonly alive: boolean;
 }
 export interface CreateCursorSessionOptions extends CursorBaseRequestOptions {
-    requestId: string;
+    initialRequestBytes: Uint8Array;
 }
 export declare function createCursorSession(options: CreateCursorSessionOptions): Promise<CursorSession>;

package/dist/cursor/bidi-session.js

@@ -1,149 +1,164 @@
-import { create, toBinary } from "@bufbuild/protobuf";
-import { BidiRequestIdSchema } from "../proto/agent_pb";
-import { CURSOR_API_URL } from "./config";
-import { concatBytes, encodeProtoMessageField, encodeProtoStringField, encodeProtoVarintField, frameConnectMessage, toFetchBody, } from "./connect-framing";
-import { buildCursorHeaders } from "./headers";
-import { errorDetails, logPluginError, logPluginWarn } from "../logger";
-export function encodeBidiAppendRequest(dataHex, requestId, appendSeqno) {
-    const requestIdBytes = toBinary(BidiRequestIdSchema, create(BidiRequestIdSchema, { requestId }));
-    return concatBytes([
-        encodeProtoStringField(1, dataHex),
-        encodeProtoMessageField(2, requestIdBytes),
-        encodeProtoVarintField(3, appendSeqno),
-    ]);
-}
+import { connect as connectHttp2, } from "node:http2";
+import { CURSOR_API_URL, CURSOR_CONNECT_PROTOCOL_VERSION } from "./config";
+import { frameConnectMessage } from "./connect-framing";
+import { buildCursorHeaderValues, } from "./headers";
+import { errorDetails, logPluginError } from "../logger";
+const CURSOR_BIDI_RUN_PATH = "/agent.v1.AgentService/Run";
 export async function createCursorSession(options) {
-    const response = await fetch(new URL("/agent.v1.AgentService/RunSSE", options.url ?? CURSOR_API_URL), {
-        method: "POST",
-        headers: buildCursorHeaders(options, "application/connect+proto", {
-            accept: "text/event-stream",
-            "connect-protocol-version": "1",
-        }),
-        body: toFetchBody(frameConnectMessage(toBinary(BidiRequestIdSchema, create(BidiRequestIdSchema, { requestId: options.requestId })))),
-    });
-    if (!response.ok || !response.body) {
-        const errorBody = await response.text().catch(() => "");
-        logPluginError("Cursor RunSSE request failed", {
-            requestId: options.requestId,
-            status: response.status,
-            responseBody: errorBody,
-        });
-        throw new Error(`RunSSE failed: ${response.status}${errorBody ? ` ${errorBody}` : ""}`);
+    if (options.initialRequestBytes.length === 0) {
+        throw new Error("Cursor sessions require an initial request message");
     }
-    const cbs = {
-        data: null,
-        close: null,
-    };
-    const abortController = new AbortController();
-    const reader = response.body.getReader();
-    let appendSeqno = 0;
-    let alive = true;
-    let closeCode = 0;
-    let writeChain = Promise.resolve();
-    const pendingChunks = [];
-    const finish = (code) => {
-        if (!alive)
-            return;
-        alive = false;
-        closeCode = code;
-        cbs.close?.(code);
-    };
-    const append = async (data) => {
-        const requestBody = encodeBidiAppendRequest(Buffer.from(data).toString("hex"), options.requestId, appendSeqno++);
-        const appendResponse = await fetch(new URL("/aiserver.v1.BidiService/BidiAppend", options.url ?? CURSOR_API_URL), {
-            method: "POST",
-            headers: buildCursorHeaders(options, "application/proto"),
-            body: toFetchBody(requestBody),
-            signal: abortController.signal,
-        });
-        if (!appendResponse.ok) {
-            const errorBody = await appendResponse.text().catch(() => "");
-            logPluginError("Cursor BidiAppend request failed", {
-                requestId: options.requestId,
-                appendSeqno: appendSeqno - 1,
-                status: appendResponse.status,
-                responseBody: errorBody,
-            });
-            throw new Error(`BidiAppend failed: ${appendResponse.status}${errorBody ? ` ${errorBody}` : ""}`);
-        }
-        await appendResponse.arrayBuffer().catch(() => undefined);
-    };
-    (async () => {
-        try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) {
-                    finish(0);
-                    break;
-                }
-                if (value && value.length > 0) {
-                    const chunk = Buffer.from(value);
-                    if (cbs.data) {
-                        cbs.data(chunk);
-                    }
-                    else {
-                        pendingChunks.push(chunk);
-                    }
-                }
+    const target = new URL(CURSOR_BIDI_RUN_PATH, options.url ?? CURSOR_API_URL);
+    const authority = `${target.protocol}//${target.host}`;
+    const requestId = crypto.randomUUID();
+    return new Promise((resolve, reject) => {
+        const cbs = {
+            data: null,
+            close: null,
+        };
+        let session;
+        let stream;
+        let alive = true;
+        let closeCode = 0;
+        let opened = false;
+        let settled = false;
+        let statusCode = 0;
+        const pendingChunks = [];
+        const errorChunks = [];
+        const closeTransport = () => {
+            try {
+                stream?.close();
             }
-        }
-        catch (error) {
-            logPluginWarn("Cursor stream reader closed with error", {
-                requestId: options.requestId,
+            catch { }
+            try {
+                session?.close();
+            }
+            catch { }
+        };
+        const finish = (code) => {
+            if (!alive)
+                return;
+            alive = false;
+            closeCode = code;
+            cbs.close?.(code);
+            closeTransport();
+        };
+        const rejectOpen = (error) => {
+            if (settled)
+                return;
+            settled = true;
+            alive = false;
+            closeTransport();
+            reject(error);
+        };
+        const resolveOpen = (sessionHandle) => {
+            if (settled)
+                return;
+            settled = true;
+            opened = true;
+            resolve(sessionHandle);
+        };
+        const handleTransportError = (message, error) => {
+            logPluginError(message, {
+                requestId,
+                url: target.toString(),
                 ...errorDetails(error),
             });
-            finish(alive ? 1 : closeCode);
-        }
-    })();
-    return {
-        get alive() {
-            return alive;
-        },
-        write(data) {
-            if (!alive)
+            if (!opened) {
+                rejectOpen(new Error(error instanceof Error ? error.message : String(error ?? message)));
                 return;
-            writeChain = writeChain
-                .then(() => append(data))
-                .catch((error) => {
-                logPluginError("Cursor stream append failed", {
-                    requestId: options.requestId,
-                    ...errorDetails(error),
-                });
+            }
+            finish(1);
+        };
+        const sessionHandle = {
+            get alive() {
+                return alive;
+            },
+            write(data) {
+                if (!alive || !stream)
+                    return;
                 try {
-                    abortController.abort();
+                    stream.write(frameConnectMessage(data));
                 }
-                catch { }
-                try {
-                    reader.cancel();
+                catch (error) {
+                    handleTransportError("Cursor HTTP/2 write failed", error);
+                }
+            },
+            end() {
+                finish(0);
+            },
+            onData(cb) {
+                cbs.data = cb;
+                while (pendingChunks.length > 0) {
+                    cb(pendingChunks.shift());
+                }
+            },
+            onClose(cb) {
+                if (!alive) {
+                    queueMicrotask(() => cb(closeCode));
                 }
-                catch { }
-                finish(1);
+                else {
+                    cbs.close = cb;
+                }
+            },
+        };
+        try {
+            session = connectHttp2(authority);
+            session.once("error", (error) => {
+                handleTransportError("Cursor HTTP/2 session failed", error);
             });
-        },
-        end() {
-            try {
-                abortController.abort();
-            }
-            catch { }
-            try {
-                reader.cancel();
-            }
-            catch { }
-            finish(0);
-        },
-        onData(cb) {
-            cbs.data = cb;
-            while (pendingChunks.length > 0) {
-                cb(pendingChunks.shift());
-            }
-        },
-        onClose(cb) {
-            if (!alive) {
-                queueMicrotask(() => cb(closeCode));
-            }
-            else {
-                cbs.close = cb;
-            }
-        },
-    };
+            const headers = {
+                ":method": "POST",
+                ":path": `${target.pathname}${target.search}`,
+                ...buildCursorHeaderValues(options, "application/connect+proto", {
+                    accept: "application/connect+proto",
+                    "connect-protocol-version": CURSOR_CONNECT_PROTOCOL_VERSION,
+                }),
+            };
+            stream = session.request(headers);
+            stream.once("response", (responseHeaders) => {
+                const statusHeader = responseHeaders[":status"];
+                statusCode =
+                    typeof statusHeader === "number"
+                        ? statusHeader
+                        : Number(statusHeader ?? 0);
+                if (statusCode >= 200 && statusCode < 300) {
+                    resolveOpen(sessionHandle);
+                }
+            });
+            stream.on("data", (chunk) => {
+                const buffer = Buffer.from(chunk);
+                if (!opened && statusCode >= 400) {
+                    errorChunks.push(buffer);
+                    return;
+                }
+                if (cbs.data) {
+                    cbs.data(buffer);
+                }
+                else {
+                    pendingChunks.push(buffer);
+                }
+            });
+            stream.once("end", () => {
+                if (!opened) {
+                    const errorBody = Buffer.concat(errorChunks).toString("utf8").trim();
+                    logPluginError("Cursor HTTP/2 Run request failed", {
+                        requestId,
+                        status: statusCode,
+                        responseBody: errorBody,
+                    });
+                    rejectOpen(new Error(`Run failed: ${statusCode || 1}${errorBody ? ` ${errorBody}` : ""}`));
+                    return;
+                }
+                finish(statusCode >= 200 && statusCode < 300 ? 0 : statusCode || 1);
+            });
+            stream.once("error", (error) => {
+                handleTransportError("Cursor HTTP/2 stream failed", error);
+            });
+            stream.write(frameConnectMessage(options.initialRequestBytes));
+        }
+        catch (error) {
+            handleTransportError("Cursor HTTP/2 transport setup failed", error);
+        }
+    });
 }

package/dist/cursor/index.d.ts

@@ -1,5 +1,5 @@
 export { CURSOR_API_URL, CURSOR_CLIENT_VERSION, CURSOR_CONNECT_PROTOCOL_VERSION, CONNECT_END_STREAM_FLAG, } from "./config";
 export { concatBytes, decodeConnectUnaryBody, encodeProtoMessageField, encodeProtoStringField, encodeProtoVarintField, encodeVarint, frameConnectMessage, toFetchBody, } from "./connect-framing";
 export { buildCursorHeaders, buildCursorHeaderValues, type CursorBaseRequestOptions, } from "./headers";
-export { createCursorSession, encodeBidiAppendRequest, type CreateCursorSessionOptions, type CursorSession, } from "./bidi-session";
+export { createCursorSession, type CreateCursorSessionOptions, type CursorSession, } from "./bidi-session";
 export { callCursorUnaryRpc, type CursorUnaryRpcOptions } from "./unary-rpc";

package/dist/cursor/index.js

@@ -1,5 +1,5 @@
 export { CURSOR_API_URL, CURSOR_CLIENT_VERSION, CURSOR_CONNECT_PROTOCOL_VERSION, CONNECT_END_STREAM_FLAG, } from "./config";
 export { concatBytes, decodeConnectUnaryBody, encodeProtoMessageField, encodeProtoStringField, encodeProtoVarintField, encodeVarint, frameConnectMessage, toFetchBody, } from "./connect-framing";
 export { buildCursorHeaders, buildCursorHeaderValues, } from "./headers";
-export { createCursorSession, encodeBidiAppendRequest, } from "./bidi-session";
+export { createCursorSession, } from "./bidi-session";
 export { callCursorUnaryRpc } from "./unary-rpc";

package/dist/cursor/unary-rpc.d.ts

@@ -4,7 +4,6 @@ export interface CursorUnaryRpcOptions {
     requestBody: Uint8Array;
     url?: string;
     timeoutMs?: number;
-    transport?: "auto" | "fetch" | "http2";
 }
 export declare function callCursorUnaryRpc(options: CursorUnaryRpcOptions): Promise<{
     body: Uint8Array;

package/dist/cursor/unary-rpc.js

@@ -1,67 +1,10 @@
 import { connect as connectHttp2, } from "node:http2";
 import { CURSOR_API_URL, CURSOR_CONNECT_PROTOCOL_VERSION } from "./config";
-import { toFetchBody } from "./connect-framing";
-import { buildCursorHeaders, buildCursorHeaderValues } from "./headers";
+import { buildCursorHeaderValues } from "./headers";
 import { errorDetails, logPluginError } from "../logger";
 export async function callCursorUnaryRpc(options) {
     const target = new URL(options.rpcPath, options.url ?? CURSOR_API_URL);
-    const transport = options.transport ?? "auto";
-    if (transport === "http2" ||
-        (transport === "auto" && target.protocol === "https:")) {
-        const http2Result = await callCursorUnaryRpcOverHttp2(options, target);
-        if (transport === "http2" ||
-            http2Result.timedOut ||
-            http2Result.exitCode !== 1) {
-            return http2Result;
-        }
-    }
-    return callCursorUnaryRpcOverFetch(options, target);
-}
-async function callCursorUnaryRpcOverFetch(options, target) {
-    let timedOut = false;
-    const timeoutMs = options.timeoutMs ?? 5_000;
-    const controller = new AbortController();
-    const timeout = timeoutMs > 0
-        ? setTimeout(() => {
-            timedOut = true;
-            controller.abort();
-        }, timeoutMs)
-        : undefined;
-    try {
-        const response = await fetch(target, {
-            method: "POST",
-            headers: buildCursorHeaders(options, "application/proto", {
-                accept: "application/proto, application/json",
-                "connect-protocol-version": CURSOR_CONNECT_PROTOCOL_VERSION,
-                "connect-timeout-ms": String(timeoutMs),
-            }),
-            body: toFetchBody(options.requestBody),
-            signal: controller.signal,
-        });
-        const body = new Uint8Array(await response.arrayBuffer());
-        return {
-            body,
-            exitCode: response.ok ? 0 : response.status,
-            timedOut,
-        };
-    }
-    catch {
-        logPluginError("Cursor unary fetch transport failed", {
-            rpcPath: options.rpcPath,
-            url: target.toString(),
-            timeoutMs,
-            timedOut,
-        });
-        return {
-            body: new Uint8Array(),
-            exitCode: timedOut ? 124 : 1,
-            timedOut,
-        };
-    }
-    finally {
-        if (timeout)
-            clearTimeout(timeout);
-    }
+    return callCursorUnaryRpcOverHttp2(options, target);
 }
 async function callCursorUnaryRpcOverHttp2(options, target) {
     const timeoutMs = options.timeoutMs ?? 5_000;

package/dist/logger.d.ts

@@ -2,5 +2,6 @@ import type { PluginInput } from "@opencode-ai/plugin";
 export declare function configurePluginLogger(input: PluginInput): void;
 export declare function errorDetails(error: unknown): Record<string, unknown>;
 export declare function logPluginWarn(message: string, extra?: Record<string, unknown>): void;
+export declare function logPluginInfo(message: string, extra?: Record<string, unknown>): void;
 export declare function logPluginError(message: string, extra?: Record<string, unknown>): void;
 export declare function flushPluginLogs(): Promise<void>;

package/dist/logger.js

@@ -27,6 +27,9 @@ export function errorDetails(error) {
 export function logPluginWarn(message, extra = {}) {
     logPlugin("warn", message, extra);
 }
+export function logPluginInfo(message, extra = {}) {
+    logPlugin("info", message, extra);
+}
 export function logPluginError(message, extra = {}) {
     logPlugin("error", message, extra);
 }

package/dist/proxy/bridge-non-streaming.js

@@ -38,14 +38,12 @@ async function collectFullResponse(payload, accessToken, modelId, convKey, metad
         pendingExecs: [],
         outputTokens: 0,
         totalTokens: 0,
-        interactionToolArgsText: new Map(),
-        emittedToolCallIds: new Set(),
     };
     const tagFilter = createThinkingTagFilter();
     bridge.onData(createConnectFrameParser((messageBytes) => {
         try {
             const serverMessage = fromBinary(AgentServerMessageSchema, messageBytes);
-            processServerMessage(serverMessage, payload.blobStore, payload.mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
+            processServerMessage(serverMessage, payload.blobStore, payload.rules, payload.mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
                 if (isThinking)
                     return;
                 const { content } = tagFilter.process(text);

package/dist/proxy/bridge-session.js

@@ -2,12 +2,10 @@ import { createCursorSession } from "../cursor/bidi-session";
 import { makeHeartbeatBytes } from "./stream-dispatch";
 const HEARTBEAT_INTERVAL_MS = 5_000;
 export async function startBridge(accessToken, requestBytes) {
-    const requestId = crypto.randomUUID();
     const bridge = await createCursorSession({
         accessToken,
-        requestId,
+        initialRequestBytes: requestBytes,
     });
-    bridge.write(requestBytes);
     const heartbeatTimer = setInterval(() => bridge.write(makeHeartbeatBytes()), HEARTBEAT_INTERVAL_MS);
     return { bridge, heartbeatTimer };
 }

package/dist/proxy/bridge-streaming.d.ts

@@ -2,4 +2,4 @@ import { type ToolResultInfo } from "../openai/messages";
 import type { ConversationRequestMetadata } from "./conversation-meta";
 import type { ActiveBridge, CursorRequestPayload } from "./types";
 export declare function handleStreamingResponse(payload: CursorRequestPayload, accessToken: string, modelId: string, bridgeKey: string, convKey: string, metadata: ConversationRequestMetadata): Promise<Response>;
-export declare function handleToolResultResume(active: ActiveBridge, toolResults: ToolResultInfo[], bridgeKey: string, convKey: string): Response;
+export declare function handleToolResultResume(active: ActiveBridge, toolResults: ToolResultInfo[], bridgeKey: string, convKey: string): Promise<Response>;

package/dist/proxy/bridge-streaming.js

@@ -1,6 +1,6 @@
 import { create, fromBinary, toBinary } from "@bufbuild/protobuf";
 import { AgentClientMessageSchema, AgentServerMessageSchema, ExecClientMessageSchema, McpErrorSchema, McpResultSchema, McpSuccessSchema, McpTextContentSchema, McpToolResultContentItemSchema, } from "../proto/agent_pb";
-import { errorDetails, logPluginError, logPluginWarn } from "../logger";
+import { errorDetails, logPluginError, logPluginInfo, logPluginWarn, } from "../logger";
 import { formatToolCallSummary, formatToolResultSummary, } from "../openai/messages";
 import { activeBridges, updateStoredConversationAfterCompletion, } from "./conversation-state";
 import { startBridge } from "./bridge-session";
@@ -8,7 +8,7 @@ import { updateConversationCheckpoint, syncStoredBlobStore, } from "./state-sync
 import { SSE_HEADERS } from "./sse";
 import { computeUsage, createConnectFrameParser, createThinkingTagFilter, parseConnectEndStream, processServerMessage, scheduleBridgeEnd, } from "./stream-dispatch";
 const SSE_KEEPALIVE_INTERVAL_MS = 15_000;
-function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools, modelId, bridgeKey, convKey, metadata) {
+function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, rules, mcpTools, modelId, bridgeKey, convKey, metadata) {
     const completionId = `chatcmpl-${crypto.randomUUID().replace(/-/g, "").slice(0, 28)}`;
     const created = Math.floor(Date.now() / 1000);
     let keepaliveTimer;
@@ -27,8 +27,6 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                 pendingExecs: [],
                 outputTokens: 0,
                 totalTokens: 0,
-                interactionToolArgsText: new Map(),
-                emittedToolCallIds: new Set(),
             };
             const tagFilter = createThinkingTagFilter();
             let assistantText = metadata.assistantSeedText ?? "";
@@ -90,7 +88,7 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
             const processChunk = createConnectFrameParser((messageBytes) => {
                 try {
                     const serverMessage = fromBinary(AgentServerMessageSchema, messageBytes);
-                    processServerMessage(serverMessage, blobStore, mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
+                    processServerMessage(serverMessage, blobStore, rules, mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
                         if (isThinking) {
                             sendSSE(makeChunk({ reasoning_content: text }));
                             return;
@@ -103,7 +101,13 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                             sendSSE(makeChunk({ content }));
                         }
                     }, (exec) => {
-                        state.pendingExecs.push(exec);
+                        const existingIndex = state.pendingExecs.findIndex((candidate) => candidate.toolCallId === exec.toolCallId);
+                        if (existingIndex >= 0) {
+                            state.pendingExecs[existingIndex] = exec;
+                        }
+                        else {
+                            state.pendingExecs.push(exec);
+                        }
                         mcpExecReceived = true;
                         const flushed = tagFilter.flush();
                         if (flushed.reasoning)
@@ -142,6 +146,7 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                             bridge,
                             heartbeatTimer,
                             blobStore,
+                            rules,
                             mcpTools,
                             pendingExecs: state.pendingExecs,
                             modelId,
@@ -206,8 +211,23 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                     stopKeepalive();
                 }
             }, SSE_KEEPALIVE_INTERVAL_MS);
+            logPluginInfo("Opened Cursor streaming bridge", {
+                modelId,
+                bridgeKey,
+                convKey,
+                mcpToolCount: mcpTools.length,
+                ruleCount: rules.length,
+            });
             bridge.onData(processChunk);
             bridge.onClose((code) => {
+                logPluginInfo("Cursor streaming bridge closed", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    code,
+                    mcpExecReceived,
+                    hadEndStreamError: Boolean(endStreamError),
+                });
                 clearInterval(heartbeatTimer);
                 stopKeepalive();
                 syncStoredBlobStore(convKey, blobStore);
@@ -257,11 +277,36 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
     return new Response(stream, { headers: SSE_HEADERS });
 }
 export async function handleStreamingResponse(payload, accessToken, modelId, bridgeKey, convKey, metadata) {
+    logPluginInfo("Starting Cursor streaming response", {
+        modelId,
+        bridgeKey,
+        convKey,
+        mcpToolCount: payload.mcpTools.length,
+    });
     const { bridge, heartbeatTimer } = await startBridge(accessToken, payload.requestBytes);
-    return createBridgeStreamResponse(bridge, heartbeatTimer, payload.blobStore, payload.mcpTools, modelId, bridgeKey, convKey, metadata);
+    return createBridgeStreamResponse(bridge, heartbeatTimer, payload.blobStore, payload.rules, payload.mcpTools, modelId, bridgeKey, convKey, metadata);
+}
+async function waitForResolvablePendingExecs(active, toolResults, timeoutMs = 2_000) {
+    const pendingToolCallIds = new Set(toolResults.map((result) => result.toolCallId));
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const unresolved = active.pendingExecs.filter((exec) => pendingToolCallIds.has(exec.toolCallId) && exec.execMsgId === 0);
+        if (unresolved.length === 0) {
+            return unresolved;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 25));
+    }
+    const unresolved = active.pendingExecs.filter((exec) => pendingToolCallIds.has(exec.toolCallId) && exec.execMsgId === 0);
+    if (unresolved.length > 0) {
+        logPluginWarn("Cursor exec metadata did not arrive before tool-result resume", {
+            bridgeToolCallIds: unresolved.map((exec) => exec.toolCallId),
+            modelId: active.modelId,
+        });
+    }
+    return unresolved;
 }
-export function handleToolResultResume(active, toolResults, bridgeKey, convKey) {
-    const { bridge, heartbeatTimer, blobStore, mcpTools, pendingExecs, modelId, metadata, } = active;
+export async function handleToolResultResume(active, toolResults, bridgeKey, convKey) {
+    const { bridge, heartbeatTimer, blobStore, rules, mcpTools, pendingExecs, modelId, metadata, } = active;
     const resumeMetadata = {
         ...metadata,
         assistantSeedText: [
@@ -271,6 +316,33 @@ export function handleToolResultResume(active, toolResults, bridgeKey, convKey)
             .filter(Boolean)
             .join("\n\n"),
     };
+    logPluginInfo("Preparing Cursor tool-result resume", {
+        bridgeKey,
+        convKey,
+        modelId,
+        toolResults,
+        pendingExecs,
+    });
+    const unresolved = await waitForResolvablePendingExecs(active, toolResults);
+    logPluginInfo("Resolved pending exec state before Cursor tool-result resume", {
+        bridgeKey,
+        convKey,
+        modelId,
+        toolResults,
+        pendingExecs,
+        unresolvedPendingExecs: unresolved,
+    });
+    if (unresolved.length > 0) {
+        clearInterval(heartbeatTimer);
+        bridge.end();
+        return new Response(JSON.stringify({
+            error: {
+                message: "Cursor requested a tool call but never provided resumable exec metadata. Aborting instead of retrying with synthetic ids.",
+                type: "invalid_request_error",
+                code: "cursor_missing_exec_metadata",
+            },
+        }), { status: 400, headers: { "Content-Type": "application/json" } });
+    }
     for (const exec of pendingExecs) {
         const result = toolResults.find((toolResult) => toolResult.toolCallId === exec.toolCallId);
         const mcpResult = result
@@ -311,7 +383,20 @@ export function handleToolResultResume(active, toolResults, bridgeKey, convKey)
         const clientMessage = create(AgentClientMessageSchema, {
             message: { case: "execClientMessage", value: execClientMessage },
         });
+        logPluginInfo("Sending Cursor tool-result resume message", {
+            bridgeKey,
+            convKey,
+            modelId,
+            toolCallId: exec.toolCallId,
+            toolName: exec.toolName,
+            source: exec.source,
+            execId: exec.execId,
+            execMsgId: exec.execMsgId,
+            cursorCallId: exec.cursorCallId,
+            modelCallId: exec.modelCallId,
+            matchedToolResult: result,
+        });
         bridge.write(toBinary(AgentClientMessageSchema, clientMessage));
     }
-    return createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools, modelId, bridgeKey, convKey, resumeMetadata);
+    return createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, rules, mcpTools, modelId, bridgeKey, convKey, resumeMetadata);
 }

package/dist/proxy/chat-completion.js

@@ -1,4 +1,4 @@
-import { logPluginWarn } from "../logger";
+import { logPluginInfo, logPluginWarn } from "../logger";
 import { buildInitialHandoffPrompt, buildTitleSourceText, buildToolResumePrompt, detectTitleRequest, parseMessages, } from "../openai/messages";
 import { buildMcpToolDefinitions, selectToolsForChoice } from "../openai/tools";
 import { activeBridges, conversationStates, createStoredConversation, deriveBridgeKey, deriveConversationKey, evictStaleConversations, hashString, normalizeAgentKey, resetStoredConversation, } from "./conversation-state";
@@ -10,6 +10,19 @@ export function handleChatCompletion(body, accessToken, context = {}) {
     const { systemPrompt, userText, turns, toolResults, pendingAssistantSummary, completedTurnsFingerprint, } = parsed;
     const modelId = body.model;
     const normalizedAgentKey = normalizeAgentKey(context.agentKey);
+    logPluginInfo("Handling Cursor chat completion request", {
+        modelId,
+        stream: body.stream !== false,
+        messageCount: body.messages.length,
+        toolCount: body.tools?.length ?? 0,
+        toolChoice: body.tool_choice,
+        sessionId: context.sessionId,
+        agentKey: normalizedAgentKey,
+        parsedUserText: userText,
+        parsedToolResults: toolResults,
+        hasPendingAssistantSummary: pendingAssistantSummary.trim().length > 0,
+        turnCount: turns.length,
+    });
     const titleDetection = detectTitleRequest(body);
     const isTitleAgent = titleDetection.matched;
     if (isTitleAgent) {
@@ -38,7 +51,23 @@ export function handleChatCompletion(body, accessToken, context = {}) {
     const bridgeKey = deriveBridgeKey(modelId, body.messages, context.sessionId, context.agentKey);
     const convKey = deriveConversationKey(body.messages, context.sessionId, context.agentKey);
     const activeBridge = activeBridges.get(bridgeKey);
+    logPluginInfo("Resolved Cursor conversation keys", {
+        modelId,
+        bridgeKey,
+        convKey,
+        hasActiveBridge: Boolean(activeBridge),
+        sessionId: context.sessionId,
+        agentKey: normalizedAgentKey,
+    });
     if (activeBridge && toolResults.length > 0) {
+        logPluginInfo("Matched OpenAI tool results to active Cursor bridge", {
+            bridgeKey,
+            convKey,
+            requestedModelId: modelId,
+            activeBridgeModelId: activeBridge.modelId,
+            toolResults,
+            pendingExecs: activeBridge.pendingExecs,
+        });
         activeBridges.delete(bridgeKey);
         if (activeBridge.bridge.alive) {
             if (activeBridge.modelId !== modelId) {
@@ -93,6 +122,16 @@ export function handleChatCompletion(body, accessToken, context = {}) {
             : userText;
     const payload = buildCursorRequest(modelId, systemPrompt, effectiveUserText, replayTurns, stored.conversationId, stored.checkpoint, stored.blobStore);
     payload.mcpTools = mcpTools;
+    logPluginInfo("Built Cursor run request payload", {
+        modelId,
+        bridgeKey,
+        convKey,
+        mcpToolCount: mcpTools.length,
+        conversationId: stored.conversationId,
+        hasCheckpoint: Boolean(stored.checkpoint),
+        replayTurnCount: replayTurns.length,
+        effectiveUserText,
+    });
     if (body.stream === false) {
         return handleNonStreamingResponse(payload, accessToken, modelId, convKey, {
             systemPrompt,

package/dist/proxy/cursor-request.js

@@ -1,13 +1,8 @@
 import { create, fromBinary, toBinary } from "@bufbuild/protobuf";
-import { createHash } from "node:crypto";
-import { AgentClientMessageSchema, AgentRunRequestSchema, ConversationActionSchema, ConversationStateStructureSchema, ConversationStepSchema, AgentConversationTurnStructureSchema, ConversationTurnStructureSchema, AssistantMessageSchema, ModelDetailsSchema, ResumeActionSchema, UserMessageActionSchema, UserMessageSchema, } from "../proto/agent_pb";
+import { AgentClientMessageSchema, AgentRunRequestSchema, AgentConversationTurnStructureSchema, AssistantMessageSchema, ConversationActionSchema, ConversationStateStructureSchema, ConversationTurnStructureSchema, CursorRuleSchema, CursorRuleTypeAgentFetchedSchema, CursorRuleTypeSchema, ConversationStepSchema, ModelDetailsSchema, ResumeActionSchema, UserMessageActionSchema, UserMessageSchema, } from "../proto/agent_pb";
 export function buildCursorRequest(modelId, systemPrompt, userText, turns, conversationId, checkpoint, existingBlobStore) {
     const blobStore = new Map(existingBlobStore ?? []);
-    // System prompt → blob store (Cursor requests it back via KV handshake)
-    const systemJson = JSON.stringify({ role: "system", content: systemPrompt });
-    const systemBytes = new TextEncoder().encode(systemJson);
-    const systemBlobId = new Uint8Array(createHash("sha256").update(systemBytes).digest());
-    blobStore.set(Buffer.from(systemBlobId).toString("hex"), systemBytes);
+    const rules = buildCursorRules(systemPrompt);
     let conversationState;
     if (checkpoint) {
         conversationState = fromBinary(ConversationStateStructureSchema, checkpoint);
@@ -40,7 +35,7 @@ export function buildCursorRequest(modelId, systemPrompt, userText, turns, conve
             turnBytes.push(toBinary(ConversationTurnStructureSchema, turnStructure));
         }
         conversationState = create(ConversationStateStructureSchema, {
-            rootPromptMessagesJson: [systemBlobId],
+            rootPromptMessagesJson: [],
             turns: turnBytes,
             todos: [],
             pendingToolCalls: [],
@@ -64,14 +59,11 @@ export function buildCursorRequest(modelId, systemPrompt, userText, turns, conve
             value: create(UserMessageActionSchema, { userMessage }),
         },
     });
-    return buildRunRequest(modelId, conversationId, conversationState, action, blobStore);
+    return buildRunRequest(modelId, conversationId, conversationState, action, blobStore, rules);
 }
 export function buildCursorResumeRequest(modelId, systemPrompt, conversationId, checkpoint, existingBlobStore) {
     const blobStore = new Map(existingBlobStore ?? []);
-    const systemJson = JSON.stringify({ role: "system", content: systemPrompt });
-    const systemBytes = new TextEncoder().encode(systemJson);
-    const systemBlobId = new Uint8Array(createHash("sha256").update(systemBytes).digest());
-    blobStore.set(Buffer.from(systemBlobId).toString("hex"), systemBytes);
+    const rules = buildCursorRules(systemPrompt);
     const conversationState = fromBinary(ConversationStateStructureSchema, checkpoint);
     const action = create(ConversationActionSchema, {
         action: {
@@ -79,9 +71,9 @@ export function buildCursorResumeRequest(modelId, systemPrompt, conversationId,
             value: create(ResumeActionSchema, {}),
         },
     });
-    return buildRunRequest(modelId, conversationId, conversationState, action, blobStore);
+    return buildRunRequest(modelId, conversationId, conversationState, action, blobStore, rules);
 }
-function buildRunRequest(modelId, conversationId, conversationState, action, blobStore) {
+function buildRunRequest(modelId, conversationId, conversationState, action, blobStore, rules) {
     const modelDetails = create(ModelDetailsSchema, {
         modelId,
         displayModelId: modelId,
@@ -99,6 +91,27 @@ function buildRunRequest(modelId, conversationId, conversationState, action, blo
     return {
         requestBytes: toBinary(AgentClientMessageSchema, clientMessage),
         blobStore,
+        rules,
         mcpTools: [],
     };
 }
+function buildCursorRules(systemPrompt) {
+    const content = systemPrompt.trim();
+    if (!content)
+        return [];
+    return [
+        create(CursorRuleSchema, {
+            fullPath: "/opencode/system-prompt.md",
+            content,
+            type: create(CursorRuleTypeSchema, {
+                type: {
+                    case: "agentFetched",
+                    value: create(CursorRuleTypeAgentFetchedSchema, {
+                        description: "OpenCode system prompt",
+                    }),
+                },
+            }),
+            source: 0,
+        }),
+    ];
+}

package/dist/proxy/stream-dispatch.d.ts

@@ -1,4 +1,4 @@
-import { type AgentServerMessage, type McpToolDefinition } from "../proto/agent_pb";
+import { type AgentServerMessage, type CursorRule, type McpToolDefinition } from "../proto/agent_pb";
 import type { CursorSession } from "../cursor/bidi-session";
 import type { StreamState } from "./stream-state";
 import type { PendingExec } from "./types";
@@ -39,4 +39,4 @@ export declare function computeUsage(state: StreamState): {
     completion_tokens: number;
     total_tokens: number;
 };
-export declare function processServerMessage(msg: AgentServerMessage, blobStore: Map<string, Uint8Array>, mcpTools: McpToolDefinition[], sendFrame: (data: Uint8Array) => void, state: StreamState, onText: (text: string, isThinking?: boolean) => void, onMcpExec: (exec: PendingExec) => void, onCheckpoint?: (checkpointBytes: Uint8Array) => void, onTurnEnded?: () => void, onUnsupportedMessage?: (info: UnsupportedServerMessageInfo) => void, onUnhandledExec?: (info: UnhandledExecInfo) => void): void;
+export declare function processServerMessage(msg: AgentServerMessage, blobStore: Map<string, Uint8Array>, rules: CursorRule[], mcpTools: McpToolDefinition[], sendFrame: (data: Uint8Array) => void, state: StreamState, onText: (text: string, isThinking?: boolean) => void, onMcpExec: (exec: PendingExec) => void, onCheckpoint?: (checkpointBytes: Uint8Array) => void, onTurnEnded?: () => void, onUnsupportedMessage?: (info: UnsupportedServerMessageInfo) => void, onUnhandledExec?: (info: UnhandledExecInfo) => void): void;

package/dist/proxy/stream-dispatch.js

@@ -1,7 +1,7 @@
 import { create, toBinary } from "@bufbuild/protobuf";
-import { AgentClientMessageSchema, ClientHeartbeatSchema, ConversationStateStructureSchema, BackgroundShellSpawnResultSchema, DeleteResultSchema, DeleteRejectedSchema, DiagnosticsResultSchema, ExecClientMessageSchema, FetchErrorSchema, FetchResultSchema, GetBlobResultSchema, GrepErrorSchema, GrepResultSchema, KvClientMessageSchema, LsRejectedSchema, LsResultSchema, McpResultSchema, ReadRejectedSchema, ReadResultSchema, RequestContextResultSchema, RequestContextSchema, RequestContextSuccessSchema, SetBlobResultSchema, ShellRejectedSchema, ShellResultSchema, WriteRejectedSchema, WriteResultSchema, WriteShellStdinErrorSchema, WriteShellStdinResultSchema, } from "../proto/agent_pb";
+import { AgentClientMessageSchema, AskQuestionInteractionResponseSchema, AskQuestionRejectedSchema, AskQuestionResultSchema, ClientHeartbeatSchema, ConversationStateStructureSchema, BackgroundShellSpawnResultSchema, CreatePlanErrorSchema, CreatePlanRequestResponseSchema, CreatePlanResultSchema, DeleteResultSchema, DeleteRejectedSchema, DiagnosticsResultSchema, ExecClientMessageSchema, ExaFetchRequestResponseSchema, ExaFetchRequestResponse_RejectedSchema, ExaSearchRequestResponseSchema, ExaSearchRequestResponse_RejectedSchema, FetchErrorSchema, FetchResultSchema, GetBlobResultSchema, GrepErrorSchema, GrepResultSchema, InteractionResponseSchema, KvClientMessageSchema, LsRejectedSchema, LsResultSchema, McpResultSchema, ReadRejectedSchema, ReadResultSchema, RequestContextResultSchema, RequestContextSchema, RequestContextSuccessSchema, SetBlobResultSchema, ShellRejectedSchema, ShellResultSchema, SwitchModeRequestResponseSchema, SwitchModeRequestResponse_RejectedSchema, WebSearchRequestResponseSchema, WebSearchRequestResponse_RejectedSchema, WriteRejectedSchema, WriteResultSchema, WriteShellStdinErrorSchema, WriteShellStdinResultSchema, } from "../proto/agent_pb";
 import { CONNECT_END_STREAM_FLAG } from "../cursor/config";
-import { logPluginError, logPluginWarn } from "../logger";
+import { logPluginError, logPluginInfo, logPluginWarn } from "../logger";
 import { decodeMcpArgsMap } from "../openai/tools";
 export function parseConnectEndStream(data) {
     try {
@@ -128,16 +128,16 @@ export function computeUsage(state) {
     const prompt_tokens = Math.max(0, total_tokens - completion_tokens);
     return { prompt_tokens, completion_tokens, total_tokens };
 }
-export function processServerMessage(msg, blobStore, mcpTools, sendFrame, state, onText, onMcpExec, onCheckpoint, onTurnEnded, onUnsupportedMessage, onUnhandledExec) {
+export function processServerMessage(msg, blobStore, rules, mcpTools, sendFrame, state, onText, onMcpExec, onCheckpoint, onTurnEnded, onUnsupportedMessage, onUnhandledExec) {
     const msgCase = msg.message.case;
     if (msgCase === "interactionUpdate") {
-        handleInteractionUpdate(msg.message.value, state, onText, onMcpExec, onTurnEnded, onUnsupportedMessage);
+        handleInteractionUpdate(msg.message.value, state, onText, onTurnEnded, onUnsupportedMessage);
     }
     else if (msgCase === "kvServerMessage") {
         handleKvMessage(msg.message.value, blobStore, sendFrame);
     }
     else if (msgCase === "execServerMessage") {
-        handleExecMessage(msg.message.value, mcpTools, sendFrame, onMcpExec, onUnhandledExec);
+        handleExecMessage(msg.message.value, rules, mcpTools, sendFrame, state, onMcpExec, onUnhandledExec);
     }
     else if (msgCase === "execServerControlMessage") {
         onUnsupportedMessage?.({
@@ -146,10 +146,7 @@ export function processServerMessage(msg, blobStore, mcpTools, sendFrame, state,
         });
     }
     else if (msgCase === "interactionQuery") {
-        onUnsupportedMessage?.({
-            category: "interactionQuery",
-            caseName: msg.message.value.query.case ?? "undefined",
-        });
+        handleInteractionQuery(msg.message.value, sendFrame, onUnsupportedMessage);
     }
     else if (msgCase === "conversationCheckpointUpdate") {
         const stateStructure = msg.message.value;
@@ -167,8 +164,19 @@ export function processServerMessage(msg, blobStore, mcpTools, sendFrame, state,
         });
     }
 }
-function handleInteractionUpdate(update, state, onText, onMcpExec, onTurnEnded, onUnsupportedMessage) {
+function handleInteractionUpdate(update, state, onText, onTurnEnded, onUnsupportedMessage) {
     const updateCase = update.message?.case;
+    if (updateCase === "partialToolCall" ||
+        updateCase === "toolCallStarted" ||
+        updateCase === "toolCallCompleted" ||
+        updateCase === "turnEnded") {
+        logPluginInfo("Received Cursor interaction update", {
+            updateCase: updateCase ?? "undefined",
+            callId: update.message?.value?.callId,
+            modelCallId: update.message?.value?.modelCallId,
+            toolCase: update.message?.value?.toolCall?.tool?.case,
+        });
+    }
     if (updateCase === "textDelta") {
         const delta = update.message.value.text || "";
         if (delta)
@@ -183,15 +191,19 @@ function handleInteractionUpdate(update, state, onText, onMcpExec, onTurnEnded,
         state.outputTokens += update.message.value.tokens ?? 0;
     }
     else if (updateCase === "partialToolCall") {
-        const partial = update.message.value;
-        if (partial.callId && partial.argsTextDelta) {
-            state.interactionToolArgsText.set(partial.callId, partial.argsTextDelta);
-        }
+        return;
     }
     else if (updateCase === "toolCallCompleted") {
-        const exec = decodeInteractionToolCall(update.message.value, state);
-        if (exec)
-            onMcpExec(exec);
+        const toolValue = update.message.value;
+        if (toolValue?.toolCall?.tool?.case === "mcpToolCall") {
+            logPluginInfo("Ignoring Cursor interaction MCP tool completion", {
+                callId: toolValue.callId,
+                modelCallId: toolValue.modelCallId,
+                toolCallId: toolValue.toolCall.tool.value?.args?.toolCallId || toolValue.callId,
+                toolName: toolValue.toolCall.tool.value?.args?.toolName ||
+                    toolValue.toolCall.tool.value?.args?.name,
+            });
+        }
     }
     else if (updateCase === "turnEnded") {
         onTurnEnded?.();
@@ -214,43 +226,92 @@ function handleInteractionUpdate(update, state, onText, onMcpExec, onTurnEnded,
             caseName: updateCase ?? "undefined",
         });
     }
-    // toolCallStarted, partialToolCall, toolCallDelta, and non-MCP
-    // toolCallCompleted updates are informational only. Actionable MCP tool
-    // calls may still appear here on some models, so we surface those, but we
-    // do not abort the bridge for native Cursor tool-call progress events.
+    // Interaction tool-call updates are informational only. Resumable MCP tool
+    // execution comes from execServerMessage.mcpArgs.
 }
-function decodeInteractionToolCall(update, state) {
-    const callId = update.callId ?? "";
-    const toolCase = update.toolCall?.tool?.case;
-    if (toolCase !== "mcpToolCall")
-        return null;
-    const mcpArgs = update.toolCall?.tool?.value?.args;
-    if (!mcpArgs)
-        return null;
-    const toolCallId = mcpArgs.toolCallId || callId || crypto.randomUUID();
-    if (state.emittedToolCallIds.has(toolCallId))
-        return null;
-    const decodedMap = decodeMcpArgsMap(mcpArgs.args ?? {});
-    const partialArgsText = callId
-        ? state.interactionToolArgsText.get(callId)?.trim()
-        : undefined;
-    let decodedArgs = "{}";
-    if (Object.keys(decodedMap).length > 0) {
-        decodedArgs = JSON.stringify(decodedMap);
-    }
-    else if (partialArgsText) {
-        decodedArgs = partialArgsText;
-    }
-    state.emittedToolCallIds.add(toolCallId);
-    if (callId)
-        state.interactionToolArgsText.delete(callId);
-    return {
-        execId: callId || toolCallId,
-        execMsgId: 0,
-        toolCallId,
-        toolName: mcpArgs.toolName || mcpArgs.name || "unknown_mcp_tool",
-        decodedArgs,
-    };
+function handleInteractionQuery(query, sendFrame, onUnsupportedMessage) {
+    const queryCase = query.query.case;
+    if (queryCase === "webSearchRequestQuery") {
+        const response = create(WebSearchRequestResponseSchema, {
+            result: {
+                case: "rejected",
+                value: create(WebSearchRequestResponse_RejectedSchema, {
+                    reason: "Native Cursor web search is not available in this environment. Use the provided MCP tool `websearch` instead.",
+                }),
+            },
+        });
+        sendInteractionResponse(query.id, "webSearchRequestResponse", response, sendFrame);
+        return;
+    }
+    if (queryCase === "askQuestionInteractionQuery") {
+        const response = create(AskQuestionInteractionResponseSchema, {
+            result: create(AskQuestionResultSchema, {
+                result: {
+                    case: "rejected",
+                    value: create(AskQuestionRejectedSchema, {
+                        reason: "Native Cursor question prompts are not available in this environment. Use the provided MCP tool `question` instead.",
+                    }),
+                },
+            }),
+        });
+        sendInteractionResponse(query.id, "askQuestionInteractionResponse", response, sendFrame);
+        return;
+    }
+    if (queryCase === "switchModeRequestQuery") {
+        const response = create(SwitchModeRequestResponseSchema, {
+            result: {
+                case: "rejected",
+                value: create(SwitchModeRequestResponse_RejectedSchema, {
+                    reason: "Cursor mode switching is not available in this environment. Continue using the current agent and the provided MCP tools.",
+                }),
+            },
+        });
+        sendInteractionResponse(query.id, "switchModeRequestResponse", response, sendFrame);
+        return;
+    }
+    if (queryCase === "exaSearchRequestQuery") {
+        const response = create(ExaSearchRequestResponseSchema, {
+            result: {
+                case: "rejected",
+                value: create(ExaSearchRequestResponse_RejectedSchema, {
+                    reason: "Native Cursor Exa search is not available in this environment. Use the provided MCP tool `websearch` instead.",
+                }),
+            },
+        });
+        sendInteractionResponse(query.id, "exaSearchRequestResponse", response, sendFrame);
+        return;
+    }
+    if (queryCase === "exaFetchRequestQuery") {
+        const response = create(ExaFetchRequestResponseSchema, {
+            result: {
+                case: "rejected",
+                value: create(ExaFetchRequestResponse_RejectedSchema, {
+                    reason: "Native Cursor Exa fetch is not available in this environment. Use the provided MCP tools `websearch` and `webfetch` instead.",
+                }),
+            },
+        });
+        sendInteractionResponse(query.id, "exaFetchRequestResponse", response, sendFrame);
+        return;
+    }
+    if (queryCase === "createPlanRequestQuery") {
+        const response = create(CreatePlanRequestResponseSchema, {
+            result: create(CreatePlanResultSchema, {
+                planUri: "",
+                result: {
+                    case: "error",
+                    value: create(CreatePlanErrorSchema, {
+                        error: "Native Cursor plan creation is not available in this environment. Use the provided MCP planning tools instead.",
+                    }),
+                },
+            }),
+        });
+        sendInteractionResponse(query.id, "createPlanRequestResponse", response, sendFrame);
+        return;
+    }
+    onUnsupportedMessage?.({
+        category: "interactionQuery",
+        caseName: queryCase ?? "undefined",
+    });
 }
 /** Send a KV client response back to Cursor. */
 function sendKvResponse(kvMsg, messageCase, value, sendFrame) {
@@ -263,6 +324,16 @@ function sendKvResponse(kvMsg, messageCase, value, sendFrame) {
     });
     sendFrame(toBinary(AgentClientMessageSchema, clientMsg));
 }
+function sendInteractionResponse(queryId, messageCase, value, sendFrame) {
+    const response = create(InteractionResponseSchema, {
+        id: queryId,
+        result: { case: messageCase, value: value },
+    });
+    const clientMessage = create(AgentClientMessageSchema, {
+        message: { case: "interactionResponse", value: response },
+    });
+    sendFrame(toBinary(AgentClientMessageSchema, clientMessage));
+}
 function handleKvMessage(kvMsg, blobStore, sendFrame) {
     const kvCase = kvMsg.message.case;
     if (kvCase === "getBlobArgs") {
@@ -283,11 +354,21 @@ function handleKvMessage(kvMsg, blobStore, sendFrame) {
         sendKvResponse(kvMsg, "setBlobResult", create(SetBlobResultSchema, {}), sendFrame);
     }
 }
-function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledExec) {
+function handleExecMessage(execMsg, rules, mcpTools, sendFrame, state, onMcpExec, onUnhandledExec) {
     const execCase = execMsg.message.case;
+    logPluginInfo("Received Cursor exec message", {
+        execCase: execCase ?? "undefined",
+        execId: execMsg.execId,
+        execMsgId: execMsg.id,
+    });
     if (execCase === "requestContextArgs") {
+        logPluginInfo("Responding to Cursor requestContextArgs", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            mcpToolCount: mcpTools.length,
+        });
         const requestContext = create(RequestContextSchema, {
-            rules: [],
+            rules,
             repositoryInfo: [],
             tools: mcpTools,
             gitRepos: [],
@@ -308,13 +389,23 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
     if (execCase === "mcpArgs") {
         const mcpArgs = execMsg.message.value;
         const decoded = decodeMcpArgsMap(mcpArgs.args ?? {});
-        onMcpExec({
+        const exec = {
             execId: execMsg.execId,
             execMsgId: execMsg.id,
             toolCallId: mcpArgs.toolCallId || crypto.randomUUID(),
             toolName: mcpArgs.toolName || mcpArgs.name,
             decodedArgs: JSON.stringify(decoded),
+            source: "exec",
+        };
+        logPluginInfo("Received Cursor exec MCP tool metadata", {
+            toolCallId: exec.toolCallId,
+            toolName: exec.toolName,
+            source: exec.source,
+            execId: exec.execId,
+            execMsgId: exec.execMsgId,
+            decodedArgs: exec.decodedArgs,
         });
+        onMcpExec(exec);
         return;
     }
     // --- Reject native Cursor tools ---
@@ -322,6 +413,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
     // so it falls back to our MCP tools (registered via RequestContext).
     const REJECT_REASON = "Tool not available in this environment. Use the MCP tools provided instead.";
     if (execCase === "readArgs") {
+        logPluginInfo("Rejecting native Cursor read tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            path: execMsg.message.value.path,
+        });
         const args = execMsg.message.value;
         const result = create(ReadResultSchema, {
             result: {
@@ -336,6 +432,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "lsArgs") {
+        logPluginInfo("Rejecting native Cursor ls tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            path: execMsg.message.value.path,
+        });
         const args = execMsg.message.value;
         const result = create(LsResultSchema, {
             result: {
@@ -350,6 +451,10 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "grepArgs") {
+        logPluginInfo("Rejecting native Cursor grep tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+        });
         const result = create(GrepResultSchema, {
             result: {
                 case: "error",
@@ -360,6 +465,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "writeArgs") {
+        logPluginInfo("Rejecting native Cursor write tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            path: execMsg.message.value.path,
+        });
         const args = execMsg.message.value;
         const result = create(WriteResultSchema, {
             result: {
@@ -374,6 +484,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "deleteArgs") {
+        logPluginInfo("Rejecting native Cursor delete tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            path: execMsg.message.value.path,
+        });
         const args = execMsg.message.value;
         const result = create(DeleteResultSchema, {
             result: {
@@ -388,6 +503,13 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "shellArgs" || execCase === "shellStreamArgs") {
+        logPluginInfo("Rejecting native Cursor shell tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            command: execMsg.message.value.command ?? "",
+            workingDirectory: execMsg.message.value.workingDirectory ?? "",
+            execCase,
+        });
         const args = execMsg.message.value;
         const result = create(ShellResultSchema, {
             result: {
@@ -404,6 +526,12 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "backgroundShellSpawnArgs") {
+        logPluginInfo("Rejecting native Cursor background shell tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            command: execMsg.message.value.command ?? "",
+            workingDirectory: execMsg.message.value.workingDirectory ?? "",
+        });
         const args = execMsg.message.value;
         const result = create(BackgroundShellSpawnResultSchema, {
             result: {
@@ -420,6 +548,10 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "writeShellStdinArgs") {
+        logPluginInfo("Rejecting native Cursor shell stdin tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+        });
         const result = create(WriteShellStdinResultSchema, {
             result: {
                 case: "error",
@@ -430,6 +562,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "fetchArgs") {
+        logPluginInfo("Rejecting native Cursor fetch tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            url: execMsg.message.value.url,
+        });
         const args = execMsg.message.value;
         const result = create(FetchResultSchema, {
             result: {
@@ -444,6 +581,11 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
         return;
     }
     if (execCase === "diagnosticsArgs") {
+        logPluginInfo("Rejecting native Cursor diagnostics tool in favor of MCP", {
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            path: execMsg.message.value.path,
+        });
         const result = create(DiagnosticsResultSchema, {});
         sendExecResult(execMsg, "diagnosticsResult", result, sendFrame);
         return;
@@ -457,6 +599,12 @@ function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledE
     };
     const resultCase = miscCaseMap[execCase];
     if (resultCase) {
+        logPluginInfo("Responding to miscellaneous Cursor exec message", {
+            execCase,
+            execId: execMsg.execId,
+            execMsgId: execMsg.id,
+            resultCase,
+        });
         sendExecResult(execMsg, resultCase, create(McpResultSchema, {}), sendFrame);
         return;
     }

package/dist/proxy/stream-state.d.ts

@@ -4,6 +4,4 @@ export interface StreamState {
     pendingExecs: PendingExec[];
     outputTokens: number;
     totalTokens: number;
-    interactionToolArgsText: Map<string, string>;
-    emittedToolCallIds: Set<string>;
 }

package/dist/proxy/types.d.ts

@@ -1,9 +1,10 @@
 import type { CursorSession } from "../cursor/bidi-session";
+import type { CursorRule, McpToolDefinition } from "../proto/agent_pb";
 import type { ConversationRequestMetadata } from "./conversation-meta";
-import type { McpToolDefinition } from "../proto/agent_pb";
 export interface CursorRequestPayload {
     requestBytes: Uint8Array;
     blobStore: Map<string, Uint8Array>;
+    rules: CursorRule[];
     mcpTools: McpToolDefinition[];
 }
 /** A pending tool execution waiting for results from the caller. */
@@ -14,12 +15,16 @@ export interface PendingExec {
     toolName: string;
     /** Decoded arguments JSON string for SSE tool_calls emission. */
     decodedArgs: string;
+    source?: "interaction" | "exec";
+    cursorCallId?: string;
+    modelCallId?: string;
 }
 /** A live Cursor session kept alive across requests for tool result continuation. */
 export interface ActiveBridge {
     bridge: CursorSession;
     heartbeatTimer: NodeJS.Timeout;
     blobStore: Map<string, Uint8Array>;
+    rules: CursorRule[];
     mcpTools: McpToolDefinition[];
     pendingExecs: PendingExec[];
     modelId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwo/opencode-cursor-oauth",
-  "version": "0.0.0-dev.4258a6733133",
+  "version": "0.0.0-dev.628837adf8c9",
   "description": "OpenCode plugin that connects Cursor's API to OpenCode via OAuth, model discovery, and a local OpenAI-compatible proxy.",
   "license": "MIT",
   "type": "module",
@@ -19,7 +19,6 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "test": "bun test/smoke.ts",
     "prepublishOnly": "npm run build"
   },
   "repository": {