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

package/lib/server/routes/mcp.js

@@ -28,33 +28,55 @@ const resolveGatewayWsUrl = ({ openclawDir, gatewayPort }) => {
 
 const sessions = new Map();
 let activeTransport = null;
-const kSessionGraceMs = 15_000;
 const kSseKeepAliveMs = 15_000;
+const kMaxSessions = 8;
 
-const closeSession = (sessionId) => {
-  const t = sessions.get(sessionId);
-  if (!t) return;
-  sessions.delete(sessionId);
-  if (activeTransport === t) activeTransport = null;
-  t.close().catch(() => {});
+let nextBridgeId = 1;
+const pendingRequests = new Map();
+
+const adoptSession = (sessionId, transport) => {
+  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 closeAllSessions = () => {
-  for (const [id] of sessions) closeSession(id);
-  activeTransport = null;
+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 retireStaleSessions = (keepId) => {
-  const staleIds = [...sessions.keys()].filter((id) => id !== keepId);
-  if (staleIds.length === 0) return;
-  setTimeout(() => {
-    for (const id of staleIds) {
-      if (sessions.has(id) && sessions.get(id) !== activeTransport) {
-        console.log(`[mcp] Cleaning up stale session: ${id}`);
-        closeSession(id);
-      }
+const cleanupTransport = (transport) => {
+  for (const [id, t] of sessions) {
+    if (t === transport) {
+      sessions.delete(id);
+      break;
     }
-  }, kSessionGraceMs);
+  }
+  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 = ({
@@ -65,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) ────────────────────────────────
@@ -156,7 +189,7 @@ const registerMcpRoutes = ({
       const transport = sessions.get(sessionId);
       if (transport) {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → routed to transport (sessions=${sessions.size})`,
+          `[mcp] ${req.method} sessionId=${sessionId} → routed (sessions=${sessions.size})`,
         );
         try {
           await transport.handleRequest(req, res, req.body);
@@ -171,7 +204,7 @@ const registerMcpRoutes = ({
         }
       } else {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (known=[${[...sessions.keys()].join(", ")}])`,
+          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (sessions=${sessions.size})`,
         );
         res.status(404).json({
           jsonrpc: "2.0",
@@ -191,27 +224,19 @@ const registerMcpRoutes = ({
         sessionIdGenerator: () => randomUUID(),
         enableJsonResponse: true,
         onsessioninitialized: (newSessionId) => {
-          sessions.set(newSessionId, transport);
-          activeTransport = transport;
-          retireStaleSessions(newSessionId);
+          adoptSession(newSessionId, transport);
           console.log(
-            `[mcp] Session registered: ${newSessionId} (sessions=${sessions.size})`,
+            `[mcp] Session adopted: ${newSessionId} (sessions=${sessions.size})`,
           );
         },
       });
 
       transport.onmessage = (message) => {
-        writeToMcpBridge(message);
+        forwardToBridge(message, transport);
       };
 
       transport.onclose = () => {
-        for (const [id, t] of sessions) {
-          if (t === transport) {
-            sessions.delete(id);
-            break;
-          }
-        }
-        if (activeTransport === transport) activeTransport = null;
+        cleanupTransport(transport);
         console.log(`[mcp] Transport closed (sessions=${sessions.size})`);
       };
 

package/package.json

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