@ai-ecoverse/mcpcat 0.14.2 → 0.14.3

package/README.md

@@ -14,7 +14,7 @@ Or via npm:
 npm install -g @ai-ecoverse/mcpcat
 ```
 
-mcpcat runs natively on macOS, Linux and Windows (Node ≥ 24), and inside Sliccy Seven as a kernel program, with the same flags, the same output and the same config file in both places.
+mcpcat runs natively on macOS, Linux and Windows (Node ≥ 24), and inside Sliccy Seven as a kernel program, with the same flags, the same output and the same config file in both places. Orphan-free shutdown of stdio server trees in the kernel needs slicc-kernel ≥ 1.74.0; on older kernels only the direct child is signalled.
 
 ## Quick start
 

package/dist/host/mcpcat.mjs

@@ -8011,6 +8011,40 @@ var StreamableHttpTransport = class extends TransportEvents {
   }
 };
 
+// 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 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 {
+        }
+      }
+    })
+  );
+  registry.clear();
+}
+
 // src/client/platform-stdio-transport.ts
 var DEFAULT_MAX_MESSAGE_BYTES2 = 4 * 1024 * 1024;
 var DEFAULT_MAX_STDERR_BYTES2 = 64 * 1024;
@@ -8067,16 +8101,21 @@ var PlatformStdioTransport = class {
     if (this.started) throw new Error("MCP stdio transport already started");
     if (this.closed) throw new Error("MCP connection closed");
     this.started = true;
-    const env = this.options.inheritEnv === false ? { ...this.options.env ?? {} } : {
-      ...this.options.platform.env,
-      ...this.options.env
-    };
-    this.process = await this.options.platform.spawn({
-      argv: [this.options.command, ...this.options.args ?? []],
-      env,
-      cwd: this.options.cwd
-    });
-    void this.readStdout();
+    if (this.options.existingProcess) {
+      this.process = this.options.existingProcess;
+    } else {
+      const env = this.options.inheritEnv === false ? { ...this.options.env ?? {} } : {
+        ...this.options.platform.env,
+        ...this.options.env
+      };
+      this.process = await this.options.platform.spawn({
+        argv: [this.options.command, ...this.options.args ?? []],
+        env,
+        cwd: this.options.cwd
+      });
+      trackStdio(this.process);
+    }
+    void this.readStdout(this.options.pendingStdout);
     void this.readStderr();
     void this.waitForExit();
   }
@@ -8109,22 +8148,22 @@ var PlatformStdioTransport = class {
     }
     const exited = await Promise.race([done, delay(grace)]);
     if (!exited) {
-      proc.kill("SIGTERM");
+      await proc.kill("SIGTERM");
       const exitedAfterTerm = await Promise.race([done, delay(closeTimeoutMs)]);
       if (!exitedAfterTerm) {
-        proc.kill("SIGKILL");
+        await proc.kill("SIGKILL");
         await done;
       }
     }
-    proc.kill("SIGTERM");
+    await proc.kill("SIGTERM");
     this.emitClose();
   }
-  async readStdout() {
+  async readStdout(pending) {
     const proc = this.process;
     if (!proc) return;
     const reader = proc.stdout.getReader();
     const maxBytes = this.options.maxMessageBytes ?? DEFAULT_MAX_MESSAGE_BYTES2;
-    let buffer = "";
+    let buffer = pending ?? "";
     try {
       for (; ; ) {
         const { done, value } = await reader.read();
@@ -8184,6 +8223,10 @@ var PlatformStdioTransport = class {
       await proc.wait();
     } catch {
     }
+    try {
+      await proc.kill("SIGTERM");
+    } catch {
+    }
     if (!this.closed) {
       this.emitClose();
     }
@@ -8525,7 +8568,9 @@ function buildTransport(options) {
       cwd: options.cwd,
       inheritEnv: true,
       platform: options.platform,
-      onStderr: buildStderrHandler(options)
+      onStderr: buildStderrHandler(options),
+      existingProcess: options.existingProcess?.proc,
+      pendingStdout: options.existingProcess?.pendingStdout
     });
   }
   return new StdioTransport({
@@ -8712,6 +8757,9 @@ function createStdioJsonRpc(proc, platform2, options) {
         reader.releaseLock();
       } catch {
       }
+    },
+    pendingBuffer() {
+      return readBuffer;
     }
   };
 }
@@ -8764,13 +8812,13 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     async close() {
       rpc.close();
       try {
-        proc.kill("SIGTERM");
+        await proc.kill("SIGTERM");
       } catch {
       }
     }
   };
 }
-async function createStdioStatelessConnection(options) {
+async function probeStdioStateless(options) {
   const inheritedEnv = {
     ...options.platform.env,
     ...options.env
@@ -8780,22 +8828,30 @@ async function createStdioStatelessConnection(options) {
     env: inheritedEnv,
     cwd: options.cwd
   });
-  void readStderr(proc, options.verbose);
+  trackStdio(proc);
   const rpc = createStdioJsonRpc(proc, options.platform, {
     version: options.version,
     timeoutMs: options.timeoutMs,
     signal: options.signal,
     verbose: options.verbose
   });
-  const discoverRaw = await rpc.request("server/discover", {
-    protocolVersion: PROTOCOL_VERSION
-  });
+  let discoverRaw;
+  try {
+    discoverRaw = await rpc.request("server/discover", {
+      protocolVersion: PROTOCOL_VERSION
+    });
+  } catch (err) {
+    const pending = rpc.pendingBuffer();
+    rpc.close();
+    return { proc, pendingStdout: pending, error: err };
+  }
+  void readStderr(proc, options.verbose);
   const discoverResult2 = discoverRaw;
   const supported = (discoverResult2?.supportedVersions ?? []).filter(
     (v) => typeof v === "string"
   );
   if (!supported.includes(PROTOCOL_VERSION)) {
-    proc.kill("SIGTERM");
+    await proc.kill("SIGTERM");
     throw new Error(
       `Server does not support ${PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
     );
