@tomflow/chatloop-tools 0.4.11 → 0.4.13

package/lib/adapters/mcp-child.mjs

@@ -3,7 +3,7 @@ import {createRequire} from 'node:module';
 import {dirname,join} from 'node:path';
 import {mkdirSync,readFileSync} from 'node:fs';
 import {randomUUID} from 'node:crypto';
-import {paths} from '../control.mjs';
+import {paths,toolCallDeadlineMs} from '../control.mjs';
 
 const require=createRequire(import.meta.url);
 const catalog=JSON.parse(readFileSync(new URL('../desktop-commander-tools.json',import.meta.url),'utf8'));
@@ -11,7 +11,10 @@ const fingerprint=tools=>JSON.stringify(tools.map(({name,inputSchema})=>({name,i
 const expected=fingerprint(catalog);
 const err=code=>({code});
 const result=(tool,before,after,outcome,error=null,pid=null,evidence=null)=>({toolId:tool.id,enabled:tool.enabled,before,after,outcome,pid,evidence,error});
+// Cold Desktop Commander initialization can exceed 9s on a busy macOS host.
+// Startup has its own budget; ordinary tool calls keep the stricter deadline.
 const timeout=ctx=>Math.max(0,Math.min(ctx.remaining(),9000));
+export const startupHandshakeBudget=ctx=>Math.max(0,Math.min(ctx.remaining(),24000));
 function entryFor(tool){
   if(tool.id!=='desktop-commander')throw Object.assign(Error('Unknown MCP child'),{code:'UNKNOWN_TOOL'});
   const pkg=require.resolve('@wonderwhy-er/desktop-commander/package.json');
@@ -69,7 +72,7 @@ export function createMcpChildAdapter({records,log}){
       if(health.after==='RUNNING')return result(tool,before,'RUNNING','ALREADY_RUNNING',null,old.pid,'MCP_TOOLS_LIST');
       return result(tool,before,'UNKNOWN','IDENTITY_UNCERTAIN',health.error,old.pid);
     }
-    if(timeout(ctx)<100)return result(tool,before,before,'DEADLINE_EXPIRED',err('TIMEOUT'));
+    if(startupHandshakeBudget(ctx)<100)return result(tool,before,before,'DEADLINE_EXPIRED',err('TIMEOUT'));
     const home=join(paths().dir,'tools',tool.id,'home');
     mkdirSync(home,{recursive:true,mode:0o700});
     const env={HOME:home,PATH:process.env.PATH||'/usr/bin:/bin',LANG:process.env.LANG||'en_US.UTF-8',
@@ -80,10 +83,10 @@ export function createMcpChildAdapter({records,log}){
     const rec=setup(tool,child);
     try{
       const info=await request(rec,'initialize',{protocolVersion:'2025-03-26',
-        capabilities:{},clientInfo:{name:'chat-loop-local-tools',version:'0.4.4'}},timeout(ctx));
+        capabilities:{},clientInfo:{name:'chat-loop-local-tools',version:'0.4.4'}},startupHandshakeBudget(ctx));
       if(!info?.protocolVersion)throw Object.assign(Error('Handshake failed'),{code:'MCP_HANDSHAKE_FAILED'});
       child.stdin.write(JSON.stringify({jsonrpc:'2.0',method:'notifications/initialized'})+'\n');
-      const listed=await request(rec,'tools/list',{},timeout(ctx));
+      const listed=await request(rec,'tools/list',{},startupHandshakeBudget(ctx));
       if(!listed||fingerprint(listed.tools||[])!==expected)
         throw Object.assign(Error('Tool schema changed'),{code:'SCHEMA_MISMATCH'});
       rec.state='RUNNING';log('tool-start',{requestId:ctx.requestId,toolId:tool.id,pid:rec.pid});
@@ -128,7 +131,9 @@ export function createMcpChildAdapter({records,log}){
     if(!catalog.some(t=>t.name===name))throw Object.assign(Error('No such tool'),{code:'UNKNOWN_TOOL'});
     rec.active++;
     try{
-      return await request(rec,'tools/call',{name,arguments:args},timeout(ctx));
+      // Leave time for IPC and Gateway acknowledgements; never exceed the caller's deadline.
+      const ms=Math.max(0,Math.min(ctx.remaining(),toolCallDeadlineMs(args)-2000));
+      return await request(rec,'tools/call',{name,arguments:args},ms);
     }catch(e){if(e.code==='TIMEOUT')rec.state='UNKNOWN';throw e;}
     finally{rec.active--;}
   }

package/lib/control.mjs

@@ -5,6 +5,11 @@ import {join} from 'node:path';
 
 export const CONTRACT = 'chat-loop.local-control.v1';
 export const VERSION = '0.4.7';
+// Bounded end-to-end tool calls: long-running Desktop Commander operations may wait up to timeout_ms.
+export const toolCallDeadlineMs = args => {
+  const requested = Number.isSafeInteger(args?.timeout_ms) && args.timeout_ms > 0 ? args.timeout_ms : 0;
+  return Math.min(42000, Math.max(12000, requested + 8000));
+};
 export const ACTIONS = new Set(['start','stop','restart','status']);
 export const directory = () => process.env.CHAT_LOOP_LOCAL_TOOLS_STATE_DIR || join(homedir(), '.chat-loop', 'local-tools');
 export const paths = () => ({dir: directory(), socket: join(directory(), 'control.sock'), lock: join(directory(), 'manager.lock'), log: join(directory(), 'events.jsonl')});

package/lib/gateway.mjs

@@ -1,7 +1,7 @@
 // Stdio MCP entrypoint: protocol framing and routing only; never owns child processes.
 import {randomUUID} from 'node:crypto';
 import {readFileSync} from 'node:fs';
-import {CONTRACT,registry,talk} from './control.mjs';
+import {CONTRACT,registry,talk,toolCallDeadlineMs} from './control.mjs';
 import {extensionTools,forwardExtensionAction} from './extension-proxy.mjs';
 
 const desktopTools=JSON.parse(readFileSync(new URL('./desktop-commander-tools.json',import.meta.url),'utf8'));
@@ -46,7 +46,7 @@ export function runGateway(){
         return reject(m.id,-32602,'UNSUPPORTED_MCP_VERSION');
       connected=true;
       return reply(m.id,{protocolVersion:m.params.protocolVersion,
-        capabilities:{tools:{}},serverInfo:{name:'chat-loop-local-tools',version:'0.4.11'}});
+        capabilities:{tools:{}},serverInfo:{name:'chat-loop-local-tools',version:'0.4.13'}});
     }
     // A modern MCP client probes discovery before falling back to legacy initialize.
     // We only implement the legacy handshake era, so report unsupported method.
@@ -63,8 +63,9 @@ export function runGateway(){
       try{
         if(routed.toolId==='chat-loop-extension')
           return reply(m.id,await forwardExtensionAction(routed.name,args));
+        const deadlineMs=toolCallDeadlineMs(args);
         const res=await talk({contract:CONTRACT,requestId:randomUUID(),action:'call',
-          scope:'tool',toolId:routed.toolId,name:routed.name,args,deadlineMs:12000},13000);
+          scope:'tool',toolId:routed.toolId,name:routed.name,args,deadlineMs},deadlineMs+2000);
         if(res.status!=='OK')return reply(m.id,failure(res.error?.code||'TOOL_UNAVAILABLE'));
         return reply(m.id,res.result);
       }catch(e){

package/lib/supervisor.mjs

@@ -40,7 +40,7 @@ async function executeCall(req){
   if(typeof req.requestId!=='string'||req.requestId.length<6||req.requestId.length>128||
      req.scope!=='tool'||typeof req.toolId!=='string'||typeof req.name!=='string'||
      !req.args||typeof req.args!=='object'||Array.isArray(req.args)||
-     !Number.isInteger(req.deadlineMs)||req.deadlineMs<1000||req.deadlineMs>30000)return invalid();
+     !Number.isInteger(req.deadlineMs)||req.deadlineMs<1000||req.deadlineMs>45000)return invalid();
   const tool=catalog.find(t=>t.id===req.toolId);
   if(!tool)return bad(req,'UNKNOWN_TOOL');
   if(!tool.enabled)return bad(req,'DISABLED_TOOL');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.11",
+  "version": "0.4.13",
   "type": "module",
   "description": "Chat Loop local tools: MCP gateway, isolated bundled tunnel-client and unified CLI",
   "bin": {