@playwo/opencode-cursor-oauth 0.0.0-dev.4463bb589222 → 0.0.0-dev.6338d5591e37

package/dist/proxy/bridge-streaming.js

@@ -103,7 +103,6 @@ function createBridgeStreamResponse(bridge, heartbeatTimer, blobStore, mcpTools,
                             sendSSE(makeChunk({ content }));
                         }
                     }, (exec) => {
-                        state.pendingExecs.push(exec);
                         mcpExecReceived = true;
                         const flushed = tagFilter.flush();
                         if (flushed.reasoning)

package/dist/proxy/stream-dispatch.js

@@ -128,6 +128,51 @@ export function computeUsage(state) {
     const prompt_tokens = Math.max(0, total_tokens - completion_tokens);
     return { prompt_tokens, completion_tokens, total_tokens };
 }
+function getPendingExecKey(exec) {
+    return exec.toolCallId || `${exec.toolName}:${exec.decodedArgs}`;
+}
+function replacePendingExec(state, exec) {
+    const execKey = getPendingExecKey(exec);
+    const existingIndex = state.pendingExecs.findIndex((candidate) => getPendingExecKey(candidate) === execKey);
+    if (existingIndex >= 0) {
+        state.pendingExecs[existingIndex] = exec;
+        return;
+    }
+    state.pendingExecs.push(exec);
+}
+function hasUsableDecodedArgs(decodedArgs) {
+    const trimmed = decodedArgs.trim();
+    return trimmed !== "" && trimmed !== "{}";
+}
+function mergePendingExec(existing, incoming) {
+    const incomingHasExecMetadata = incoming.execMsgId !== 0;
+    const existingHasExecMetadata = existing.execMsgId !== 0;
+    return {
+        execId: incomingHasExecMetadata || !existing.execId ? incoming.execId : existing.execId,
+        execMsgId: incomingHasExecMetadata || !existingHasExecMetadata
+            ? incoming.execMsgId
+            : existing.execMsgId,
+        toolCallId: existing.toolCallId || incoming.toolCallId,
+        toolName: incoming.toolName && incoming.toolName !== "unknown_mcp_tool"
+            ? incoming.toolName
+            : existing.toolName,
+        decodedArgs: hasUsableDecodedArgs(incoming.decodedArgs)
+            ? incoming.decodedArgs
+            : existing.decodedArgs,
+    };
+}
+function emitPendingExec(exec, state, onMcpExec) {
+    const execKey = getPendingExecKey(exec);
+    const existing = state.pendingExecs.find((candidate) => getPendingExecKey(candidate) === execKey);
+    const nextExec = existing ? mergePendingExec(existing, exec) : exec;
+    if (state.emittedToolCallIds.has(execKey)) {
+        replacePendingExec(state, nextExec);
+        return;
+    }
+    state.emittedToolCallIds.add(execKey);
+    replacePendingExec(state, nextExec);
+    onMcpExec(nextExec);
+}
 export function processServerMessage(msg, blobStore, mcpTools, sendFrame, state, onText, onMcpExec, onCheckpoint, onTurnEnded, onUnsupportedMessage, onUnhandledExec) {
     const msgCase = msg.message.case;
     if (msgCase === "interactionUpdate") {
@@ -137,7 +182,7 @@ export function processServerMessage(msg, blobStore, mcpTools, sendFrame, state,
         handleKvMessage(msg.message.value, blobStore, sendFrame);
     }
     else if (msgCase === "execServerMessage") {
-        handleExecMessage(msg.message.value, mcpTools, sendFrame, onMcpExec, onUnhandledExec);
+        handleExecMessage(msg.message.value, mcpTools, sendFrame, state, onMcpExec, onUnhandledExec);
     }
     else if (msgCase === "execServerControlMessage") {
         onUnsupportedMessage?.({
@@ -182,13 +227,14 @@ function handleInteractionUpdate(update, state, onText, onMcpExec, onTurnEnded,
     else if (updateCase === "partialToolCall") {
         const partial = update.message.value;
         if (partial.callId && partial.argsTextDelta) {
-            state.interactionToolArgsText.set(partial.callId, partial.argsTextDelta);
+            const existing = state.interactionToolArgsText.get(partial.callId) ?? "";
+            state.interactionToolArgsText.set(partial.callId, `${existing}${partial.argsTextDelta}`);
         }
     }
     else if (updateCase === "toolCallCompleted") {
         const exec = decodeInteractionToolCall(update.message.value, state);
         if (exec)
-            onMcpExec(exec);
+            emitPendingExec(exec, state, onMcpExec);
     }
     else if (updateCase === "turnEnded") {
         onTurnEnded?.();
@@ -225,8 +271,6 @@ function decodeInteractionToolCall(update, state) {
     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()
@@ -238,7 +282,6 @@ function decodeInteractionToolCall(update, state) {
     else if (partialArgsText) {
         decodedArgs = partialArgsText;
     }
-    state.emittedToolCallIds.add(toolCallId);
     if (callId)
         state.interactionToolArgsText.delete(callId);
     return {
@@ -374,7 +417,7 @@ function handleKvMessage(kvMsg, blobStore, sendFrame) {
         sendKvResponse(kvMsg, "setBlobResult", create(SetBlobResultSchema, {}), sendFrame);
     }
 }
-function handleExecMessage(execMsg, mcpTools, sendFrame, onMcpExec, onUnhandledExec) {
+function handleExecMessage(execMsg, mcpTools, sendFrame, state, onMcpExec, onUnhandledExec) {
     const execCase = execMsg.message.case;
     if (execCase === "requestContextArgs") {
         const requestContext = create(RequestContextSchema, {
@@ -399,13 +442,14 @@ 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),
-        });
+        };
+        emitPendingExec(exec, state, onMcpExec);
         return;
     }
     // --- Reject native Cursor tools ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwo/opencode-cursor-oauth",
-  "version": "0.0.0-dev.4463bb589222",
+  "version": "0.0.0-dev.6338d5591e37",
   "description": "OpenCode plugin that connects Cursor's API to OpenCode via OAuth, model discovery, and a local OpenAI-compatible proxy.",
   "license": "MIT",
   "type": "module",