@rama_nigg/open-cursor 2.3.15 → 2.3.17

package/src/plugin.ts

@@ -25,6 +25,9 @@ import { ToolRouter } from "./tools/router.js";
 import { SkillLoader } from "./tools/skills/loader.js";
 import { SkillResolver } from "./tools/skills/resolver.js";
 import { autoRefreshModels } from "./models/sync.js";
+import { readMcpConfigs } from "./mcp/config.js";
+import { McpClientManager } from "./mcp/client-manager.js";
+import { buildMcpToolHookEntries, buildMcpToolDefinitions } 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";
@@ -77,6 +80,61 @@ function debugLogToFile(message: string, data: any): void {
   }
 }
 
+interface McpToolSummary {
+  serverName: string;
+  toolName: string;
+  description?: string;
+  params?: string[];
+}
+
+export function buildAvailableToolsSystemMessage(
+  lastToolNames: string[],
+  lastToolMap: Array<{ id: string; name: string }>,
+  mcpToolDefs: any[],
+  mcpToolSummaries?: McpToolSummary[],
+): string | null {
+  const parts: string[] = [];
+
+  if (lastToolNames.length > 0 || lastToolMap.length > 0) {
+    const names = lastToolNames.join(", ");
+    const mapping = lastToolMap.map((m) => `${m.id} -> ${m.name}`).join("; ");
+    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 servers = new Map<string, McpToolSummary[]>();
+    for (const s of mcpToolSummaries) {
+      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]",
+      "",
+    ];
+
+    for (const [server, tools] of servers) {
+      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}`);
+      }
+      lines.push("");
+    }
+
+    parts.push(lines.join("\n"));
+  }
+
+  return parts.length > 0 ? parts.join("\n\n") : null;
+}
+
 export async function ensurePluginDirectory(): Promise<void> {
   const configHome = process.env.XDG_CONFIG_HOME
     ? resolve(process.env.XDG_CONFIG_HOME)
@@ -1739,6 +1797,49 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
   // Auto-refresh model list from cursor-agent (non-blocking, fire-and-forget)
   autoRefreshModels().catch(() => {});
 
+  // MCP tool bridge: connect to MCP servers and register their tools.
+  // We await init so tools are available before the plugin returns its tool hook.
+  const mcpManager = new McpClientManager();
+  let mcpToolEntries: Record<string, any> = {};
+  let mcpToolDefs: any[] = [];
+  let mcpToolSummaries: McpToolSummary[] = [];
+  const mcpEnabled = process.env.CURSOR_ACP_MCP_BRIDGE !== "false"; // default ON
+
+  if (mcpEnabled) {
+    try {
+      const configs = readMcpConfigs();
+      if (configs.length === 0) {
+        log.debug("No MCP servers configured, skipping MCP bridge");
+      } else {
+        log.debug("MCP bridge: connecting to servers", { count: configs.length });
+
+        await Promise.allSettled(configs.map((c) => mcpManager.connectServer(c)));
+
+        const tools = mcpManager.listTools();
+        if (tools.length === 0) {
+          log.debug("MCP bridge: no tools discovered");
+        } else {
+          mcpToolEntries = buildMcpToolHookEntries(tools, mcpManager);
+          mcpToolDefs = buildMcpToolDefinitions(tools);
+          mcpToolSummaries = tools.map((t) => ({
+            serverName: t.serverName,
+            toolName: t.name,
+            description: t.description,
+            params: t.inputSchema
+              ? Object.keys((t.inputSchema as any).properties ?? {})
+              : undefined,
+          }));
+          log.info("MCP bridge: registered tools", {
+            servers: mcpManager.connectedServers.length,
+            tools: Object.keys(mcpToolEntries).length,
+          });
+        }
+      }
+    } catch (err) {
+      log.debug("MCP bridge init failed", { error: String(err) });
+    }
+  }
+
   // Initialize toast service for MCP pass-through notifications
   toastService.setClient(client);
 
@@ -1862,7 +1963,7 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
   const toolHookEntries = buildToolHookEntries(localRegistry, workspaceDirectory);
 
   return {
-    tool: toolHookEntries,
+    tool: { ...toolHookEntries, ...mcpToolEntries },
     auth: {
       provider: CURSOR_PROVIDER_ID,
       async loader(_getAuth: () => Promise<Auth>) {
@@ -1935,16 +2036,32 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
           log.debug("Failed to refresh tools", { error: String(err) });
         }
       }
+
+      // Append MCP bridge tool definitions so the model can call them
+      if (mcpToolDefs.length > 0) {
+        const beforeTools = Array.isArray(output.options.tools) ? output.options.tools : [];
+        if (Array.isArray(output.options.tools)) {
+          output.options.tools = [...output.options.tools, ...mcpToolDefs];
+        } else {
+          output.options.tools = mcpToolDefs;
+        }
+        const afterTools = Array.isArray(output.options.tools) ? output.options.tools : [];
+        log.debug("Injected MCP tool definitions into chat.params", {
+          injectedCount: mcpToolDefs.length,
+          beforeCount: beforeTools.length,
+          afterCount: afterTools.length,
+          mcpNames: mcpToolDefs.slice(0, 10).map((t: any) => t?.function?.name ?? t?.name ?? "unknown"),
+          tailNames: afterTools.slice(-10).map((t: any) => t?.function?.name ?? t?.name ?? "unknown"),
+        });
+      }
     },
 
     async "experimental.chat.system.transform"(input: any, output: { system: string[] }) {
-      if (!toolsEnabled || lastToolNames.length === 0) return;
-      const names = lastToolNames.join(", ");
-      const mapping = lastToolMap.map((m) => `${m.id} -> ${m.name}`).join("; ");
+      if (!toolsEnabled) return;
+      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries);
+      if (!systemMessage) return;
       output.system = output.system || [];
-      output.system.push(
-        `Available OpenCode tools (use via tool calls): ${names}. Original skill ids mapped as: ${mapping}. Aliases include oc_skill_* and oc_superskill_* when applicable.`
-      );
+      output.system.push(systemMessage);
     },
   };
 };

package/src/tools/defaults.ts

@@ -18,7 +18,7 @@ export function registerDefaultTools(registry: ToolRegistry): void {
         },
         timeout: {
           type: "number",
-          description: "Timeout in milliseconds (default: 30000)"
+          description: "Timeout in seconds (default: 30)"
         },
         cwd: {
           type: "string",
@@ -29,25 +29,49 @@ export function registerDefaultTools(registry: ToolRegistry): void {
     },
     source: "local" as const
   }, async (args) => {
-    const { exec } = await import("child_process");
-    const { promisify } = await import("util");
-    const execAsync = promisify(exec);
+    const { spawn } = await import("child_process");
 
-    try {
-      const command = resolveBashCommand(args);
-      if (!command) {
-        throw new Error("bash: missing required argument 'command'");
-      }
-      const timeout = resolveTimeout(args.timeout);
-      const cwd = resolveWorkingDirectory(args);
-      const { stdout, stderr } = await execAsync(command, {
-        timeout: timeout ?? 30000,
-        cwd: cwd
-      });
-      return stdout || stderr || "Command executed successfully";
-    } catch (error: any) {
-      throw error;
+    const command = resolveBashCommand(args);
+    if (!command) {
+      throw new Error("bash: missing required argument 'command'");
     }
+    const timeoutMs = resolveTimeoutMs(args.timeout);
+    const cwd = resolveWorkingDirectory(args);
+
+    return new Promise<string>((resolve, reject) => {
+      const proc = spawn(command, {
+        shell: process.env.SHELL || "/bin/bash",
+        cwd,
+      });
+
+      const stdoutChunks: Buffer[] = [];
+      const stderrChunks: Buffer[] = [];
+      let timedOut = false;
+
+      const timer = setTimeout(() => {
+        timedOut = true;
+        proc.kill("SIGTERM");
+      }, timeoutMs);
+
+      proc.stdout.on("data", (chunk: Buffer) => stdoutChunks.push(chunk));
+      proc.stderr.on("data", (chunk: Buffer) => stderrChunks.push(chunk));
+
+      proc.on("close", (code) => {
+        clearTimeout(timer);
+        const stdout = Buffer.concat(stdoutChunks).toString("utf8");
+        const stderr = Buffer.concat(stderrChunks).toString("utf8");
+        const output = stdout || stderr || "Command executed successfully";
+        if (timedOut) {
+          resolve(`Command timed out after ${timeoutMs / 1000}s\n${output}`);
+        } else if (code !== 0) {
+          resolve(`${output}\n[Exit code: ${code}]`);
+        } else {
+          resolve(output);
+        }
+      });
+
+      proc.on("error", reject);
+    });
   });
 
   // 2. Read tool - Read file contents
@@ -598,6 +622,14 @@ function resolveTimeout(value: unknown): number | undefined {
   return undefined;
 }
 
+// Convert model-supplied timeout (seconds) to milliseconds. Falls back to 30s.
+function resolveTimeoutMs(value: unknown): number {
+  const raw = resolveTimeout(value);
+  if (raw === undefined) return 30_000;
+  // Values ≤ 600 are treated as seconds (no real use case for a <600ms shell timeout).
+  return raw <= 600 ? raw * 1000 : raw;
+}
+
 function resolveBoolean(value: unknown, defaultValue: boolean): boolean {
   if (typeof value === "boolean") {
     return value;