dsh-cursor-subscription 0.6.1 → 0.6.2

package/lib/index.js

@@ -2636,14 +2636,13 @@ export class CursorAdapter extends LlmAdapter {
 						} else if (update.type === "tokenDelta") {
 							if (Number.isFinite(update.tokens) && update.tokens > 0) outputTokens = update.tokens;
 						} else if (update.type === "partialToolCall") {
+							// Buffer only. Emitting incomplete tool-call chunks here created
+							// nameless DSH tool blocks that competed with real mcpArgs frames.
 							if (toolCallBuffer === undefined || toolCallBuffer.id !== update.callId) {
 								toolCallBuffer = { id: update.callId, name: "", arguments: "" };
-								yield { type: "block-start", index: TOOL_BLOCK_INDEX, blockType: "tool-call" };
-								yield { type: "tool-call-delta", index: TOOL_BLOCK_INDEX, id: ToolCallId(update.callId), argumentsDelta: "" };
 							}
 							if (update.argsTextDelta.length > 0) {
 								toolCallBuffer.arguments += update.argsTextDelta;
-								yield { type: "tool-call-delta", index: TOOL_BLOCK_INDEX, id: ToolCallId(update.callId), argumentsDelta: update.argsTextDelta };
 							}
 						} else if (update.type === "toolCallStarted" || update.type === "toolCallCompleted" || update.type === "toolCallDelta") {
 							emittedToolCall = true;
@@ -2682,7 +2681,6 @@ export class CursorAdapter extends LlmAdapter {
 									"TOOL_LIMIT",
 								);
 							}
-							emittedToolCall = true;
 							// decodeExecServerMessage nests the parsed McpArgs under
 							// `exec.args`: { name, toolCallId, providerIdentifier, toolName, args }.
 							const mcp = exec.args ?? {};
@@ -2694,24 +2692,46 @@ export class CursorAdapter extends LlmAdapter {
 									args[key] = null;
 								}
 							}
+							const candidateName = mcp.toolName || mcp.name;
+							const tool = resolveTextTool(candidateName, options.tools ?? []);
+							if (tool === undefined) {
+								// Cursor occasionally emits empty/placeholder MCP execs around
+								// real calls. Reject them immediately so they never become
+								// pending bridge entries that later poison the resume path with
+								// "Tool result not provided".
+								run.writeMessage(encodeExecClientMessageEnvelope(encodeExecClientMessage(
+									exec.id,
+									exec.execId,
+									11,
+									encodeMcpError(`Unknown or unsupported MCP tool: ${candidateName || "(empty)"}`),
+								)));
+								continue;
+							}
+							emittedToolCall = true;
 							const id = mcp.toolCallId || exec.execId || crypto.randomUUID();
-							const name = mcp.toolName || mcp.name;
-							yield { type: "block-start", index: TOOL_BLOCK_INDEX, blockType: "tool-call" };
+							const name = tool.name;
+							const normalizedArgs = normalizeTextToolArguments(tool, args);
+							const argumentsJson = JSON.stringify(normalizedArgs);
+							// Parallel MCP calls must use distinct DSH block indexes. Reusing
+							// TOOL_BLOCK_INDEX causes the agent loop to keep only one call while
+							// pendingExecs still waits for every sibling.
+							const blockIndex = TOOL_BLOCK_INDEX + pendingExecs.length;
+							yield { type: "block-start", index: blockIndex, blockType: "tool-call" };
 							yield {
 								type: "tool-call-delta",
-								index: TOOL_BLOCK_INDEX,
+								index: blockIndex,
 								id: ToolCallId(id),
 								name,
-								argumentsDelta: JSON.stringify(args),
+								argumentsDelta: argumentsJson,
 							};
 							yield {
 								type: "block-end",
-								index: TOOL_BLOCK_INDEX,
+								index: blockIndex,
 								block: {
 									type: "tool-call",
 									id: ToolCallId(id),
 									name,
-									arguments: JSON.stringify(args),
+									arguments: argumentsJson,
 								},
 							};
 							pendingExecs.push({ id: exec.id, execId: exec.execId, toolCallId: id });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cursor-subscription",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "packageManager": "pnpm@11.19.0",
   "description": "Cursor subscription for DeepSeek Harness with browser login, token refresh, model discovery, and the Cursor Agent chat protocol",
   "type": "module",