@rama_nigg/open-cursor 2.4.3 → 2.4.5

package/dist/cli/discover.js

@@ -298,6 +298,15 @@ function resolveCursorAgentBinary(deps = {}) {
   log.warn("cursor-agent not found at known paths, falling back to PATH", { checkedPaths: knownPaths });
   return "cursor-agent";
 }
+function formatShellCommandForPlatform(command, platform = process.platform) {
+  if (platform !== "win32") {
+    return command;
+  }
+  if (command.startsWith('"') && command.endsWith('"')) {
+    return command;
+  }
+  return `"${command}"`;
+}
 var log;
 var init_binary = __esm(() => {
   init_logger();

package/dist/cli/opencode-cursor.js

@@ -298,6 +298,15 @@ function resolveCursorAgentBinary(deps = {}) {
   log.warn("cursor-agent not found at known paths, falling back to PATH", { checkedPaths: knownPaths });
   return "cursor-agent";
 }
+function formatShellCommandForPlatform(command, platform = process.platform) {
+  if (platform !== "win32") {
+    return command;
+  }
+  if (command.startsWith('"') && command.endsWith('"')) {
+    return command;
+  }
+  return `"${command}"`;
+}
 var log;
 var init_binary = __esm(() => {
   init_logger();

package/dist/index.js

@@ -456,6 +456,15 @@ function resolveCursorAgentBinary(deps = {}) {
   log.warn("cursor-agent not found at known paths, falling back to PATH", { checkedPaths: knownPaths });
   return "cursor-agent";
 }
+function formatShellCommandForPlatform(command, platform = process.platform) {
+  if (platform !== "win32") {
+    return command;
+  }
+  if (command.startsWith('"') && command.endsWith('"')) {
+    return command;
+  }
+  return `"${command}"`;
+}
 var log;
 var init_binary = __esm(() => {
   init_logger();
@@ -505,7 +514,7 @@ async function pollForAuthFile(timeoutMs = AUTH_POLL_TIMEOUT, intervalMs = AUTH_
 async function startCursorOAuth() {
   return new Promise((resolve, reject) => {
     log2.info("Starting cursor-cli login process");
-    const proc = spawn(resolveCursorAgentBinary(), ["login"], {
+    const proc = spawn(formatShellCommandForPlatform(resolveCursorAgentBinary()), ["login"], {
       stdio: ["pipe", "pipe", "pipe"],
       shell: process.platform === "win32"
     });
@@ -699,29 +708,6 @@ class LineBuffer {
   }
 }
 
-// src/streaming/types.ts
-var hasTextContent = (event) => event.message.content.some((content) => content.type === "text"), hasThinkingContent = (event) => event.message.content.some((content) => content.type === "thinking"), isAssistantText = (event) => event.type === "assistant" && hasTextContent(event), isThinking = (event) => {
-  if (event.type === "thinking") {
-    return true;
-  }
-  return event.type === "assistant" && hasThinkingContent(event);
-}, isToolCall = (event) => event.type === "tool_call", isResult = (event) => event.type === "result", extractText = (event) => event.message.content.filter((content) => content.type === "text").map((content) => content.text).join(""), extractThinking = (event) => {
-  if (event.type === "thinking") {
-    return event.text ?? "";
-  }
-  return event.message.content.filter((content) => content.type === "thinking").map((content) => content.thinking).join("");
-}, inferToolName = (event) => {
-  const [key] = Object.keys(event.tool_call ?? {});
-  if (!key) {
-    return "";
-  }
-  if (key.endsWith("ToolCall")) {
-    const base = key.slice(0, -"ToolCall".length);
-    return base.charAt(0).toLowerCase() + base.slice(1);
-  }
-  return key;
-};
-
 // src/streaming/delta-tracker.ts
 class DeltaTracker {
   lastText = "";
@@ -759,14 +745,70 @@ class DeltaTracker {
   }
 }
 
+class MixedDeltaTracker {
+  emittedText = "";
+  emittedThinking = "";
+  nextText(value) {
+    const delta = this.diff(this.emittedText, value);
+    if (delta) {
+      this.emittedText += delta;
+    }
+    return delta;
+  }
+  nextThinking(value) {
+    const delta = this.diff(this.emittedThinking, value);
+    if (delta) {
+      this.emittedThinking += delta;
+    }
+    return delta;
+  }
+  reset() {
+    this.emittedText = "";
+    this.emittedThinking = "";
+  }
+  diff(emitted, current) {
+    if (!emitted) {
+      return current;
+    }
+    if (current.startsWith(emitted)) {
+      return current.slice(emitted.length);
+    }
+    if (emitted.startsWith(current)) {
+      return "";
+    }
+    return current;
+  }
+}
+
+// src/streaming/types.ts
+var hasTextContent = (event) => event.message.content.some((content) => content.type === "text"), hasThinkingContent = (event) => event.message.content.some((content) => content.type === "thinking"), isAssistantText = (event) => event.type === "assistant" && hasTextContent(event), isThinking = (event) => {
+  if (event.type === "thinking") {
+    return true;
+  }
+  return event.type === "assistant" && hasThinkingContent(event);
+}, isToolCall = (event) => event.type === "tool_call", isResult = (event) => event.type === "result", extractText = (event) => event.message.content.filter((content) => content.type === "text").map((content) => content.text).join(""), extractThinking = (event) => {
+  if (event.type === "thinking") {
+    return event.text ?? "";
+  }
+  return event.message.content.filter((content) => content.type === "thinking").map((content) => content.thinking).join("");
+}, inferToolName = (event) => {
+  const [key] = Object.keys(event.tool_call ?? {});
+  if (!key) {
+    return "";
+  }
+  if (key.endsWith("ToolCall")) {
+    const base = key.slice(0, -"ToolCall".length);
+    return base.charAt(0).toLowerCase() + base.slice(1);
+  }
+  return key;
+};
+
 // src/streaming/openai-sse.ts
 class StreamToSseConverter {
   id;
   created;
   model;
-  tracker = new DeltaTracker;
-  sawAssistantPartials = false;
-  sawThinkingPartials = false;
+  tracker = new MixedDeltaTracker;
   constructor(model, options) {
     this.model = model;
     this.id = options?.id ?? `cursor-acp-${Date.now()}`;
@@ -774,35 +816,17 @@ class StreamToSseConverter {
   }
   handleEvent(event) {
     if (isAssistantText(event)) {
-      const isPartial = typeof event.timestamp_ms === "number";
-      if (isPartial) {
-        const text = extractText(event);
-        if (text) {
-          this.sawAssistantPartials = true;
-          return [this.chunkWith({ content: text })];
-        }
-        return [];
-      }
-      if (this.sawAssistantPartials) {
+      const text = extractText(event);
+      if (!text)
         return [];
-      }
-      const delta = this.tracker.nextText(extractText(event));
+      const delta = this.tracker.nextText(text);
       return delta ? [this.chunkWith({ content: delta })] : [];
     }
     if (isThinking(event)) {
-      const isPartial = typeof event.timestamp_ms === "number";
-      if (isPartial) {
-        const text = extractThinking(event);
-        if (text) {
-          this.sawThinkingPartials = true;
-          return [this.chunkWith({ reasoning_content: text })];
-        }
-        return [];
-      }
-      if (this.sawThinkingPartials) {
+      const text = extractThinking(event);
+      if (!text)
         return [];
-      }
-      const delta = this.tracker.nextThinking(extractThinking(event));
+      const delta = this.tracker.nextThinking(text);
       return delta ? [this.chunkWith({ reasoning_content: delta })] : [];
     }
     if (isToolCall(event)) {
@@ -13796,7 +13820,7 @@ ${output}`);
     if (include) {
       grepArgs.push(`--include=${include}`);
     }
-    grepArgs.push(pattern, path2);
+    grepArgs.push("-e", pattern, path2);
     const runGrep = async (extraArgs = []) => {
       return execFileAsync("grep", [...extraArgs, ...grepArgs], { timeout: 30000 });
     };
@@ -16110,6 +16134,7 @@ function extractCompletionFromStream(output) {
   let usage;
   let sawAssistantPartials = false;
   let sawThinkingPartials = false;
+  const tracker = new MixedDeltaTracker;
   for (const line of lines) {
     const event = parseStreamJsonLine(line);
     if (!event) {
@@ -16121,8 +16146,8 @@ function extractCompletionFromStream(output) {
         continue;
       const isPartial = typeof event.timestamp_ms === "number";
       if (isPartial) {
-        assistantText += text;
         sawAssistantPartials = true;
+        assistantText += tracker.nextText(text);
       } else if (!sawAssistantPartials) {
         assistantText = text;
       }
@@ -16132,8 +16157,8 @@ function extractCompletionFromStream(output) {
       if (thinking) {
         const isPartial = typeof event.timestamp_ms === "number";
         if (isPartial) {
-          reasoningText += thinking;
           sawThinkingPartials = true;
+          reasoningText += tracker.nextThinking(thinking);
         } else if (!sawThinkingPartials) {
           reasoningText = thinking;
         }
@@ -16820,7 +16845,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       if (FORCE_TOOL_MODE) {
         cmd.push("--force");
       }
-      const child = spawn3(cmd[0], cmd.slice(1), {
+      const child = spawn3(formatShellCommandForPlatform(cmd[0]), cmd.slice(1), {
         stdio: ["pipe", "pipe", "pipe"],
         shell: process.platform === "win32"
       });
@@ -16967,22 +16992,18 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
             child.kill();
           } catch {}
         };
-        child.stdout.on("data", async (chunk) => {
-          if (streamTerminated || res.writableEnded) {
-            return;
-          }
-          if (!firstTokenReceived) {
-            perf.mark("first-token");
-            firstTokenReceived = true;
-          }
-          for (const line of lineBuffer.push(chunk)) {
-            if (streamTerminated || res.writableEnded) {
+        const chunkQueue = [];
+        let draining = false;
+        let childClosed = false;
+        let childCloseHandled = false;
+        let childExitCode = null;
+        const processLines = async (lines) => {
+          for (const line of lines) {
+            if (streamTerminated || res.writableEnded)
               break;
-            }
             const event = parseStreamJsonLine(line);
-            if (!event) {
+            if (!event)
               continue;
-            }
             if (isResult(event)) {
               usage = extractOpenAiUsageFromResult(event) ?? usage;
             }
@@ -17031,148 +17052,100 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
                 }
                 break;
               }
-              if (result.intercepted) {
+              if (result.intercepted)
                 break;
-              }
-              if (result.skipConverter) {
+              if (result.skipConverter)
                 continue;
-              }
             }
-            if (streamTerminated || res.writableEnded) {
+            if (streamTerminated || res.writableEnded)
               break;
-            }
             for (const sse of converter.handleEvent(event)) {
               res.write(sse);
             }
           }
-        });
-        child.on("close", async (code) => {
-          if (streamTerminated || res.writableEnded) {
+        };
+        const drainQueue = async () => {
+          if (draining)
             return;
-          }
-          for (const line of lineBuffer.flush()) {
-            if (streamTerminated || res.writableEnded) {
-              break;
-            }
-            const event = parseStreamJsonLine(line);
-            if (!event) {
-              continue;
-            }
-            if (isResult(event)) {
-              usage = extractOpenAiUsageFromResult(event) ?? usage;
-            }
-            if (event.type === "tool_call") {
-              const result = await handleToolLoopEventWithFallback({
-                event,
-                boundary: boundaryContext.getBoundary(),
-                boundaryMode: boundaryContext.getBoundary().mode,
-                autoFallbackToLegacy: ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK,
-                toolLoopMode: TOOL_LOOP_MODE,
-                allowedToolNames,
-                toolSchemaMap,
-                toolLoopGuard,
-                toolMapper,
-                toolSessionId,
-                shouldEmitToolUpdates: SHOULD_EMIT_TOOL_UPDATES,
-                proxyExecuteToolCalls: PROXY_EXECUTE_TOOL_CALLS,
-                suppressConverterToolEvents: SUPPRESS_CONVERTER_TOOL_EVENTS,
-                toolRouter,
-                responseMeta: { id, created, model },
-                passThroughTracker,
-                onToolUpdate: (update) => {
-                  res.write(formatToolUpdateEvent(update));
-                },
-                onToolResult: (toolResult) => {
-                  res.write(`data: ${JSON.stringify(toolResult)}
-
-`);
-                },
-                onInterceptedToolCall: (toolCall) => {
-                  emitToolCallAndTerminate(toolCall);
-                },
-                onFallbackToLegacy: (error) => {
-                  boundaryContext.activateLegacyFallback("handleToolLoopEvent.close", error);
-                }
-              });
-              if (result.terminate) {
-                if (!result.terminate.silent) {
-                  emitTerminalAssistantErrorAndTerminate(result.terminate.message);
-                } else {
-                  streamTerminated = true;
-                  try {
-                    child.kill();
-                  } catch {}
-                }
-                break;
-              }
-              if (result.intercepted) {
+          draining = true;
+          try {
+            while (chunkQueue.length > 0) {
+              if (streamTerminated || res.writableEnded)
                 break;
+              const chunk = chunkQueue.shift();
+              if (!firstTokenReceived) {
+                perf.mark("first-token");
+                firstTokenReceived = true;
               }
-              if (result.skipConverter) {
-                continue;
-              }
-            }
-            if (streamTerminated || res.writableEnded) {
-              break;
-            }
-            for (const sse of converter.handleEvent(event)) {
-              res.write(sse);
+              await processLines(lineBuffer.push(chunk));
             }
-          }
-          if (streamTerminated || res.writableEnded) {
-            return;
-          }
-          perf.mark("request:done");
-          perf.summarize();
-          const stderrText = Buffer.concat(stderrChunks).toString().trim();
-          log20.debug("cursor-agent completed (node stream)", {
-            code,
-            stderrChars: stderrText.length
-          });
-          if (code !== 0) {
-            const errSource = stderrText || `cursor-agent exited with code ${String(code ?? "unknown")} and no output`;
-            const parsed = parseAgentError(errSource);
-            const msg = formatErrorForUser(parsed);
-            const errChunk = createChatCompletionChunk(id, created, model, msg, true);
-            res.write(`data: ${JSON.stringify(errChunk)}
+            if (childClosed && !childCloseHandled && !streamTerminated && !res.writableEnded) {
+              childCloseHandled = true;
+              await processLines(lineBuffer.flush());
+              if (streamTerminated || res.writableEnded)
+                return;
+              perf.mark("request:done");
+              perf.summarize();
+              const stderrText = Buffer.concat(stderrChunks).toString().trim();
+              log20.debug("cursor-agent completed (node stream)", {
+                code: childExitCode,
+                stderrChars: stderrText.length
+              });
+              if (childExitCode !== 0) {
+                const errSource = stderrText || `cursor-agent exited with code ${String(childExitCode ?? "unknown")} and no output`;
+                const parsed = parseAgentError(errSource);
+                const msg = formatErrorForUser(parsed);
+                const errChunk = createChatCompletionChunk(id, created, model, msg, true);
+                res.write(`data: ${JSON.stringify(errChunk)}
 
 `);
-            res.write(formatSseDone());
-            streamTerminated = true;
-            res.end();
-            return;
-          }
-          const passThroughSummary = passThroughTracker.getSummary();
-          if (passThroughSummary.hasActivity) {
-            await toastService.showPassThroughSummary(passThroughSummary.tools);
-          }
-          if (passThroughSummary.errors.length > 0) {
-            await toastService.showErrorSummary(passThroughSummary.errors);
-          }
-          const doneChunk = {
-            id,
-            object: "chat.completion.chunk",
-            created,
-            model,
-            choices: [
-              {
-                index: 0,
-                delta: {},
-                finish_reason: "stop"
+                res.write(formatSseDone());
+                streamTerminated = true;
+                res.end();
+                return;
               }
-            ]
-          };
-          res.write(`data: ${JSON.stringify(doneChunk)}
+              const passThroughSummary = passThroughTracker.getSummary();
+              if (passThroughSummary.hasActivity) {
+                await toastService.showPassThroughSummary(passThroughSummary.tools);
+              }
+              if (passThroughSummary.errors.length > 0) {
+                await toastService.showErrorSummary(passThroughSummary.errors);
+              }
+              const doneChunk = {
+                id,
+                object: "chat.completion.chunk",
+                created,
+                model,
+                choices: [{ index: 0, delta: {}, finish_reason: "stop" }]
+              };
+              res.write(`data: ${JSON.stringify(doneChunk)}
 
 `);
-          if (usage) {
-            const usageChunk = createChatCompletionUsageChunk(id, created, model, usage);
-            res.write(`data: ${JSON.stringify(usageChunk)}
+              if (usage) {
+                const usageChunk = createChatCompletionUsageChunk(id, created, model, usage);
+                res.write(`data: ${JSON.stringify(usageChunk)}
 
 `);
+              }
+              res.write(formatSseDone());
+              streamTerminated = true;
+              res.end();
+            }
+          } finally {
+            draining = false;
+            if (!streamTerminated && !res.writableEnded && (chunkQueue.length > 0 || childClosed && !childCloseHandled)) {
+              drainQueue();
+            }
           }
-          res.write(formatSseDone());
-          res.end();
+        };
+        child.stdout.on("data", (chunk) => {
+          chunkQueue.push(Buffer.from(chunk));
+          drainQueue();
+        });
+        child.on("close", (code) => {
+          childClosed = true;
+          childExitCode = code;
+          drainQueue();
         });
       }
     } catch (error) {
@@ -17347,6 +17320,8 @@ function buildToolHookEntries(registry, fallbackBaseDir) {
   const sessionWorkspaceBySession = new Map;
   const tools = registry.list();
   for (const t of tools) {
+    if (NATIVE_TOOL_HOOK_EXCLUSIONS.has(t.name))
+      continue;
     const handler = registry.getHandler(t.name);
     if (!handler)
       continue;
@@ -17371,7 +17346,7 @@ function buildToolHookEntries(registry, fallbackBaseDir) {
   }
   return entries;
 }
-var log20, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROVIDER_PREFIX, CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, SESSION_WORKSPACE_CACHE_LIMIT = 200, FORCE_TOOL_MODE, EMIT_TOOL_UPDATES, FORWARD_TOOL_CALLS, TOOL_LOOP_MODE_RAW, TOOL_LOOP_MODE, TOOL_LOOP_MODE_VALID, PROVIDER_BOUNDARY_MODE_RAW, PROVIDER_BOUNDARY_MODE, PROVIDER_BOUNDARY_MODE_VALID, LEGACY_PROVIDER_BOUNDARY, PROVIDER_BOUNDARY, ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK, TOOL_LOOP_MAX_REPEAT_RAW, TOOL_LOOP_MAX_REPEAT, TOOL_LOOP_MAX_REPEAT_VALID, PROXY_EXECUTE_TOOL_CALLS, SUPPRESS_CONVERTER_TOOL_EVENTS, SHOULD_EMIT_TOOL_UPDATES, CursorPlugin = async ({ $, directory, worktree, client: client3, serverUrl }) => {
+var log20, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp", CURSOR_PROVIDER_PREFIX, CURSOR_PROXY_HOST = "127.0.0.1", CURSOR_PROXY_DEFAULT_PORT = 32124, CURSOR_PROXY_DEFAULT_BASE_URL, REUSE_EXISTING_PROXY, SESSION_WORKSPACE_CACHE_LIMIT = 200, FORCE_TOOL_MODE, EMIT_TOOL_UPDATES, FORWARD_TOOL_CALLS, TOOL_LOOP_MODE_RAW, TOOL_LOOP_MODE, TOOL_LOOP_MODE_VALID, PROVIDER_BOUNDARY_MODE_RAW, PROVIDER_BOUNDARY_MODE, PROVIDER_BOUNDARY_MODE_VALID, LEGACY_PROVIDER_BOUNDARY, PROVIDER_BOUNDARY, ENABLE_PROVIDER_BOUNDARY_AUTOFALLBACK, TOOL_LOOP_MAX_REPEAT_RAW, TOOL_LOOP_MAX_REPEAT, TOOL_LOOP_MAX_REPEAT_VALID, PROXY_EXECUTE_TOOL_CALLS, SUPPRESS_CONVERTER_TOOL_EVENTS, SHOULD_EMIT_TOOL_UPDATES, NATIVE_TOOL_HOOK_EXCLUSIONS, CursorPlugin = async ({ $, directory, worktree, client: client3, serverUrl }) => {
   const workspaceDirectory = resolveWorkspaceDirectory(worktree, directory);
   log20.debug("Plugin initializing", {
     directory,
@@ -17672,6 +17647,7 @@ var init_plugin = __esm(() => {
     suppressConverterToolEvents: SUPPRESS_CONVERTER_TOOL_EVENTS,
     shouldEmitToolUpdates: SHOULD_EMIT_TOOL_UPDATES
   } = PROVIDER_BOUNDARY.computeToolLoopFlags(TOOL_LOOP_MODE, FORWARD_TOOL_CALLS, EMIT_TOOL_UPDATES));
+  NATIVE_TOOL_HOOK_EXCLUSIONS = new Set(["grep"]);
   plugin_default = CursorPlugin;
 });
 
@@ -17724,7 +17700,7 @@ class SimpleCursorClient {
       args.push("--resume", resumeId);
     }
     this.log.debug("Executing prompt stream", { promptLength: prompt.length, mode, model });
-    const child = spawn3(this.config.cursorAgentPath, args, {
+    const child = spawn3(formatShellCommandForPlatform(this.config.cursorAgentPath), args, {
       cwd,
       stdio: ["pipe", "pipe", "pipe"],
       shell: process.platform === "win32"
@@ -17811,7 +17787,7 @@ class SimpleCursorClient {
     }
     this.log.debug("Executing prompt", { promptLength: prompt.length, mode, model });
     return new Promise((resolve3, reject) => {
-      const child = spawn3(this.config.cursorAgentPath, args, {
+      const child = spawn3(formatShellCommandForPlatform(this.config.cursorAgentPath), args, {
         cwd,
         stdio: ["pipe", "pipe", "pipe"],
         shell: process.platform === "win32"
@@ -18060,42 +18036,22 @@ function createProxyServer(config) {
 
 // src/streaming/ai-sdk-parts.ts
 class StreamToAiSdkParts {
-  tracker = new DeltaTracker;
   toolArgsById = new Map;
   startedToolIds = new Set;
-  sawAssistantPartials = false;
-  sawThinkingPartials = false;
+  tracker = new MixedDeltaTracker;
   handleEvent(event) {
     if (isAssistantText(event)) {
-      const isPartial = typeof event.timestamp_ms === "number";
-      if (isPartial) {
-        const text = extractText(event);
-        if (text) {
-          this.sawAssistantPartials = true;
-          return [{ type: "text-delta", textDelta: text }];
-        }
-        return [];
-      }
-      if (this.sawAssistantPartials) {
+      const text = extractText(event);
+      if (!text)
         return [];
-      }
-      const delta = this.tracker.nextText(extractText(event));
+      const delta = this.tracker.nextText(text);
       return delta ? [{ type: "text-delta", textDelta: delta }] : [];
     }
     if (isThinking(event)) {
-      const isPartial = typeof event.timestamp_ms === "number";
-      if (isPartial) {
-        const text = extractThinking(event);
-        if (text) {
-          this.sawThinkingPartials = true;
-          return [{ type: "text-delta", textDelta: text }];
-        }
-        return [];
-      }
-      if (this.sawThinkingPartials) {
+      const text = extractThinking(event);
+      if (!text)
         return [];
-      }
-      const delta = this.tracker.nextThinking(extractThinking(event));
+      const delta = this.tracker.nextThinking(text);
       return delta ? [{ type: "text-delta", textDelta: delta }] : [];
     }
     if (isToolCall(event)) {