@rama_nigg/open-cursor 2.4.5 → 2.4.6

package/dist/plugin-entry.js

@@ -1066,27 +1066,6 @@ var init_perf = __esm(() => {
 });
 
 // src/proxy/prompt-builder.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join5 } from "node:path";
-function ensureLogDir2() {
-  try {
-    if (!existsSync4(DEBUG_LOG_DIR)) {
-      mkdirSync2(DEBUG_LOG_DIR, { recursive: true });
-    }
-  } catch {}
-}
-function debugLogToFile(message, data) {
-  try {
-    ensureLogDir2();
-    const timestamp = new Date().toISOString();
-    const logLine = `[${timestamp}] ${message}: ${JSON.stringify(data, null, 2)}
-`;
-    appendFileSync2(DEBUG_LOG_FILE, logLine);
-  } catch (err) {
-    log5.debug(message, data);
-  }
-}
 function buildPromptFromMessages(messages, tools, subagentNames = []) {
   const messageSummary = messages.map((m, i) => {
     const role = m?.role ?? "?";
@@ -1100,7 +1079,7 @@ function buildPromptFromMessages(messages, tools, subagentNames = []) {
   const assistantWithToolCalls = messages.filter((m) => m?.role === "assistant" && Array.isArray(m?.tool_calls) && m.tool_calls.length > 0);
   const assistantEmpty = messages.filter((m) => m?.role === "assistant" && (!m?.tool_calls || m.tool_calls.length === 0) && (!m?.content || m.content === "" || m.content === null));
   const toolResults = messages.filter((m) => m?.role === "tool");
-  debugLogToFile("buildPromptFromMessages", {
+  log5.debug("buildPromptFromMessages", {
     totalMessages: messages.length,
     totalTools: tools.length,
     messageSummary,
@@ -1195,22 +1174,20 @@ ${toolDescs}`);
   const finalPrompt = lines.join(`
 
 `);
-  debugLogToFile("buildPromptFromMessages: final prompt", {
+  log5.debug("buildPromptFromMessages: final prompt", {
     lineCount: lines.length,
     promptLength: finalPrompt.length,
     promptPreview: finalPrompt.slice(0, 500),
     hasToolResultFormat: finalPrompt.includes("TOOL_RESULT"),
     hasAssistantToolCallFormat: finalPrompt.includes("tool_call(id:"),
-    hasCompletionSignal: finalPrompt.includes("Based on the tool results")
+    hasCompletionSignal: finalPrompt.includes("The above tool calls have been executed")
   });
   return finalPrompt;
 }
-var log5, DEBUG_LOG_DIR, DEBUG_LOG_FILE;
+var log5;
 var init_prompt_builder = __esm(() => {
   init_logger();
   log5 = createLogger("proxy:prompt-builder");
-  DEBUG_LOG_DIR = join5(homedir4(), ".config", "opencode", "logs");
-  DEBUG_LOG_FILE = join5(DEBUG_LOG_DIR, "tool-loop-debug.log");
 });
 
 // src/proxy/tool-loop.ts
@@ -11999,7 +11976,7 @@ function buildMcpToolDefinitions(tools) {
 function namespaceMcpTool(serverName, toolName) {
   const sanitizedServer = serverName.replace(/[^a-zA-Z0-9]/g, "_");
   const sanitizedTool = toolName.replace(/[^a-zA-Z0-9]/g, "_");
-  return `mcp__${sanitizedServer}__${sanitizedTool}`;
+  return `${MCP_TOOL_PREFIX}${sanitizedServer}__${sanitizedTool}`;
 }
 function mcpSchemaToZod(inputSchema, z2) {
   if (!inputSchema || typeof inputSchema !== "object") {
@@ -12041,7 +12018,7 @@ function mcpSchemaToZod(inputSchema, z2) {
   }
   return shape;
 }
-var log13;
+var log13, MCP_TOOL_PREFIX = "mcp__";
 var init_tool_bridge = __esm(() => {
   init_logger();
   log13 = createLogger("mcp:tool-bridge");
@@ -14046,9 +14023,6 @@ function resolveEditArguments(args) {
       newString = fallbackContent;
     }
   }
-  if (oldString === undefined && newString !== undefined) {
-    oldString = "";
-  }
   return {
     path: path2,
     old_string: oldString,
@@ -14455,7 +14429,10 @@ function applyToolSchemaCompat(toolCall, toolSchemaMap) {
   const toolSpecificArgs = normalizeToolSpecificArgs(toolCall.function.name, normalizedArgs);
   const schema = toolSchemaMap.get(toolCall.function.name);
   const sanitization = sanitizeArgumentsForSchema(toolSpecificArgs, schema);
-  const validation = validateToolArguments(toolCall.function.name, sanitization.args, schema, sanitization.unexpected);
+  const validation = validateToolArguments(toolCall.function.name, sanitization.args, schema, sanitization.unexpected, {
+    originalArgs: parsedArgs,
+    writeSchema: toolSchemaMap.get("write")
+  });
   const normalizedToolCall = {
     ...toolCall,
     function: {
@@ -14466,12 +14443,59 @@ function applyToolSchemaCompat(toolCall, toolSchemaMap) {
   return {
     toolCall: normalizedToolCall,
     normalizedArgs: sanitization.args,
+    originalArgs: parsedArgs,
     originalArgKeys,
     normalizedArgKeys: Object.keys(sanitization.args),
     collisionKeys,
     validation
   };
 }
+function isFullFileShapedEditValidationFailure(toolName, args, validation, originalArgs, writeSchema) {
+  if (toolName.toLowerCase() !== "edit" || validation.ok) {
+    return false;
+  }
+  return buildEditFullFileHint(args, validation.missing, validation.typeErrors, {
+    originalArgs,
+    writeSchema
+  }) !== null;
+}
+function buildWriteArguments(filePath, content, writeSchema) {
+  if (!isRecord3(writeSchema)) {
+    return { path: filePath, content };
+  }
+  const required = Array.isArray(writeSchema.required) ? writeSchema.required.filter((value) => typeof value === "string") : [];
+  if (required.includes("filePath")) {
+    return { filePath, content };
+  }
+  return { path: filePath, content };
+}
+function tryRerouteEditToWrite(toolCall, compat, allowedToolNames, toolSchemaMap) {
+  if (toolCall.function.name.toLowerCase() !== "edit") {
+    return null;
+  }
+  if (!allowedToolNames.has("write") || !toolSchemaMap.has("write")) {
+    return null;
+  }
+  const writeSchema = toolSchemaMap.get("write");
+  if (!isFullFileShapedEditValidationFailure(toolCall.function.name, compat.normalizedArgs, compat.validation, compat.originalArgs, writeSchema)) {
+    return null;
+  }
+  const filePath = typeof compat.normalizedArgs.path === "string" && compat.normalizedArgs.path.length > 0 ? compat.normalizedArgs.path : typeof compat.normalizedArgs.filePath === "string" && compat.normalizedArgs.filePath.length > 0 ? compat.normalizedArgs.filePath : null;
+  if (!filePath) {
+    return null;
+  }
+  const content = typeof compat.normalizedArgs.new_string === "string" ? compat.normalizedArgs.new_string : typeof compat.normalizedArgs.newString === "string" ? compat.normalizedArgs.newString : typeof compat.normalizedArgs.content === "string" ? compat.normalizedArgs.content : null;
+  if (content === null) {
+    return null;
+  }
+  return {
+    ...toolCall,
+    function: {
+      name: "write",
+      arguments: JSON.stringify(buildWriteArguments(filePath, content, writeSchema))
+    }
+  };
+}
 function parseArguments(rawArguments) {
   try {
     const parsed = JSON.parse(rawArguments);
@@ -14654,7 +14678,7 @@ function sanitizeArgumentsForSchema(args, schema) {
   }
   return { args: sanitized, unexpected };
 }
-function validateToolArguments(toolName, args, schema, unexpected) {
+function validateToolArguments(toolName, args, schema, unexpected, context = {}) {
   if (!isRecord3(schema)) {
     return {
       hasSchema: false,
@@ -14690,10 +14714,59 @@ function validateToolArguments(toolName, args, schema, unexpected) {
     missing,
     unexpected,
     typeErrors,
-    repairHint: ok ? undefined : buildRepairHint(toolName, missing, unexpected, typeErrors)
+    repairHint: ok ? undefined : buildRepairHint(toolName, args, missing, unexpected, typeErrors, context)
   };
 }
-function buildRepairHint(toolName, missing, unexpected, typeErrors) {
+function hadOldStringPropertyInPayload(args) {
+  for (const key of Object.keys(args)) {
+    const token = key.toLowerCase().replace(/[^a-z0-9]/g, "");
+    if (token === "oldstring") {
+      return true;
+    }
+  }
+  return false;
+}
+function hasEditFilePath(args) {
+  const pathValue = args.path ?? args.filePath;
+  return typeof pathValue === "string" && pathValue.trim().length > 0;
+}
+function hasEditBody(args) {
+  const body = args.new_string ?? args.newString ?? args.content;
+  return typeof body === "string" && body.length > 0;
+}
+function writeToolExample(writeSchema) {
+  if (!isRecord3(writeSchema)) {
+    return "write with path and content";
+  }
+  const required = Array.isArray(writeSchema.required) ? writeSchema.required.filter((value) => typeof value === "string") : [];
+  if (required.includes("filePath")) {
+    return "write with filePath and content";
+  }
+  return "write with path and content";
+}
+function buildEditFullFileHint(args, missing, typeErrors, context) {
+  if (typeErrors.length > 0) {
+    return null;
+  }
+  const missingOldStringOnly = (missing.includes("old_string") || missing.includes("oldString")) && missing.every((key) => key === "old_string" || key === "oldString");
+  if (!missingOldStringOnly) {
+    return null;
+  }
+  const originalArgs = context.originalArgs ?? {};
+  if (hadOldStringPropertyInPayload(originalArgs)) {
+    return null;
+  }
+  if (!hasEditFilePath(args) || !hasEditBody(args)) {
+    return null;
+  }
+  const example = writeToolExample(context.writeSchema);
+  return `For a full file body, use ${example} instead of edit without old_string`;
+}
+function buildRepairHint(toolName, args, missing, unexpected, typeErrors, context = {}) {
+  const fullFileHint = toolName.toLowerCase() === "edit" ? buildEditFullFileHint(args, missing, typeErrors, context) : null;
+  if (fullFileHint) {
+    return fullFileHint;
+  }
   const hints = [];
   if (missing.length > 0) {
     hints.push(`missing required: ${missing.join(", ")}`);
@@ -14704,7 +14777,7 @@ function buildRepairHint(toolName, missing, unexpected, typeErrors) {
   if (typeErrors.length > 0) {
     hints.push(`fix type errors: ${typeErrors.join("; ")}`);
   }
-  if (toolName.toLowerCase() === "edit" && (missing.includes("old_string") || missing.includes("new_string"))) {
+  if (toolName.toLowerCase() === "edit" && (missing.includes("old_string") || missing.includes("oldString") || missing.includes("new_string") || missing.includes("newString"))) {
     hints.push("edit requires path, old_string, and new_string");
   }
   return hints.join(" | ");
@@ -14891,6 +14964,14 @@ async function handleToolLoopEventLegacy(options) {
         }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
+      const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat, allowedToolNames, toolSchemaMap);
+      if (reroutedWrite) {
+        log18.debug("Rerouting malformed edit call to write (legacy)", {
+          missing: compat.validation.missing
+        });
+        await onInterceptedToolCall(reroutedWrite);
+        return { intercepted: true, skipConverter: true };
+      }
       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", {
@@ -15042,6 +15123,18 @@ async function handleToolLoopEventV1(options) {
         terminate: createSchemaValidationTermination(normalizedToolCall, compat.validation)
       };
     }
+    const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat, allowedToolNames, toolSchemaMap);
+    if (reroutedWrite) {
+      log18.debug("Rerouting malformed edit call to write", {
+        missing: compat.validation.missing,
+        typeErrors: compat.validation.typeErrors
+      });
+      await onInterceptedToolCall(reroutedWrite);
+      return {
+        intercepted: true,
+        skipConverter: true
+      };
+    }
     if (schemaValidationFailureMode === "pass_through" && shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
       const hintChunk = createNonFatalSchemaValidationHintChunk(responseMeta, normalizedToolCall, compat.validation);
       log18.debug("Emitting non-fatal schema validation hint and skipping malformed tool execution", {
@@ -15252,8 +15345,9 @@ function shouldTerminateOnSchemaValidation(toolCall, validation) {
 }
 function createNonFatalSchemaValidationHintChunk(meta, toolCall, validation) {
   const termination = createSchemaValidationTermination(toolCall, validation);
-  const hint = termination.repairHint || "Use write for full-file replacement, or provide path, old_string, and new_string for edit.";
-  const content = `Skipped malformed tool call "${toolCall.function.name}": ${termination.message} ${hint}`.trim();
+  const fallbackHint = "Use write for full-file replacement, or provide path, old_string, and new_string for edit.";
+  const suffix = termination.repairHint ? "" : ` ${fallbackHint}`;
+  const content = `Skipped malformed tool call "${toolCall.function.name}": ${termination.message}${suffix}`.trim();
   return {
     id: meta.id,
     object: "chat.completion.chunk",
@@ -15894,25 +15988,13 @@ __export(exports_plugin, {
   CursorPlugin: () => CursorPlugin
 });
 import { tool as tool2 } from "@opencode-ai/plugin";
-import { appendFileSync as appendFileSync3, existsSync as existsSync5, realpathSync } from "fs";
+import { realpathSync } from "fs";
 import { mkdir } from "fs/promises";
-import { homedir as homedir5 } from "os";
-import { isAbsolute, join as join6, relative, resolve as resolve2 } from "path";
-function ensureDebugLogDir() {
-  try {
-    if (!existsSync5(DEBUG_LOG_DIR2)) {
-      mkdir(DEBUG_LOG_DIR2, { recursive: true }).catch(() => {});
-    }
-  } catch {}
-}
-function debugLogToFile2(message, data) {
-  try {
-    ensureDebugLogDir();
-    const timestamp = new Date().toISOString();
-    const logLine = `[${timestamp}] ${message}: ${JSON.stringify(data, null, 2)}
-`;
-    appendFileSync3(DEBUG_LOG_FILE2, logLine);
-  } catch {}
+import { homedir as homedir4 } from "os";
+import { isAbsolute, join as join5, relative, resolve as resolve2 } from "path";
+function getMcpToolDefinitionName(mcpToolDefs, index) {
+  const name = mcpToolDefs[index]?.function?.name;
+  return typeof name === "string" && name.length > 0 ? name : undefined;
 }
 function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries, subagentNames = []) {
   const parts = [];
@@ -15922,27 +16004,27 @@ function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDef
     parts.push(`Available OpenCode tools (use via tool calls): ${names}. Original skill ids mapped as: ${mapping}. Aliases include oc_skill_* and oc_superskill_* when applicable.`);
   }
   if (mcpToolSummaries && mcpToolSummaries.length > 0) {
+    const summariesWithCallNames = mcpToolSummaries.map((summary, index) => ({
+      ...summary,
+      callName: summary.callName ?? getMcpToolDefinitionName(mcpToolDefs, index) ?? namespaceMcpTool(summary.serverName, summary.toolName)
+    }));
     const servers = new Map;
-    for (const s of mcpToolSummaries) {
+    for (const s of summariesWithCallNames) {
       const list = servers.get(s.serverName) ?? [];
       list.push(s);
       servers.set(s.serverName, list);
     }
     const lines = [
-      "MCP TOOLS — Use via Shell with the `mcptool` CLI.",
-      "Syntax: mcptool call <server> <tool> [json-args]",
+      `MCP TOOLS — Use via direct tool calls (\`${MCP_TOOL_PREFIX}<server>__<tool>\`).`,
+      "These tools are exposed as first-class tool calls (e.g. mcp__filesystem__read_file).",
       ""
     ];
     for (const [server2, tools] of servers) {
       lines.push(`Server: ${server2}`);
       for (const t of tools) {
         const paramHint = t.params?.length ? ` (params: ${t.params.join(", ")})` : "";
-        lines.push(`  - ${t.toolName}${paramHint}${t.description ? " — " + t.description : ""}`);
-      }
-      if (tools.length > 0) {
-        const ex = tools[0];
-        const exArgs = ex.params?.length ? ` '{"${ex.params[0]}":"..."}'` : "";
-        lines.push(`  Example: mcptool call ${server2} ${ex.toolName}${exArgs}`);
+        const sourceHint = t.callName === t.toolName ? "" : ` (server: ${t.serverName}; tool: ${t.toolName})`;
+        lines.push(`  - ${t.callName}${paramHint}${t.description ? " — " + t.description : ""}${sourceHint}`);
       }
       lines.push("");
     }
@@ -15957,8 +16039,8 @@ function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDef
 `) : null;
 }
 async function ensurePluginDirectory() {
-  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join6(homedir5(), ".config");
-  const pluginDir = join6(configHome, "opencode", "plugin");
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join5(homedir4(), ".config");
+  const pluginDir = join5(configHome, "opencode", "plugin");
   try {
     await mkdir(pluginDir, { recursive: true });
     log20.debug("Plugin directory ensured", { path: pluginDir });
@@ -15975,8 +16057,8 @@ function getGlobalKey() {
   return "__opencode_cursor_proxy_server__";
 }
 function getOpenCodeConfigPrefix() {
-  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join6(homedir5(), ".config");
-  return join6(configHome, "opencode");
+  const configHome = process.env.XDG_CONFIG_HOME ? resolve2(process.env.XDG_CONFIG_HOME) : join5(homedir4(), ".config");
+  return join5(configHome, "opencode");
 }
 function canonicalizePathForCompare(pathValue) {
   const resolvedPath = resolve2(pathValue);
@@ -16053,7 +16135,7 @@ function resolveWorkspaceDirectory(worktree, directory) {
   if (isAcceptableWorkspace(cwd, configPrefix)) {
     return cwd;
   }
-  const home = resolveCandidate(homedir5());
+  const home = resolveCandidate(homedir4());
   if (home && !isRootPath(home)) {
     return home;
   }
@@ -16355,7 +16437,7 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const messages = Array.isArray(body?.messages) ? body.messages : [];
       const stream = body?.stream === true;
       const tools = Array.isArray(body?.tools) ? body.tools : [];
-      debugLogToFile2("raw_request_body", {
+      log20.debug("raw request body", {
         model: body?.model,
         cursorModel: body?.cursorModel,
         stream,
@@ -17346,7 +17428,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, NATIVE_TOOL_HOOK_EXCLUSIONS, CursorPlugin = async ({ $, directory, worktree, client: client3, serverUrl }) => {
+var log20, 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,
@@ -17402,6 +17484,7 @@ var log20, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
           mcpToolSummaries = tools.map((t) => ({
             serverName: t.serverName,
             toolName: t.name,
+            callName: namespaceMcpTool(t.serverName, t.name),
             description: t.description,
             params: t.inputSchema ? Object.keys(t.inputSchema.properties ?? {}) : undefined
           }));
@@ -17619,8 +17702,6 @@ var init_plugin = __esm(() => {
   init_tool_loop_guard();
   init_binary();
   log20 = createLogger("plugin");
-  DEBUG_LOG_DIR2 = join6(homedir5(), ".config", "opencode", "logs");
-  DEBUG_LOG_FILE2 = join6(DEBUG_LOG_DIR2, "tool-loop-debug.log");
   CURSOR_PROVIDER_PREFIX = `${CURSOR_PROVIDER_ID2}/`;
   CURSOR_PROXY_DEFAULT_BASE_URL = `http://${CURSOR_PROXY_HOST}:${CURSOR_PROXY_DEFAULT_PORT}/v1`;
   REUSE_EXISTING_PROXY = process.env.CURSOR_ACP_REUSE_EXISTING_PROXY !== "false";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rama_nigg/open-cursor",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "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/mcp/tool-bridge.ts

@@ -4,6 +4,8 @@ import type { McpClientManager } from "./client-manager.js";
 
 const log = createLogger("mcp:tool-bridge");
 
+export const MCP_TOOL_PREFIX = "mcp__";
+
 interface DiscoveredMcpTool {
   name: string;
   serverName: string;
@@ -76,10 +78,10 @@ export function buildMcpToolDefinitions(tools: DiscoveredMcpTool[]): any[] {
   return defs;
 }
 
-function namespaceMcpTool(serverName: string, toolName: string): string {
+export function namespaceMcpTool(serverName: string, toolName: string): string {
   const sanitizedServer = serverName.replace(/[^a-zA-Z0-9]/g, "_");
   const sanitizedTool = toolName.replace(/[^a-zA-Z0-9]/g, "_");
-  return `mcp__${sanitizedServer}__${sanitizedTool}`;
+  return `${MCP_TOOL_PREFIX}${sanitizedServer}__${sanitizedTool}`;
 }
 
 function mcpSchemaToZod(inputSchema: Record<string, unknown> | undefined, z: any): any {

package/src/plugin.ts

@@ -1,7 +1,7 @@
 import type { Plugin, PluginInput } from "@opencode-ai/plugin";
 import { tool } from "@opencode-ai/plugin";
 import type { Auth } from "@opencode-ai/sdk";
-import { appendFileSync, existsSync, mkdirSync, realpathSync } from "fs";
+import { realpathSync } from "fs";
 import { mkdir } from "fs/promises";
 import { homedir } from "os";
 import { isAbsolute, join, relative, resolve } from "path";
@@ -33,7 +33,12 @@ import { SkillResolver } from "./tools/skills/resolver.js";
 import { autoRefreshModels } from "./models/sync.js";
 import { readMcpConfigs, readSubagentNames } from "./mcp/config.js";
 import { McpClientManager } from "./mcp/client-manager.js";
-import { buildMcpToolHookEntries, buildMcpToolDefinitions } from "./mcp/tool-bridge.js";
+import {
+  MCP_TOOL_PREFIX,
+  buildMcpToolHookEntries,
+  buildMcpToolDefinitions,
+  namespaceMcpTool,
+} from "./mcp/tool-bridge.js";
 import { createOpencodeClient } from "@opencode-ai/sdk";
 import { ToolRegistry as CoreRegistry } from "./tools/core/registry.js";
 import { LocalExecutor } from "./tools/executors/local.js";
@@ -62,38 +67,19 @@ import { formatShellCommandForPlatform, resolveCursorAgentBinary } from "./utils
 
 const log = createLogger("plugin");
 
-// Debug log file for tool-loop investigation
-const DEBUG_LOG_DIR = join(homedir(), ".config", "opencode", "logs");
-const DEBUG_LOG_FILE = join(DEBUG_LOG_DIR, "tool-loop-debug.log");
-
-function ensureDebugLogDir(): void {
-  try {
-    if (!existsSync(DEBUG_LOG_DIR)) {
-      mkdir(DEBUG_LOG_DIR, { recursive: true }).catch(() => {});
-    }
-  } catch {
-    // Ignore errors creating log directory
-  }
-}
-
-function debugLogToFile(message: string, data: any): void {
-  try {
-    ensureDebugLogDir();
-    const timestamp = new Date().toISOString();
-    const logLine = `[${timestamp}] ${message}: ${JSON.stringify(data, null, 2)}\n`;
-    appendFileSync(DEBUG_LOG_FILE, logLine);
-  } catch {
-    // Ignore errors
-  }
-}
-
 interface McpToolSummary {
   serverName: string;
   toolName: string;
+  callName?: string;
   description?: string;
   params?: string[];
 }
 
+function getMcpToolDefinitionName(mcpToolDefs: any[], index: number): string | undefined {
+  const name = mcpToolDefs[index]?.function?.name;
+  return typeof name === "string" && name.length > 0 ? name : undefined;
+}
+
 export function buildAvailableToolsSystemMessage(
   lastToolNames: string[],
   lastToolMap: Array<{ id: string; name: string }>,
@@ -110,16 +96,23 @@ export function buildAvailableToolsSystemMessage(
   }
 
   if (mcpToolSummaries && mcpToolSummaries.length > 0) {
-    const servers = new Map<string, McpToolSummary[]>();
-    for (const s of mcpToolSummaries) {
+    const summariesWithCallNames = mcpToolSummaries.map((summary, index) => ({
+      ...summary,
+      callName: summary.callName
+        ?? getMcpToolDefinitionName(mcpToolDefs, index)
+        ?? namespaceMcpTool(summary.serverName, summary.toolName),
+    }));
+
+    const servers = new Map<string, Array<McpToolSummary & { callName: string }>>();
+    for (const s of summariesWithCallNames) {
       const list = servers.get(s.serverName) ?? [];
       list.push(s);
       servers.set(s.serverName, list);
     }
 
     const lines: string[] = [
-      "MCP TOOLS — Use via Shell with the `mcptool` CLI.",
-      "Syntax: mcptool call <server> <tool> [json-args]",
+      `MCP TOOLS — Use via direct tool calls (\`${MCP_TOOL_PREFIX}<server>__<tool>\`).`,
+      "These tools are exposed as first-class tool calls (e.g. mcp__filesystem__read_file).",
       "",
     ];
 
@@ -127,12 +120,8 @@ export function buildAvailableToolsSystemMessage(
       lines.push(`Server: ${server}`);
       for (const t of tools) {
         const paramHint = t.params?.length ? ` (params: ${t.params.join(", ")})` : "";
-        lines.push(`  - ${t.toolName}${paramHint}${t.description ? " — " + t.description : ""}`);
-      }
-      if (tools.length > 0) {
-        const ex = tools[0];
-        const exArgs = ex.params?.length ? ` '{"${ex.params[0]}":"..."}'` : "";
-        lines.push(`  Example: mcptool call ${server} ${ex.toolName}${exArgs}`);
+        const sourceHint = t.callName === t.toolName ? "" : ` (server: ${t.serverName}; tool: ${t.toolName})`;
+        lines.push(`  - ${t.callName}${paramHint}${t.description ? " — " + t.description : ""}${sourceHint}`);
       }
       lines.push("");
     }
@@ -707,8 +696,7 @@ async function ensureCursorProxyServer(workspaceDirectory: string, toolRouter?:
       const stream = body?.stream === true;
       const tools = Array.isArray(body?.tools) ? body.tools : [];
 
-      // DEBUG: Log raw request structure for tool-loop investigation
-      debugLogToFile("raw_request_body", {
+      log.debug("raw request body", {
         model: body?.model,
         cursorModel: body?.cursorModel,
         stream,
@@ -1903,6 +1891,7 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
           mcpToolSummaries = tools.map((t) => ({
             serverName: t.serverName,
             toolName: t.name,
+            callName: namespaceMcpTool(t.serverName, t.name),
             description: t.description,
             params: t.inputSchema
               ? Object.keys((t.inputSchema as any).properties ?? {})

package/src/provider/runtime-interception.ts

@@ -3,7 +3,11 @@ import { extractOpenAiToolCall, type OpenAiToolCall, type ToolCallExtractionResu
 import type { StreamJsonToolCallEvent } from "../streaming/types.js";
 import type { ToolRouter } from "../tools/router.js";
 import { createLogger } from "../utils/logger.js";
-import { applyToolSchemaCompat, type ToolSchemaValidationResult } from "./tool-schema-compat.js";
+import {
+  applyToolSchemaCompat,
+  tryRerouteEditToWrite,
+  type ToolSchemaValidationResult,
+} from "./tool-schema-compat.js";
 import type { ToolLoopGuard } from "./tool-loop-guard.js";
 import type { ProviderBoundaryMode, ToolLoopMode } from "./boundary.js";
 import type { ProviderBoundary } from "./boundary.js";
@@ -190,6 +194,20 @@ export async function handleToolLoopEventLegacy(
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
 
+      const reroutedWrite = tryRerouteEditToWrite(
+        normalizedToolCall,
+        compat,
+        allowedToolNames,
+        toolSchemaMap,
+      );
+      if (reroutedWrite) {
+        log.debug("Rerouting malformed edit call to write (legacy)", {
+          missing: compat.validation.missing,
+        });
+        await onInterceptedToolCall(reroutedWrite);
+        return { intercepted: true, skipConverter: true };
+      }
+
       if (shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)) {
         const hintChunk = createNonFatalSchemaValidationHintChunk(
           responseMeta,
@@ -383,6 +401,23 @@ export async function handleToolLoopEventV1(
         terminate: createSchemaValidationTermination(normalizedToolCall, compat.validation),
       };
     }
+    const reroutedWrite = tryRerouteEditToWrite(
+      normalizedToolCall,
+      compat,
+      allowedToolNames,
+      toolSchemaMap,
+    );
+    if (reroutedWrite) {
+      log.debug("Rerouting malformed edit call to write", {
+        missing: compat.validation.missing,
+        typeErrors: compat.validation.typeErrors,
+      });
+      await onInterceptedToolCall(reroutedWrite);
+      return {
+        intercepted: true,
+        skipConverter: true,
+      };
+    }
     if (
       schemaValidationFailureMode === "pass_through"
       && shouldEmitNonFatalSchemaValidationHint(normalizedToolCall, compat.validation)
@@ -668,11 +703,11 @@ function createNonFatalSchemaValidationHintChunk(
   validation: ToolSchemaValidationResult,
 ): NonFatalSchemaValidationResultChunk {
   const termination = createSchemaValidationTermination(toolCall, validation);
-  const hint =
-    termination.repairHint
-    || "Use write for full-file replacement, or provide path, old_string, and new_string for edit.";
+  const fallbackHint =
+    "Use write for full-file replacement, or provide path, old_string, and new_string for edit.";
+  const suffix = termination.repairHint ? "" : ` ${fallbackHint}`;
   const content =
-    `Skipped malformed tool call "${toolCall.function.name}": ${termination.message} ${hint}`.trim();
+    `Skipped malformed tool call "${toolCall.function.name}": ${termination.message}${suffix}`.trim();
   return {
     id: meta.id,
     object: "chat.completion.chunk",