@ai-ecoverse/mcpcat 0.18.0 → 0.18.2

package/dist/host/mcpcat.mjs

@@ -11905,7 +11905,40 @@ function parseRequestLine(buf, endPos) {
   return { method, target, headers, headerEnd: endPos + 4 };
 }
 async function handleConnection(readable, writable, handler) {
-  const reader = readable.getReader();
+  const raw = readable.getReader();
+  let ahead = null;
+  const parked = [];
+  const reader = {
+    read() {
+      const queued = parked.shift();
+      if (queued) return Promise.resolve(queued);
+      const next = ahead ?? raw.read();
+      ahead = null;
+      return next;
+    }
+  };
+  const watch = async (live, disconnect) => {
+    let held = 0;
+    while (held <= MAX_HEADER_SIZE + MAX_BODY_SIZE) {
+      const pending = ahead ?? raw.read();
+      ahead = pending;
+      let result;
+      try {
+        result = await pending;
+      } catch {
+        if (live.on) disconnect.abort();
+        return;
+      }
+      if (!live.on) return;
+      ahead = null;
+      parked.push(result);
+      if (result.done) {
+        disconnect.abort();
+        return;
+      }
+      held += result.value.length;
+    }
+  };
   const writer = writable.getWriter();
   let buf = new Uint8Array(4096);
   let bufLen = 0;
@@ -11951,7 +11984,16 @@ async function handleConnection(readable, writable, handler) {
         headers: parsed.headers,
         body
       };
-      const response = await handler(request);
+      const disconnect = new AbortController();
+      const live = { on: true };
+      void watch(live, disconnect);
+      let response;
+      try {
+        response = await handler(request, disconnect.signal);
+      } finally {
+        live.on = false;
+      }
+      if (disconnect.signal.aborted) break;
       await writeResponse(writer, response);
       const connectionHeader = (parsed.headers.connection ?? "").toLowerCase();
       if (connectionHeader === "close") break;
@@ -11968,7 +12010,7 @@ async function handleConnection(readable, writable, handler) {
       }
     }
   } finally {
-    reader.releaseLock();
+    raw.releaseLock();
     try {
       await writer.close();
     } catch {
@@ -12821,7 +12863,8 @@ 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, signal) {
+async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd, signal, cancel) {
+  if (cancel?.aborted) return { stdout: "", stderr: "cancelled", exitCode: 124 };
   let proc;
   try {
     proc = await platform2.spawn({
@@ -12834,16 +12877,14 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
     return { stdout: "", stderr: `spawn failed: ${err.message}`, exitCode: 127 };
   }
   inflightProcs.add(proc);
-  if (stdin !== void 0) {
+  const feedStdin = async () => {
     const writer = proc.stdin.getWriter();
-    await writer.write(new TextEncoder().encode(stdin));
-    await writer.close();
-  } else {
     try {
-      await proc.stdin.getWriter().close();
+      if (stdin !== void 0) await writer.write(new TextEncoder().encode(stdin));
+      await writer.close();
     } catch {
     }
-  }
+  };
   const stdoutChunks = [];
   const stderrChunks = [];
   const readStream3 = async (stream, into) => {
@@ -12858,38 +12899,54 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
       r.releaseLock();
     }
   };
-  const timer = new Promise(
-    (resolve) => setTimeout(() => resolve("timeout"), timeoutMs)
-  );
+  let timerId;
+  let onAbort;
+  let onCancel;
+  const timer = new Promise((resolve) => {
+    timerId = setTimeout(() => resolve("timeout"), timeoutMs);
+  });
   const abortPromise = signal ? new Promise((resolve) => {
     if (signal.aborted) {
       resolve("timeout");
       return;
     }
-    signal.addEventListener("abort", () => resolve("timeout"), { once: true });
+    onAbort = () => resolve("timeout");
+    signal.addEventListener("abort", onAbort, { once: true });
+  }) : null;
+  const cancelPromise = cancel ? new Promise((resolve) => {
+    if (cancel.aborted) {
+      resolve("cancel");
+      return;
+    }
+    onCancel = () => resolve("cancel");
+    cancel.addEventListener("abort", onCancel, { once: true });
   }) : null;
   const work = Promise.all([
     readStream3(proc.stdout, stdoutChunks),
     readStream3(proc.stderr, stderrChunks),
-    proc.wait()
+    proc.wait(),
+    feedStdin()
   ]);
-  const racers = [
-    work,
-    timer
-  ];
+  const racers = [work, timer];
   if (abortPromise !== null) racers.push(abortPromise);
-  const result = await Promise.race(racers);
-  if (result === "timeout") {
-    await proc.kill("SIGTERM");
-    if (!signal?.aborted) {
-      await new Promise((resolve) => setTimeout(resolve, 5e3));
-      try {
-        await proc.kill("SIGKILL");
-      } catch {
-      }
+  if (cancelPromise !== null) racers.push(cancelPromise);
+  let result;
+  try {
+    result = await Promise.race(racers);
+  } finally {
+    clearTimeout(timerId);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
+    if (onCancel) cancel?.removeEventListener("abort", onCancel);
+  }
+  if (result === "timeout" || result === "cancel") {
+    if (signal?.aborted) {
+      await proc.kill("SIGTERM");
+    } else {
+      await terminate(proc, CALL_KILL_GRACE_MS);
     }
     inflightProcs.delete(proc);
-    return { stdout: "", stderr: "timed out", exitCode: 124 };
+    const stderr = result === "cancel" ? "cancelled" : "timed out";
+    return { stdout: "", stderr, exitCode: 124 };
   }
   inflightProcs.delete(proc);
   try {
@@ -12915,6 +12972,31 @@ function concat(chunks) {
   return out;
 }
 var KILL_GRACE_MS = 2e3;
+var CALL_KILL_GRACE_MS = 5e3;
+async function terminate(proc, graceMs) {
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
+  let graceId;
+  let exited;
+  try {
+    exited = await Promise.race([
+      proc.wait().then(() => true),
+      new Promise((r) => {
+        graceId = setTimeout(() => r(false), graceMs);
+      })
+    ]);
+  } finally {
+    clearTimeout(graceId);
+  }
+  if (!exited) {
+    try {
+      await proc.kill("SIGKILL");
+    } catch {
+    }
+  }
+}
 var SIGNAL_EXIT = { SIGINT: 130, SIGTERM: 143, SIGHUP: 129 };
 async function trapShutdown(platform2, handler) {
   await Promise.all(
@@ -12926,24 +13008,7 @@ async function trapShutdown(platform2, handler) {
 async function killInflight() {
   const procs = [...inflightProcs];
   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), KILL_GRACE_MS))
-      ]);
-      if (!exited) {
-        try {
-          await proc.kill("SIGKILL");
-        } catch {
-        }
-      }
-    })
-  );
+  await Promise.all(procs.map((proc) => terminate(proc, KILL_GRACE_MS)));
   inflightProcs.clear();
 }
 async function runHelpForCli(platform2, filePath, childEnv, cwd, signal) {
@@ -13040,7 +13105,7 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
     );
     return run2;
   }
