@playwo/opencode-cursor-oauth 0.0.0-dev.4258a6733133 → 0.0.0-dev.4696faa690e4

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

@@ -5,6 +5,8 @@ import { updateStoredConversationAfterCompletion } from "./conversation-state";
 import { startBridge } from "./bridge-session";
 import { updateConversationCheckpoint, syncStoredBlobStore, } from "./state-sync";
 import { computeUsage, createConnectFrameParser, createThinkingTagFilter, parseConnectEndStream, processServerMessage, scheduleBridgeEnd, } from "./stream-dispatch";
+import { createBridgeCloseController } from "./bridge-close-controller";
+const MCP_TOOL_BATCH_WINDOW_MS = 150;
 export async function handleNonStreamingResponse(payload, accessToken, modelId, convKey, metadata) {
     const completionId = `chatcmpl-${crypto.randomUUID().replace(/-/g, "").slice(0, 28)}`;
     const created = Math.floor(Date.now() / 1000);
@@ -32,35 +34,55 @@ async function collectFullResponse(payload, accessToken, modelId, convKey, metad
     let fullText = "";
     let endStreamError = null;
     const pendingToolCalls = [];
+    let toolCallEndTimer;
     const { bridge, heartbeatTimer } = await startBridge(accessToken, payload.requestBytes);
+    const bridgeCloseController = createBridgeCloseController(bridge);
+    const stopToolCallEndTimer = () => {
+        if (!toolCallEndTimer)
+            return;
+        clearTimeout(toolCallEndTimer);
+        toolCallEndTimer = undefined;
+    };
+    const scheduleToolCallBridgeEnd = () => {
+        stopToolCallEndTimer();
+        toolCallEndTimer = setTimeout(() => scheduleBridgeEnd(bridge), MCP_TOOL_BATCH_WINDOW_MS);
+    };
     const state = {
         toolCallIndex: 0,
         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.cloudRule, payload.mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
                 if (isThinking)
                     return;
                 const { content } = tagFilter.process(text);
                 fullText += content;
             }, (exec) => {
-                pendingToolCalls.push({
+                const toolCall = {
                     id: exec.toolCallId,
                     type: "function",
                     function: {
                         name: exec.toolName,
                         arguments: exec.decodedArgs,
                     },
-                });
-                scheduleBridgeEnd(bridge);
-            }, (checkpointBytes) => updateConversationCheckpoint(convKey, checkpointBytes), () => scheduleBridgeEnd(bridge), (info) => {
+                };
+                const existingIndex = pendingToolCalls.findIndex((call) => call.id === exec.toolCallId);
+                if (existingIndex >= 0) {
+                    pendingToolCalls[existingIndex] = toolCall;
+                }
+                else {
+                    pendingToolCalls.push(toolCall);
+                }
+                scheduleToolCallBridgeEnd();
+            }, (_info) => { }, (checkpointBytes) => {
+                updateConversationCheckpoint(convKey, checkpointBytes);
+                bridgeCloseController.noteCheckpoint();
+            }, () => bridgeCloseController.noteTurnEnded(), (info) => {
                 endStreamError = new Error(`Cursor returned unsupported ${info.category}: ${info.caseName}${info.detail ? ` (${info.detail})` : ""}`);
                 logPluginError("Closing non-streaming Cursor bridge after unsupported message", {
                     modelId,
@@ -97,6 +119,8 @@ async function collectFullResponse(payload, accessToken, modelId, convKey, metad
         scheduleBridgeEnd(bridge);
     }));
     bridge.onClose(() => {
+        bridgeCloseController.dispose();
+        stopToolCallEndTimer();
         clearInterval(heartbeatTimer);
         syncStoredBlobStore(convKey, payload.blobStore);
         const flushed = tagFilter.flush();

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,23 +1,36 @@
 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";
 import { updateConversationCheckpoint, syncStoredBlobStore, } from "./state-sync";
 import { SSE_HEADERS } from "./sse";
 import { computeUsage, createConnectFrameParser, createThinkingTagFilter, parseConnectEndStream, processServerMessage, scheduleBridgeEnd, } from "./stream-dispatch";
+import { createBridgeCloseController } from "./bridge-close-controller";
 const SSE_KEEPALIVE_INTERVAL_MS = 15_000;
-function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools, modelId, bridgeKey, convKey, metadata) {
+const MCP_TOOL_BATCH_WINDOW_MS = 150;
+function sortedIds(values) {
+    return [...values].sort();
+}
+function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, cloudRule, mcpTools, modelId, bridgeKey, convKey, metadata) {
     const completionId = `chatcmpl-${crypto.randomUUID().replace(/-/g, "").slice(0, 28)}`;
     const created = Math.floor(Date.now() / 1000);
     let keepaliveTimer;
+    let toolCallFlushTimer;
+    const bridgeCloseController = createBridgeCloseController(bridge);
     const stopKeepalive = () => {
         if (!keepaliveTimer)
             return;
         clearInterval(keepaliveTimer);
         keepaliveTimer = undefined;
     };
+    const stopToolCallFlushTimer = () => {
+        if (!toolCallFlushTimer)
+            return;
+        clearTimeout(toolCallFlushTimer);
+        toolCallFlushTimer = undefined;
+    };
     const stream = new ReadableStream({
         start(controller) {
             const encoder = new TextEncoder();
@@ -27,13 +40,13 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                 pendingExecs: [],
                 outputTokens: 0,
                 totalTokens: 0,
-                interactionToolArgsText: new Map(),
-                emittedToolCallIds: new Set(),
             };
             const tagFilter = createThinkingTagFilter();
             let assistantText = metadata.assistantSeedText ?? "";
             let mcpExecReceived = false;
             let endStreamError = null;
+            let toolCallsFlushed = false;
+            const streamedToolCalls = new Map();
             const sendSSE = (data) => {
                 if (closed)
                     return;
@@ -67,6 +80,7 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                     return;
                 closed = true;
                 stopKeepalive();
+                stopToolCallFlushTimer();
                 controller.close();
             };
             const makeChunk = (delta, finishReason = null) => ({
@@ -87,10 +101,157 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                     usage: { prompt_tokens, completion_tokens, total_tokens },
                 };
             };
+            const ensureStreamedToolCall = (toolCallId, toolName) => {
+                const existing = streamedToolCalls.get(toolCallId);
+                if (existing) {
+                    if (toolName && existing.toolName !== toolName) {
+                        existing.toolName = toolName;
+                    }
+                    return existing;
+                }
+                const createdState = {
+                    index: state.toolCallIndex++,
+                    toolName,
+                    started: false,
+                };
+                streamedToolCalls.set(toolCallId, createdState);
+                return createdState;
+            };
+            const emitPendingToolStart = (toolCallId, toolName, source) => {
+                if (!toolName)
+                    return;
+                const toolCall = ensureStreamedToolCall(toolCallId, toolName);
+                if (toolCall.started)
+                    return;
+                toolCall.started = true;
+                logPluginInfo("Streaming pending Cursor tool-call start", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    toolCallId,
+                    toolName,
+                    index: toolCall.index,
+                    source,
+                });
+                sendSSE(makeChunk({
+                    tool_calls: [
+                        {
+                            index: toolCall.index,
+                            id: toolCallId,
+                            type: "function",
+                            function: {
+                                name: toolCall.toolName,
+                                arguments: "",
+                            },
+                        },
+                    ],
+                }));
+            };
+            const publishPendingToolCalls = () => {
+                if (closed || toolCallsFlushed || state.pendingExecs.length === 0)
+                    return;
+                logPluginInfo("Evaluating Cursor tool-call publish", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    pendingExecToolCallIds: sortedIds(state.pendingExecs.map((exec) => exec.toolCallId)),
+                    toolCallsFlushed,
+                    mcpExecReceived,
+                    nowMs: Date.now(),
+                });
+                toolCallsFlushed = true;
+                stopToolCallFlushTimer();
+                const flushed = tagFilter.flush();
+                if (flushed.reasoning)
+                    sendSSE(makeChunk({ reasoning_content: flushed.reasoning }));
+                if (flushed.content) {
+                    assistantText += flushed.content;
+                    sendSSE(makeChunk({ content: flushed.content }));
+                }
+                const assistantSeedText = [
+                    assistantText.trim(),
+                    state.pendingExecs
+                        .map((exec) => formatToolCallSummary({
+                        id: exec.toolCallId,
+                        type: "function",
+                        function: {
+                            name: exec.toolName,
+                            arguments: exec.decodedArgs,
+                        },
+                    }))
+                        .join("\n\n"),
+                ]
+                    .filter(Boolean)
+                    .join("\n\n");
+                activeBridges.set(bridgeKey, {
+                    bridge,
+                    heartbeatTimer,
+                    blobStore,
+                    cloudRule,
+                    mcpTools,
+                    pendingExecs: [...state.pendingExecs],
+                    modelId,
+                    metadata: {
+                        ...metadata,
+                        assistantSeedText,
+                    },
+                    diagnostics: {
+                        announcedToolCallIds: [],
+                        publishedToolCallIds: state.pendingExecs.map((exec) => exec.toolCallId),
+                        lastMcpUpdate: "publish",
+                        publishedAtMs: Date.now(),
+                    },
+                });
+                logPluginInfo("Publishing Cursor tool-call envelope", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    pendingExecToolCallIds: sortedIds(state.pendingExecs.map((exec) => exec.toolCallId)),
+                    emittedToolCallIds: state.pendingExecs.map((exec) => exec.toolCallId),
+                    assistantSeedTextLength: assistantSeedText.length,
+                });
+                for (const exec of state.pendingExecs) {
+                    emitPendingToolStart(exec.toolCallId, exec.toolName, "publish");
+                    const streamedToolCall = ensureStreamedToolCall(exec.toolCallId, exec.toolName);
+                    sendSSE(makeChunk({
+                        tool_calls: [
+                            {
+                                index: streamedToolCall.index,
+                                function: {
+                                    arguments: exec.decodedArgs,
+                                },
+                            },
+                        ],
+                    }));
+                }
+                logPluginInfo("Stored active Cursor bridge for tool-result resume", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    diagnostics: activeBridges.get(bridgeKey)?.diagnostics,
+                    pendingExecToolCallIds: sortedIds(state.pendingExecs.map((exec) => exec.toolCallId)),
+                });
+                sendSSE(makeChunk({}, "tool_calls"));
+                sendDone();
+                closeController();
+            };
+            const schedulePendingToolCallPublish = () => {
+                if (toolCallsFlushed)
+                    return;
+                stopToolCallFlushTimer();
+                logPluginInfo("Scheduling Cursor tool-call publish", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    delayMs: MCP_TOOL_BATCH_WINDOW_MS,
+                    pendingExecToolCallIds: sortedIds(state.pendingExecs.map((exec) => exec.toolCallId)),
+                });
+                toolCallFlushTimer = setTimeout(publishPendingToolCalls, MCP_TOOL_BATCH_WINDOW_MS);
+            };
             const processChunk = createConnectFrameParser((messageBytes) => {
                 try {
                     const serverMessage = fromBinary(AgentServerMessageSchema, messageBytes);
-                    processServerMessage(serverMessage, blobStore, mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
+                    processServerMessage(serverMessage, blobStore, cloudRule, mcpTools, (data) => bridge.write(data), state, (text, isThinking) => {
                         if (isThinking) {
                             sendSSE(makeChunk({ reasoning_content: text }));
                             return;
@@ -103,57 +264,91 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                             sendSSE(makeChunk({ content }));
                         }
                     }, (exec) => {
-                        state.pendingExecs.push(exec);
+                        if (toolCallsFlushed) {
+                            logPluginWarn("Received Cursor MCP exec after tool-call envelope was already published", {
+                                modelId,
+                                bridgeKey,
+                                convKey,
+                                toolCallId: exec.toolCallId,
+                                toolName: exec.toolName,
+                                publishedToolCallIds: activeBridges.get(bridgeKey)?.diagnostics?.publishedToolCallIds ??
+                                    [],
+                            });
+                        }
+                        emitPendingToolStart(exec.toolCallId, exec.toolName, "exec");
+                        const pendingBefore = sortedIds(state.pendingExecs.map((candidate) => candidate.toolCallId));
+                        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)
-                            sendSSE(makeChunk({ reasoning_content: flushed.reasoning }));
-                        if (flushed.content) {
-                            assistantText += flushed.content;
-                            sendSSE(makeChunk({ content: flushed.content }));
+                        const pendingAfter = sortedIds(state.pendingExecs.map((candidate) => candidate.toolCallId));
+                        const existingActiveBridge = activeBridges.get(bridgeKey);
+                        if (existingActiveBridge) {
+                            existingActiveBridge.diagnostics = {
+                                announcedToolCallIds: existingActiveBridge.diagnostics?.announcedToolCallIds ?? [],
+                                publishedToolCallIds: existingActiveBridge.diagnostics?.publishedToolCallIds ?? [],
+                                lastMcpUpdate: `exec:${exec.toolCallId}`,
+                                publishedAtMs: existingActiveBridge.diagnostics?.publishedAtMs,
+                                lastResumeAttemptAtMs: existingActiveBridge.diagnostics?.lastResumeAttemptAtMs,
+                            };
                         }
-                        const assistantSeedText = [
-                            assistantText.trim(),
-                            formatToolCallSummary({
-                                id: exec.toolCallId,
-                                type: "function",
-                                function: {
-                                    name: exec.toolName,
-                                    arguments: exec.decodedArgs,
-                                },
-                            }),
-                        ]
-                            .filter(Boolean)
-                            .join("\n\n");
-                        sendSSE(makeChunk({
-                            tool_calls: [
-                                {
-                                    index: state.toolCallIndex++,
-                                    id: exec.toolCallId,
-                                    type: "function",
-                                    function: {
-                                        name: exec.toolName,
-                                        arguments: exec.decodedArgs,
-                                    },
-                                },
-                            ],
-                        }));
-                        activeBridges.set(bridgeKey, {
-                            bridge,
-                            heartbeatTimer,
-                            blobStore,
-                            mcpTools,
-                            pendingExecs: state.pendingExecs,
+                        logPluginInfo("Tracking Cursor MCP exec in streaming bridge", {
                             modelId,
-                            metadata: {
-                                ...metadata,
-                                assistantSeedText,
-                            },
+                            bridgeKey,
+                            convKey,
+                            toolCallId: exec.toolCallId,
+                            toolName: exec.toolName,
+                            pendingBefore,
+                            pendingAfter,
+                            hasStoredActiveBridge: Boolean(existingActiveBridge),
+                            storedActiveBridgePendingExecToolCallIds: existingActiveBridge
+                                ? sortedIds(existingActiveBridge.pendingExecs.map((candidate) => candidate.toolCallId))
+                                : [],
+                        });
+                        schedulePendingToolCallPublish();
+                    }, (info) => {
+                        if (toolCallsFlushed) {
+                            logPluginWarn("Received Cursor MCP interaction update after tool-call envelope was already published", {
+                                modelId,
+                                bridgeKey,
+                                convKey,
+                                updateCase: info.updateCase,
+                                toolCallId: info.toolCallId,
+                                publishedToolCallIds: activeBridges.get(bridgeKey)?.diagnostics?.publishedToolCallIds ??
+                                    [],
+                            });
+                        }
+                        if (info.updateCase !== "toolCallCompleted") {
+                            emitPendingToolStart(info.toolCallId, info.toolName ?? "", "interaction");
+                        }
+                        const existingActiveBridge = activeBridges.get(bridgeKey);
+                        if (existingActiveBridge) {
+                            existingActiveBridge.diagnostics = {
+                                announcedToolCallIds: existingActiveBridge.diagnostics?.announcedToolCallIds ?? [],
+                                publishedToolCallIds: existingActiveBridge.diagnostics?.publishedToolCallIds ?? [],
+                                lastMcpUpdate: `${info.updateCase}:${info.toolCallId}`,
+                                publishedAtMs: existingActiveBridge.diagnostics?.publishedAtMs,
+                                lastResumeAttemptAtMs: existingActiveBridge.diagnostics?.lastResumeAttemptAtMs,
+                            };
+                        }
+                        logPluginInfo("Tracking Cursor MCP interaction state in streaming bridge", {
+                            modelId,
+                            bridgeKey,
+                            convKey,
+                            updateCase: info.updateCase,
+                            toolCallId: info.toolCallId,
+                            pendingExecToolCallIds: sortedIds(state.pendingExecs.map((candidate) => candidate.toolCallId)),
+                            hasStoredActiveBridge: Boolean(existingActiveBridge),
+                            storedActiveBridgeDiagnostics: existingActiveBridge?.diagnostics,
                         });
-                        sendSSE(makeChunk({}, "tool_calls"));
-                        sendDone();
-                        closeController();
-                    }, (checkpointBytes) => updateConversationCheckpoint(convKey, checkpointBytes), () => scheduleBridgeEnd(bridge), (info) => {
+                    }, (checkpointBytes) => {
+                        updateConversationCheckpoint(convKey, checkpointBytes);
+                        bridgeCloseController.noteCheckpoint();
+                    }, () => bridgeCloseController.noteTurnEnded(), (info) => {
                         endStreamError = new Error(`Cursor returned unsupported ${info.category}: ${info.caseName}${info.detail ? ` (${info.detail})` : ""}`);
                         logPluginError("Closing Cursor bridge after unsupported message", {
                             modelId,
@@ -206,10 +401,29 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                     stopKeepalive();
                 }
             }, SSE_KEEPALIVE_INTERVAL_MS);
+            logPluginInfo("Opened Cursor streaming bridge", {
+                modelId,
+                bridgeKey,
+                convKey,
+                mcpToolCount: mcpTools.length,
+                hasCloudRule: Boolean(cloudRule),
+            });
             bridge.onData(processChunk);
             bridge.onClose((code) => {
+                logPluginInfo("Cursor streaming bridge closed", {
+                    modelId,
+                    bridgeKey,
+                    convKey,
+                    code,
+                    mcpExecReceived,
+                    hadEndStreamError: Boolean(endStreamError),
+                    pendingExecToolCallIds: sortedIds(state.pendingExecs.map((exec) => exec.toolCallId)),
+                    storedActiveBridgeDiagnostics: activeBridges.get(bridgeKey)?.diagnostics,
+                });
+                bridgeCloseController.dispose();
                 clearInterval(heartbeatTimer);
                 stopKeepalive();
+                stopToolCallFlushTimer();
                 syncStoredBlobStore(convKey, blobStore);
                 if (endStreamError) {
                     activeBridges.delete(bridgeKey);
@@ -238,7 +452,9 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
             });
         },
         cancel(reason) {
+            bridgeCloseController.dispose();
             stopKeepalive();
+            stopToolCallFlushTimer();
             clearInterval(heartbeatTimer);
             syncStoredBlobStore(convKey, blobStore);
             const active = activeBridges.get(bridgeKey);
@@ -257,11 +473,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.cloudRule, payload.mcpTools, modelId, bridgeKey, convKey, metadata);
 }
-export function handleToolResultResume(active, toolResults, bridgeKey, convKey) {
-    const { bridge, heartbeatTimer, blobStore, mcpTools, pendingExecs, modelId, metadata, } = active;
+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 async function handleToolResultResume(active, toolResults, bridgeKey, convKey) {
+    const { bridge, heartbeatTimer, blobStore, cloudRule, mcpTools, pendingExecs, modelId, metadata, } = active;
     const resumeMetadata = {
         ...metadata,
         assistantSeedText: [
@@ -271,7 +512,73 @@ export function handleToolResultResume(active, toolResults, bridgeKey, convKey)
             .filter(Boolean)
             .join("\n\n"),
     };
-    for (const exec of pendingExecs) {
+    const pendingToolCallIds = new Set(pendingExecs.map((exec) => exec.toolCallId));
+    const toolResultIds = new Set(toolResults.map((result) => result.toolCallId));
+    const missingToolResultIds = pendingExecs
+        .map((exec) => exec.toolCallId)
+        .filter((toolCallId) => !toolResultIds.has(toolCallId));
+    const unexpectedToolResultIds = toolResults
+        .map((result) => result.toolCallId)
+        .filter((toolCallId) => !pendingToolCallIds.has(toolCallId));
+    const matchedPendingExecs = pendingExecs.filter((exec) => toolResultIds.has(exec.toolCallId));
+    logPluginInfo("Preparing Cursor tool-result resume", {
+        bridgeKey,
+        convKey,
+        modelId,
+        toolResults,
+        pendingExecs,
+        bridgeAlive: bridge.alive,
+        diagnostics: active.diagnostics,
+    });
+    if (active.diagnostics) {
+        active.diagnostics.lastResumeAttemptAtMs = Date.now();
+    }
+    const unresolved = await waitForResolvablePendingExecs(active, toolResults);
+    logPluginInfo("Resolved pending exec state before Cursor tool-result resume", {
+        bridgeKey,
+        convKey,
+        modelId,
+        toolResults,
+        pendingExecs,
+        unresolvedPendingExecs: unresolved,
+        diagnostics: active.diagnostics,
+    });
+    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" } });
+    }
+    if (missingToolResultIds.length > 0 || unexpectedToolResultIds.length > 0) {
+        logPluginError("Aborting Cursor tool-result resume because tool-call ids did not match", {
+            bridgeKey,
+            convKey,
+            modelId,
+            pendingToolCallIds: [...pendingToolCallIds],
+            toolResultIds: [...toolResultIds],
+            missingToolResultIds,
+            unexpectedToolResultIds,
+        });
+        clearInterval(heartbeatTimer);
+        bridge.end();
+        return new Response(JSON.stringify({
+            error: {
+                message: "Tool-result ids did not match the active Cursor MCP tool calls. Aborting instead of resuming a potentially stuck session.",
+                type: "invalid_request_error",
+                code: "cursor_tool_result_mismatch",
+                details: {
+                    missingToolResultIds,
+                    unexpectedToolResultIds,
+                },
+            },
+        }), { status: 400, headers: { "Content-Type": "application/json" } });
+    }
+    for (const exec of matchedPendingExecs) {
         const result = toolResults.find((toolResult) => toolResult.toolCallId === exec.toolCallId);
         const mcpResult = result
             ? create(McpResultSchema, {
@@ -311,7 +618,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, cloudRule, mcpTools, modelId, bridgeKey, convKey, resumeMetadata);
 }