@rama_nigg/open-cursor 2.4.2 → 2.4.4

package/dist/index.js

@@ -13796,7 +13796,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 });
     };
@@ -14563,8 +14563,8 @@ function normalizeToolSpecificArgs(toolName, args) {
   if (!hasStringNew && typeof content === "string") {
     repaired.new_string = content;
   }
-  if (typeof repaired.new_string === "string" && !hasStringOld) {
-    repaired.old_string = "";
+  if (hasStringOld && repaired.old_string === "") {
+    delete repaired.old_string;
   }
   return repaired;
 }
@@ -14867,15 +14867,7 @@ async function handleToolLoopEventLegacy(options) {
         }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
-      const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
-      if (reroutedWrite) {
-        log18.debug("Rerouting malformed edit call to write (legacy)", {
-          path: reroutedWrite.path,
-          missing: compat.validation.missing,
-          typeErrors: compat.validation.typeErrors
-        });
-        normalizedToolCall = reroutedWrite.toolCall;
-      } else if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
+      if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
         const hintChunk = createNonFatalSchemaValidationHintChunk(responseMeta, normalizedToolCall, compat.validation);
         log18.debug("Emitting non-fatal schema validation hint in legacy and skipping malformed tool execution", {
           tool: normalizedToolCall.function.name,
@@ -15019,19 +15011,6 @@ async function handleToolLoopEventV1(options) {
       }
       return { intercepted: false, skipConverter: true, terminate: termination2 };
     }
-    const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
-    if (reroutedWrite) {
-      log18.debug("Rerouting malformed edit call to write", {
-        path: reroutedWrite.path,
-        missing: compat.validation.missing,
-        typeErrors: compat.validation.typeErrors
-      });
-      await onInterceptedToolCall(reroutedWrite.toolCall);
-      return {
-        intercepted: true,
-        skipConverter: true
-      };
-    }
     if (schemaValidationFailureMode === "pass_through" && shouldTerminateOnSchemaValidation(normalizedToolCall, compat.validation)) {
       return {
         intercepted: false,
@@ -15341,36 +15320,6 @@ function shouldUsePassThroughForEditSchema(event) {
   const normalizedName = rawName.endsWith("ToolCall") ? rawName.slice(0, -"ToolCall".length) : rawName;
   return normalizedName.toLowerCase() === "edit";
 }
-function tryRerouteEditToWrite(toolCall, normalizedArgs, allowedToolNames, toolSchemaMap) {
-  if (toolCall.function.name.toLowerCase() !== "edit") {
-    return null;
-  }
-  if (!allowedToolNames.has("write") || !toolSchemaMap.has("write")) {
-    return null;
-  }
-  const path2 = typeof normalizedArgs.path === "string" && normalizedArgs.path.length > 0 ? normalizedArgs.path : null;
-  if (!path2) {
-    return null;
-  }
-  const content = typeof normalizedArgs.new_string === "string" ? normalizedArgs.new_string : typeof normalizedArgs.content === "string" ? normalizedArgs.content : null;
-  if (content === null) {
-    return null;
-  }
-  const oldString = normalizedArgs.old_string;
-  if (typeof oldString === "string" && oldString.length > 0) {
-    return null;
-  }
-  return {
-    path: path2,
-    toolCall: {
-      ...toolCall,
-      function: {
-        name: "write",
-        arguments: JSON.stringify({ path: path2, content })
-      }
-    }
-  };
-}
 function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -17398,6 +17347,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;
@@ -17422,7 +17373,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,
@@ -17723,6 +17674,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;
 });
 

package/dist/plugin-entry.js

@@ -13796,7 +13796,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 });
     };
