dsh-cursor-subscription 0.6.1 → 0.6.3

package/README.md

@@ -60,7 +60,7 @@ Then add `dsh-cursor-subscription` to the `dsh.profile.bundles` array in `packag
 
 When a tool is required, the agent converts Cursor's tool request into a local DSH tool execution. The result is returned to the model through the conversation history; Cursor's filesystem tools are not used.
 
-The **Runtime settings** card controls the maximum tool rounds in one Cursor run and the HTTP retry policy. Retry count means additional attempts and defaults to `0` (disabled). Cursor's streaming POST protocol cannot prove that a failed attempt was not processed remotely, so enabling retries may repeat model work or usage. Retries occur only before any response output when the initial HTTP status matches the configured list.
+The **Runtime settings** card controls the maximum tool rounds in one Cursor run and the HTTP retry policy. The tool-round cap defaults to `200` (range 1–1000) and ends the run with `TOOL_LIMIT` when exceeded. Retry count means additional attempts and defaults to `0` (disabled). Cursor's streaming POST protocol cannot prove that a failed attempt was not processed remotely, so enabling retries may repeat model work or usage. Retries occur only before any response output when the initial HTTP status matches the configured list.
 
 ## Updating and Removing
 

package/README_zh.md

@@ -71,7 +71,8 @@ pnpm add file:D:/mcp/dsh-cursor-subscription
 需要调用工具时，Agent 会把 Cursor 侧的工具请求转成 DSH 本地工具执行，结果通过
 对话历史回传给模型，全程不经过 Cursor 的文件系统工具。
 
-「运行设置」卡片可以调整单次 Cursor 任务的最大工具轮次和 HTTP 重试策略。重试次数指
+「运行设置」卡片可以调整单次 Cursor 任务的最大工具轮次和 HTTP 重试策略。工具轮次上限
+默认 `200`（范围 1–1000），超过后以 `TOOL_LIMIT` 终止该次运行。重试次数指
 首次请求之外的额外尝试次数，默认 `0`（关闭）。Cursor 的流式 POST 协议无法证明失败请求
 未被远端处理，因此启用重试可能重复模型工作或用量；仅当尚未产生任何输出且初始 HTTP
 状态码匹配列表时才会重试。

package/lib/index.js

@@ -172,7 +172,7 @@ export const STREAM_PROGRESS_TIMEOUT_MS = 60 * 1000;
 /** Retain checkpoints/live tool bridges for inactive DSH sessions. */
 export const SESSION_STATE_TTL_MS = 30 * 60 * 1000;
 /** Stop one Cursor Run before an unconstrained agent can loop forever. */
-export const MAX_TOOL_ROUNDS = 64;
+export const MAX_TOOL_ROUNDS = 200;
 export const DEFAULT_RETRY_COUNT = 0;
 export const DEFAULT_RETRY_INTERVAL_MS = 1000;
 export const DEFAULT_RETRY_HTTP_STATUS_CODES = Object.freeze([408, 425, 429, 500, 502, 503, 504]);
@@ -2636,17 +2636,28 @@ 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;
+						} else if (update.type === "turnEnded") {
+							// Cursor ends every assistant turn with this update, but it does
+							// not reliably close the HTTP/2 stream afterwards: the server can
+							// keep the run alive with heartbeats only. Ignoring the update
+							// therefore left a finished answer waiting until the progress
+							// watchdog aborted the run, and the resulting retryable TIMEOUT
+							// made DSH discard the answer the user had already read and
+							// re-run the whole step. The trailing conversation checkpoint
+							// always arrives before turnEnded, so stopping here keeps
+							// everything a later run needs. A pending MCP tool call still
+							// waits for its checkpoint so the live bridge stays resumable.
+							if (!toolCallPending) break;
 						}
 					} else if (message.case === "kvServerMessage") {
 						const kv = message.value;
@@ -2682,7 +2693,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 +2704,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.3",
   "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",