@ai-ecoverse/mcpcat 0.15.7 → 0.15.8

package/dist/host/mcpcat.mjs

@@ -8119,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();
 }
 
@@ -8255,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) {
@@ -8948,10 +8958,7 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     },
     async close() {
       rpc.close();
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
+      await reapStdio(proc);
     }
   };
 }
@@ -12821,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;
@@ -13037,9 +13049,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
     earlyAbort.abort();
     inflightDone = killInflight();
   };
-  platform2.onSignal?.("SIGTERM", onShutdown);
-  platform2.onSignal?.("SIGINT", onShutdown);
-  platform2.onSignal?.("SIGHUP", onShutdown);
+  await trapShutdown(platform2, onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -13380,11 +13390,7 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
       });
     }
   };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13584,11 +13590,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
       });
     }
   };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13769,11 +13771,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);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -16174,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;
@@ -16536,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;
@@ -16768,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;
+          }
         }
       });
     }
@@ -16946,5 +16957,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.15.7", args);
+var code = await run(platform, "0.15.8", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -7740,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();
 }
 
@@ -7876,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) {
@@ -8569,10 +8579,7 @@ function buildConnectionMethods(rpc, discoverResult2, proc) {
     },
     async close() {
       rpc.close();
-      try {
-        await proc.kill("SIGTERM");
-      } catch {
-      }
+      await reapStdio(proc);
     }
   };
 }
@@ -12442,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;
@@ -12658,9 +12670,7 @@ async function discoverWithSignal(platform2, commands, childEnv, cwd) {
     earlyAbort.abort();
     inflightDone = killInflight();
   };
-  platform2.onSignal?.("SIGTERM", onShutdown);
-  platform2.onSignal?.("SIGINT", onShutdown);
-  platform2.onSignal?.("SIGHUP", onShutdown);
+  await trapShutdown(platform2, onShutdown);
   for (const cmd of commands) {
     try {
       const cli = await discoverCli(platform2, cmd.path, cmd.name, childEnv, cwd, earlyAbort.signal);
@@ -13001,11 +13011,7 @@ async function runWebMcpHttp(platform2, options, getTools, callTool, serverName,
       });
     }
   };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13205,11 +13211,7 @@ async function runProxyHttp(platform2, options, proxy, resolvedBearer, generated
       });
     }
   };
-  if (platform2.onSignal) {
-    platform2.onSignal("SIGINT", shutdown);
-    platform2.onSignal("SIGTERM", shutdown);
-    platform2.onSignal("SIGHUP", shutdown);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -13390,11 +13392,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);
-  }
+  await trapShutdown(platform2, shutdown);
   if (generatedBearer && resolvedBearer) {
     tokenFilePath = await publishBearer(
       platform2,
@@ -15795,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;
@@ -16157,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;
@@ -16410,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;
+      }
     }
   };
 }
@@ -16645,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);
@@ -16667,7 +16678,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.15.7", 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.7",
+  "version": "0.15.8",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -56,9 +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.19.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",