@@ -14563,8 +14563,8 @@ function normalizeToolSpecificArgs(toolName, args) {
   if (!hasStringNew && typeof content === "string") {
     repaired.new_string = content;
   }
-  if (typeof repaired.new_string === "string" && !hasStringOld) {
-    repaired.old_string = "";
+  if (hasStringOld && repaired.old_string === "") {
+    delete repaired.old_string;
   }
   return repaired;
 }
@@ -14867,15 +14867,7 @@ async function handleToolLoopEventLegacy(options) {
         }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
-      const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
-      if (reroutedWrite) {
-        log18.debug("Rerouting malformed edit call to write (legacy)", {
-          path: reroutedWrite.path,
-          missing: compat.validation.missing,
-          typeErrors: compat.validation.typeErrors
-        });
-        normalizedToolCall = reroutedWrite.toolCall;
-      } else if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
+      if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
         const hintChunk = createNonFatalSchemaValidationHintChunk(responseMeta, normalizedToolCall, compat.validation);
         log18.debug("Emitting non-fatal schema validation hint in legacy and skipping malformed tool execution", {
           tool: normalizedToolCall.function.name,
@@ -15019,19 +15011,6 @@ async function handleToolLoopEventV1(options) {
       }
       return { intercepted: false, skipConverter: true, terminate: termination2 };
     }
-    const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
-    if (reroutedWrite) {
-      log18.debug("Rerouting malformed edit call to write", {
-        path: reroutedWrite.path,
-        missing: compat.validation.missing,
-        typeErrors: compat.validation.typeErrors
-      });
-      await onInterceptedToolCall(reroutedWrite.toolCall);
-      return {
-        intercepted: true,
-        skipConverter: true
-      };
-    }
     if (schemaValidationFailureMode === "pass_through" && shouldTerminateOnSchemaValidation(normalizedToolCall, compat.validation)) {
       return {
         intercepted: false,
@@ -15341,36 +15320,6 @@ function shouldUsePassThroughForEditSchema(event) {
   const normalizedName = rawName.endsWith("ToolCall") ? rawName.slice(0, -"ToolCall".length) : rawName;
   return normalizedName.toLowerCase() === "edit";
 }
-function tryRerouteEditToWrite(toolCall, normalizedArgs, allowedToolNames, toolSchemaMap) {
-  if (toolCall.function.name.toLowerCase() !== "edit") {
-    return null;
-  }
-  if (!allowedToolNames.has("write") || !toolSchemaMap.has("write")) {
-    return null;
-  }
-  const path2 = typeof normalizedArgs.path === "string" && normalizedArgs.path.length > 0 ? normalizedArgs.path : null;
-  if (!path2) {
-    return null;
-  }
-  const content = typeof normalizedArgs.new_string === "string" ? normalizedArgs.new_string : typeof normalizedArgs.content === "string" ? normalizedArgs.content : null;
-  if (content === null) {
-    return null;
-  }
-  const oldString = normalizedArgs.old_string;
-  if (typeof oldString === "string" && oldString.length > 0) {
-    return null;
-  }
-  return {
-    path: path2,
-    toolCall: {
-      ...toolCall,
-      function: {
-        name: "write",
-        arguments: JSON.stringify({ path: path2, content })
-      }
-    }
-  };
-}
 function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -17398,6 +17347,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;
@@ -17422,7 +17373,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,
@@ -17723,6 +17674,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;
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rama_nigg/open-cursor",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "No prompt limits. No broken streams. Full thinking + tool support. Your Cursor subscription, properly integrated.",
   "type": "module",
   "main": "dist/plugin-entry.js",

package/src/plugin.ts

@@ -1843,11 +1843,15 @@ function applyToolContextDefaults(
 /**
  * Build tool hook entries from local registry
  */
+const NATIVE_TOOL_HOOK_EXCLUSIONS = new Set(["grep"]);
+
 function buildToolHookEntries(registry: CoreRegistry, fallbackBaseDir?: string): Record<string, any> {
   const entries: Record<string, any> = {};
   const sessionWorkspaceBySession = new Map<string, string>();
   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;
 

package/src/provider/runtime-interception.ts

@@ -190,20 +190,7 @@ export async function handleToolLoopEventLegacy(
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
 
-      const reroutedWrite = tryRerouteEditToWrite(
-        normalizedToolCall,
-        compat.normalizedArgs,
-        allowedToolNames,
-        toolSchemaMap,
-      );
-      if (reroutedWrite) {
-        log.debug("Rerouting malformed edit call to write (legacy)", {
-          path: reroutedWrite.path,
-          missing: compat.validation.missing,
-          typeErrors: compat.validation.typeErrors,
-        });
-        normalizedToolCall = reroutedWrite.toolCall;
-      } else if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
+      if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
         const hintChunk = createNonFatalSchemaValidationHintChunk(
           responseMeta,
           normalizedToolCall,
@@ -386,24 +373,6 @@ export async function handleToolLoopEventV1(
       }
       return { intercepted: false, skipConverter: true, terminate: termination };
     }
-    const reroutedWrite = tryRerouteEditToWrite(
-      normalizedToolCall,
-      compat.normalizedArgs,
-      allowedToolNames,
-      toolSchemaMap,
-    );
-    if (reroutedWrite) {
-      log.debug("Rerouting malformed edit call to write", {
-        path: reroutedWrite.path,
-        missing: compat.validation.missing,
-        typeErrors: compat.validation.typeErrors,
-      });
-      await onInterceptedToolCall(reroutedWrite.toolCall);
-      return {
-        intercepted: true,
-        skipConverter: true,
-      };
-    }
     if (
       schemaValidationFailureMode === "pass_through"
       && shouldTerminateOnSchemaValidation(normalizedToolCall, compat.validation)
@@ -809,53 +778,6 @@ function shouldUsePassThroughForEditSchema(event: StreamJsonToolCallEvent): bool
   return normalizedName.toLowerCase() === "edit";
 }
 
-function tryRerouteEditToWrite(
-  toolCall: OpenAiToolCall,
-  normalizedArgs: Record<string, unknown>,
-  allowedToolNames: Set<string>,
-  toolSchemaMap: Map<string, unknown>,
-): { path: string; toolCall: OpenAiToolCall } | null {
-  if (toolCall.function.name.toLowerCase() !== "edit") {
-    return null;
-  }
-  if (!allowedToolNames.has("write") || !toolSchemaMap.has("write")) {
-    return null;
-  }
-
-  const path = typeof normalizedArgs.path === "string" && normalizedArgs.path.length > 0
-    ? normalizedArgs.path
-    : null;
-  if (!path) {
-    return null;
-  }
-
-  const content =
-    typeof normalizedArgs.new_string === "string"
-      ? normalizedArgs.new_string
-      : typeof normalizedArgs.content === "string"
-        ? normalizedArgs.content
-        : null;
-  if (content === null) {
-    return null;
-  }
-
-  const oldString = normalizedArgs.old_string;
-  if (typeof oldString === "string" && oldString.length > 0) {
-    return null;
-  }
-
-  return {
-    path,
-    toolCall: {
-      ...toolCall,
-      function: {
-        name: "write",
-        arguments: JSON.stringify({ path, content }),
-      },
-    },
-  };
-}
-
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }

package/src/provider/tool-schema-compat.ts

@@ -261,8 +261,8 @@ function normalizeToolSpecificArgs(toolName: string, args: JsonRecord): JsonReco
   if (!hasStringNew && typeof content === "string") {
     repaired.new_string = content;
   }
-  if (typeof repaired.new_string === "string" && !hasStringOld) {
-    repaired.old_string = "";
+  if (hasStringOld && repaired.old_string === "") {
+    delete repaired.old_string;
   }
 
   return repaired;

package/src/tools/defaults.ts

@@ -274,7 +274,7 @@ export function registerDefaultTools(registry: ToolRegistry): void {
     if (include) {
       grepArgs.push(`--include=${include}`);
     }
-    grepArgs.push(pattern, path);
+    grepArgs.push("-e", pattern, path);
 
     const runGrep = async (extraArgs: string[] = []) => {
       return execFileAsync("grep", [...extraArgs, ...grepArgs], { timeout: 30000 });