@chrysb/alphaclaw 0.9.0-beta.6 → 0.9.0-beta.7

package/lib/server/routes/mcp.js

@@ -26,28 +26,57 @@ const resolveGatewayWsUrl = ({ openclawDir, gatewayPort }) => {
   return `${scheme}://127.0.0.1:${gatewayPort}`;
 };
 
-let activeSessionId = null;
+const sessions = new Map();
 let activeTransport = null;
 const kSseKeepAliveMs = 15_000;
+const kMaxSessions = 8;
 
-const closeActiveSession = () => {
-  if (!activeTransport) return;
-  const id = activeSessionId;
-  const t = activeTransport;
-  activeSessionId = null;
-  activeTransport = null;
-  t.close().catch(() => {});
-  if (id) console.log(`[mcp] Closed session: ${id}`);
-};
+let nextBridgeId = 1;
+const pendingRequests = new Map();
 
 const adoptSession = (sessionId, transport) => {
-  if (activeTransport && activeTransport !== transport) {
-    const prevId = activeSessionId;
-    activeTransport.close().catch(() => {});
-    console.log(`[mcp] Replaced session ${prevId} → ${sessionId}`);
-  }
-  activeSessionId = sessionId;
+  sessions.set(sessionId, transport);
   activeTransport = transport;
+
+  if (sessions.size > kMaxSessions) {
+    const oldestId = sessions.keys().next().value;
+    if (oldestId !== sessionId) {
+      const old = sessions.get(oldestId);
+      sessions.delete(oldestId);
+      old.close().catch(() => {});
+      console.log(`[mcp] Evicted oldest session: ${oldestId}`);
+    }
+  }
+};
+
+const forwardToBridge = (message, transport) => {
+  if (message.id != null) {
+    const bridgeId = nextBridgeId++;
+    pendingRequests.set(bridgeId, { originalId: message.id, transport });
+    writeToMcpBridge({ ...message, id: bridgeId });
+  } else {
+    writeToMcpBridge(message);
+  }
+};
+
+const cleanupTransport = (transport) => {
+  for (const [id, t] of sessions) {
+    if (t === transport) {
+      sessions.delete(id);
+      break;
+    }
+  }
+  for (const [bridgeId, pending] of pendingRequests) {
+    if (pending.transport === transport) pendingRequests.delete(bridgeId);
+  }
+  if (activeTransport === transport) activeTransport = null;
+};
+
+const closeAllSessions = () => {
+  for (const [, t] of sessions) t.close().catch(() => {});
+  sessions.clear();
+  pendingRequests.clear();
+  activeTransport = null;
 };
 
 const registerMcpRoutes = ({
@@ -58,10 +87,21 @@ const registerMcpRoutes = ({
   openclawDir,
 }) => {
   setOnMcpMessage((message) => {
-    if (!activeTransport) return;
-    activeTransport.send(message).catch((err) => {
-      console.error("[mcp] Failed to forward to transport:", err?.message);
-    });
+    if (message.id != null) {
+      const pending = pendingRequests.get(message.id);
+      if (pending) {
+        pendingRequests.delete(message.id);
+        pending.transport
+          .send({ ...message, id: pending.originalId })
+          .catch((err) => {
+            console.error("[mcp] Failed to forward response:", err?.message);
+          });
+      }
+      return;
+    }
+    if (activeTransport) {
+      activeTransport.send(message).catch(() => {});
+    }
   });
 
   // ── Internal API (session auth) ────────────────────────────────
@@ -96,7 +136,7 @@ const registerMcpRoutes = ({
   });
 
   app.post("/api/mcp/stop", requireAuth, async (_req, res) => {
-    closeActiveSession();
+    closeAllSessions();
     const result = stopMcpBridge();
     res.json(result);
   });
@@ -146,12 +186,13 @@ const registerMcpRoutes = ({
 
     // ── Existing session ───────────────────────────────────────
     if (sessionId) {
-      if (sessionId === activeSessionId && activeTransport) {
+      const transport = sessions.get(sessionId);
+      if (transport) {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → active session`,
+          `[mcp] ${req.method} sessionId=${sessionId} → routed (sessions=${sessions.size})`,
         );
         try {
-          await activeTransport.handleRequest(req, res, req.body);
+          await transport.handleRequest(req, res, req.body);
         } catch (err) {
           console.error(
             "[mcp] handleRequest error (existing session):",
@@ -163,7 +204,7 @@ const registerMcpRoutes = ({
         }
       } else {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (active=${activeSessionId || "none"})`,
+          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (sessions=${sessions.size})`,
         );
         res.status(404).json({
           jsonrpc: "2.0",
@@ -184,20 +225,19 @@ const registerMcpRoutes = ({
         enableJsonResponse: true,
         onsessioninitialized: (newSessionId) => {
           adoptSession(newSessionId, transport);
-          console.log(`[mcp] Session adopted: ${newSessionId}`);
+          console.log(
+            `[mcp] Session adopted: ${newSessionId} (sessions=${sessions.size})`,
+          );
         },
       });
 
       transport.onmessage = (message) => {
-        writeToMcpBridge(message);
+        forwardToBridge(message, transport);
       };
 
       transport.onclose = () => {
-        if (activeTransport === transport) {
-          activeSessionId = null;
-          activeTransport = null;
-        }
-        console.log(`[mcp] Transport closed`);
+        cleanupTransport(transport);
+        console.log(`[mcp] Transport closed (sessions=${sessions.size})`);
       };
 
       transport.onerror = (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.0-beta.6",
+  "version": "0.9.0-beta.7",
   "publishConfig": {
     "access": "public"
   },