@mhingston5/conduit 1.1.3 → 1.1.5

package/tests/__snapshots__/assets.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`Asset Integrity (Golden Tests) > should match Isolate SDK snapshot 1`] = `
 "// Generated SDK for isolated-vm
 const __allowedTools = ["test__*","github__*"];
-const tools = {
+const _tools = {
   test: {
     async hello(args) {
       const resStr = await __callTool("test__hello", JSON.stringify(args || {}));
@@ -28,7 +28,19 @@ const tools = {
     const resStr = await __callTool(normalized, JSON.stringify(args || {}));
     return JSON.parse(resStr);
   },
-};"
+};
+
+const tools = new Proxy(_tools, {
+    get: (target, prop) => {
+        if (prop in target) return target[prop];
+        if (prop === 'then') return undefined;
+        if (typeof prop === 'string') {
+            throw new Error(\`Namespace '\${prop}' not found. It might be invalid, or all tools in it were disallowed.\`);
+        }
+        return undefined;
+    }
+});
+"
 `;
 
 exports[`Asset Integrity (Golden Tests) > should match Python SDK snapshot 1`] = `
@@ -67,7 +79,7 @@ tools = _Tools()"
 exports[`Asset Integrity (Golden Tests) > should match TypeScript SDK snapshot 1`] = `
 "// Generated SDK - Do not edit
 const __allowedTools = ["test__*","github__*"];
