@ai-ecoverse/mcpcat 0.15.6 → 0.15.8

package/dist/host/mcpcat.mjs

@@ -1854,6 +1854,16 @@ var init_version = __esm({
 });
 
 // node_modules/quickjs-wasi/dist/index.js
+var dist_exports = {};
+__export(dist_exports, {
+  CompileFlags: () => CompileFlags,
+  EvalFlags: () => EvalFlags,
+  Intrinsics: () => Intrinsics,
+  JSException: () => JSException,
+  JSValueHandle: () => JSValueHandle,
+  MAX_STACK_SIZE: () => MAX_STACK_SIZE,
+  QuickJS: () => QuickJS
+});
 function stringKeyNeedsValuePath(key) {
   return key.includes("\0") || LONE_SURROGATE_RE.test(key);
 }
@@ -5365,8 +5375,8 @@ SOURCE: /[\s\S]+/
 });
 
 // node_modules/@earendil-works/pi-codemode/dist/index.js
-var dist_exports = {};
-__export(dist_exports, {
+var dist_exports2 = {};
+__export(dist_exports2, {
   CODEMODE_OPTIONS_PREFIX: () => CODEMODE_OPTIONS_PREFIX,
   CODEMODE_SOURCE_GRAMMAR: () => CODEMODE_SOURCE_GRAMMAR,
   CodemodeSandbox: () => CodemodeSandbox,
@@ -8109,37 +8119,55 @@ var StreamableHttpTransport = class extends TransportEvents {
   }
 };
 
+// src/client/reap.ts
+var POLL_MS = 25;
+async function gone(proc, exited, ms) {
+  const end = Date.now() + ms;
+  for (; ; ) {
+    if (exited() && !await proc.groupAlive?.()) return true;
+    if (Date.now() >= end) return false;
+    await new Promise((r) => setTimeout(r, POLL_MS));
+  }
+}
+async function reap(proc, graceMs) {
+  let exited = false;
+  void proc.wait().then(
+    () => {
+      exited = true;
+    },
+    () => {
+      exited = true;
+    }
+  );
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
+  if (await gone(proc, () => exited, graceMs)) return;
+  try {
+    await proc.kill("SIGKILL");
+  } catch {
+  }
+  await gone(proc, () => exited, graceMs);
+}
+
 // src/client/stdio-registry.ts
 var GRACE_MS = 2e3;
 var registry = /* @__PURE__ */ new Set();
 function trackStdio(proc) {
   registry.add(proc);
-  void proc.wait().then(
-    () => registry.delete(proc),
-    () => registry.delete(proc)
-  );
+}
+async function reapStdio(proc, graceMs = GRACE_MS) {
+  try {
+    await reap(proc, graceMs);
+  } finally {
+    registry.delete(proc);
+  }
 }
 async function killAllStdio() {
   const procs = [...registry];
   if (procs.length === 0) return;
-  await Promise.all(
-    procs.map(async (proc) => {
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
-      const exited = await Promise.race([
-        proc.wait().then(() => true),
-        new Promise((r) => setTimeout(() => r(false), GRACE_MS))
-      ]);
-      if (!exited) {
-        try {
-          await proc.kill("SIGKILL");
-        } catch {
-        }
-      }
-    })
-  );
+  await Promise.all(procs.map((proc) => reapStdio(proc)));
   registry.clear();
 }
 
@@ -8245,16 +8273,8 @@ var PlatformStdioTransport = class {
       await proc.stdin.close();
     } catch {
     }
-    const exited = await Promise.race([done, delay(grace)]);
-    if (!exited) {
-      await proc.kill("SIGTERM");
-      const exitedAfterTerm = await Promise.race([done, delay(closeTimeoutMs)]);
-      if (!exitedAfterTerm) {
-        await proc.kill("SIGKILL");
-        await done;
-      }
-    }
-    await proc.kill("SIGTERM");
+    await Promise.race([done, delay(grace)]);
+    await reapStdio(proc, closeTimeoutMs);
     this.emitClose();
   }
   async readStdout(pending) {
@@ -8938,10 +8958,7 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     },
     async close() {
       rpc.close();
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
+      await reapStdio(proc);
     }
   };
 }
