@rama_nigg/open-cursor 2.4.1 → 2.4.3

package/dist/cli/opencode-cursor.js

@@ -377,6 +377,7 @@ import {
   existsSync as existsSync2,
   lstatSync,
   mkdirSync as mkdirSync2,
+  realpathSync,
   readFileSync,
   rmSync,
   symlinkSync,
@@ -1634,13 +1635,33 @@ function main() {
     process.exit(1);
   }
 }
-if (fileURLToPath(import.meta.url) === resolve(process.argv[1] || "")) {
+function resolveEntrypointArg(argvPath) {
+  if (!argvPath)
+    return "";
+  return resolve(argvPath);
+}
+function toRealPath(path2) {
+  try {
+    return realpathSync(path2);
+  } catch {
+    return path2;
+  }
+}
+function isCliEntrypoint(metaUrl, argvPath) {
+  const currentPath = fileURLToPath(metaUrl);
+  const argvResolved = resolveEntrypointArg(argvPath);
+  if (!argvResolved)
+    return false;
+  return currentPath === argvResolved || toRealPath(currentPath) === toRealPath(argvResolved);
+}
+if (isCliEntrypoint(import.meta.url, process.argv[1])) {
   main();
 }
 export {
   summarizeModelSync,
   runDoctorChecks,
   runDeepDoctorChecks,
+  isCliEntrypoint,
   getStatusResult,
   getBrandingHeader,
   explainCursorModels,

package/dist/index.js

@@ -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);
 }

package/dist/plugin-entry.js

@@ -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);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rama_nigg/open-cursor",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "No prompt limits. No broken streams. Full thinking + tool support. Your Cursor subscription, properly integrated.",
   "type": "module",
   "main": "dist/plugin-entry.js",
@@ -11,7 +11,7 @@
     "test": "bun test",
     "test:unit": "bun test tests/unit",
     "test:integration": "bun test tests/integration",
-    "test:ci:unit": "bun test tests/tools/defaults.test.ts tests/tools/executor-chain.test.ts tests/tools/sdk-executor.test.ts tests/tools/mcp-executor.test.ts tests/tools/skills.test.ts tests/tools/registry.test.ts tests/unit/cli/model-discovery.test.ts tests/unit/proxy/prompt-builder.test.ts tests/unit/proxy/tool-loop.test.ts tests/unit/provider-boundary.test.ts tests/unit/provider-runtime-interception.test.ts tests/unit/provider-tool-schema-compat.test.ts tests/unit/provider-tool-loop-guard.test.ts tests/unit/plugin.test.ts tests/unit/plugin-tools-hook.test.ts tests/unit/plugin-tool-resolution.test.ts tests/unit/plugin-config.test.ts tests/unit/plugin-stream-extraction.test.ts tests/unit/auth.test.ts tests/unit/streaming/line-buffer.test.ts tests/unit/streaming/parser.test.ts tests/unit/streaming/types.test.ts tests/unit/streaming/delta-tracker.test.ts tests/unit/streaming/openai-sse.test.ts tests/unit/streaming/ai-sdk-parts.test.ts tests/competitive/edge.test.ts",
+    "test:ci:unit": "bun test tests/tools/defaults.test.ts tests/tools/executor-chain.test.ts tests/tools/sdk-executor.test.ts tests/tools/mcp-executor.test.ts tests/tools/skills.test.ts tests/tools/registry.test.ts tests/unit/cli/opencode-cursor.test.ts tests/unit/cli/model-discovery.test.ts tests/unit/proxy/prompt-builder.test.ts tests/unit/proxy/tool-loop.test.ts tests/unit/provider-boundary.test.ts tests/unit/provider-runtime-interception.test.ts tests/unit/provider-tool-schema-compat.test.ts tests/unit/provider-tool-loop-guard.test.ts tests/unit/plugin.test.ts tests/unit/plugin-tools-hook.test.ts tests/unit/plugin-tool-resolution.test.ts tests/unit/plugin-config.test.ts tests/unit/plugin-stream-extraction.test.ts tests/unit/auth.test.ts tests/unit/streaming/line-buffer.test.ts tests/unit/streaming/parser.test.ts tests/unit/streaming/types.test.ts tests/unit/streaming/delta-tracker.test.ts tests/unit/streaming/openai-sse.test.ts tests/unit/streaming/ai-sdk-parts.test.ts tests/competitive/edge.test.ts",
     "test:ci:integration": "bun test tests/integration/comprehensive.test.ts tests/integration/tools-router.integration.test.ts tests/integration/stream-router.integration.test.ts tests/integration/opencode-loop.integration.test.ts",
     "check:pricing": "bun run scripts/check-cursor-pricing-coverage.ts",
     "check:pricing:fixture": "bun run scripts/check-cursor-pricing-coverage.ts --models-file tests/fixtures/cursor-pricing-models.txt --skip-doc-fetch",

package/src/cli/opencode-cursor.ts

@@ -6,6 +6,7 @@ import {
   existsSync,
   lstatSync,
   mkdirSync,
+  realpathSync,
   readFileSync,
   rmSync,
   symlinkSync,
@@ -1035,6 +1036,26 @@ function main() {
   }
 }
 
-if (process.env.NODE_ENV !== "test" && fileURLToPath(import.meta.url) === resolve(process.argv[1] || "")) {
+function resolveEntrypointArg(argvPath: string | undefined): string {
+  if (!argvPath) return "";
+  return resolve(argvPath);
+}
+
+function toRealPath(path: string): string {
+  try {
+    return realpathSync(path);
+  } catch {
+    return path;
+  }
+}
+
+export function isCliEntrypoint(metaUrl: string, argvPath: string | undefined): boolean {
+  const currentPath = fileURLToPath(metaUrl);
+  const argvResolved = resolveEntrypointArg(argvPath);
+  if (!argvResolved) return false;
+  return currentPath === argvResolved || toRealPath(currentPath) === toRealPath(argvResolved);
+}
+
+if (process.env.NODE_ENV !== "test" && isCliEntrypoint(import.meta.url, process.argv[1])) {
   main();
 }

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;