@wrongstack/mcp 0.296.4 → 0.297.0

package/dist/index.js

@@ -3570,6 +3570,7 @@ function scheduleRegistryReconnect({
 
 // src/wrap-tool.ts
 import { ToolCapabilities } from "@wrongstack/core/security";
+import { mcpQualifiedToolName } from "@wrongstack/core/utils";
 var MUTATING_RE = /create|update|delete|write|send|set|put|post|patch|remove|rename|move/i;
 function isMutatingTool(mcpTool) {
   if (MUTATING_RE.test(mcpTool.name)) return true;
@@ -3585,7 +3586,7 @@ function isMutatingTool(mcpTool) {
   return false;
 }
 function wrapMCPTool(serverName, mcpTool, client, permission = "confirm", observer) {
-  const qualifiedName = `mcp__${serverName}__${mcpTool.name}`;
+  const qualifiedName = mcpQualifiedToolName(serverName, mcpTool.name);
   return {
     name: qualifiedName,
     description: mcpTool.description ?? `${qualifiedName} (MCP tool)`,
@@ -4635,6 +4636,7 @@ function serveStdio(server, opts = {}) {
   let closed = false;
   let bufferTooLarge = false;
   let writeChain = Promise.resolve();
+  const inFlightHandlers = /* @__PURE__ */ new Set();
   const writeLine = (s) => {
     writeChain = writeChain.then(
       () => new Promise((resolve) => {
@@ -4681,7 +4683,7 @@ function serveStdio(server, opts = {}) {
       buffer = buffer.slice(idx + 1);
       idx = buffer.indexOf("\n");
       if (!line.trim()) continue;
-      void server.handleMessage(line).then((res) => {
+      const handler = server.handleMessage(line).then((res) => {
         if (res !== null) writeLine(res);
       }).catch((err) => {
         console.error(
@@ -4692,13 +4694,16 @@ function serveStdio(server, opts = {}) {
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           })
         );
+      }).finally(() => {
+        inFlightHandlers.delete(handler);
       });
+      inFlightHandlers.add(handler);
     }
   };
   let resolveDone;
   const done = new Promise((resolve) => {
     resolveDone = () => {
-      void writeChain.then(() => resolve());
+      void Promise.allSettled([...inFlightHandlers]).then(() => writeChain).then(() => resolve());
     };
   });
   const onEnd = () => {