@chrysb/alphaclaw 0.9.0-beta.7 → 0.9.0

package/lib/public/js/components/mcp-tab/index.js

@@ -1,237 +0,0 @@
-import { h } from "preact";
-import { useState, useCallback } from "preact/hooks";
-import htm from "htm";
-import {
-  fetchMcpInfo,
-  startMcpBridge,
-  stopMcpBridge,
-} from "../../lib/api.js";
-import { usePolling } from "../../hooks/usePolling.js";
-import { showToast } from "../toast.js";
-import { PageHeader } from "../page-header.js";
-import { ActionButton } from "../action-button.js";
-import { PaneShell } from "../pane-shell.js";
-
-const html = htm.bind(h);
-
-const kMcpTools = [
-  { name: "conversations_list", desc: "List recent routed conversations with filters" },
-  { name: "conversation_get", desc: "Return a single conversation by session key" },
-  { name: "messages_read", desc: "Retrieve transcript history for a conversation" },
-  { name: "attachments_fetch", desc: "Extract non-text content metadata from messages" },
-  { name: "events_poll", desc: "Read queued live events since a cursor position" },
-  { name: "events_wait", desc: "Long-poll for next matching event with timeout" },
-  { name: "messages_send", desc: "Send text replies through existing routes" },
-  { name: "permissions_list_open", desc: "List pending exec/plugin approval requests" },
-  { name: "permissions_respond", desc: "Resolve approvals (allow-once, allow-always, deny)" },
-];
-
-const StatusDot = ({ active }) => html`
-  <span
-    class="inline-block w-2 h-2 rounded-full shrink-0 ${active
-      ? "bg-green-500"
-      : "bg-gray-600"}"
-  />
-`;
-
-const buildConfigSnippet = ({ origin, token }) => {
-  const encodedToken = encodeURIComponent(String(token || ""));
-  const sseUrl = `${origin}/mcp/sse?token=${encodedToken}`;
-  return JSON.stringify(
-    {
-      mcpServers: {
-        openclaw: {
-          url: sseUrl,
-        },
-      },
-    },
-    null,
-    2,
-  );
-};
-
-export const McpTab = () => {
-  const [acting, setActing] = useState(false);
-
-  const {
-    data: info,
-    refresh,
-  } = usePolling(fetchMcpInfo, 8000, {
-    cacheKey: "/api/mcp/info",
-  });
-  const loading = !info;
-
-  const running = !!info?.running;
-  const tokenAvailable = !!info?.tokenAvailable;
-  const gatewayToken = info?.gatewayToken || "";
-
-  const handleStart = useCallback(async () => {
-    if (acting) return;
-    setActing(true);
-    try {
-      const result = await startMcpBridge();
-      if (result?.ok) {
-        showToast(
-          result.alreadyRunning
-            ? "MCP bridge already running"
-            : "MCP bridge started",
-          "success",
-        );
-      } else {
-        showToast("Failed to start MCP bridge", "error");
-      }
-      await refresh({ force: true });
-    } catch (err) {
-      showToast("Failed to start: " + err.message, "error");
-    } finally {
-      setActing(false);
-    }
-  }, [acting, refresh]);
-
-  const handleStop = useCallback(async () => {
-    if (acting) return;
-    setActing(true);
-    try {
-      const result = await stopMcpBridge();
-      if (result?.ok) {
-        showToast("MCP bridge stopped", "success");
-      } else {
-        showToast("Failed to stop MCP bridge", "error");
-      }
-      await refresh({ force: true });
-    } catch (err) {
-      showToast("Failed to stop: " + err.message, "error");
-    } finally {
-      setActing(false);
-    }
-  }, [acting, refresh]);
-
-  const handleCopy = useCallback(() => {
-    const origin = window.location.origin;
-    const snippet = buildConfigSnippet({ origin, token: gatewayToken });
-    navigator.clipboard
-      .writeText(snippet)
-      .then(() => showToast("Copied to clipboard", "success"))
-      .catch(() => showToast("Failed to copy", "error"));
-  }, [gatewayToken]);
-
-  const configSnippet = buildConfigSnippet({
-    origin: typeof window !== "undefined" ? window.location.origin : "https://your-host",
-    token: gatewayToken || "<gateway-token>",
-  });
-
-  if (loading && !info) {
-    return html`
-      <${PaneShell} header=${html`<${PageHeader} title="MCP" />`}>
-        <div class="bg-surface border border-border rounded-xl p-4 text-sm text-fg-muted">
-          Loading...
-        </div>
-      </${PaneShell}>
-    `;
-  }
-
-  return html`
-    <${PaneShell}
-      header=${html`
-        <${PageHeader}
-          title="MCP"
-          actions=${html`
-            ${running
-              ? html`<${ActionButton}
-                  onClick=${handleStop}
-                  disabled=${acting}
-                  loading=${acting}
-                  loadingMode="inline"
-                  tone="secondary"
-                  size="sm"
-                  idleLabel="Stop bridge"
-                  loadingLabel="Stopping…"
-                  className="text-xs"
-                />`
-              : html`<${ActionButton}
-                  onClick=${handleStart}
-                  disabled=${acting}
-                  loading=${acting}
-                  loadingMode="inline"
-                  tone="primary"
-                  size="sm"
-                  idleLabel="Start bridge"
-                  loadingLabel="Starting…"
-                  className="text-xs"
-                />`}
-          `}
-        />
-      `}
-    >
-      <!-- Status -->
-      <div class="bg-surface border border-border rounded-xl overflow-hidden">
-        <h3 class="card-label text-xs px-4 pt-3 pb-2">Status</h3>
-        <div class="px-4 pb-3 space-y-2">
-          <div class="flex items-center gap-2 text-sm">
-            <${StatusDot} active=${running} />
-            <span class="text-body">
-              MCP Bridge: ${running ? "Running" : "Stopped"}
-            </span>
-            ${running && info?.pid
-              ? html`<span class="text-fg-dim text-xs">(PID ${info.pid})</span>`
-              : null}
-          </div>
-          <div class="flex items-center gap-2 text-sm">
-            <${StatusDot} active=${tokenAvailable} />
-            <span class="text-body">
-              Gateway token: ${tokenAvailable ? "Configured" : "Not set"}
-            </span>
-          </div>
-          ${info?.gatewayWsUrl
-            ? html`<div class="text-xs text-fg-dim">
-                Gateway: <code class="bg-field px-1 rounded">${info.gatewayWsUrl}</code>
-              </div>`
-            : null}
-        </div>
-      </div>
-
-      <!-- Config Snippet -->
-      <div class="bg-surface border border-border rounded-xl overflow-hidden">
-        <div class="flex items-center justify-between px-4 pt-3 pb-2">
-          <h3 class="card-label text-xs">Client Config</h3>
-          <button
-            onclick=${handleCopy}
-            class="text-xs px-2 py-0.5 rounded border border-border text-fg-muted hover:text-body hover:border-fg-muted"
-          >
-            Copy
-          </button>
-        </div>
-        <div class="px-4 pb-3">
-          <p class="text-xs text-fg-dim mb-2">
-            Add this to your MCP client config (Cursor, Claude Desktop, etc.):
-          </p>
-          <pre
-            class="bg-field border border-border rounded-lg p-3 text-xs text-body font-mono overflow-x-auto whitespace-pre"
-          >${configSnippet}</pre>
-          ${!running
-            ? html`<p class="text-xs text-status-warning-muted mt-2">
-                Start the MCP bridge above before connecting a client.
-              </p>`
-            : null}
-        </div>
-      </div>
-
-      <!-- Available Tools -->
-      <div class="bg-surface border border-border rounded-xl overflow-hidden">
-        <h3 class="card-label text-xs px-4 pt-3 pb-2">Available Tools</h3>
-        <div class="divide-y divide-border">
-          ${kMcpTools.map(
-            (tool) => html`
-              <div class="flex items-start gap-3 px-4 py-2">
-                <code class="text-xs shrink-0 pt-0.5" style="min-width: 170px"
-                  >${tool.name}</code
-                >
-                <span class="text-xs text-fg-dim">${tool.desc}</span>
-              </div>
-            `,
-          )}
-        </div>
-      </div>
-    </${PaneShell}>
-  `;
-};