@@ -9367,7 +9384,7 @@ function toolDeclaration(tool) {
   };
 }
 async function runDescribeTs(platform2, targets, budget) {
-  const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports));
+  const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const allTools = [];
   for (const target of targets) {
     const tools = await target.conn.listTools();
@@ -9438,6 +9455,39 @@ async function runGrep(platform2, pattern, targets, options) {
 // src/codemode/run.ts
 init_dist2();
 init_source();
+
+// src/codemode/deadline.ts
+var expiries = /* @__PURE__ */ new WeakMap();
+var hooked = /* @__PURE__ */ new WeakSet();
+function hookDeadlines(quickjs) {
+  if (hooked.has(quickjs)) return;
+  hooked.add(quickjs);
+  const create = quickjs.create.bind(quickjs);
+  quickjs.create = (options) => {
+    const expired = options.wasm ? expiries.get(options.wasm) : void 0;
+    const inner = options.interruptHandler;
+    if (!expired || !inner) return create(options);
+    return create({ ...options, interruptHandler: () => expired() || inner() });
+  };
+}
+function bindDeadline(wasm, timeoutMs, now = Date.now) {
+  let endsAt = Number.POSITIVE_INFINITY;
+  let tripped = false;
+  expiries.set(wasm, () => {
+    if (!tripped && now() >= endsAt) tripped = true;
+    return tripped;
+  });
+  return {
+    start() {
+      endsAt = now() + timeoutMs;
+    },
+    get tripped() {
+      return tripped;
+    }
+  };
+}
+
+// src/codemode/run.ts
 async function loadStore(platform2, stateDir2) {
   const storePath = `${stateDir2}/codemode-store.json`;
   try {
@@ -9623,9 +9673,23 @@ async function runCode(targets, source, options) {
     ...buildDiscoveryGlobals(allDeclaredTools, namespaces, searchDocs),
     ...options.allowShell ? [buildShellGlobal(platform2)] : []
   ];
-  const sandbox = await createSandbox(platform2, toolImpls, globals, timeoutMs, memoryLimitBytes);
+  const { sandbox, deadline } = await createSandbox(
+    platform2,
+    toolImpls,
+    globals,
+    timeoutMs,
+    memoryLimitBytes
+  );
   try {
-    const result = await sandbox.execute(code2, { store });
+    deadline?.start();
+    const executed = await sandbox.execute(code2, { store });
+    const result = deadline?.tripped && !executed.ok ? {
+      ...executed,
+      error: {
+        kind: "timeout",
+        message: `Execution timed out after ${timeoutMs} ms`
+      }
+    } : executed;
     if (result.ok) {
       const writes = result.storeWrites;
       if (Object.keys(writes.set).length > 0 || writes.delete.length > 0) {
@@ -9671,12 +9735,23 @@ async function createSandbox(platform2, tools, globals, timeoutMs, memoryLimitBy
   const isKernel2 = platform2.packageDir !== void 0;
   if (isKernel2) {
     const { InlineCodemodeSandbox: InlineCodemodeSandbox2 } = await Promise.resolve().then(() => (init_portable(), portable_exports));
+    const { QuickJS: QuickJS2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+    hookDeadlines(QuickJS2);
     const wasm = await loadWasmKernel(platform2);
-    return new InlineCodemodeSandbox2({ tools, globals, timeoutMs, wasm, memoryLimitBytes });
+    const deadline = bindDeadline(wasm, timeoutMs);
+    const sandbox2 = new InlineCodemodeSandbox2({
+      tools,
+      globals,
+      timeoutMs,
+      wasm,
+      memoryLimitBytes,
+      interruptBudget: Number.POSITIVE_INFINITY
+    });
+    return { sandbox: sandbox2, deadline };
   }
-  const { CodemodeSandbox: CodemodeSandbox2, loadQuickJSWasm: loadQuickJSWasm2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports));
+  const { CodemodeSandbox: CodemodeSandbox2, loadQuickJSWasm: loadQuickJSWasm2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const wasmPath = await resolveWasmPath(platform2);
-  return new CodemodeSandbox2({
+  const sandbox = new CodemodeSandbox2({
     tools,
     globals,
     timeoutMs,
@@ -9684,6 +9759,7 @@ async function createSandbox(platform2, tools, globals, timeoutMs, memoryLimitBy
     wasm: loadQuickJSWasm2(wasmPath),
     workerUrl: new URL("./codemode-worker.mjs", import.meta.url)
   });
+  return { sandbox };
 }
 async function resolveWasmPath(platform2) {
   const candidates = [
@@ -12752,6 +12828,11 @@ function concat(chunks) {
   return out;
 }
 var KILL_GRACE_MS = 2e3;
+async function trapShutdown(platform2, handler) {
+  await Promise.all(
+    ["SIGINT", "SIGTERM", "SIGHUP"].map((sig) => platform2.onSignal?.(sig, handler))
+  );
+}
 async function killInflight() {
   const procs = [...inflightProcs];
   if (procs.length === 0) return;
@@ -12968,8 +13049,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
     earlyAbort.abort();
     inflightDone = killInflight();
   };
-  platform2.onSignal?.("SIGTERM", onShutdown);
-  platform2.onSignal?.("SIGINT", onShutdown);
+  await trapShutdown(platform2, onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -13300,6 +13380,17 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13308,31 +13399,22 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve --webmcp: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve --webmcp: listening on ${listenUrl}
 `);
-  if (options.onListening) {
-    await options.onListening(actualPort);
-  }
-  let shutdownRequested = false;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
+    if (options.onListening) {
+      await options.onListening(actualPort);
     }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = async (request) => {
     if (request.target !== "/mcp") {
@@ -13496,6 +13578,19 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  let proxyDone;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    proxyDone = proxy.shutdown();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13504,32 +13599,22 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve --proxy: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve --proxy: listening on ${listenUrl}
 `);
-  if (options.onListening) {
-    await options.onListening(actualPort);
-  }
-  let shutdownRequested = false;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    void proxy.shutdown();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
+    if (options.onListening) {
+      await options.onListening(actualPort);
     }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleProxyMcpRequest(
     request,
@@ -13554,6 +13639,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   } catch {
     if (!shutdownRequested) throw new Error("listener closed unexpectedly");
   }
+  await proxyDone;
   return 0;
 }
 async function handleProxyMcpRequest(request, proxy, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -13673,6 +13759,19 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  let inflightDone;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    inflightDone = killInflight();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13681,30 +13780,19 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
-  let shutdownRequested = false;
-  let inflightDone;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    inflightDone = killInflight();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
-    }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleMcpRequest(
     request,
@@ -16084,8 +16172,10 @@ async function dispatchMultiTarget(platform2, parsed, version) {
     });
     platform2.exit(exitCode);
   }
-  platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
-  platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129));
+  await Promise.all([
+    platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143)),
+    platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129))
+  ]);
   const config = await MergedConfigSource.load(platform2);
   if (parsed.verb === "code") {
     let source;
@@ -16446,12 +16536,14 @@ async function runClientVerb(platform2, version, parsed) {
     });
     platform2.exit(exitCode);
   }
-  platform2.onSignal?.("SIGINT", () => {
-    interrupted = true;
-    sigintController.abort();
-  });
-  platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
-  platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129));
+  await Promise.all([
+    platform2.onSignal?.("SIGINT", () => {
+      interrupted = true;
+      sigintController.abort();
+    }),
+    platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143)),
+    platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129))
+  ]);
   const showProgress = !parsed.silent && (parsed.verbose || platform2.isatty(2));
   const onProgress = (progress, total, message) => {
     if (!showProgress) return;
@@ -16678,6 +16770,15 @@ function nodeSpawn(options) {
             child.kill(sig);
           } catch {
           }
+        },
+        async groupAlive() {
+          if (!USE_PROCESS_GROUPS2 || child.pid === void 0) return false;
+          try {
+            process.kill(-child.pid, 0);
+            return true;
+          } catch {
+            return false;
+          }
         }
       });
     }
