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

package/lib/server/routes/mcp.js

@@ -26,34 +26,28 @@ const resolveGatewayWsUrl = ({ openclawDir, gatewayPort }) => {
   return `${scheme}://127.0.0.1:${gatewayPort}`;
 };
 
-const sessions = new Map();
+let activeSessionId = null;
 let activeTransport = null;
-const kSessionGraceMs = 15_000;
+const kSseKeepAliveMs = 15_000;
 
-const closeSession = (sessionId) => {
-  const t = sessions.get(sessionId);
-  if (!t) return;
-  sessions.delete(sessionId);
-  if (activeTransport === t) activeTransport = null;
+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}`);
 };
 
-const closeAllSessions = () => {
-  for (const [id] of sessions) closeSession(id);
-  activeTransport = null;
-};
-
-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);
-      }
-    }
-  }, kSessionGraceMs);
+const adoptSession = (sessionId, transport) => {
+  if (activeTransport && activeTransport !== transport) {
+    const prevId = activeSessionId;
+    activeTransport.close().catch(() => {});
+    console.log(`[mcp] Replaced session ${prevId} → ${sessionId}`);
+  }
+  activeSessionId = sessionId;
+  activeTransport = transport;
 };
 
 const registerMcpRoutes = ({
@@ -102,7 +96,7 @@ const registerMcpRoutes = ({
   });
 
   app.post("/api/mcp/stop", requireAuth, async (_req, res) => {
-    closeAllSessions();
+    closeActiveSession();
     const result = stopMcpBridge();
     res.json(result);
   });
@@ -140,19 +134,24 @@ const registerMcpRoutes = ({
 
     if (req.method === "GET") {
       res.setHeader("X-Accel-Buffering", "no");
+      const keepAliveId = setInterval(() => {
+        if (res.headersSent && !res.writableEnded) {
+          res.write(": keepalive\n\n");
+        }
+      }, kSseKeepAliveMs);
+      res.on("close", () => clearInterval(keepAliveId));
     }
 
     const sessionId = req.headers["mcp-session-id"];
 
     // ── Existing session ───────────────────────────────────────
     if (sessionId) {
-      const transport = sessions.get(sessionId);
-      if (transport) {
+      if (sessionId === activeSessionId && activeTransport) {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → routed to transport (sessions=${sessions.size})`,
+          `[mcp] ${req.method} sessionId=${sessionId} → active session`,
         );
         try {
-          await transport.handleRequest(req, res, req.body);
+          await activeTransport.handleRequest(req, res, req.body);
         } catch (err) {
           console.error(
             "[mcp] handleRequest error (existing session):",
@@ -164,7 +163,7 @@ const registerMcpRoutes = ({
         }
       } else {
         console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (known=[${[...sessions.keys()].join(", ")}])`,
+          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (active=${activeSessionId || "none"})`,
         );
         res.status(404).json({
           jsonrpc: "2.0",
@@ -184,12 +183,8 @@ const registerMcpRoutes = ({
         sessionIdGenerator: () => randomUUID(),
         enableJsonResponse: true,
         onsessioninitialized: (newSessionId) => {
-          sessions.set(newSessionId, transport);
-          activeTransport = transport;
-          retireStaleSessions(newSessionId);
-          console.log(
-            `[mcp] Session registered: ${newSessionId} (sessions=${sessions.size})`,
-          );
+          adoptSession(newSessionId, transport);
+          console.log(`[mcp] Session adopted: ${newSessionId}`);
         },
       });
 
@@ -198,14 +193,11 @@ const registerMcpRoutes = ({
       };
 
       transport.onclose = () => {
-        for (const [id, t] of sessions) {
-          if (t === transport) {
-            sessions.delete(id);
-            break;
-          }
+        if (activeTransport === transport) {
+          activeSessionId = null;
+          activeTransport = null;
         }
-        if (activeTransport === transport) activeTransport = null;
-        console.log(`[mcp] Transport closed (sessions=${sessions.size})`);
+        console.log(`[mcp] Transport closed`);
       };
 
       transport.onerror = (err) => {

package/package.json

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