-const tools = {
+const _tools = {
   test: {
     /** Returns a greeting */
     async hello(args) {
@@ -93,5 +105,17 @@ const tools = {
     return await __internalCallTool(normalized, args);
   },
 };
+
+const tools = new Proxy(_tools, {
+    get: (target, prop) => {
+        if (prop in target) return target[prop];
+        if (prop === 'then') return undefined;
+        if (typeof prop === 'string') {
+            throw new Error(\`Namespace '\${prop}' not found. It might be invalid, or all tools in it were disallowed.\`);
+        }
+        return undefined;
+    }
+});
+
 (globalThis as any).tools = tools;"
 `;

package/tests/dynamic.tool.test.ts

@@ -44,10 +44,10 @@ describe('Dynamic Tool Calling (E2E)', () => {
         // Register a mock upstream tool
         (gatewayService as any).clients.set('mock', {
             call: vi.fn().mockImplementation((req) => {
-                if (req.method === 'call_tool' && req.params.name === 'hello') {
+                if (req.method === 'tools/call' && req.params.name === 'hello') {
                     return { jsonrpc: '2.0', id: req.id, result: { content: [{ type: 'text', text: `Hello ${req.params.arguments.name}` }] } };
                 }
-                if (req.method === 'list_tools') {
+                if (req.method === 'tools/list') {
                     return { jsonrpc: '2.0', id: req.id, result: { tools: [{ name: 'hello', inputSchema: {} }] } };
                 }
                 return { jsonrpc: '2.0', id: req.id, result: {} };
@@ -227,7 +227,7 @@ print(f"RESULT:{result}")
         const request = callArgs[0];
 
         expect(request).toMatchObject({
-            method: 'call_tool',
+            method: 'tools/call',
             params: {
                 name: 'hello',
                 arguments: { name: 'Isolate' }

package/tests/gateway.manifest.test.ts

@@ -56,7 +56,7 @@ describe('GatewayService (Manifests)', () => {
         const stubs = await gateway.listToolStubs('test-upstream', context);
 
         expect(mockClient.getManifest).toHaveBeenCalled();
-        expect(mockClient.call).toHaveBeenCalledWith(expect.objectContaining({ method: 'list_tools' }), context);
+        expect(mockClient.call).toHaveBeenCalledWith(expect.objectContaining({ method: 'tools/list' }), context);
         expect(stubs).toHaveLength(1);
         expect(stubs[0].id).toBe('test-upstream__tool_rpc');
     });

package/tests/gateway.service.test.ts

@@ -58,7 +58,7 @@ describe('GatewayService', () => {
         expect(axios.post).toHaveBeenCalledWith(
             'http://u1',
             expect.objectContaining({
-                method: 'call_tool',
+                method: 'tools/call',
                 params: expect.objectContaining({ name: 't1' })
             }),
             expect.anything()

package/tests/reference_mcp.ts

@@ -5,7 +5,7 @@ const server = Fastify();
 server.post('/', async (request, reply) => {
     const { method, params, id } = request.body as any;
 
-    if (method === 'list_tools') {
+    if (method === 'list_tools' || method === 'tools/list') {
         return {
             jsonrpc: '2.0',
             id,
@@ -21,12 +21,14 @@ server.post('/', async (request, reply) => {
         };
     }
 
-    if (method === 'call_tool') {
+    if (method === 'call_tool' || method === 'tools/call') {
+        const toolName = params.name || '';
+        const args = params.arguments || {};
         return {
             jsonrpc: '2.0',
             id,
             result: {
-                content: [{ type: 'text', text: `Echo: ${JSON.stringify(params.arguments)}` }]
+                content: [{ type: 'text', text: `Echo: ${JSON.stringify(args)}` }]
             }
         };
     }

package/tests/routing.test.ts

@@ -162,7 +162,7 @@ describe('RequestController Routing', () => {
         }, mockContext);
 
         expect(mockIsolateExecutor.execute).toHaveBeenCalled();
-        expect(result!.result.stdout).toBe('isolate');
+        expect(result!.result.structuredContent.stdout).toBe('isolate');
     });
 
 });

package/tests/sdk/sdk-generator.test.ts

@@ -15,12 +15,13 @@ describe('SDKGenerator', () => {
 
             const code = generator.generateTypeScript(bindings);
 
-            expect(code).toContain('const tools = {');
+            expect(code).toContain('const _tools = {');
             expect(code).toContain('github: {');
             expect(code).toContain('async createIssue(args)');
             expect(code).toContain('await __internalCallTool("github__createIssue", args)');
             expect(code).toContain('slack: {');
             expect(code).toContain('async sendMessage(args)');
+            expect(code).toContain('const tools = new Proxy(_tools');
             expect(code).toContain('(globalThis as any).tools = tools');
         });
 
@@ -58,7 +59,7 @@ describe('SDKGenerator', () => {
         it('should handle empty bindings', () => {
             const code = generator.generateTypeScript([]);
 
-            expect(code).toContain('const tools = {');
+            expect(code).toContain('const _tools = {');
             expect(code).toContain('async $raw(name, args)');
         });
     });

package/tsup.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from 'tsup';
 export default defineConfig({
     entry: {
         index: 'src/index.ts',
-        'executors/pyodide.worker': 'src/executors/pyodide.worker.ts'
+        'pyodide.worker': 'src/executors/pyodide.worker.ts'
     },
     format: ['esm'],
     dts: true,

package/dist/executors/pyodide.worker.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/executors/pyodide.worker.ts"],"sourcesContent":["import { parentPort, workerData } from 'node:worker_threads';\nimport { loadPyodide, type PyodideInterface } from 'pyodide';\nimport net from 'node:net';\n\nlet pyodide: PyodideInterface | null = null;\nlet currentStdout = '';\nlet currentStderr = '';\nlet totalOutputBytes = 0;\nlet totalLogEntries = 0;\nlet currentLimits: any = null;\n\nasync function init() {\n    if (pyodide) return pyodide;\n\n    pyodide = await loadPyodide({\n        stdout: (text) => {\n            if (currentLimits && (totalOutputBytes > (currentLimits.maxOutputBytes || 1024 * 1024) || totalLogEntries > (currentLimits.maxLogEntries || 10000))) {\n                return; // Stop processing logs once limit breached\n            }\n            currentStdout += text + '\\n';\n            totalOutputBytes += text.length + 1;\n            totalLogEntries++;\n        },\n        stderr: (text) => {\n            if (currentLimits && (totalOutputBytes > (currentLimits.maxOutputBytes || 1024 * 1024) || totalLogEntries > (currentLimits.maxLogEntries || 10000))) {\n                return; // Stop processing logs once limit breached\n            }\n            currentStderr += text + '\\n';\n            totalOutputBytes += text.length + 1;\n            totalLogEntries++;\n        },\n    });\n\n    return pyodide;\n}\n\nasync function handleTask(data: any) {\n    const { code, limits, ipcInfo, shim } = data;\n    currentStdout = '';\n    currentStderr = '';\n    totalOutputBytes = 0;\n    totalLogEntries = 0;\n    currentLimits = limits;\n\n    try {\n        const p = await init();\n\n        const sendIPCRequest = async (method: string, params: any) => {\n            if (!ipcInfo?.ipcAddress) throw new Error('Conduit IPC address not configured');\n\n            return new Promise((resolve, reject) => {\n                let client: net.Socket;\n\n                if (ipcInfo.ipcAddress.includes(':')) {\n                    const lastColon = ipcInfo.ipcAddress.lastIndexOf(':');\n                    const host = ipcInfo.ipcAddress.substring(0, lastColon);\n                    const port = ipcInfo.ipcAddress.substring(lastColon + 1);\n\n                    let targetHost = host.replace(/[\\[\\]]/g, '');\n                    if (targetHost === '0.0.0.0' || targetHost === '::' || targetHost === '::1' || targetHost === '') {\n                        targetHost = '127.0.0.1';\n                    }\n\n                    client = net.createConnection({\n                        host: targetHost,\n                        port: parseInt(port)\n                    });\n                } else {\n                    client = net.createConnection({ path: ipcInfo.ipcAddress });\n                }\n\n                const id = Math.random().toString(36).substring(7);\n                const request = {\n                    jsonrpc: '2.0',\n                    id,\n                    method,\n                    params: params || {},\n                    auth: { bearerToken: ipcInfo.ipcToken }\n                };\n\n                client.on('error', (err) => {\n                    reject(err);\n                    client.destroy();\n                });\n\n                client.write(JSON.stringify(request) + '\\n');\n\n                let buffer = '';\n                client.on('data', (data) => {\n                    buffer += data.toString();\n                    // Robust framing: read until we find a complete JSON object on a line\n                    const lines = buffer.split('\\n');\n                    buffer = lines.pop() || ''; // Keep the last partial line\n\n                    for (const line of lines) {\n                        if (!line.trim()) continue;\n                        try {\n                            const response = JSON.parse(line);\n                            if (response.id === id) {\n                                if (response.error) {\n                                    reject(new Error(response.error.message));\n                                } else {\n                                    resolve(response.result);\n                                }\n                                client.end();\n                                return;\n                            }\n                        } catch (e) {\n                            // If parse fails, it might be a partial line that we haven't seen the end of yet\n                            // but since we split by \\n, this shouldn't happen unless the \\n was inside the JSON.\n                            // However, Conduit ensures JSON-RPC is one line.\n                        }\n                    }\n                });\n\n                client.on('end', () => {\n                    if (buffer.trim()) {\n                        try {\n                            const response = JSON.parse(buffer);\n                            if (response.id === id) {\n                                if (response.error) {\n                                    reject(new Error(response.error.message));\n                                } else {\n                                    resolve(response.result);\n                                }\n                            }\n                        } catch (e) { }\n                    }\n                });\n            });\n        };\n\n        (p as any).globals.set('discover_mcp_tools_js', (options: any) => {\n            return sendIPCRequest('mcp_discover_tools', options);\n        });\n\n        (p as any).globals.set('call_mcp_tool_js', (name: string, args: any) => {\n            return sendIPCRequest('mcp_call_tool', { name, arguments: args });\n        });\n\n        if (shim) {\n            await p.runPythonAsync(shim);\n        }\n\n        const result = await p.runPythonAsync(code);\n\n        if (totalOutputBytes > (limits.maxOutputBytes || 1024 * 1024)) {\n            throw new Error('[LIMIT_OUTPUT]');\n        }\n        if (totalLogEntries > (limits.maxLogEntries || 10000)) {\n            throw new Error('[LIMIT_LOG]');\n        }\n\n        parentPort?.postMessage({\n            stdout: currentStdout,\n            stderr: currentStderr,\n            result: String(result),\n            success: true,\n        });\n    } catch (err: any) {\n        let isOutput = err.message.includes('[LIMIT_OUTPUT]');\n        let isLog = err.message.includes('[LIMIT_LOG]');\n\n        // Fallback: check counters if message doesn't match (e.g. wrapped in OSError)\n        if (!isOutput && !isLog && currentLimits) {\n            if (totalOutputBytes > (currentLimits.maxOutputBytes || 1024 * 1024)) {\n                isOutput = true;\n            }\n            // Check specific log limit breach\n            if (totalLogEntries > (currentLimits.maxLogEntries || 10000)) {\n                isLog = true;\n            }\n        }\n\n        parentPort?.postMessage({\n            stdout: currentStdout,\n            stderr: currentStderr,\n            error: err.message,\n            limitBreached: isOutput ? 'output' : (isLog ? 'log' : undefined),\n            success: false,\n        });\n    }\n}\n\nparentPort?.on('message', async (msg) => {\n    if (msg.type === 'execute') {\n        await handleTask(msg.data);\n    } else if (msg.type === 'ping') {\n        parentPort?.postMessage({ type: 'pong' });\n    }\n});\n\n// Signal ready\nparentPort?.postMessage({ type: 'ready' });\n\n"],"mappings":"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","names":["data"]}