package/lib/public/js/components/routes/mcp-route.js

@@ -1,7 +0,0 @@
-import { h } from "preact";
-import htm from "htm";
-import { McpTab } from "../mcp-tab/index.js";
-
-const html = htm.bind(h);
-
-export const McpRoute = () => html`<${McpTab} />`;

package/lib/server/mcp-bridge.js

@@ -1,158 +0,0 @@
-const { spawn } = require("child_process");
-
-const kStderrTailLines = 50;
-
-let mcpChild = null;
-let mcpStartedAt = null;
-let mcpStderrTail = [];
-let stdoutBuffer = Buffer.alloc(0);
-let onMcpMessage = null;
-
-const appendStderrTail = (chunk) => {
-  const text = Buffer.isBuffer(chunk)
-    ? chunk.toString("utf8")
-    : String(chunk ?? "");
-  for (const line of text.split("\n")) {
-    const trimmed = line.trimEnd();
-    if (!trimmed) continue;
-    mcpStderrTail.push(trimmed);
-  }
-  if (mcpStderrTail.length > kStderrTailLines) {
-    mcpStderrTail = mcpStderrTail.slice(-kStderrTailLines);
-  }
-};
-
-const isMcpBridgeRunning = () =>
-  mcpChild !== null && mcpChild.exitCode === null && !mcpChild.killed;
-
-const getMcpBridgeStatus = () => ({
-  running: isMcpBridgeRunning(),
-  pid: isMcpBridgeRunning() ? mcpChild.pid : null,
-  startedAt: isMcpBridgeRunning() ? mcpStartedAt : null,
-  stderrTail: mcpStderrTail.slice(-10),
-});
-
-const setOnMcpMessage = (callback) => {
-  onMcpMessage = typeof callback === "function" ? callback : null;
-};
-
-const drainStdoutLines = () => {
-  while (stdoutBuffer.length > 0) {
-    const newlineIndex = stdoutBuffer.indexOf("\n");
-    if (newlineIndex === -1) break;
-
-    const line = stdoutBuffer.toString("utf8", 0, newlineIndex).replace(/\r$/, "");
-    stdoutBuffer = stdoutBuffer.slice(newlineIndex + 1);
-    if (!line.trim()) continue;
-
-    let parsed = null;
-    try {
-      parsed = JSON.parse(line);
-    } catch {
-      appendStderrTail(`Unparseable MCP stdout line: ${line.slice(0, 120)}`);
-      continue;
-    }
-    console.log(`[mcp-bridge] ← child stdout: method=${parsed?.method || "(response)"} id=${parsed?.id ?? "none"}`);
-    if (onMcpMessage) {
-      try {
-        onMcpMessage(parsed);
-      } catch (err) {
-        appendStderrTail(`onMcpMessage error: ${err?.message || err}`);
-      }
-    }
-  }
-};
-
-const startMcpBridge = ({ gatewayEnv, gatewayWsUrl, gatewayToken }) => {
-  if (isMcpBridgeRunning()) {
-    return { ok: true, alreadyRunning: true, ...getMcpBridgeStatus() };
-  }
-
-  const args = ["mcp", "serve"];
-  if (gatewayWsUrl) {
-    args.push("--url", gatewayWsUrl);
-  }
-  const childEnv = gatewayEnv();
-  if (gatewayToken) {
-    childEnv.OPENCLAW_GATEWAY_TOKEN = String(gatewayToken);
-  }
-
-  mcpStderrTail = [];
-  stdoutBuffer = Buffer.alloc(0);
-
-  const child = spawn("openclaw", args, {
-    env: childEnv,
-    stdio: ["pipe", "pipe", "pipe"],
-  });
-
-  mcpChild = child;
-  mcpStartedAt = Date.now();
-
-  child.stdout.on("data", (data) => {
-    const chunk = Buffer.isBuffer(data)
-      ? data
-      : Buffer.from(String(data ?? ""), "utf8");
-    stdoutBuffer = Buffer.concat([stdoutBuffer, chunk]);
-    drainStdoutLines();
-  });
-
-  child.stderr.on("data", (data) => {
-    appendStderrTail(data);
-    process.stderr.write(`[mcp-bridge] ${data}`);
-  });
-
-  child.on("exit", (code, signal) => {
-    console.log(
-      `[mcp-bridge] Process exited with code ${code}${signal ? ` signal ${signal}` : ""}`,
-    );
-    if (mcpChild === child) mcpChild = null;
-    mcpStartedAt = null;
-  });
-
-  child.on("error", (error) => {
-    appendStderrTail(error?.message || String(error || "unknown process error"));
-    console.error(
-      `[mcp-bridge] Process failed to start: ${error?.message || error}`,
-    );
-  });
-
-  console.log(`[mcp-bridge] Started MCP bridge (pid ${child.pid})`);
-  return { ok: true, alreadyRunning: false, ...getMcpBridgeStatus() };
-};
-
-const stopMcpBridge = () => {
-  if (!isMcpBridgeRunning()) {
-    return { ok: true, wasStopped: true };
-  }
-  const pid = mcpChild.pid;
-  mcpChild.kill("SIGTERM");
-  mcpChild = null;
-  mcpStartedAt = null;
-  console.log(`[mcp-bridge] Stopped MCP bridge (pid ${pid})`);
-  return { ok: true, wasStopped: false };
-};
-
-const writeToMcpBridge = (jsonRpcMessage) => {
-  if (!isMcpBridgeRunning()) return false;
-  if (jsonRpcMessage == null) return false;
-  const payload =
-    typeof jsonRpcMessage === "string"
-      ? jsonRpcMessage
-      : JSON.stringify(jsonRpcMessage);
-  if (!payload) return false;
-  const method = jsonRpcMessage?.method;
-  const id = jsonRpcMessage?.id;
-  const payloadBytes = Buffer.byteLength(payload, "utf8");
-  console.log(`[mcp-bridge] → child stdin: method=${method || "(response)"} id=${id ?? "none"} bytes=${payloadBytes}`);
-  mcpChild.stdin.write(`${payload}\n`);
-  return true;
-};
-
-module.exports = {
-  isMcpBridgeRunning,
-  getMcpBridgeStatus,
-  startMcpBridge,
-  stopMcpBridge,
-  writeToMcpBridge,
-  setOnMcpMessage,
-};

