@wrongstack/mcp 0.298.3 → 0.299.0

package/dist/index.js

@@ -3769,7 +3769,7 @@ var MCPRegistry = class _MCPRegistry {
     if (lazy) {
       await this.startLazy(slot);
     } else {
-      await this.attemptConnect(slot);
+      await this.singleFlightConnect(slot);
     }
   }
   /** Record an intentionally disabled configuration without opening a transport. */
@@ -3805,7 +3805,21 @@ var MCPRegistry = class _MCPRegistry {
       );
       return;
     }
-    await this.attemptConnect(slot);
+    await this.singleFlightConnect(slot);
+  }
+  singleFlightConnect(slot) {
+    if (slot.client && slot.state === "connected") return Promise.resolve(slot.client);
+    if (slot.connecting) return slot.connecting;
+    const promise = (async () => {
+      try {
+        await this.attemptConnect(slot);
+        return slot.client;
+      } finally {
+        slot.connecting = void 0;
+      }
+    })();
+    slot.connecting = promise;
+    return promise;
   }
   /**
    * Ensure a lazy server is connected, spawning it on demand. Single-flight:
@@ -3816,28 +3830,20 @@ var MCPRegistry = class _MCPRegistry {
     if (!slot) throw new Error(`MCP server "${name}" not registered`);
     slot.lastUsed = Date.now();
     if (slot.client && slot.state === "connected") return slot.client;
-    if (slot.connecting) return slot.connecting;
     const waking = slot.state === "dormant";
     if (waking) {
       slot.operations.wakeCount++;
       this.recordOperation(slot, "wake", "lazy-demand");
+      slot.attempts = 0;
+      slot.reconnectCycles = 0;
     }
-    slot.connecting = (async () => {
-      try {
-        slot.attempts = 0;
-        slot.reconnectCycles = 0;
-        await this.attemptConnect(slot);
-        if (!slot.client) {
-          throw new Error(`MCP server "${name}" failed to connect on demand`);
-        }
-        slot.lastUsed = Date.now();
-        this.ensureIdleSweep();
-        return slot.client;
-      } finally {
-        slot.connecting = void 0;
-      }
-    })();
-    return slot.connecting;
+    const client = await this.singleFlightConnect(slot);
+    if (!client) {
+      throw new Error(`MCP server "${name}" failed to connect on demand`);
+    }
+    slot.lastUsed = Date.now();
+    this.ensureIdleSweep();
+    return client;
   }
   /**
    * Register all cached tools for a given server into the tool registry.
@@ -3898,6 +3904,7 @@ var MCPRegistry = class _MCPRegistry {
       clearTimeout(slot.reconnectTimer);
       slot.reconnectTimer = void 0;
     }
+    slot.state = "disconnected";
     if (slot.client) {
       slot.client.removeExitListener(this.onChildExit);
       if (slot.onDisconnect) slot.client.removeDisconnectListener(slot.onDisconnect);
@@ -3916,7 +3923,6 @@ var MCPRegistry = class _MCPRegistry {
     slot.resourceTemplates = void 0;
     slot.prompts = void 0;
     slot.registeredLazy = false;
-    slot.state = "disconnected";
     this.recordOperation(slot, "stop", "manual");
     this.events.emit("mcp.server.disconnected", { name, reason: "stop" });
   }
@@ -3928,7 +3934,11 @@ var MCPRegistry = class _MCPRegistry {
     await this.stop(name);
     slot.attempts = 0;
     slot.reconnectCycles = 0;
-    await this.attemptConnect(slot);
+    if (slot.lazy) {
+      await this.startLazy(slot);
+    } else {
+      await this.singleFlightConnect(slot);
+    }
   }
   list() {
     return Array.from(this.servers.values()).map((s) => {
@@ -4356,6 +4366,9 @@ var MCPRegistry = class _MCPRegistry {
     const MAX_ATTEMPTS = MCP_CONSTANTS.RECONNECT.MAX_ATTEMPTS;
     let attempt = 0;
     while (attempt < MAX_ATTEMPTS) {
+      if (this.servers.has(slot.cfg.name) && this.servers.get(slot.cfg.name) !== slot) {
+        return;
+      }
       attempt++;
       const startedAt = Date.now();
       slot.state = attempt === 1 ? "connecting" : "reconnecting";
@@ -4385,6 +4398,15 @@ var MCPRegistry = class _MCPRegistry {
         client.addToolsChangedListener(this.onToolsChanged);
         this.addCatalogListeners(client);
         await client.connect();
+        if (slot.state === "disconnected" || this.servers.has(slot.cfg.name) && this.servers.get(slot.cfg.name) !== slot) {
+          client.removeExitListener(this.onChildExit);
+          if (boundDisconnect) client.removeDisconnectListener(boundDisconnect);
+          client.removeToolsChangedListener(this.onToolsChanged);
+          this.removeCatalogListeners(client);
+          await client.close().catch(() => {
+          });
+          return;
+        }
         if (slot.client && slot.client !== client) {
           const prior = slot.client;
           const priorDisconnect = slot.onDisconnect;
@@ -4457,6 +4479,9 @@ var MCPRegistry = class _MCPRegistry {
         }
         const delay = 500 * 2 ** attempt;
         await new Promise((r) => setTimeout(r, delay));
+        if (slot.state === "disconnected" || this.servers.has(slot.cfg.name) && this.servers.get(slot.cfg.name) !== slot) {
+          return;
+        }
       }
     }
   }

package/dist/registry-slots.d.ts

@@ -26,7 +26,7 @@ export interface ServerSlot {
     /** Epoch ms of the last tool call — drives idle auto-sleep. */
     lastUsed: number;
     /** Single-flight guard so concurrent first-calls trigger only one connect. */
-    connecting?: Promise<MCPClient> | undefined;
+    connecting?: Promise<MCPClient | undefined> | undefined;
     /** Whether this lazy server's resolver wrappers are registered (register once). */
     registeredLazy: boolean;
     /** Bounded, payload-free operational telemetry for this server. */

package/dist/registry.d.ts

@@ -46,6 +46,7 @@ export declare class MCPRegistry {
      * cache yet, do a one-time cold discovery connect to learn + cache the tools.
      */
     private startLazy;
+    private singleFlightConnect;
     /**
      * Ensure a lazy server is connected, spawning it on demand. Single-flight:
      * concurrent first-calls share one connect. Resolver wrappers call this.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/mcp",
-  "version": "0.298.3",
+  "version": "0.299.0",
   "license": "MIT",
   "description": "WrongStack Model Context Protocol client and registry: stdio, SSE, and streamable HTTP transports.",
   "repository": {
@@ -26,7 +26,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@wrongstack/core": "0.298.3"
+    "@wrongstack/core": "0.299.0"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",