@chrysb/alphaclaw 0.9.0-beta.0 → 0.9.0-beta.2

package/lib/server/routes/mcp.js

@@ -26,17 +26,34 @@ const resolveGatewayWsUrl = ({ openclawDir, gatewayPort }) => {
   return `${scheme}://127.0.0.1:${gatewayPort}`;
 };
 
+const sessions = new Map();
 let activeTransport = null;
+const kSessionGraceMs = 15_000;
 
-const closeActiveTransport = async () => {
-  if (!activeTransport) return;
-  const t = activeTransport;
+const closeSession = (sessionId) => {
+  const t = sessions.get(sessionId);
+  if (!t) return;
+  sessions.delete(sessionId);
+  if (activeTransport === t) activeTransport = null;
+  t.close().catch(() => {});
+};
+
+const closeAllSessions = () => {
+  for (const [id] of sessions) closeSession(id);
   activeTransport = null;
-  try {
-    await t.close();
-  } catch {
-    /* already closed */
-  }
+};
+
+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 registerMcpRoutes = ({
@@ -46,7 +63,6 @@ const registerMcpRoutes = ({
   gatewayEnv,
   openclawDir,
 }) => {
-  // Wire bridge stdout messages → active transport
   setOnMcpMessage((message) => {
     if (!activeTransport) return;
     activeTransport.send(message).catch((err) => {
@@ -86,7 +102,7 @@ const registerMcpRoutes = ({
   });
 
   app.post("/api/mcp/stop", requireAuth, async (_req, res) => {
-    await closeActiveTransport();
+    closeAllSessions();
     const result = stopMcpBridge();
     res.json(result);
   });
@@ -125,38 +141,52 @@ const registerMcpRoutes = ({
     const sessionId = req.headers["mcp-session-id"];
 
     // ── Existing session ───────────────────────────────────────
-    if (sessionId && activeTransport) {
-      try {
-        await activeTransport.handleRequest(req, res, req.body);
-      } catch (err) {
-        console.error("[mcp] handleRequest error (existing session):", err?.message);
-        if (!res.headersSent) {
-          res.status(500).json({ error: "Internal transport error" });
+    if (sessionId) {
+      const transport = sessions.get(sessionId);
+      if (transport) {
+        console.log(
+          `[mcp] ${req.method} sessionId=${sessionId} → routed to transport (sessions=${sessions.size})`,
+        );
+        try {
+          await transport.handleRequest(req, res, req.body);
+        } catch (err) {
+          console.error(
+            "[mcp] handleRequest error (existing session):",
+            err?.message,
+          );
+          if (!res.headersSent) {
+            res.status(500).json({ error: "Internal transport error" });
+          }
         }
+      } else {
+        console.log(
+          `[mcp] ${req.method} sessionId=${sessionId} → NOT FOUND (known=[${[...sessions.keys()].join(", ")}])`,
+        );
+        res.status(404).json({
+          jsonrpc: "2.0",
+          error: {
+            code: -32001,
+            message: "Session not found. The server may have been restarted.",
+          },
+          id: null,
+        });
       }
       return;
     }
 
-    // ── Stale / unknown session ────────────────────────────────
-    if (sessionId && !activeTransport) {
-      res.status(404).json({
-        jsonrpc: "2.0",
-        error: {
-          code: -32000,
-          message: "Session not found. The server may have been restarted.",
-        },
-        id: null,
-      });
-      return;
-    }
-
     // ── New session (POST without session ID) ────────────────
-    // Let the transport validate the body internally — it will reject
-    // non-initialize requests and return the proper JSON-RPC error.
-    if (!sessionId && req.method === "POST") {
+    if (req.method === "POST") {
       const transport = new StreamableHTTPServerTransport({
         sessionIdGenerator: () => randomUUID(),
         enableJsonResponse: true,
+        onsessioninitialized: (newSessionId) => {
+          sessions.set(newSessionId, transport);
+          activeTransport = transport;
+          retireStaleSessions(newSessionId);
+          console.log(
+            `[mcp] Session registered: ${newSessionId} (sessions=${sessions.size})`,
+          );
+        },
       });
 
       transport.onmessage = (message) => {
@@ -164,10 +194,14 @@ const registerMcpRoutes = ({
       };
 
       transport.onclose = () => {
-        if (activeTransport === transport) {
-          activeTransport = null;
-          console.log("[mcp] Transport closed");
+        for (const [id, t] of sessions) {
+          if (t === transport) {
+            sessions.delete(id);
+            break;
+          }
         }
+        if (activeTransport === transport) activeTransport = null;
+        console.log(`[mcp] Transport closed (sessions=${sessions.size})`);
       };
 
       transport.onerror = (err) => {
@@ -176,27 +210,17 @@ const registerMcpRoutes = ({
 
       await transport.start();
 
-      // Set activeTransport BEFORE handleRequest so the onMcpMessage
-      // callback can forward the child's response to this transport.
-      const prev = activeTransport;
-      activeTransport = transport;
-
       try {
         await transport.handleRequest(req, res, req.body);
       } catch (err) {
-        console.error("[mcp] handleRequest error (new session):", err?.message);
+        console.error(
+          "[mcp] handleRequest error (new session):",
+          err?.message,
+        );
         if (!res.headersSent) {
           res.status(500).json({ error: "Failed to initialize MCP session" });
         }
       }
-
-      if (transport.sessionId) {
-        if (prev) prev.close().catch(() => {});
-        console.log(`[mcp] Session established: ${transport.sessionId}`);
-      } else {
-        // Session was not established — roll back
-        if (activeTransport === transport) activeTransport = prev;
-      }
       return;
     }
 

package/package.json

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