@sammorrowdrums/mcpi-ext 0.1.0 → 0.2.0

package/scripts/test-tool-cli-smoke.mjs

@@ -1,28 +1,42 @@
 #!/usr/bin/env node
 /**
  * Smoke test: start RPC server with the weather test server,
- * exercise every tool-cli command, then shut down.
+ * exercise every tool-cli command via the CLI binary, then shut down.
+ *
+ * Tests the full wiring: ToolProvider → ToolCliServer → tool-cli CLI.
  */
 import { McpClientManager } from "../dist/mcp/client-manager.js";
-import { ToolCliRpcServer } from "../dist/tool-cli/rpc-server.js";
+import { ToolCliServer } from "@sammorrowdrums/tool-cli/server";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 
 const execFileAsync = promisify(execFile);
-const CLI = "dist/tool-cli/cli.js";
+
+// Resolve the tool-cli binary from node_modules/.bin
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const CLI = join(__dirname, "..", "node_modules", ".bin", "tool-cli");
+
 const manager = new McpClientManager();
-let rpc;
+let server;
 
 async function run(...args) {
   const { stdout } = await execFileAsync("node", [CLI, ...args], {
     encoding: "utf-8",
-    env: { ...process.env, TOOL_CLI_PORT: String(rpc.getPort()) },
+    env: {
+      ...process.env,
+      TOOL_CLI_PORT: String(server.getPort()),
+      TOOL_CLI_TOKEN: token,
+    },
   });
   console.log(`$ tool-cli ${args.join(" ")}`);
   console.log(stdout);
   return stdout;
 }
 