-  function invokeTemplateTool(tool, args2) {
+  function invokeTemplateTool(tool, args2, cancel) {
     const templateArgs = {};
     if (args2 && typeof args2 === "object") {
       for (const [k, v] of Object.entries(args2)) {
@@ -13058,11 +13123,13 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       )
     );
   }
-  async function executeTool(tool, cli, args2) {
+  async function executeTool(tool, cli, args2, cancel) {
     if (tool.kind === "help") {
       const result = await runCommand(
         platform2,
@@ -13072,7 +13139,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
       if (result.exitCode === 0) return result;
       return runCommand(
@@ -13083,7 +13152,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
     }
     if (tool.kind === "invoke") {
@@ -13098,7 +13169,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         parsed2.stdin,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
     }
     const parsed = readToolArguments(args2 ?? {});
@@ -13114,18 +13187,20 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
       planned.stdin,
       options.callTimeout,
       options.maxOutput,
-      serveCwd
+      serveCwd,
+      void 0,
+      cancel
     );
   }
-  async function invoke(name, args2) {
+  async function invoke(name, args2, cancel) {
     const tool = allTools.find((t) => t.name === name);
     if (!tool) return { stdout: "", stderr: `unknown tool ${name}`, exitCode: 1 };
     if (tool.cli === "" && tool.commandPath.length === 0) {
-      return invokeTemplateTool(tool, args2);
+      return invokeTemplateTool(tool, args2, cancel);
     }
     const cli = clis.find((c) => c.name === tool.cli);
     if (!cli) return { stdout: "", stderr: `unknown cli ${tool.cli}`, exitCode: 1 };
-    return enqueue(cli.name, () => executeTool(tool, cli, args2));
+    return enqueue(cli.name, () => executeTool(tool, cli, args2, cancel));
   }
   return { invoke, rpcTools };
 }
@@ -13869,10 +13944,13 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   let tokenFilePath;
   let shutdownRequested = false;
   let inflightDone;
+  const stopCalls = new AbortController();
+  const activeCalls = /* @__PURE__ */ new Set();
   const shutdown = () => {
     if (shutdownRequested) return;
     shutdownRequested = true;
     listener.close();
+    stopCalls.abort();
     inflightDone = killInflight();
     if (tokenFilePath) {
       platform2.fs.unlink?.(tokenFilePath).catch(() => {
@@ -13902,17 +13980,30 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
   }
-  const handler = (request) => handleMcpRequest(
-    request,
-    tools,
-    call,
-    serverName,
-    version,
-    serverOrigins,
-    allowedOrigins,
-    allowedHosts,
-    resolvedBearer
-  );
+  const handler = (request, signal) => {
+    const cancel = new AbortController();
+    const relay = () => cancel.abort();
+    signal.addEventListener("abort", relay, { once: true });
+    stopCalls.signal.addEventListener("abort", relay, { once: true });
+    if (signal.aborted || stopCalls.signal.aborted) relay();
+    const pending = handleMcpRequest(
+      request,
+      tools,
+      (name, args2) => call(name, args2, cancel.signal),
+      serverName,
+      version,
+      serverOrigins,
+      allowedOrigins,
+      allowedHosts,
+      resolvedBearer
+    ).finally(() => {
+      signal.removeEventListener("abort", relay);
+      stopCalls.signal.removeEventListener("abort", relay);
+      activeCalls.delete(pending);
+    });
+    activeCalls.add(pending);
+    return pending;
+  };
   try {
     for await (const connection of listener) {
       if (shutdownRequested) break;
@@ -13934,6 +14025,7 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     } catch {
     }
   }
+  await Promise.allSettled([...activeCalls]);
   return 0;
 }
 async function handleMcpRequest(request, tools, call, serverName, version, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -17096,5 +17188,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.18.0", args);
+var code = await run(platform, "0.18.2", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -11526,7 +11526,40 @@ function parseRequestLine(buf, endPos) {
   return { method, target, headers, headerEnd: endPos + 4 };
 }
 async function handleConnection(readable, writable, handler) {
-  const reader = readable.getReader();
+  const raw = readable.getReader();
+  let ahead = null;
+  const parked = [];
+  const reader = {
+    read() {
+      const queued = parked.shift();
+      if (queued) return Promise.resolve(queued);
+      const next = ahead ?? raw.read();
+      ahead = null;
+      return next;
+    }
+  };
+  const watch = async (live, disconnect) => {
+    let held = 0;
+    while (held <= MAX_HEADER_SIZE + MAX_BODY_SIZE) {
+      const pending = ahead ?? raw.read();
+      ahead = pending;
+      let result;
+      try {
+        result = await pending;
+      } catch {
+        if (live.on) disconnect.abort();
+        return;
+      }
+      if (!live.on) return;
+      ahead = null;
+      parked.push(result);
+      if (result.done) {
+        disconnect.abort();
+        return;
+      }
+      held += result.value.length;
+    }
+  };
   const writer = writable.getWriter();
   let buf = new Uint8Array(4096);
   let bufLen = 0;
@@ -11572,7 +11605,16 @@ async function handleConnection(readable, writable, handler) {
         headers: parsed.headers,
         body
       };
-      const response = await handler(request);
+      const disconnect = new AbortController();
+      const live = { on: true };
+      void watch(live, disconnect);
+      let response;
+      try {
+        response = await handler(request, disconnect.signal);
+      } finally {
+        live.on = false;
+      }
+      if (disconnect.signal.aborted) break;
       await writeResponse(writer, response);
       const connectionHeader = (parsed.headers.connection ?? "").toLowerCase();
       if (connectionHeader === "close") break;
@@ -11589,7 +11631,7 @@ async function handleConnection(readable, writable, handler) {
       }
     }
   } finally {
-    reader.releaseLock();
+    raw.releaseLock();
     try {
       await writer.close();
     } catch {
@@ -12442,7 +12484,8 @@ 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, signal) {
+async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs, maxOutput, cwd, signal, cancel) {
+  if (cancel?.aborted) return { stdout: "", stderr: "cancelled", exitCode: 124 };
   let proc;
   try {
     proc = await platform2.spawn({
@@ -12455,16 +12498,14 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
     return { stdout: "", stderr: `spawn failed: ${err.message}`, exitCode: 127 };
   }
   inflightProcs.add(proc);
-  if (stdin !== void 0) {
+  const feedStdin = async () => {
     const writer = proc.stdin.getWriter();
-    await writer.write(new TextEncoder().encode(stdin));
-    await writer.close();
-  } else {
     try {
-      await proc.stdin.getWriter().close();
+      if (stdin !== void 0) await writer.write(new TextEncoder().encode(stdin));
+      await writer.close();
     } catch {
     }
-  }
+  };
   const stdoutChunks = [];
   const stderrChunks = [];
   const readStream3 = async (stream, into) => {
@@ -12479,38 +12520,54 @@ async function runCommand(platform2, cmdPath, argv, childEnv, stdin, timeoutMs,
       r.releaseLock();
     }
   };
-  const timer = new Promise(
-    (resolve2) => setTimeout(() => resolve2("timeout"), timeoutMs)
-  );
+  let timerId;
+  let onAbort;
+  let onCancel;
+  const timer = new Promise((resolve2) => {
+    timerId = setTimeout(() => resolve2("timeout"), timeoutMs);
+  });
   const abortPromise = signal ? new Promise((resolve2) => {
     if (signal.aborted) {
       resolve2("timeout");
       return;
     }
-    signal.addEventListener("abort", () => resolve2("timeout"), { once: true });
+    onAbort = () => resolve2("timeout");
+    signal.addEventListener("abort", onAbort, { once: true });
+  }) : null;
+  const cancelPromise = cancel ? new Promise((resolve2) => {
+    if (cancel.aborted) {
+      resolve2("cancel");
+      return;
+    }
+    onCancel = () => resolve2("cancel");
+    cancel.addEventListener("abort", onCancel, { once: true });
   }) : null;
   const work = Promise.all([
     readStream3(proc.stdout, stdoutChunks),
     readStream3(proc.stderr, stderrChunks),
-    proc.wait()
+    proc.wait(),
+    feedStdin()
   ]);
-  const racers = [
-    work,
-    timer
-  ];
+  const racers = [work, timer];
   if (abortPromise !== null) racers.push(abortPromise);
-  const result = await Promise.race(racers);
-  if (result === "timeout") {
-    await proc.kill("SIGTERM");
-    if (!signal?.aborted) {
-      await new Promise((resolve2) => setTimeout(resolve2, 5e3));
-      try {
-        await proc.kill("SIGKILL");
-      } catch {
-      }
+  if (cancelPromise !== null) racers.push(cancelPromise);
+  let result;
+  try {
+    result = await Promise.race(racers);
+  } finally {
+    clearTimeout(timerId);
+    if (onAbort) signal?.removeEventListener("abort", onAbort);
+    if (onCancel) cancel?.removeEventListener("abort", onCancel);
+  }
+  if (result === "timeout" || result === "cancel") {
+    if (signal?.aborted) {
+      await proc.kill("SIGTERM");
+    } else {
+      await terminate(proc, CALL_KILL_GRACE_MS);
     }
     inflightProcs.delete(proc);
-    return { stdout: "", stderr: "timed out", exitCode: 124 };
+    const stderr = result === "cancel" ? "cancelled" : "timed out";
+    return { stdout: "", stderr, exitCode: 124 };
   }
   inflightProcs.delete(proc);
   try {
@@ -12536,6 +12593,31 @@ function concat(chunks) {
   return out;
 }
 var KILL_GRACE_MS = 2e3;
+var CALL_KILL_GRACE_MS = 5e3;
+async function terminate(proc, graceMs) {
+  try {
+    await proc.kill("SIGTERM");
+  } catch {
+  }
+  let graceId;
+  let exited;
+  try {
+    exited = await Promise.race([
+      proc.wait().then(() => true),
+      new Promise((r) => {
+        graceId = setTimeout(() => r(false), graceMs);
+      })
+    ]);
+  } finally {
+    clearTimeout(graceId);
+  }
+  if (!exited) {
+    try {
+      await proc.kill("SIGKILL");
+    } catch {
+    }
+  }
+}
 var SIGNAL_EXIT = { SIGINT: 130, SIGTERM: 143, SIGHUP: 129 };
 async function trapShutdown(platform2, handler) {
   await Promise.all(
@@ -12547,24 +12629,7 @@ async function trapShutdown(platform2, handler) {
 async function killInflight() {
   const procs = [...inflightProcs];
   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), KILL_GRACE_MS))
-      ]);
-      if (!exited) {
-        try {
-          await proc.kill("SIGKILL");
-        } catch {
-        }
-      }
-    })
-  );
+  await Promise.all(procs.map((proc) => terminate(proc, KILL_GRACE_MS)));
   inflightProcs.clear();
 }
 async function runHelpForCli(platform2, filePath, childEnv, cwd, signal) {
@@ -12661,7 +12726,7 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
     );
     return run2;
   }
-  function invokeTemplateTool(tool, args) {
+  function invokeTemplateTool(tool, args, cancel) {
     const templateArgs = {};
     if (args && typeof args === "object") {
       for (const [k, v] of Object.entries(args)) {
@@ -12679,11 +12744,13 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       )
     );
   }
-  async function executeTool(tool, cli, args) {
+  async function executeTool(tool, cli, args, cancel) {
     if (tool.kind === "help") {
       const result = await runCommand(
         platform2,
@@ -12693,7 +12760,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
       if (result.exitCode === 0) return result;
       return runCommand(
@@ -12704,7 +12773,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         void 0,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
     }
     if (tool.kind === "invoke") {
@@ -12719,7 +12790,9 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
         parsed2.stdin,
         options.callTimeout,
         options.maxOutput,
-        serveCwd
+        serveCwd,
+        void 0,
+        cancel
       );
     }
     const parsed = readToolArguments(args ?? {});
@@ -12735,18 +12808,20 @@ function createToolExecutor(platform2, clis, allTools, childEnv, options, serveC
       planned.stdin,
       options.callTimeout,
       options.maxOutput,
-      serveCwd
+      serveCwd,
+      void 0,
+      cancel
     );
   }
-  async function invoke(name, args) {
+  async function invoke(name, args, cancel) {
     const tool = allTools.find((t) => t.name === name);
     if (!tool) return { stdout: "", stderr: `unknown tool ${name}`, exitCode: 1 };
     if (tool.cli === "" && tool.commandPath.length === 0) {
-      return invokeTemplateTool(tool, args);
+      return invokeTemplateTool(tool, args, cancel);
     }
     const cli = clis.find((c) => c.name === tool.cli);
     if (!cli) return { stdout: "", stderr: `unknown cli ${tool.cli}`, exitCode: 1 };
-    return enqueue(cli.name, () => executeTool(tool, cli, args));
+    return enqueue(cli.name, () => executeTool(tool, cli, args, cancel));
   }
   return { invoke, rpcTools };
 }
@@ -13490,10 +13565,13 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
   let tokenFilePath;
   let shutdownRequested = false;
   let inflightDone;
+  const stopCalls = new AbortController();
+  const activeCalls = /* @__PURE__ */ new Set();
   const shutdown = () => {
     if (shutdownRequested) return;
     shutdownRequested = true;
     listener.close();
+    stopCalls.abort();
     inflightDone = killInflight();
     if (tokenFilePath) {
       platform2.fs.unlink?.(tokenFilePath).catch(() => {
@@ -13523,17 +13601,30 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     await platform2.write(2, `mcpcat serve: listening on ${listenUrl}
 `);
   }
-  const handler = (request) => handleMcpRequest(
-    request,
-    tools,
-    call,
-    serverName,
-    version,
-    serverOrigins,
-    allowedOrigins,
-    allowedHosts,
-    resolvedBearer
-  );
+  const handler = (request, signal) => {
+    const cancel = new AbortController();
+    const relay = () => cancel.abort();
+    signal.addEventListener("abort", relay, { once: true });
+    stopCalls.signal.addEventListener("abort", relay, { once: true });
+    if (signal.aborted || stopCalls.signal.aborted) relay();
+    const pending = handleMcpRequest(
+      request,
+      tools,
+      (name, args) => call(name, args, cancel.signal),
+      serverName,
+      version,
+      serverOrigins,
+      allowedOrigins,
+      allowedHosts,
+      resolvedBearer
+    ).finally(() => {
+      signal.removeEventListener("abort", relay);
+      stopCalls.signal.removeEventListener("abort", relay);
+      activeCalls.delete(pending);
+    });
+    activeCalls.add(pending);
+    return pending;
+  };
   try {
     for await (const connection of listener) {
       if (shutdownRequested) break;
@@ -13555,6 +13646,7 @@ async function runHttpServer(platform2, options, tools, call, serverName, versio
     } catch {
     }
   }
+  await Promise.allSettled([...activeCalls]);
   return 0;
 }
 async function handleMcpRequest(request, tools, call, serverName, version, serverOrigins, allowedOrigins, allowedHosts, resolvedBearer) {
@@ -16818,7 +16910,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.18.0", args);
+  return run(platform2, "0.18.2", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -62,14 +62,14 @@
   },
   "devDependencies": {
     "@ai-ecoverse/slicc-bios": "1.38.0",
-    "@ai-ecoverse/slicc-kernel": "1.143.1",
-    "@ai-ecoverse/slicc-shared-web": "1.29.16",
+    "@ai-ecoverse/slicc-kernel": "1.143.4",
+    "@ai-ecoverse/slicc-shared-web": "1.30.3",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",
     "@types/node": "26.6.5",
     "esbuild": "0.28.2",
-    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.143.1",
+    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.143.4",
     "lefthook": "2.2.2",
     "monocart-coverage-reports": "2.13.2",
     "proper-lockfile": "4.1.2",