@@ -16856,5 +16957,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.15.6", args);
+var code = await run(platform, "0.15.8", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -1475,6 +1475,16 @@ var init_version = __esm({
 });
 
 // node_modules/quickjs-wasi/dist/index.js
+var dist_exports = {};
+__export(dist_exports, {
+  CompileFlags: () => CompileFlags,
+  EvalFlags: () => EvalFlags,
+  Intrinsics: () => Intrinsics,
+  JSException: () => JSException,
+  JSValueHandle: () => JSValueHandle,
+  MAX_STACK_SIZE: () => MAX_STACK_SIZE,
+  QuickJS: () => QuickJS
+});
 function stringKeyNeedsValuePath(key) {
   return key.includes("\0") || LONE_SURROGATE_RE.test(key);
 }
@@ -4986,8 +4996,8 @@ SOURCE: /[\s\S]+/
 });
 
 // node_modules/@earendil-works/pi-codemode/dist/index.js
-var dist_exports = {};
-__export(dist_exports, {
+var dist_exports2 = {};
+__export(dist_exports2, {
   CODEMODE_OPTIONS_PREFIX: () => CODEMODE_OPTIONS_PREFIX,
   CODEMODE_SOURCE_GRAMMAR: () => CODEMODE_SOURCE_GRAMMAR,
   CodemodeSandbox: () => CodemodeSandbox,
@@ -7730,37 +7740,55 @@ var StreamableHttpTransport = class extends TransportEvents {
   }
 };
 
+// src/client/reap.ts
+var POLL_MS = 25;
+async function gone(proc, exited, ms) {
+  const end = Date.now() + ms;
+  for (; ; ) {
+    if (exited() && !await proc.groupAlive?.()) return true;
+    if (Date.now() >= end) return false;
+    await new Promise((r) => setTimeout(r, POLL_MS));
+  }
+}
+async function reap(proc, graceMs) {
+  let exited = false;
+  void proc.wait().then(
+    () => {
+      exited = true;
+    },
+    () => {
+      exited = true;
+    }
+  );
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
+  if (await gone(proc, () => exited, graceMs)) return;
+  try {
+    await proc.kill("SIGKILL");
+  } catch {
+  }
+  await gone(proc, () => exited, graceMs);
+}
+
 // src/client/stdio-registry.ts
 var GRACE_MS = 2e3;
 var registry = /* @__PURE__ */ new Set();
 function trackStdio(proc) {
   registry.add(proc);
-  void proc.wait().then(
-    () => registry.delete(proc),
-    () => registry.delete(proc)
-  );
+}
+async function reapStdio(proc, graceMs = GRACE_MS) {
+  try {
+    await reap(proc, graceMs);
+  } finally {
+    registry.delete(proc);
+  }
 }
 async function killAllStdio() {
   const procs = [...registry];
   if (procs.length === 0) return;
-  await Promise.all(
-    procs.map(async (proc) => {
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
-      const exited = await Promise.race([
-        proc.wait().then(() => true),
-        new Promise((r) => setTimeout(() => r(false), GRACE_MS))
-      ]);
-      if (!exited) {
-        try {
-          await proc.kill("SIGKILL");
-        } catch {
-        }
-      }
-    })
-  );
+  await Promise.all(procs.map((proc) => reapStdio(proc)));
   registry.clear();
 }
 
@@ -7866,16 +7894,8 @@ var PlatformStdioTransport = class {
       await proc.stdin.close();
     } catch {
     }
-    const exited = await Promise.race([done, delay(grace)]);
-    if (!exited) {
-      await proc.kill("SIGTERM");
-      const exitedAfterTerm = await Promise.race([done, delay(closeTimeoutMs)]);
-      if (!exitedAfterTerm) {
-        await proc.kill("SIGKILL");
-        await done;
-      }
-    }
-    await proc.kill("SIGTERM");
+    await Promise.race([done, delay(grace)]);
+    await reapStdio(proc, closeTimeoutMs);
     this.emitClose();
   }
   async readStdout(pending) {
@@ -8559,10 +8579,7 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     },
     async close() {
       rpc.close();
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
+      await reapStdio(proc);
     }
   };
 }