+let token;
+
 try {
   await manager.connectOne("weather", {
     type: "stdio",
@@ -30,8 +44,25 @@ try {
     args: ["dist/test-servers/weather-stdio.js"],
   });
 
-  rpc = new ToolCliRpcServer(manager, 0);
-  await rpc.start(console.log);
+  // Bridge McpClientManager to ToolProvider
+  const provider = {
+    getServerNames: () => manager.getConnectedServers(),
+    getTools: (s) => manager.getToolsForServer(s),
+    async callTool(s, tool, args) {
+      const client = manager.getClient(s);
+      if (!client) throw new Error(`No client for "${s}"`);
+      const result = await client.callTool({ name: tool, arguments: args });
+      return {
+        content: result.content,
+        isError: result.isError === true ? true : undefined,
+        structuredContent: result.structuredContent,
+      };
+    },
+  };
+
+  server = new ToolCliServer(provider);
+  const startResult = await server.start(console.log);
+  token = startResult.token;
 
   // --help: list servers
   const help = await run("--help");
@@ -50,13 +81,13 @@ try {
   const result = await run("weather", "check_weather_for_city", '{"city":"London"}');
   if (!result.includes("London")) throw new Error("call result missing London");
 
-  await rpc.stop();
+  await server.stop();
   await manager.disconnectAll();
   console.log("Smoke test passed ✓");
   process.exit(0);
 } catch (err) {
   console.error("Smoke test failed:", err);
-  await rpc?.stop().catch(() => {});
+  await server?.stop().catch(() => {});
   await manager.disconnectAll().catch(() => {});
   process.exit(1);
 }

package/src/index.ts

@@ -15,7 +15,8 @@ import {
   formatMcpSkillsForPrompt,
   registerMcpToolProxies,
 } from "./skills/index.js";
-import { ToolCliRpcServer, formatToolCliForPrompt } from "./tool-cli/index.js";
+import { ToolCliServer, formatToolCliForPrompt } from "./tool-cli/index.js";
+import type { ToolProvider } from "./tool-cli/index.js";
 
 export default function (pi: ExtensionAPI) {
   pi.registerTool(dockerE2ETool);
@@ -27,11 +28,27 @@ export default function (pi: ExtensionAPI) {
 
   const mcpManager = new McpClientManager();
   const skillRegistry = new SkillRegistry();
-  const rpcServer = new ToolCliRpcServer(mcpManager);
   const codeModeManager = new CodeModeManager();
   const enabledTools = new Set<string>();
   const gatedToolNames = new Set<string>();
 
+  // Bridge McpClientManager to the ToolProvider interface
+  const toolProvider: ToolProvider = {
+    getServerNames: () => mcpManager.getConnectedServers(),
+    getTools: (server) => mcpManager.getToolsForServer(server),
+    async callTool(server, tool, args) {
+      const client = mcpManager.getClient(server);
+      if (!client) throw new Error(`No client for server "${server}"`);
+      const result = await client.callTool({ name: tool, arguments: args });
+      return {
+        content: result.content as unknown[],
+        isError: result.isError === true ? true : undefined,
+        structuredContent: result.structuredContent as Record<string, unknown> | undefined,
+      };
+    },
+  };
+  const rpcServer = new ToolCliServer(toolProvider);
+
   // Register the load_skill tool so the model can activate MCP skills
   pi.registerTool(createLoadSkillTool({ registry: skillRegistry, mcpManager, enabledTools }));
 
@@ -90,7 +107,9 @@ export default function (pi: ExtensionAPI) {
 
         // Start the tool-cli RPC server for progressive tool discovery
         try {
-          await rpcServer.start(log);
+          const { port, token } = await rpcServer.start(log);
+          pi.setEnv("TOOL_CLI_PORT", String(port));
+          pi.setEnv("TOOL_CLI_TOKEN", token);
         } catch (err) {
           log(`[tool-cli] Failed to start RPC server: ${(err as Error).message}`);
         }
@@ -151,6 +170,8 @@ export default function (pi: ExtensionAPI) {
   });
 
   pi.on("session_shutdown", async () => {
+    pi.unsetEnv("TOOL_CLI_PORT");
+    pi.unsetEnv("TOOL_CLI_TOKEN");
     await rpcServer.stop();
     await mcpManager.disconnectAll();
     skillRegistry.clear();

package/src/tool-cli/index.ts

@@ -1,3 +1,3 @@
-export { ToolCliRpcServer } from "./rpc-server.js";
+export { ToolCliServer } from "@sammorrowdrums/tool-cli/server";
+export type { ToolProvider } from "@sammorrowdrums/tool-cli/server";
 export { formatToolCliForPrompt } from "./format.js";
-export { DEFAULT_PORT, PORT_ENV_VAR, resolvePort } from "./constants.js";

package/dist/code-mode/code-mode-integration.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=code-mode-integration.test.d.ts.map

package/dist/code-mode/code-mode-integration.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"code-mode-integration.test.d.ts","sourceRoot":"","sources":["../../src/code-mode/code-mode-integration.test.ts"],"names":[],"mappings":""}

package/dist/code-mode/code-mode-integration.test.js

@@ -1,116 +0,0 @@
-import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { McpClientManager } from "../mcp/client-manager.js";
-import { CodeModeManager } from "./index.js";
-/**
- * Integration test: connect to the test weather server, verify code mode
- * eligibility, type hint generation, and sandboxed execution with real
- * MCP tool calls returning structuredContent.
- */
-describe("code mode integration (weather server)", () => {
-    const manager = new McpClientManager();
-    const codeMode = new CodeModeManager();
-    beforeAll(async () => {
-        await manager.connectAll({
-            mcpServers: {
-                "test-weather": {
-                    type: "stdio",
-                    command: "node",
-                    args: ["dist/test-servers/weather-stdio.js"],
-                },
-            },
-        });
-        codeMode.initialize(manager);
-    });
-    afterAll(async () => {
-        await manager.disconnectAll();
-    });
-    it("discovers eligible tools with readOnlyHint + outputSchema", () => {
-        const eligible = codeMode.getEligibleTools();
-        expect(eligible.length).toBeGreaterThanOrEqual(2);
-        const names = eligible.map((t) => t.name).sort();
-        expect(names).toContain("check_weather_for_city");
-        expect(names).toContain("check_weekly_forecast_for_city");
-        expect(names).toContain("echo");
-    });
-    it("generates type hints for eligible tools", () => {
-        const hints = codeMode.getTypeHints();
-        expect(hints).toContain("declare const codemode");
-        expect(hints).toContain("check_weather_for_city");
-        expect(hints).toContain("check_weekly_forecast_for_city");
-        expect(hints).toContain("echo");
-        expect(hints).toContain("listTools");
-    });
-    it("reports as active", () => {
-        expect(codeMode.isActive).toBe(true);
-    });
-    it("generates system prompt section", () => {
-        const section = codeMode.formatSystemPromptSection();
-        expect(section).toContain("<code_mode>");
-        expect(section).toContain("code_search");
-        expect(section).toContain("code_execute");
-        expect(section).toContain("declare const codemode");
-    });
-    it("executes code that calls a single tool", async () => {
-        const result = await codeMode.executeCode(`
-      const weather = await codemode.check_weather_for_city({ city: "Tokyo" });
-      return weather;
-    `);
-        expect(result.error).toBeUndefined();
-        expect(result.result).toHaveProperty("temperature", 26);
-        expect(result.result).toHaveProperty("conditions", "Sunny");
-        expect(result.result).toHaveProperty("humidity", 55);
-    });
-    it("executes code that chains multiple tool calls", async () => {
-        const result = await codeMode.executeCode(`
-      const cities = ["London", "Tokyo"];
-      const results = [];
-      for (const city of cities) {
-        const w = await codemode.check_weather_for_city({ city });
-        results.push({ city, temp: w.temperature });
-      }
-      return results;
-    `);
-        expect(result.error).toBeUndefined();
-        expect(result.result).toEqual([
-            { city: "London", temp: 14 },
-            { city: "Tokyo", temp: 26 },
-        ]);
-    });
-    it("executes code that uses listTools", async () => {
-        const result = await codeMode.executeCode(`
-      const tools = await codemode.listTools();
-      return tools.sort();
-    `);
-        expect(result.error).toBeUndefined();
-        const names = result.result;
-        expect(names).toContain("check_weather_for_city");
-        expect(names).toContain("echo");
-    });
-    it("executes code that calls echo tool", async () => {
-        const result = await codeMode.executeCode(`
-      const r = await codemode.echo({ message: "hello code mode" });
-      return r;
-    `);
-        expect(result.error).toBeUndefined();
-        expect(result.result).toEqual({ echo: "hello code mode" });
-    });
-    it("handles tool errors gracefully", async () => {
-        const result = await codeMode.executeCode(`
-      const w = await codemode.check_weather_for_city({ city: "Atlantis" });
-      return w;
-    `);
-        // Atlantis isn't in the data — server returns text-only content (no structuredContent)
-        // The executor should still return something (parsed text or raw string)
-        expect(result.error).toBeUndefined();
-        expect(result.result).toBeDefined();
-    });
-    it("search mode works for tool discovery", async () => {
-        const result = await codeMode.searchTools(`
-      const tools = await codemode.listTools();
-      return tools;
-    `);
-        expect(result.error).toBeUndefined();
-        expect(Array.isArray(result.result)).toBe(true);
-    });
-});
-//# sourceMappingURL=code-mode-integration.test.js.map

package/dist/code-mode/code-mode-integration.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"code-mode-integration.test.js","sourceRoot":"","sources":["../../src/code-mode/code-mode-integration.test.ts"],"names":[],"mappings":"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"}

package/dist/code-mode/eligibility.d.ts

@@ -1,10 +0,0 @@
-import type { McpClientManager, McpTool } from "../mcp/index.js";
-/**
- * A tool is eligible for code mode when:
- * 1. annotations.readOnlyHint === true — does not modify its environment
- * 2. outputSchema is defined — results are typed and parseable
- */
-export declare function isEligibleForCodeMode(tool: McpTool): boolean;
-/** Get all tools eligible for code mode across all connected MCP servers. */
-export declare function getEligibleTools(mcpManager: McpClientManager): McpTool[];
-//# sourceMappingURL=eligibility.d.ts.map

package/dist/code-mode/eligibility.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eligibility.d.ts","sourceRoot":"","sources":["../../src/code-mode/eligibility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAG5D;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,EAAE,CAExE"}

package/dist/code-mode/eligibility.js

@@ -1,14 +0,0 @@
-/**
- * A tool is eligible for code mode when:
- * 1. annotations.readOnlyHint === true — does not modify its environment
- * 2. outputSchema is defined — results are typed and parseable
- */
-export function isEligibleForCodeMode(tool) {
-    const annotations = tool.annotations;
-    return annotations?.readOnlyHint === true && tool.outputSchema != null;
-}
-/** Get all tools eligible for code mode across all connected MCP servers. */
-export function getEligibleTools(mcpManager) {
-    return mcpManager.getTools().filter(isEligibleForCodeMode);
-}
-//# sourceMappingURL=eligibility.js.map

package/dist/code-mode/eligibility.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eligibility.js","sourceRoot":"","sources":["../../src/code-mode/eligibility.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAa;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAqD,CAAC;IAC/E,OAAO,WAAW,EAAE,YAAY,KAAK,IAAI,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC;AACzE,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,gBAAgB,CAAC,UAA4B;IAC3D,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAC7D,CAAC"}

package/dist/code-mode/eligibility.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=eligibility.test.d.ts.map

package/dist/code-mode/eligibility.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eligibility.test.d.ts","sourceRoot":"","sources":["../../src/code-mode/eligibility.test.ts"],"names":[],"mappings":""}

package/dist/code-mode/eligibility.test.js

@@ -1,53 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { isEligibleForCodeMode } from "./eligibility.js";
-function makeTool(overrides = {}) {
-    return {
-        name: "test_tool",
-        description: "A test tool",
-        inputSchema: { type: "object", properties: {} },
-        serverName: "test-server",
-        ...overrides,
-    };
-}
-describe("isEligibleForCodeMode", () => {
-    it("returns true when readOnlyHint is true and outputSchema is defined", () => {
-        const tool = makeTool({
-            annotations: { readOnlyHint: true },
-            outputSchema: { type: "object", properties: { result: { type: "string" } } },
-        });
-        expect(isEligibleForCodeMode(tool)).toBe(true);
-    });
-    it("returns false when readOnlyHint is false", () => {
-        const tool = makeTool({
-            annotations: { readOnlyHint: false },
-            outputSchema: { type: "object", properties: {} },
-        });
-        expect(isEligibleForCodeMode(tool)).toBe(false);
-    });
-    it("returns false when readOnlyHint is missing", () => {
-        const tool = makeTool({
-            annotations: {},
-            outputSchema: { type: "object", properties: {} },
-        });
-        expect(isEligibleForCodeMode(tool)).toBe(false);
-    });
-    it("returns false when annotations is undefined", () => {
-        const tool = makeTool({
-            annotations: undefined,
-            outputSchema: { type: "object", properties: {} },
-        });
-        expect(isEligibleForCodeMode(tool)).toBe(false);
-    });
-    it("returns false when outputSchema is missing", () => {
-        const tool = makeTool({
-            annotations: { readOnlyHint: true },
-            outputSchema: undefined,
-        });
-        expect(isEligibleForCodeMode(tool)).toBe(false);
-    });
-    it("returns false when both readOnlyHint and outputSchema are missing", () => {
-        const tool = makeTool();
-        expect(isEligibleForCodeMode(tool)).toBe(false);
-    });
-});
-//# sourceMappingURL=eligibility.test.js.map

package/dist/code-mode/eligibility.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eligibility.test.js","sourceRoot":"","sources":["../../src/code-mode/eligibility.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,SAAS,QAAQ,CAAC,YAA8B,EAAE;IAChD,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;QAC/C,UAAU,EAAE,aAAa;QACzB,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,IAAI,GAAG,QAAQ,CAAC;YACpB,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;YACnC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;SAC7E,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC;YACpB,WAAW,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE;YACpC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SACjD,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,QAAQ,CAAC;YACpB,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SACjD,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,IAAI,GAAG,QAAQ,CAAC;YACpB,WAAW,EAAE,SAAS;YACtB,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SACjD,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,QAAQ,CAAC;YACpB,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;YACnC,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;QACxB,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/code-mode/executor.d.ts

@@ -1,35 +0,0 @@
-/** Result of code execution. */
-export interface ExecuteResult {
-    result: unknown;
-    error?: string;
-    logs: string[];
-}
-/** A function the sandbox can call to invoke an MCP tool. */
-export type ToolDispatchFn = (toolName: string, args: Record<string, unknown>) => Promise<unknown>;
-export interface ExecutorOptions {
-    /** Memory limit in MB for the V8 isolate. Default: 128. */
-    memoryLimit?: number;
-    /** Execution timeout in milliseconds. Default: 30000. */
-    timeoutMs?: number;
-}
-/**
- * Execute model-generated JavaScript code in an isolated V8 sandbox.
- *
- * The code runs in a fresh `isolated-vm` isolate with:
- * - Enforced memory limit (default 128MB)
- * - Execution timeout (default 30s)
- * - No access to Node.js APIs, filesystem, or network
- * - Only access to provided tool dispatch functions via `codemode.*` proxy
- *
- * Tool calls are dispatched to the host via `Reference` callbacks —
- * actual MCP tool execution happens outside the sandbox.
- */
-export declare function executeInSandbox(code: string, toolNames: string[], dispatch: ToolDispatchFn, options?: ExecutorOptions): Promise<ExecuteResult>;
-/**
- * Normalize model-generated code:
- * - Strip markdown code fences
- * - Handle arrow functions, function declarations, export default
- * - Otherwise leave code as a statement block; callers must explicitly `return` a value
- */
-export declare function normalizeCode(code: string): string;
-//# sourceMappingURL=executor.d.ts.map

package/dist/code-mode/executor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/code-mode/executor.ts"],"names":[],"mappings":"AAGA,gCAAgC;AAChC,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,6DAA6D;AAC7D,MAAM,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEnG,MAAM,WAAW,eAAe;IAC9B,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAKD;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EAAE,EACnB,QAAQ,EAAE,cAAc,EACxB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC,CAUxB;AA6ED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6BlD"}

package/dist/code-mode/executor.js

@@ -1,120 +0,0 @@
-import ivm from "isolated-vm";
-import { sanitizeToolName } from "./type-hints.js";
-const DEFAULT_MEMORY_LIMIT = 128;
-const DEFAULT_TIMEOUT_MS = 30_000;
-/**
- * Execute model-generated JavaScript code in an isolated V8 sandbox.
- *
- * The code runs in a fresh `isolated-vm` isolate with:
- * - Enforced memory limit (default 128MB)
- * - Execution timeout (default 30s)
- * - No access to Node.js APIs, filesystem, or network
- * - Only access to provided tool dispatch functions via `codemode.*` proxy
- *
- * Tool calls are dispatched to the host via `Reference` callbacks —
- * actual MCP tool execution happens outside the sandbox.
- */
-export async function executeInSandbox(code, toolNames, dispatch, options = {}) {
-    const memoryLimit = options.memoryLimit ?? DEFAULT_MEMORY_LIMIT;
-    const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-    const isolate = new ivm.Isolate({ memoryLimit });
-    try {
-        return await runInIsolate(isolate, code, toolNames, dispatch, timeoutMs);
-    }
-    finally {
-        isolate.dispose();
-    }
-}
-async function runInIsolate(isolate, code, toolNames, dispatch, timeoutMs) {
-    const ctx = await isolate.createContext();
-    const jail = ctx.global;
-    const logs = [];
-    // Inject console.log that captures to logs array
-    const logCallback = new ivm.Callback((...args) => {
-        logs.push(args.map((a) => (typeof a === "string" ? a : JSON.stringify(a))).join(" "));
-    });
-    await jail.set("__log", logCallback);
-    // Inject tool dispatcher Reference (async callback)
-    const dispatchRef = new ivm.Reference(async (toolName, argsJson) => {
-        const args = JSON.parse(argsJson);
-        const result = await dispatch(toolName, args);
-        return JSON.stringify(result === undefined ? null : result);
-    });
-    await jail.set("__dispatch", dispatchRef);
-    // Build the tool call helper and codemode proxy as setup code
-    const toolProxyEntries = toolNames
-        .map((name) => {
-        const safe = sanitizeToolName(name);
-        return `    ${safe}: async (args) => __callTool(${JSON.stringify(name)}, args)`;
-    })
-        .join(",\n");
-    const normalized = normalizeCode(code);
-    // Use ctx.eval with { promise: true } instead of compileModule,
-    // because module.evaluate() can resolve prematurely with multiple
-    // sequential async Reference.apply calls.
-    const wrappedCode = `
-    (async () => {
-      const console = { log: (...args) => __log(args.map(a => typeof a === 'string' ? a : JSON.stringify(a)).join(' ')) };
-      const __callTool = async (name, args) => {
-        const r = await __dispatch.apply(undefined, [name, JSON.stringify(args ?? {})], { arguments: { copy: true }, result: { promise: true, copy: true } });
-        return JSON.parse(r);
-      };
-      const codemode = {
-        listTools: async () => ${JSON.stringify(toolNames)},
-        describeTools: async (names) => "Use the typed codemode.toolName(args) methods instead.",
-${toolProxyEntries}
-      };
-
-      const __userFn = async () => {
-        ${normalized}
-      };
-
-      return JSON.stringify({ value: await __userFn() });
-    })()
-  `;
-    try {
-        const rawResult = (await ctx.eval(wrappedCode, {
-            promise: true,
-            copy: true,
-            timeout: timeoutMs,
-        }));
-        const parsed = JSON.parse(rawResult);
-        return { result: parsed.value, logs };
-    }
-    catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        return { result: undefined, error: message, logs };
-    }
-}
-/**
- * Normalize model-generated code:
- * - Strip markdown code fences
- * - Handle arrow functions, function declarations, export default
- * - Otherwise leave code as a statement block; callers must explicitly `return` a value
- */
-export function normalizeCode(code) {
-    let normalized = code.trim();
-    // Strip markdown code fences
-    normalized = normalized.replace(/^```(?:js|javascript|typescript|ts)?\s*\n?/i, "");
-    normalized = normalized.replace(/\n?```\s*$/i, "");
-    normalized = normalized.trim();
-    // If it's an arrow function or function expression, invoke it
-    if (/^(?:async\s+)?(?:\([^)]*\)|[a-zA-Z_$][a-zA-Z0-9_$]*)\s*=>/.test(normalized)) {
-        return `return (${normalized})();`;
-    }
-    // If it's a function declaration, invoke it
-    if (/^(?:async\s+)?function\s+/.test(normalized)) {
-        const match = normalized.match(/^(?:async\s+)?function\s+([a-zA-Z_$][a-zA-Z0-9_$]*)/);
-        if (match) {
-            return `${normalized}\nreturn ${match[1]}();`;
-        }
-    }
-    // If it starts with export default, strip the export default
-    if (/^export\s+default\s+/.test(normalized)) {
-        normalized = normalized.replace(/^export\s+default\s+/, "");
-        return `return (${normalized})();`;
-    }
-    // Otherwise, treat as a code block — return the last expression
-    return normalized;
-}
-//# sourceMappingURL=executor.js.map

package/dist/code-mode/executor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/code-mode/executor.ts"],"names":[],"mappings":"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"}

package/dist/code-mode/executor.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=executor.test.d.ts.map

package/dist/code-mode/executor.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"executor.test.d.ts","sourceRoot":"","sources":["../../src/code-mode/executor.test.ts"],"names":[],"mappings":""}