package/lib/server/routes/mcp.js

@@ -1,292 +0,0 @@
-const { randomUUID } = require("crypto");
-const { createRequire } = require("module");
-
-// Load the SDK through openclaw's dependency tree so its express@5 peer
-// stays nested and never hoists over AlphaClaw's express@4 at the app root.
-const openclawRequire = createRequire(require.resolve("openclaw"));
-const {
-  StreamableHTTPServerTransport,
-} = openclawRequire("@modelcontextprotocol/sdk/server/streamableHttp.js");
-
-const {
-  isMcpBridgeRunning,
-  getMcpBridgeStatus,
-  startMcpBridge,
-  stopMcpBridge,
-  writeToMcpBridge,
-  setOnMcpMessage,
-} = require("../mcp-bridge");
-const { getGatewayPort } = require("../gateway");
-const { readOpenclawConfig } = require("../openclaw-config");
-
-const resolveGatewayWsUrl = ({ openclawDir, gatewayPort }) => {
-  const cfg = readOpenclawConfig({ openclawDir, fallback: {} });
-  const gatewayTlsEnabled = cfg?.gateway?.tls?.enabled === true;
-  const scheme = gatewayTlsEnabled ? "wss" : "ws";
-  return `${scheme}://127.0.0.1:${gatewayPort}`;
-};
-
-const sessions = new Map();
-let activeTransport = null;
-const kSseKeepAliveMs = 15_000;
-const kMaxSessions = 8;
-
-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 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 = ({
-  app,
-  requireAuth,
-  constants,
-  gatewayEnv,
-  openclawDir,
-}) => {
-  setOnMcpMessage((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) ────────────────────────────────
-
-  app.get("/api/mcp/info", requireAuth, (_req, res) => {
-    const port = getGatewayPort();
-    const gatewayWsUrl = resolveGatewayWsUrl({
-      openclawDir,
-      gatewayPort: port,
-    });
-    res.json({
-      ok: true,
-      ...getMcpBridgeStatus(),
-      gatewayPort: port,
-      gatewayWsUrl,
-      tokenAvailable: !!constants.GATEWAY_TOKEN,
-      gatewayToken: constants.GATEWAY_TOKEN || "",
-    });
-  });
-
-  app.post("/api/mcp/start", requireAuth, (_req, res) => {
-    const port = getGatewayPort();
-    const result = startMcpBridge({
-      gatewayEnv,
-      gatewayWsUrl: resolveGatewayWsUrl({
-        openclawDir,
-        gatewayPort: port,
-      }),
-      gatewayToken: constants.GATEWAY_TOKEN,
-    });
-    res.json(result);
-  });
-
-  app.post("/api/mcp/stop", requireAuth, async (_req, res) => {
-    closeAllSessions();
-    const result = stopMcpBridge();
-    res.json(result);
-  });
-
-  // ── MCP transport endpoint (token auth) ────────────────────────
-
-  const validateMcpToken = (req, res) => {
-    const bearerToken = String(req.get("authorization") || "")
-      .replace(/^Bearer\s+/i, "")
-      .trim();
-    const queryToken = String(req.query?.token || "");
-    const rawToken = bearerToken || queryToken;
-    const normalizedToken = rawToken.replace(/ /g, "+");
-    if (!constants.GATEWAY_TOKEN) {
-      res
-        .status(503)
-        .json({ error: "Gateway token is not configured for MCP transport" });
-      return false;
-    }
-    if (!normalizedToken || normalizedToken !== constants.GATEWAY_TOKEN) {
-      res.status(401).json({ error: "Invalid or missing token" });
-      return false;
-    }
-    return true;
-  };
-
-  // Primary MCP endpoint – Streamable HTTP (GET / POST / DELETE)
-  app.all("/mcp/sse", async (req, res) => {
-    if (!validateMcpToken(req, res)) return;
-
-    if (!isMcpBridgeRunning()) {
-      res.status(503).json({ error: "MCP bridge is not running" });
-      return;
-    }
-
-    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) {
-        console.log(
-          `[mcp] ${req.method} sessionId=${sessionId} → routed (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 (sessions=${sessions.size})`,
-        );
-        res.status(404).json({
-          jsonrpc: "2.0",
-          error: {
-            code: -32001,
-            message: "Session not found. The server may have been restarted.",
-          },
-          id: null,
-        });
-      }
-      return;
-    }
-
-    // ── New session (POST without session ID) ────────────────
-    if (req.method === "POST") {
-      const transport = new StreamableHTTPServerTransport({
-        sessionIdGenerator: () => randomUUID(),
-        enableJsonResponse: true,
-        onsessioninitialized: (newSessionId) => {
-          adoptSession(newSessionId, transport);
-          console.log(
-            `[mcp] Session adopted: ${newSessionId} (sessions=${sessions.size})`,
-          );
-        },
-      });
-
-      transport.onmessage = (message) => {
-        forwardToBridge(message, transport);
-      };
-
-      transport.onclose = () => {
-        cleanupTransport(transport);
-        console.log(`[mcp] Transport closed (sessions=${sessions.size})`);
-      };
-
-      transport.onerror = (err) => {
-        console.error("[mcp] Transport error:", err?.message);
-      };
-
-      await transport.start();
-
-      try {
-        await transport.handleRequest(req, res, req.body);
-      } catch (err) {
-        console.error(
-          "[mcp] handleRequest error (new session):",
-          err?.message,
-        );
-        if (!res.headersSent) {
-          res.status(500).json({ error: "Failed to initialize MCP session" });
-        }
-      }
-      return;
-    }
-
-    res.status(400).json({
-      jsonrpc: "2.0",
-      error: { code: -32600, message: "Bad Request" },
-      id: null,
-    });
-  });
-
-  // Legacy endpoint for SSE-transport clients that POST to /mcp/message
-  app.post("/mcp/message", async (req, res) => {
-    if (!validateMcpToken(req, res)) return;
-    if (!isMcpBridgeRunning()) {
-      res.status(503).json({ error: "MCP bridge is not running" });
-      return;
-    }
-    if (!activeTransport) {
-      res.status(503).json({ error: "No active MCP session" });
-      return;
-    }
-    try {
-      await activeTransport.handleRequest(req, res, req.body);
-    } catch (err) {
-      console.error("[mcp] handleRequest error (/mcp/message):", err?.message);
-      if (!res.headersSent) {
-        res.status(500).json({ error: "Internal transport error" });
-      }
-    }
-  });
-};
-
-module.exports = { registerMcpRoutes };

package/patches/openclaw+2026.3.28.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/openclaw/dist/gateway-cli-DlnlX7IW.js b/node_modules/openclaw/dist/gateway-cli-DlnlX7IW.js
-index ca48b932..c12478c4 100644
---- a/node_modules/openclaw/dist/gateway-cli-DlnlX7IW.js
-+++ b/node_modules/openclaw/dist/gateway-cli-DlnlX7IW.js
-@@ -25935,7 +25935,7 @@ function attachGatewayWsMessageHandler(params) {
- 					close(1008, truncateCloseReason(authMessage));
- 				};
- 				const clearUnboundScopes = () => {
--					if (scopes.length > 0) {
-+					if (scopes.length > 0 && !sharedAuthOk) {
- 						scopes = [];
- 						connectParams.scopes = scopes;
- 					}