@@ -8988,7 +9005,7 @@ function toolDeclaration(tool) {
   };
 }
 async function runDescribeTs(platform2, targets, budget) {
-  const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports));
+  const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const allTools = [];
   for (const target of targets) {
     const tools = await target.conn.listTools();
@@ -9059,6 +9076,39 @@ async function runGrep(platform2, pattern, targets, options) {
 // src/codemode/run.ts
 init_dist2();
 init_source();
+
+// src/codemode/deadline.ts
+var expiries = /* @__PURE__ */ new WeakMap();
+var hooked = /* @__PURE__ */ new WeakSet();
+function hookDeadlines(quickjs) {
+  if (hooked.has(quickjs)) return;
+  hooked.add(quickjs);
+  const create = quickjs.create.bind(quickjs);
+  quickjs.create = (options) => {
+    const expired = options.wasm ? expiries.get(options.wasm) : void 0;
+    const inner = options.interruptHandler;
+    if (!expired || !inner) return create(options);
+    return create({ ...options, interruptHandler: () => expired() || inner() });
+  };
+}
+function bindDeadline(wasm, timeoutMs, now = Date.now) {
+  let endsAt = Number.POSITIVE_INFINITY;
+  let tripped = false;
+  expiries.set(wasm, () => {
+    if (!tripped && now() >= endsAt) tripped = true;
+    return tripped;
+  });
+  return {
+    start() {
+      endsAt = now() + timeoutMs;
+    },
+    get tripped() {
+      return tripped;
+    }
+  };
+}
+
+// src/codemode/run.ts
 async function loadStore(platform2, stateDir2) {
   const storePath = `${stateDir2}/codemode-store.json`;
   try {
@@ -9244,9 +9294,23 @@ async function runCode(targets, source, options) {
     ...buildDiscoveryGlobals(allDeclaredTools, namespaces, searchDocs),
     ...options.allowShell ? [buildShellGlobal(platform2)] : []
   ];
-  const sandbox = await createSandbox(platform2, toolImpls, globals, timeoutMs, memoryLimitBytes);
+  const { sandbox, deadline } = await createSandbox(
+    platform2,
+    toolImpls,
+    globals,
+    timeoutMs,
+    memoryLimitBytes
+  );
   try {
-    const result = await sandbox.execute(code, { store });
+    deadline?.start();
+    const executed = await sandbox.execute(code, { store });
+    const result = deadline?.tripped && !executed.ok ? {
+      ...executed,
+      error: {
+        kind: "timeout",
+        message: `Execution timed out after ${timeoutMs} ms`
+      }
+    } : executed;
     if (result.ok) {
       const writes = result.storeWrites;
       if (Object.keys(writes.set).length > 0 || writes.delete.length > 0) {
@@ -9292,12 +9356,23 @@ async function createSandbox(platform2, tools, globals, timeoutMs, memoryLimitBy
   const isKernel2 = platform2.packageDir !== void 0;
   if (isKernel2) {
     const { InlineCodemodeSandbox: InlineCodemodeSandbox2 } = await Promise.resolve().then(() => (init_portable(), portable_exports));
+    const { QuickJS: QuickJS2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+    hookDeadlines(QuickJS2);
     const wasm = await loadWasmKernel(platform2);
-    return new InlineCodemodeSandbox2({ tools, globals, timeoutMs, wasm, memoryLimitBytes });
+    const deadline = bindDeadline(wasm, timeoutMs);
+    const sandbox2 = new InlineCodemodeSandbox2({
+      tools,
+      globals,
+      timeoutMs,
+      wasm,
+      memoryLimitBytes,
+      interruptBudget: Number.POSITIVE_INFINITY
+    });
+    return { sandbox: sandbox2, deadline };
   }
-  const { CodemodeSandbox: CodemodeSandbox2, loadQuickJSWasm: loadQuickJSWasm2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports));
+  const { CodemodeSandbox: CodemodeSandbox2, loadQuickJSWasm: loadQuickJSWasm2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const wasmPath = await resolveWasmPath(platform2);
-  return new CodemodeSandbox2({
+  const sandbox = new CodemodeSandbox2({
     tools,
     globals,
     timeoutMs,
@@ -9305,6 +9380,7 @@ async function createSandbox(platform2, tools, globals, timeoutMs, memoryLimitBy
     wasm: loadQuickJSWasm2(wasmPath),
     workerUrl: new URL("./codemode-worker.mjs", import.meta.url)
   });
+  return { sandbox };
 }
 async function resolveWasmPath(platform2) {
   const candidates = [
@@ -12373,6 +12449,11 @@ function concat(chunks) {
   return out;
 }
 var KILL_GRACE_MS = 2e3;
+async function trapShutdown(platform2, handler) {
+  await Promise.all(
+    ["SIGINT", "SIGTERM", "SIGHUP"].map((sig) => platform2.onSignal?.(sig, handler))
+  );
+}
 async function killInflight() {
   const procs = [...inflightProcs];
   if (procs.length === 0) return;
@@ -12589,8 +12670,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
     earlyAbort.abort();
     inflightDone = killInflight();
   };
-  platform2.onSignal?.("SIGTERM", onShutdown);
-  platform2.onSignal?.("SIGINT", onShutdown);
+  await trapShutdown(platform2, onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -12921,6 +13001,17 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -12929,31 +13020,22 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve --webmcp: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve --webmcp: listening on ${listenUrl}
 `);
-  if (options.onListening) {
-    await options.onListening(actualPort);
-  }
-  let shutdownRequested = false;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
+    if (options.onListening) {
+      await options.onListening(actualPort);
     }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = async (request) => {
     if (request.target !== "/mcp") {
@@ -13117,6 +13199,19 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  let proxyDone;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    proxyDone = proxy.shutdown();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13125,32 +13220,22 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve --proxy: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve --proxy: listening on ${listenUrl}
 `);
-  if (options.onListening) {
-    await options.onListening(actualPort);
-  }
-  let shutdownRequested = false;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    void proxy.shutdown();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
+    if (options.onListening) {
+      await options.onListening(actualPort);
     }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleProxyMcpRequest(
     request,
@@ -13175,6 +13260,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   } catch {
     if (!shutdownRequested) throw new Error("listener closed unexpectedly");
   }
+  await proxyDone;
   return 0;
 }
 async function handleProxyMcpRequest(request, proxy, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -13294,6 +13380,19 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
+  let shutdownRequested = false;
+  let inflightDone;
+  const shutdown = () => {
+    if (shutdownRequested) return;
+    shutdownRequested = true;
+    listener.close();
+    inflightDone = killInflight();
+    if (tokenFilePath) {
+      platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  };
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13302,30 +13401,19 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
       address,
       options.json
     );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
   } else {
     if (options.json) {
       await platform2.write(1, `${JSON.stringify(address)}
 `);
     }
   }
-  await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
-  let shutdownRequested = false;
-  let inflightDone;
-  const shutdown = () => {
-    if (shutdownRequested) return;
-    shutdownRequested = true;
-    listener.close();
-    inflightDone = killInflight();
-    if (tokenFilePath) {
-      platform2.fs.unlink?.(tokenFilePath).catch(() => {
-      });
-    }
-  };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleMcpRequest(
     request,
@@ -15705,8 +15793,10 @@ async function dispatchMultiTarget(platform2, parsed, version) {
     });
     platform2.exit(exitCode);
   }
-  platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
-  platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129));
+  await Promise.all([
+    platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143)),
+    platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129))
+  ]);
   const config = await MergedConfigSource.load(platform2);
   if (parsed.verb === "code") {
     let source;
@@ -16067,12 +16157,14 @@ async function runClientVerb(platform2, version, parsed) {
     });
     platform2.exit(exitCode);
   }
-  platform2.onSignal?.("SIGINT", () => {
-    interrupted = true;
-    sigintController.abort();
-  });
-  platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
-  platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129));
+  await Promise.all([
+    platform2.onSignal?.("SIGINT", () => {
+      interrupted = true;
+      sigintController.abort();
+    }),
+    platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143)),
+    platform2.onSignal?.("SIGHUP", () => void killTreeAndExit(129))
+  ]);
   const showProgress = !parsed.silent && (parsed.verbose || platform2.isatty(2));
   const onProgress = (progress, total, message) => {
     if (!showProgress) return;
@@ -16320,6 +16412,15 @@ async function kernelSpawn(ctx, options) {
         await ctx.kill(childPid, signal);
       } catch {
       }
+    },
+    async groupAlive() {
+      if (!useGroupKill) return false;
+      try {
+        await ctx.kill(-childPid, "SIGCONT");
+        return true;
+      } catch {
+        return false;
+      }
     }
   };
 }
@@ -16555,8 +16656,8 @@ function createKernelPlatform(ctx, options) {
     exit(code) {
       ctx.exit(code);
     },
-    onSignal(signal, handler) {
-      ctx.signals.on(signal, handler);
+    async onSignal(signal, handler) {
+      await ctx.signals.on(signal, handler);
     },
     async seal(request) {
       return kernelSeal(ctx, request);
@@ -16577,7 +16678,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.15.6", args);
+  return run(platform2, "0.15.8", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.15.6",
+  "version": "0.15.8",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -56,8 +56,9 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-kernel": "1.94.1",
-    "@ai-ecoverse/slicc-shared-web": "1.17.0",
+    "@ai-ecoverse/slicc-bios": "1.1.2",
+    "@ai-ecoverse/slicc-kernel": "1.94.4",
+    "@ai-ecoverse/slicc-shared-web": "1.20.0",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",