@@ -8829,25 +8885,37 @@ async function connect(platform2, options) {
     platform: platform2
   };
   if (options.command) {
+    let fallbackProcess;
     if (!options.protocolVersion || options.protocolVersion.startsWith("2026")) {
-      try {
-        return await createStdioStatelessConnection({
-          command: options.command,
-          args: options.args,
-          env: options.env,
-          cwd: options.cwd,
-          platform: platform2,
-          version: options.version,
-          timeoutMs: options.timeoutMs,
-          signal: options.signal,
-          verbose: options.verbose
-        });
-      } catch (err) {
-        const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601;
-        const isUnsupported = err instanceof Error && err.message.includes("does not support");
-        if (options.protocolVersion?.startsWith("2026")) throw err;
-        if (!isMethodNotFound && !isUnsupported) throw err;
+      const result = await probeStdioStateless({
+        command: options.command,
+        args: options.args,
+        env: options.env,
+        cwd: options.cwd,
+        platform: platform2,
+        version: options.version,
+        timeoutMs: options.timeoutMs,
+        signal: options.signal,
+        verbose: options.verbose
+      });
+      if (!("proc" in result)) return result;
+      const isMethodNotFound = result.error instanceof StatelessRpcError && result.error.code === -32601;
+      const isUnsupported = result.error.message.includes("does not support");
+      if (options.protocolVersion?.startsWith("2026")) {
+        try {
+          await result.proc.kill("SIGTERM");
+        } catch {
+        }
+        throw result.error;
+      }
+      if (!isMethodNotFound && !isUnsupported) {
+        try {
+          await result.proc.kill("SIGTERM");
+        } catch {
+        }
+        throw result.error;
       }
+      fallbackProcess = { proc: result.proc, pendingStdout: result.pendingStdout };
     }
     return createPiConnection({
       command: options.command,
@@ -8855,6 +8923,7 @@ async function connect(platform2, options) {
       env: options.env,
       cwd: options.cwd,
       roots: options.roots,
+      existingProcess: fallbackProcess,
       ...shared
     });
   }
@@ -12129,7 +12198,7 @@ function capOutput(value, limit) {
 ${value.slice(value.length - half)}`;
 }
 var inflightProcs = /* @__PURE__ */ new Set();
-async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd) {
+async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd, signal) {
   let proc;
   try {
     proc = await platform2.spawn({
@@ -12168,23 +12237,41 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
   const timer = new Promise(
     (resolve) => setTimeout(() => resolve("timeout"), timeoutMs)
   );
+  const abortPromise = signal ? new Promise((resolve) => {
+    if (signal.aborted) {
+      resolve("timeout");
+      return;
+    }
+    signal.addEventListener("abort", () => resolve("timeout"), { once: true });
+  }) : null;
   const work = Promise.all([
     readStream3(proc.stdout, stdoutChunks),
     readStream3(proc.stderr, stderrChunks),
     proc.wait()
   ]);
-  const result = await Promise.race([work, timer]);
+  const racers = [
+    work,
+    timer
+  ];
+  if (abortPromise !== null) racers.push(abortPromise);
+  const result = await Promise.race(racers);
   if (result === "timeout") {
-    proc.kill("SIGTERM");
-    await new Promise((resolve) => setTimeout(resolve, 5e3));
-    try {
-      proc.kill("SIGKILL");
-    } catch {
+    await proc.kill("SIGTERM");
+    if (!signal?.aborted) {
+      await new Promise((resolve) => setTimeout(resolve, 5e3));
+      try {
+        await proc.kill("SIGKILL");
+      } catch {
+      }
     }
     inflightProcs.delete(proc);
     return { stdout: "", stderr: "timed out", exitCode: 124 };
   }
   inflightProcs.delete(proc);
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
   const [, , exitResult] = result;
   const dec = new TextDecoder();
   return {
@@ -12203,25 +12290,31 @@ function concat(chunks) {
   }
   return out;
 }
+var KILL_GRACE_MS = 2e3;
 async function killInflight() {
-  for (const proc of inflightProcs) {
-    try {
-      proc.kill("SIGTERM");
-    } catch {
-    }
-  }
-  if (inflightProcs.size > 0) {
-    await new Promise((resolve) => setTimeout(resolve, 5e3));
-    for (const proc of inflightProcs) {
+  const procs = [...inflightProcs];
+  if (procs.length === 0) return;
+  await Promise.all(
+    procs.map(async (proc) => {
       try {
-        proc.kill("SIGKILL");
+        await proc.kill("SIGTERM");
       } catch {
       }
-    }
-  }
+      const exited = await Promise.race([
+        proc.wait().then(() => true),
+        new Promise((r) => setTimeout(() => r(false), KILL_GRACE_MS))
+      ]);
+      if (!exited) {
+        try {
+          await proc.kill("SIGKILL");
+        } catch {
+        }
+      }
+    })
+  );
   inflightProcs.clear();
 }
-async function runHelpForCli(platform2, filePath, childEnv, cwd) {
+async function runHelpForCli(platform2, filePath, childEnv, cwd, signal) {
   const dashed = await runCommand(
     platform2,
     filePath,
@@ -12230,9 +12323,11 @@ async function runHelpForCli(platform2, filePath, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   if (dashed.exitCode === 0 && dashed.stdout.trim()) return dashed.stdout;
+  if (signal?.aborted) return "";
   const plain = await runCommand(
     platform2,
     filePath,
@@ -12241,7 +12336,8 @@ async function runHelpForCli(platform2, filePath, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   if (plain.exitCode === 0 && plain.stdout.trim()) return plain.stdout;
   return dashed.stdout.trim() ? dashed.stdout : "";
@@ -12268,7 +12364,7 @@ async function expandGroupCommands(platform2, filePath, commands, childEnv, cwd)
   }
   return current;
 }
-async function discoverCli(platform2, filePath, explicitName, childEnv, cwd) {
+async function discoverCli(platform2, filePath, explicitName, childEnv, cwd, signal) {
   const mcp = await runCommand(
     platform2,
     filePath,
@@ -12277,10 +12373,11 @@ async function discoverCli(platform2, filePath, explicitName, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   const override = mcp.exitCode === 0 ? parseMcpOverride(mcp.stdout) : null;
-  const helpText2 = override ? "" : await runHelpForCli(platform2, filePath, childEnv, cwd);
+  const helpText2 = override || signal?.aborted ? "" : await runHelpForCli(platform2, filePath, childEnv, cwd, signal);
   if (!override && !helpText2.trim()) {
     throw new Error(`${filePath} did not print help or --mcp descriptor`);
   }
@@ -12400,6 +12497,32 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
   }
   return { invoke, rpcTools };
 }
+async function discoverWithSignal(platform2, commands, childEnv, cwd) {
+  const clis = [];
+  let earlyShutdown = false;
+  let inflightDone;
+  const earlyAbort = new AbortController();
+  const onShutdown = () => {
+    earlyShutdown = true;
+    earlyAbort.abort();
+    inflightDone = killInflight();
+  };
+  platform2.onSignal?.("SIGTERM", onShutdown);
+  platform2.onSignal?.("SIGINT", onShutdown);
+  for (const cmd of commands) {
+    try {
+      const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
+      clis.push(cli);
+    } catch (err) {
+      if (earlyShutdown) return { exitCode: 143, inflightDone };
+      await platform2.write(2, `mcpcat serve: ${err.message}
+`);
+      return { exitCode: 2 };
+    }
+  }
+  if (earlyShutdown) return { exitCode: 143, inflightDone };
+  return { clis };
+}
 async function runServe(platform2, options, version) {
   let resolvedBearer;
   let generatedBearer = false;
@@ -12443,17 +12566,17 @@ async function runServe(platform2, options, version) {
   }
   const serveCwd = options.cwd ?? platform2.cwd;
   const childEnv = buildChildEnv(platform2, options.envAllow);
-  const clis = [];
-  for (const cmd of options.commands) {
-    try {
-      const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, serveCwd);
-      clis.push(cli);
-    } catch (err) {
-      await platform2.write(2, `mcpcat serve: ${err.message}
-`);
-      return 2;
+  const discovery = await discoverWithSignal(platform2, options.commands, childEnv, serveCwd);
+  if ("exitCode" in discovery) {
+    if (discovery.inflightDone !== void 0) {
+      try {
+        await discovery.inflightDone;
+      } catch {
+      }
     }
+    return discovery.exitCode;
   }
+  const { clis } = discovery;
   const allTools = clis.flatMap((cli) => buildTools(cli.name, cli.commands));
   for (const spec of options.toolTemplates) {
     const tool = parseToolTemplate(spec);
@@ -12679,6 +12802,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   if (platform2.onSignal) {
     platform2.onSignal("SIGINT", shutdown);
     platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleProxyMcpRequest(
     request,
@@ -12838,11 +12962,12 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
   let shutdownRequested = false;
+  let inflightDone;
   const shutdown = () => {
     if (shutdownRequested) return;
     shutdownRequested = true;
     listener.close();
-    void killInflight();
+    inflightDone = killInflight();
     if (tokenFilePath) {
       platform2.fs.unlink?.(tokenFilePath).catch(() => {
       });
@@ -12851,6 +12976,7 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   if (platform2.onSignal) {
     platform2.onSignal("SIGINT", shutdown);
     platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleMcpRequest(
     request,
@@ -12878,6 +13004,12 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   } catch {
     if (!shutdownRequested) throw new Error("listener closed unexpectedly");
   }
+  if (inflightDone !== void 0) {
+    try {
+      await inflightDone;
+    } catch {
+    }
+  }
   return 0;
 }
 async function handleMcpRequest(request, tools, call, serverName, version, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -15207,6 +15339,10 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       } catch {
       }
     }
+    try {
+      await Promise.race([killAllStdio(), new Promise((r) => setTimeout(r, 3e3))]);
+    } catch {
+    }
     platform2.exit(exitCode);
   }
   platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
@@ -15545,6 +15681,10 @@ async function runClientVerb(platform2, version, parsed) {
       } catch {
       }
     }
+    try {
+      await Promise.race([killAllStdio(), new Promise((r) => setTimeout(r, 3e3))]);
+    } catch {
+    }
     platform2.exit(exitCode);
   }
   platform2.onSignal?.("SIGINT", () => {
@@ -15942,5 +16082,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.14.2", args);
+var code = await run(platform, "0.14.3", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -7632,6 +7632,40 @@ var StreamableHttpTransport = class extends TransportEvents {
   }
 };
 
+// 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 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 {
+        }
+      }
+    })
+  );
+  registry.clear();
+}
+
 // src/client/platform-stdio-transport.ts
 var DEFAULT_MAX_MESSAGE_BYTES2 = 4 * 1024 * 1024;
 var DEFAULT_MAX_STDERR_BYTES2 = 64 * 1024;
@@ -7688,16 +7722,21 @@ var PlatformStdioTransport = class {
     if (this.started) throw new Error("MCP stdio transport already started");
     if (this.closed) throw new Error("MCP connection closed");
     this.started = true;
-    const env2 = this.options.inheritEnv === false ? { ...this.options.env ?? {} } : {
-      ...this.options.platform.env,
-      ...this.options.env
-    };
-    this.process = await this.options.platform.spawn({
-      argv: [this.options.command, ...this.options.args ?? []],
-      env: env2,
-      cwd: this.options.cwd
-    });
-    void this.readStdout();
+    if (this.options.existingProcess) {
+      this.process = this.options.existingProcess;
+    } else {
+      const env2 = this.options.inheritEnv === false ? { ...this.options.env ?? {} } : {
+        ...this.options.platform.env,
+        ...this.options.env
+      };
+      this.process = await this.options.platform.spawn({
+        argv: [this.options.command, ...this.options.args ?? []],
+        env: env2,
+        cwd: this.options.cwd
+      });
+      trackStdio(this.process);
+    }
+    void this.readStdout(this.options.pendingStdout);
     void this.readStderr();
     void this.waitForExit();
   }
@@ -7730,22 +7769,22 @@ var PlatformStdioTransport = class {
     }
     const exited = await Promise.race([done, delay(grace)]);
     if (!exited) {
-      proc.kill("SIGTERM");
+      await proc.kill("SIGTERM");
       const exitedAfterTerm = await Promise.race([done, delay(closeTimeoutMs)]);
       if (!exitedAfterTerm) {
-        proc.kill("SIGKILL");
+        await proc.kill("SIGKILL");
         await done;
       }
     }
-    proc.kill("SIGTERM");
+    await proc.kill("SIGTERM");
     this.emitClose();
   }
-  async readStdout() {
+  async readStdout(pending) {
     const proc = this.process;
     if (!proc) return;
     const reader = proc.stdout.getReader();
     const maxBytes = this.options.maxMessageBytes ?? DEFAULT_MAX_MESSAGE_BYTES2;
-    let buffer = "";
+    let buffer = pending ?? "";
     try {
       for (; ; ) {
         const { done, value } = await reader.read();
@@ -7805,6 +7844,10 @@ var PlatformStdioTransport = class {
       await proc.wait();
     } catch {
     }
+    try {
+      await proc.kill("SIGTERM");
+    } catch {
+    }
     if (!this.closed) {
       this.emitClose();
     }
@@ -8146,7 +8189,9 @@ function buildTransport(options) {
       cwd: options.cwd,
       inheritEnv: true,
       platform: options.platform,
-      onStderr: buildStderrHandler(options)
+      onStderr: buildStderrHandler(options),
+      existingProcess: options.existingProcess?.proc,
+      pendingStdout: options.existingProcess?.pendingStdout
     });
   }
   return new StdioTransport({
@@ -8333,6 +8378,9 @@ function createStdioJsonRpc(proc, platform2, options) {
         reader.releaseLock();
       } catch {
       }
+    },
+    pendingBuffer() {
+      return readBuffer;
     }
   };
 }
@@ -8385,13 +8433,13 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     async close() {
       rpc.close();
       try {
-        proc.kill("SIGTERM");
+        await proc.kill("SIGTERM");
       } catch {
       }
     }
   };
 }
-async function createStdioStatelessConnection(options) {
+async function probeStdioStateless(options) {
   const inheritedEnv = {
     ...options.platform.env,
     ...options.env
@@ -8401,22 +8449,30 @@ async function createStdioStatelessConnection(options) {
     env: inheritedEnv,
     cwd: options.cwd
   });
-  void readStderr(proc, options.verbose);
+  trackStdio(proc);
   const rpc = createStdioJsonRpc(proc, options.platform, {
     version: options.version,
     timeoutMs: options.timeoutMs,
     signal: options.signal,
     verbose: options.verbose
   });
-  const discoverRaw = await rpc.request("server/discover", {
-    protocolVersion: PROTOCOL_VERSION
-  });
+  let discoverRaw;
+  try {
+    discoverRaw = await rpc.request("server/discover", {
+      protocolVersion: PROTOCOL_VERSION
+    });
+  } catch (err) {
+    const pending = rpc.pendingBuffer();
+    rpc.close();
+    return { proc, pendingStdout: pending, error: err };
+  }
+  void readStderr(proc, options.verbose);
   const discoverResult2 = discoverRaw;
   const supported = (discoverResult2?.supportedVersions ?? []).filter(
     (v) => typeof v === "string"
   );
   if (!supported.includes(PROTOCOL_VERSION)) {
-    proc.kill("SIGTERM");
+    await proc.kill("SIGTERM");
     throw new Error(
       `Server does not support ${PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
     );
@@ -8450,25 +8506,37 @@ async function connect(platform2, options) {
     platform: platform2
   };
   if (options.command) {
+    let fallbackProcess;
     if (!options.protocolVersion || options.protocolVersion.startsWith("2026")) {
-      try {
-        return await createStdioStatelessConnection({
-          command: options.command,
-          args: options.args,
-          env: options.env,
-          cwd: options.cwd,
-          platform: platform2,
-          version: options.version,
-          timeoutMs: options.timeoutMs,
-          signal: options.signal,
-          verbose: options.verbose
-        });
-      } catch (err) {
-        const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601;
-        const isUnsupported = err instanceof Error && err.message.includes("does not support");
-        if (options.protocolVersion?.startsWith("2026")) throw err;
-        if (!isMethodNotFound && !isUnsupported) throw err;
+      const result = await probeStdioStateless({
+        command: options.command,
+        args: options.args,
+        env: options.env,
+        cwd: options.cwd,
+        platform: platform2,
+        version: options.version,
+        timeoutMs: options.timeoutMs,
+        signal: options.signal,
+        verbose: options.verbose
+      });
+      if (!("proc" in result)) return result;
+      const isMethodNotFound = result.error instanceof StatelessRpcError && result.error.code === -32601;
+      const isUnsupported = result.error.message.includes("does not support");
+      if (options.protocolVersion?.startsWith("2026")) {
+        try {
+          await result.proc.kill("SIGTERM");
+        } catch {
+        }
+        throw result.error;
+      }
+      if (!isMethodNotFound && !isUnsupported) {
+        try {
+          await result.proc.kill("SIGTERM");
+        } catch {
+        }
+        throw result.error;
       }
+      fallbackProcess = { proc: result.proc, pendingStdout: result.pendingStdout };
     }
     return createPiConnection({
       command: options.command,
@@ -8476,6 +8544,7 @@ async function connect(platform2, options) {
       env: options.env,
       cwd: options.cwd,
       roots: options.roots,
+      existingProcess: fallbackProcess,
       ...shared
     });
   }
@@ -11750,7 +11819,7 @@ function capOutput(value, limit) {
 ${value.slice(value.length - half)}`;
 }
 var inflightProcs = /* @__PURE__ */ new Set();
-async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd) {
+async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd, signal) {
   let proc;
   try {
     proc = await platform2.spawn({
@@ -11789,23 +11858,41 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
   const timer = new Promise(
     (resolve2) => setTimeout(() => resolve2("timeout"), timeoutMs)
   );
+  const abortPromise = signal ? new Promise((resolve2) => {
+    if (signal.aborted) {
+      resolve2("timeout");
+      return;
+    }
+    signal.addEventListener("abort", () => resolve2("timeout"), { once: true });
+  }) : null;
   const work = Promise.all([
     readStream3(proc.stdout, stdoutChunks),
     readStream3(proc.stderr, stderrChunks),
     proc.wait()
   ]);
-  const result = await Promise.race([work, timer]);
+  const racers = [
+    work,
+    timer
+  ];
+  if (abortPromise !== null) racers.push(abortPromise);
+  const result = await Promise.race(racers);
   if (result === "timeout") {
-    proc.kill("SIGTERM");
-    await new Promise((resolve2) => setTimeout(resolve2, 5e3));
-    try {
-      proc.kill("SIGKILL");
-    } catch {
+    await proc.kill("SIGTERM");
+    if (!signal?.aborted) {
+      await new Promise((resolve2) => setTimeout(resolve2, 5e3));
+      try {
+        await proc.kill("SIGKILL");
+      } catch {
+      }
     }
     inflightProcs.delete(proc);
     return { stdout: "", stderr: "timed out", exitCode: 124 };
   }
   inflightProcs.delete(proc);
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
   const [, , exitResult] = result;
   const dec = new TextDecoder();
   return {
@@ -11824,25 +11911,31 @@ function concat(chunks) {
   }
   return out;
 }
+var KILL_GRACE_MS = 2e3;
 async function killInflight() {
-  for (const proc of inflightProcs) {
-    try {
-      proc.kill("SIGTERM");
-    } catch {
-    }
-  }
-  if (inflightProcs.size > 0) {
-    await new Promise((resolve2) => setTimeout(resolve2, 5e3));
-    for (const proc of inflightProcs) {
+  const procs = [...inflightProcs];
+  if (procs.length === 0) return;
+  await Promise.all(
+    procs.map(async (proc) => {
       try {
-        proc.kill("SIGKILL");
+        await proc.kill("SIGTERM");
       } catch {
       }
-    }
-  }
+      const exited = await Promise.race([
+        proc.wait().then(() => true),
+        new Promise((r) => setTimeout(() => r(false), KILL_GRACE_MS))
+      ]);
+      if (!exited) {
+        try {
+          await proc.kill("SIGKILL");
+        } catch {
+        }
+      }
+    })
+  );
   inflightProcs.clear();
 }
-async function runHelpForCli(platform2, filePath, childEnv, cwd) {
+async function runHelpForCli(platform2, filePath, childEnv, cwd, signal) {
   const dashed = await runCommand(
     platform2,
     filePath,
@@ -11851,9 +11944,11 @@ async function runHelpForCli(platform2, filePath, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   if (dashed.exitCode === 0 && dashed.stdout.trim()) return dashed.stdout;
+  if (signal?.aborted) return "";
   const plain = await runCommand(
     platform2,
     filePath,
@@ -11862,7 +11957,8 @@ async function runHelpForCli(platform2, filePath, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   if (plain.exitCode === 0 && plain.stdout.trim()) return plain.stdout;
   return dashed.stdout.trim() ? dashed.stdout : "";
@@ -11889,7 +11985,7 @@ async function expandGroupCommands(platform2, filePath, commands, childEnv, cwd)
   }
   return current;
 }
-async function discoverCli(platform2, filePath, explicitName, childEnv, cwd) {
+async function discoverCli(platform2, filePath, explicitName, childEnv, cwd, signal) {
   const mcp = await runCommand(
     platform2,
     filePath,
@@ -11898,10 +11994,11 @@ async function discoverCli(platform2, filePath, explicitName, childEnv, cwd) {
     void 0,
     1e4,
     MAX_OUTPUT_DEFAULT,
-    cwd
+    cwd,
+    signal
   );
   const override = mcp.exitCode === 0 ? parseMcpOverride(mcp.stdout) : null;
-  const helpText2 = override ? "" : await runHelpForCli(platform2, filePath, childEnv, cwd);
+  const helpText2 = override || signal?.aborted ? "" : await runHelpForCli(platform2, filePath, childEnv, cwd, signal);
   if (!override && !helpText2.trim()) {
     throw new Error(`${filePath} did not print help or --mcp descriptor`);
   }
@@ -12021,6 +12118,32 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
   }
   return { invoke, rpcTools };
 }
+async function discoverWithSignal(platform2, commands, childEnv, cwd) {
+  const clis = [];
+  let earlyShutdown = false;
+  let inflightDone;
+  const earlyAbort = new AbortController();
+  const onShutdown = () => {
+    earlyShutdown = true;
+    earlyAbort.abort();
+    inflightDone = killInflight();
+  };
+  platform2.onSignal?.("SIGTERM", onShutdown);
+  platform2.onSignal?.("SIGINT", onShutdown);
+  for (const cmd of commands) {
+    try {
+      const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
+      clis.push(cli);
+    } catch (err) {
+      if (earlyShutdown) return { exitCode: 143, inflightDone };
+      await platform2.write(2, `mcpcat serve: ${err.message}
+`);
+      return { exitCode: 2 };
+    }
+  }
+  if (earlyShutdown) return { exitCode: 143, inflightDone };
+  return { clis };
+}
 async function runServe(platform2, options, version) {
   let resolvedBearer;
   let generatedBearer = false;
@@ -12064,17 +12187,17 @@ async function runServe(platform2, options, version) {
   }
   const serveCwd = options.cwd ?? platform2.cwd;
   const childEnv = buildChildEnv(platform2, options.envAllow);
-  const clis = [];
-  for (const cmd of options.commands) {
-    try {
-      const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, serveCwd);
-      clis.push(cli);
-    } catch (err) {
-      await platform2.write(2, `mcpcat serve: ${err.message}
-`);
-      return 2;
+  const discovery = await discoverWithSignal(platform2, options.commands, childEnv, serveCwd);
+  if ("exitCode" in discovery) {
+    if (discovery.inflightDone !== void 0) {
+      try {
+        await discovery.inflightDone;
+      } catch {
+      }
     }
+    return discovery.exitCode;
   }
+  const { clis } = discovery;
   const allTools = clis.flatMap((cli) => buildTools(cli.name, cli.commands));
   for (const spec of options.toolTemplates) {
     const tool = parseToolTemplate(spec);
@@ -12300,6 +12423,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
   if (platform2.onSignal) {
     platform2.onSignal("SIGINT", shutdown);
     platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleProxyMcpRequest(
     request,
@@ -12459,11 +12583,12 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
   let shutdownRequested = false;
+  let inflightDone;
   const shutdown = () => {
     if (shutdownRequested) return;
     shutdownRequested = true;
     listener.close();
-    void killInflight();
+    inflightDone = killInflight();
     if (tokenFilePath) {
       platform2.fs.unlink?.(tokenFilePath).catch(() => {
       });
@@ -12472,6 +12597,7 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   if (platform2.onSignal) {
     platform2.onSignal("SIGINT", shutdown);
     platform2.onSignal("SIGTERM", shutdown);
+    platform2.onSignal("SIGHUP", shutdown);
   }
   const handler = (request) => handleMcpRequest(
     request,
@@ -12499,6 +12625,12 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   } catch {
     if (!shutdownRequested) throw new Error("listener closed unexpectedly");
   }
+  if (inflightDone !== void 0) {
+    try {
+      await inflightDone;
+    } catch {
+    }
+  }
   return 0;
 }
 async function handleMcpRequest(request, tools, call, serverName, version, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -14828,6 +14960,10 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       } catch {
       }
     }
+    try {
+      await Promise.race([killAllStdio(), new Promise((r) => setTimeout(r, 3e3))]);
+    } catch {
+    }
     platform2.exit(exitCode);
   }
   platform2.onSignal?.("SIGTERM", () => void killTreeAndExit(143));
@@ -15166,6 +15302,10 @@ async function runClientVerb(platform2, version, parsed) {
       } catch {
       }
     }
+    try {
+      await Promise.race([killAllStdio(), new Promise((r) => setTimeout(r, 3e3))]);
+    } catch {
+    }
     platform2.exit(exitCode);
   }
   platform2.onSignal?.("SIGINT", () => {
@@ -15351,28 +15491,42 @@ function kernelFs(ctx) {
     chmod: ctx.fs.chmod ? (path, mode) => ctx.fs.chmod(path, mode) : void 0
   };
 }
+var groupSpawnSupported;
 async function kernelSpawn(ctx, options) {
+  const tryGroup = groupSpawnSupported !== false;
   const result = await ctx.spawn({
     argv: options.argv,
     env: options.env,
     cwd: options.cwd,
     stdin: "pipe",
     stdout: "pipe",
-    stderr: "pipe"
+    stderr: "pipe",
+    ...tryGroup ? { pgid: 0 } : {}
   });
   const childPid = result.pid;
+  if (groupSpawnSupported === void 0) {
+    try {
+      await ctx.kill(-childPid, "SIGCONT");
+      groupSpawnSupported = true;
+    } catch {
+      groupSpawnSupported = false;
+    }
+  }
+  const useGroupKill = groupSpawnSupported;
   return {
     stdin: result.stdin,
     stdout: result.stdout,
     stderr: result.stderr,
     wait: () => result.wait(),
-    kill: (signal) => {
-      try {
-        ctx.kill(-childPid, signal);
-      } catch {
+    kill: async (signal) => {
+      if (useGroupKill) {
+        try {
+          await ctx.kill(-childPid, signal);
+        } catch {
+        }
       }
       try {
-        ctx.kill(childPid, signal);
+        await ctx.kill(childPid, signal);
       } catch {
       }
     }
@@ -15592,7 +15746,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.14.2", args);
+  return run(platform2, "0.14.3", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -56,7 +56,7 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-kernel": "1.75.0",
+    "@ai-ecoverse/slicc-kernel": "1.76.0",
     "@ai-ecoverse/slicc-shared-web": "1.13.1",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",