@ai-ecoverse/mcpcat 0.15.6 → 0.15.7

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,
@@ -9367,7 +9377,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 +9448,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 +9666,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 +9728,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 +9752,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 = [
@@ -12970,6 +13039,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
   };
   platform2.onSignal?.("SIGTERM", onShutdown);
   platform2.onSignal?.("SIGINT", onShutdown);
+  platform2.onSignal?.("SIGHUP", onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -13300,6 +13370,21 @@ 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(() => {
+      });
+    }
+  };
+  if (platform2.onSignal) {
+    platform2.onSignal("SIGINT", shutdown);
+    platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
+  }
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13308,31 +13393,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 +13572,23 @@ 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(() => {
+      });
+    }
+  };
+  if (platform2.onSignal) {
+    platform2.onSignal("SIGINT", shutdown);
+    platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
+  }
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13504,32 +13597,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 +13637,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,22 +13757,6 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
-  if (generatedBearer && resolvedBearer) {
-    tokenFilePath = await publishBearer(
-      platform2,
-      resolvedBearer,
-      actualPort,
-      address,
-      options.json
-    );
-  } else {
-    if (options.json) {
-      await platform2.write(1, `${JSON.stringify(address)}
-`);
-    }
-  }
-  await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
-`);
   let shutdownRequested = false;
   let inflightDone;
   const shutdown = () => {
@@ -13706,6 +13774,28 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     platform2.onSignal("SIGTERM", shutdown);
     platform2.onSignal("SIGHUP", shutdown);
   }
+  if (generatedBearer && resolvedBearer) {
+    tokenFilePath = await publishBearer(
+      platform2,
+      resolvedBearer,
+      actualPort,
+      address,
+      options.json
+    );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  } else {
+    if (options.json) {
+      await platform2.write(1, `${JSON.stringify(address)}
+`);
+    }
+  }
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
+`);
+  }
   const handler = (request) => handleMcpRequest(
     request,
     tools,
@@ -16856,5 +16946,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.15.6", args);
+var code = await run(platform, "0.15.7", 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,
@@ -8988,7 +8998,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 +9069,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 +9287,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 +9349,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 +9373,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 = [
@@ -12591,6 +12660,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
   };
   platform2.onSignal?.("SIGTERM", onShutdown);
   platform2.onSignal?.("SIGINT", onShutdown);
+  platform2.onSignal?.("SIGHUP", onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -12921,6 +12991,21 @@ 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(() => {
+      });
+    }
+  };
+  if (platform2.onSignal) {
+    platform2.onSignal("SIGINT", shutdown);
+    platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
+  }
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -12929,31 +13014,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 +13193,23 @@ 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(() => {
+      });
+    }
+  };
+  if (platform2.onSignal) {
+    platform2.onSignal("SIGINT", shutdown);
+    platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
+  }
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13125,32 +13218,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 +13258,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,22 +13378,6 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   const address = serveAddress(platform2, options.host, actualPort);
   const listenUrl = address.url;
   let tokenFilePath;
-  if (generatedBearer && resolvedBearer) {
-    tokenFilePath = await publishBearer(
-      platform2,
-      resolvedBearer,
-      actualPort,
-      address,
-      options.json
-    );
-  } else {
-    if (options.json) {
-      await platform2.write(1, `${JSON.stringify(address)}
-`);
-    }
-  }
-  await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
-`);
   let shutdownRequested = false;
   let inflightDone;
   const shutdown = () => {
@@ -13327,6 +13395,28 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     platform2.onSignal("SIGTERM", shutdown);
     platform2.onSignal("SIGHUP", shutdown);
   }
+  if (generatedBearer && resolvedBearer) {
+    tokenFilePath = await publishBearer(
+      platform2,
+      resolvedBearer,
+      actualPort,
+      address,
+      options.json
+    );
+    if (shutdownRequested && tokenFilePath) {
+      await platform2.fs.unlink?.(tokenFilePath).catch(() => {
+      });
+    }
+  } else {
+    if (options.json) {
+      await platform2.write(1, `${JSON.stringify(address)}
+`);
+    }
+  }
+  if (!shutdownRequested) {
+    await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
+`);
+  }
   const handler = (request) => handleMcpRequest(
     request,
     tools,
@@ -16577,7 +16667,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.7", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.15.6",
+  "version": "0.15.7",
   "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-bios": "1.0.1",
     "@ai-ecoverse/slicc-kernel": "1.94.1",
-    "@ai-ecoverse/slicc-shared-web": "1.17.0",
+    "@ai-ecoverse/slicc-shared-web": "1.19.0",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",