openclaw-navigator 5.0.2 → 5.2.0

package/cli.mjs

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 
 /**
- * openclaw-navigator v4.1.0
+ * openclaw-navigator v5.2.0
  *
  * One-command bridge + tunnel for the Navigator browser.
  * Starts a local bridge, creates a Cloudflare tunnel automatically,
  * and gives you a 6-digit pairing code. Works on any OS.
- * Auto-installs, builds, and starts the OC Web UI on first run.
+ *
+ * Chat and WebSocket are transparently proxied to the OC gateway (port 18789).
+ * The web UI at port 4000 is also proxied — no local build needed.
  *
  * Usage:
  *   npx openclaw-navigator                  Auto-tunnel (default)
@@ -80,7 +82,9 @@ function loadBridgeIdentity() {
     if (data.pairingCode && data.token) {
       return data;
     }
-  } catch { /* first run */ }
+  } catch {
+    /* first run */
+  }
   return null;
 }
 
@@ -112,7 +116,15 @@ function appendJSONL(filePath, record) {
 function readJSONL(filePath, limit = 200) {
   try {
     const lines = readFileSync(filePath, "utf8").trim().split("\n").filter(Boolean);
-    const parsed = lines.map((l) => { try { return JSON.parse(l); } catch { return null; } }).filter(Boolean);
+    const parsed = lines
+      .map((l) => {
+        try {
+          return JSON.parse(l);
+        } catch {
+          return null;
+        }
+      })
+      .filter(Boolean);
     return limit > 0 ? parsed.slice(-limit) : parsed;
   } catch {
     return [];
@@ -132,146 +144,6 @@ function writeJSON(filePath, data) {
   writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf8");
 }
 
-// ── OC Web UI lifecycle ──────────────────────────────────────────────────────
-
-const UI_DIR = join(homedir(), ".openclaw", "ui");
-const UI_REPO = "https://github.com/sandman66666/openclaw-ui.git";
-let uiProcess = null;
-
-async function isUIInstalled() {
-  return existsSync(join(UI_DIR, "package.json")) && existsSync(join(UI_DIR, ".next"));
-}
-
-async function setupUI() {
-  const { execSync } = await import("node:child_process");
-
-  if (existsSync(join(UI_DIR, "package.json"))) {
-    info("  UI directory exists, reinstalling...");
-    return await buildUI();
-  }
-
-  heading("Setting up OC Web UI (first time)");
-  info("  Cloning from GitHub...");
-
-  mkdirSync(join(homedir(), ".openclaw"), { recursive: true });
-
-  try {
-    execSync(`git clone --depth 1 ${UI_REPO} "${UI_DIR}"`, {
-      stdio: ["ignore", "pipe", "pipe"],
-      timeout: 60000,
-    });
-    ok("Repository cloned");
-  } catch (err) {
-    fail(`Failed to clone UI repo: ${err.message}`);
-    return false;
-  }
-
-  return await buildUI();
-}
-
-async function buildUI() {
-  const { execSync } = await import("node:child_process");
-
-  process.stdout.write(`  ${DIM}Installing dependencies (this may take a minute)...${RESET}`);
-  try {
-    execSync("npm install --production=false", {
-      cwd: UI_DIR,
-      stdio: ["ignore", "pipe", "pipe"],
-      timeout: 120000,
-      env: { ...process.env, NODE_ENV: "development" },
-    });
-    process.stdout.write(`\r${" ".repeat(70)}\r`);
-    ok("Dependencies installed");
-  } catch (err) {
-    process.stdout.write(`\r${" ".repeat(70)}\r`);
-    fail(`npm install failed: ${err.stderr?.toString()?.slice(-200) || err.message}`);
-    return false;
-  }
-
-  process.stdout.write(`  ${DIM}Building web UI...${RESET}`);
-  try {
-    execSync("npx next build", {
-      cwd: UI_DIR,
-      stdio: ["ignore", "pipe", "pipe"],
-      timeout: 180000,
-    });
-    process.stdout.write(`\r${" ".repeat(70)}\r`);
-    ok("Web UI built successfully");
-    return true;
-  } catch (err) {
-    process.stdout.write(`\r${" ".repeat(70)}\r`);
-    fail(`Build failed: ${err.stderr?.toString()?.slice(-200) || err.message}`);
-    return false;
-  }
-}
-
-async function updateUI() {
-  const { execSync } = await import("node:child_process");
-
-  if (!existsSync(join(UI_DIR, ".git"))) {
-    warn("UI not installed yet — running full setup instead");
-    return await setupUI();
-  }
-
-  heading("Updating OC Web UI");
-
-  try {
-    const result = execSync("git pull --rebase origin main", {
-      cwd: UI_DIR,
-      encoding: "utf8",
-      timeout: 30000,
-    });
-
-    if (result.includes("Already up to date")) {
-      ok("Already up to date");
-      return true;
-    }
-
-    ok("Pulled latest changes");
-    return await buildUI();
-  } catch (err) {
-    fail(`Update failed: ${err.message}`);
-    return false;
-  }
-}
-
-function startUIServer(port) {
-  if (uiProcess) {
-    uiProcess.kill();
-    uiProcess = null;
-  }
-
-  uiProcess = spawn("npx", ["next", "start", "-p", String(port)], {
-    cwd: UI_DIR,
-    stdio: ["ignore", "pipe", "pipe"],
-    env: { ...process.env, PORT: String(port), NODE_ENV: "production" },
-  });
-
-  uiProcess.on("error", (err) => {
-    warn(`OC Web UI failed to start: ${err.message}`);
-    uiProcess = null;
-  });
-
-  uiProcess.on("exit", (code) => {
-    if (code !== null && code !== 0) {
-      warn(`OC Web UI exited with code ${code}`);
-    }
-    uiProcess = null;
-  });
-
-  return new Promise((resolve) => {
-    const timer = setTimeout(() => {
-      ok(`OC Web UI starting on port ${port} (PID ${uiProcess?.pid})`);
-      resolve(true);
-    }, 1500);
-
-    uiProcess.on("exit", () => {
-      clearTimeout(timer);
-      resolve(false);
-    });
-  });
-}
-
 // Pairing code state
 let pairingCode = null;
 let pairingData = null;
@@ -408,7 +280,9 @@ function sendJSON(res, status, body) {
 
 function validateBridgeAuth(req) {
   const authHeader = req.headers["authorization"];
-  if (!authHeader) return false;
+  if (!authHeader) {
+    return false;
+  }
   const token = authHeader.replace(/^Bearer\s+/i, "");
   return validTokens.has(token);
 }
@@ -446,7 +320,7 @@ function handleRequest(req, res) {
       routing: {
         "/ui/*": `localhost:${ocUIPort}`,
         "/api/*": `localhost:${ocGatewayPort}`,
-        "/ws": `localhost:${ocGatewayPort}`,
+        "/ws": `localhost:${ocGatewayPort} (WebSocket proxy)`,
       },
       tunnel: activeTunnelURL
         ? {
@@ -463,7 +337,11 @@ function handleRequest(req, res) {
   // ── GET /navigator/commands ──
   if (req.method === "GET" && path === "/navigator/commands") {
     if (!validateBridgeAuth(req)) {
-      sendJSON(res, 401, { ok: false, error: "unauthorized", hint: "Include Authorization: Bearer <token> header" });
+      sendJSON(res, 401, {
+        ok: false,
+        error: "unauthorized",
+        hint: "Include Authorization: Bearer <token> header",
+      });
       return;
     }
     if (!bridgeState.connected) {
@@ -484,7 +362,11 @@ function handleRequest(req, res) {
   // ── POST /navigator/events ──
   if (req.method === "POST" && path === "/navigator/events") {
     if (!validateBridgeAuth(req)) {
-      sendJSON(res, 401, { ok: false, error: "unauthorized", hint: "Include Authorization: Bearer <token> header" });
+      sendJSON(res, 401, {
+        ok: false,
+        error: "unauthorized",
+        hint: "Include Authorization: Bearer <token> header",
+      });
       return;
     }
     readBody(req)
@@ -571,7 +453,11 @@ function handleRequest(req, res) {
   // ── POST /navigator/command ──
   if (req.method === "POST" && path === "/navigator/command") {
     if (!validateBridgeAuth(req)) {
-      sendJSON(res, 401, { ok: false, error: "unauthorized", hint: "Include Authorization: Bearer <token> header" });
+      sendJSON(res, 401, {
+        ok: false,
+        error: "unauthorized",
+        hint: "Include Authorization: Bearer <token> header",
+      });
       return;
     }
     readBody(req)
@@ -894,9 +780,8 @@ function handleRequest(req, res) {
     proxyReq.on("error", (err) => {
       sendJSON(res, 502, {
         ok: false,
-        error: `OC Web UI not reachable on port ${ocUIPort}`,
+        error: `OC Web UI not reachable on port ${ocUIPort} — make sure the OC gateway is running`,
         detail: err.message,
-        hint: `Not found — Reverse proxy rule for /ui/* → localhost:${ocUIPort} is working, but the web UI is not running. Start it with: openclaw gateway start`,
       });
     });
 
@@ -906,7 +791,7 @@ function handleRequest(req, res) {
   }
 
   // ── Reverse proxy: /api/* → OC Gateway (localhost:ocGatewayPort) ─────
-  // Keeps /api/ prefix intact so /api/sessions/send → localhost:18789/api/sessions/send
+  // Keeps /api/ prefix intact — all API calls including chat go to the gateway.
   if (path.startsWith("/api/")) {
     const targetURL = `${path}${url.search}`;
 
@@ -935,7 +820,10 @@ function handleRequest(req, res) {
         ok: false,
         error: `OC Gateway not reachable on port ${ocGatewayPort}`,
         detail: err.message,
-        hint: "Make sure the OC gateway is running on port " + ocGatewayPort + " (openclaw gateway start)",
+        hint:
+          "Make sure the OC gateway is running on port " +
+          ocGatewayPort +
+          " (openclaw gateway start)",
       });
     });
 
@@ -1073,12 +961,9 @@ async function main() {
   let noTunnel = false;
   let withMcp = false;
   let pm2Setup = false;
-  let tunnelToken = null;   // For named tunnels (Cloudflare)
+  let tunnelToken = null; // For named tunnels (Cloudflare)
   let tunnelHostname = null; // For named tunnels (stable URL)
   let freshIdentity = false; // --new-code: force new pairing code
-  let setupUIFlag = false;
-  let updateUIFlag = false;
-  let noUIFlag = false;
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--port" && args[i + 1]) {
@@ -1111,15 +996,6 @@ async function main() {
     if (args[i] === "--new-code") {
       freshIdentity = true;
     }
-    if (args[i] === "--setup-ui") {
-      setupUIFlag = true;
-    }
-    if (args[i] === "--update-ui") {
-      updateUIFlag = true;
-    }
-    if (args[i] === "--no-ui") {
-      noUIFlag = true;
-    }
     if (args[i] === "--help" || args[i] === "-h") {
       console.log(`
 ${BOLD}openclaw-navigator${RESET} — One-command bridge + tunnel for Navigator
@@ -1138,9 +1014,6 @@ ${BOLD}Options:${RESET}
   --no-tunnel               Skip auto-tunnel, use SSH or LAN instead
   --bind <host>             Bind address (default: 127.0.0.1)
   --new-code                Force a new pairing code (discard saved identity)
-  --setup-ui                Force (re)install + build OC Web UI
-  --update-ui               Pull latest UI changes and rebuild
-  --no-ui                   Don't auto-start the web UI
   --help                    Show this help
 
 ${BOLD}Stability (recommended for production):${RESET}
@@ -1149,11 +1022,11 @@ ${BOLD}Stability (recommended for production):${RESET}
   --tunnel-hostname <host>  Hostname for named tunnel (e.g. nav.yourdomain.com)
 
 ${BOLD}Routing (through Cloudflare tunnel):${RESET}
-  /ui/*          → localhost:<ui-port>      Web UI (login page, dashboard)
-  /api/*         → localhost:<gateway-port> Sessions API, chat endpoints
-  /ws, WebSocket → localhost:<gateway-port> Real-time streaming, chat events
-  /health        → bridge itself            Health check
-  /navigator/*   → bridge itself            Navigator control endpoints
+  /ui/*                → localhost:<ui-port>      Web UI (proxied to OC gateway's UI server)
+  /api/*               → localhost:<gateway-port> OC gateway API (chat, sessions, etc.)
+  /ws, WebSocket       → localhost:<gateway-port> WebSocket proxy to OC gateway
+  /health              → bridge itself            Health check
+  /navigator/*         → bridge itself            Navigator control endpoints
 
 ${BOLD}Environment variables:${RESET}
   OPENCLAW_UI_PORT=4000         Where the web UI runs
@@ -1176,7 +1049,11 @@ ${BOLD}How it works:${RESET}
   if (pm2Setup) {
     const { execSync: findNode } = await import("node:child_process");
     let npxPath;
-    try { npxPath = findNode("which npx", { encoding: "utf8" }).trim(); } catch { npxPath = "npx"; }
+    try {
+      npxPath = findNode("which npx", { encoding: "utf8" }).trim();
+    } catch {
+      npxPath = "npx";
+    }
 
     const ecosystemContent = `// PM2 ecosystem config for openclaw-navigator bridge
 // Generated by: npx openclaw-navigator --pm2-setup
@@ -1185,7 +1062,7 @@ module.exports = {
   apps: [{
     name: "openclaw-navigator",
     script: "${npxPath}",
-    args: "openclaw-navigator@latest --mcp --no-ui --port ${port}",
+    args: "openclaw-navigator@latest --mcp --port ${port}",
     cwd: "${homedir()}",
     autorestart: true,
     max_restarts: 50,
@@ -1212,7 +1089,9 @@ module.exports = {
     console.log(`  ${CYAN}npm install -g pm2${RESET}          ${DIM}(if not installed)${RESET}`);
     console.log(`  ${CYAN}pm2 start ecosystem.config.cjs${RESET}`);
     console.log(`  ${CYAN}pm2 save${RESET}                    ${DIM}(auto-start on boot)${RESET}`);
-    console.log(`  ${CYAN}pm2 startup${RESET}                 ${DIM}(install system startup hook)${RESET}`);
+    console.log(
+      `  ${CYAN}pm2 startup${RESET}                 ${DIM}(install system startup hook)${RESET}`,
+    );
     console.log("");
     console.log(`${BOLD}Useful PM2 commands:${RESET}`);
     console.log(`  ${CYAN}pm2 logs openclaw-navigator${RESET} ${DIM}(view logs)${RESET}`);
@@ -1239,49 +1118,62 @@ module.exports = {
     server.listen(port, bindHost, () => resolve());
   });
 
-  // ── WebSocket upgrade proxy → OC Gateway (localhost:ocGatewayPort) ───
-  // Proxies WebSocket connections so Navigator can stream chat events
+  // ── WebSocket proxy — forward /ws connections to OC gateway ─────────
+  // The bridge is a transparent relay: Navigator connects here, we pipe to
+  // the OC gateway WebSocket at ws://localhost:ocGatewayPort/ws.
   server.on("upgrade", (req, socket, head) => {
     const reqUrl = new URL(req.url ?? "/", "http://localhost");
     const reqPath = reqUrl.pathname;
 
-    // Only proxy WebSocket paths intended for the OC gateway
-    if (reqPath === "/ws" || reqPath.startsWith("/ws/") || reqPath.startsWith("/api/") || reqPath === "/") {
-      const targetPath = `${reqPath}${reqUrl.search}`;
-
-      const proxy = netConnect(ocGatewayPort, "127.0.0.1", () => {
-        // Forward the original HTTP upgrade request over the TCP socket
-        const upgradeReq =
-          `${req.method} ${targetPath} HTTP/${req.httpVersion}\r\n` +
-          Object.entries(req.headers)
-            .map(([k, v]) => `${k}: ${v}`)
-            .join("\r\n") +
-          "\r\n\r\n";
-        proxy.write(upgradeReq);
-        if (head && head.length > 0) {
-          proxy.write(head);
-        }
-        // Pipe bidirectionally
-        socket.pipe(proxy);
-        proxy.pipe(socket);
-      });
-
-      proxy.on("error", (err) => {
-        console.log(`  ${DIM}WebSocket proxy error: ${err.message}${RESET}`);
-        socket.destroy();
-      });
+    // Only handle /ws paths
+    if (reqPath !== "/ws" && !reqPath.startsWith("/ws/")) {
+      socket.destroy();
+      return;
+    }
 
-      socket.on("error", () => {
-        proxy.destroy();
-      });
+    // Connect to the gateway WebSocket
+    const gwSocket = netConnect(ocGatewayPort, "127.0.0.1", () => {
+      // Forward the HTTP upgrade request to the gateway
+      const upgradeHeaders = [
+        `${req.method} ${req.url} HTTP/${req.httpVersion}`,
+        ...Object.entries(req.headers).map(([k, v]) => `${k}: ${v}`),
+        "",
+        "",
+      ].join("\r\n");
+      gwSocket.write(upgradeHeaders);
+      if (head && head.length > 0) {
+        gwSocket.write(head);
+      }
+    });
 
-      socket.on("close", () => {
-        proxy.destroy();
-      });
-    } else {
-      // Not a proxied path — reject
+    gwSocket.on("error", (err) => {
+      console.log(`  ${DIM}WS proxy: gateway unreachable — ${err.message}${RESET}`);
       socket.destroy();
-    }
+    });
+
+    // Once the gateway responds with 101, pipe bidirectionally
+    gwSocket.once("data", (firstChunk) => {
+      const response = firstChunk.toString();
+      if (response.startsWith("HTTP/1.1 101")) {
+        // Forward the 101 response to the client
+        socket.write(firstChunk);
+        // Now pipe both directions transparently
+        socket.pipe(gwSocket);
+        gwSocket.pipe(socket);
+
+        socket.on("close", () => gwSocket.destroy());
+        gwSocket.on("close", () => socket.destroy());
+        socket.on("error", () => gwSocket.destroy());
+        gwSocket.on("error", () => socket.destroy());
+
+        console.log(`  ${DIM}WebSocket proxied to gateway:${ocGatewayPort}${RESET}`);
+      } else {
+        // Gateway rejected the upgrade
+        socket.write(firstChunk);
+        socket.destroy();
+        gwSocket.destroy();
+      }
+    });
   });
 
   ok(`Bridge server running on ${bindHost}:${port}`);
@@ -1323,14 +1215,15 @@ module.exports = {
   const MAX_TUNNEL_RECONNECT_DELAY = 60_000; // cap at 60s
 
   async function startOrReconnectTunnel() {
-    if (!cloudflaredBin) return null;
+    if (!cloudflaredBin) {
+      return null;
+    }
 
     // Named tunnel mode (stable URL, no reconnect gymnastics needed)
+    // The tunnel routing (hostname → localhost:port) is configured in
+    // the Cloudflare Zero Trust dashboard, not on the CLI.
     if (tunnelToken) {
       const tunnelArgs = ["tunnel", "run", "--token", tunnelToken];
-      if (tunnelHostname) {
-        tunnelArgs.push("--url", `http://localhost:${port}`);
-      }
       const child = spawn(cloudflaredBin, tunnelArgs, {
         stdio: ["ignore", "pipe", "pipe"],
       });
@@ -1349,6 +1242,14 @@ module.exports = {
         gatewayURL = namedURL;
         pairingData.url = namedURL;
         ok(`Named tunnel active: ${CYAN}${namedURL}${RESET}`);
+
+        // Register with relay so QuickConnect pairing codes resolve
+        const relayOk = await registerWithRelay(pairingCode, namedURL, token, displayName);
+        if (relayOk) {
+          ok("Pairing code registered with relay");
+        } else {
+          warn("Relay unavailable — use the deep link or tunnel URL directly");
+        }
       }
       return child;
     }
@@ -1356,9 +1257,14 @@ module.exports = {
     // Quick Tunnel mode — URL changes on every start
     const result = await startTunnel(cloudflaredBin, port);
     if (!result) {
-      const delay = Math.min(2000 * Math.pow(2, tunnelReconnectAttempts), MAX_TUNNEL_RECONNECT_DELAY);
+      const delay = Math.min(
+        2000 * Math.pow(2, tunnelReconnectAttempts),
+        MAX_TUNNEL_RECONNECT_DELAY,
+      );
       tunnelReconnectAttempts++;
-      warn(`Tunnel failed — retrying in ${Math.round(delay / 1000)}s (attempt ${tunnelReconnectAttempts})...`);
+      warn(
+        `Tunnel failed — retrying in ${Math.round(delay / 1000)}s (attempt ${tunnelReconnectAttempts})...`,
+      );
       setTimeout(startOrReconnectTunnel, delay);
       return null;
     }
@@ -1390,7 +1296,10 @@ module.exports = {
       tunnelProcess = null;
       activeTunnelURL = null;
       // Exponential backoff restart
-      const delay = Math.min(3000 * Math.pow(2, tunnelReconnectAttempts), MAX_TUNNEL_RECONNECT_DELAY);
+      const delay = Math.min(
+        3000 * Math.pow(2, tunnelReconnectAttempts),
+        MAX_TUNNEL_RECONNECT_DELAY,
+      );
       tunnelReconnectAttempts++;
       setTimeout(startOrReconnectTunnel, delay);
     });
@@ -1439,33 +1348,10 @@ module.exports = {
     console.log("");
   }
 
-  // ── OC Web UI: auto-setup + start ─────────────────────────────────────
-  if (!noUIFlag) {
-    if (setupUIFlag) {
-      await setupUI();
-    } else if (updateUIFlag) {
-      await updateUI();
-    }
-
-    if (await isUIInstalled()) {
-      await startUIServer(ocUIPort);
-    } else if (!setupUIFlag && !noUIFlag) {
-      heading("OC Web UI not found — setting up automatically");
-      const setupOk = await setupUI();
-      if (setupOk) {
-        await startUIServer(ocUIPort);
-      } else {
-        warn("Web UI setup failed — you can retry with: npx openclaw-navigator --setup-ui");
-        warn("The bridge will still work, but /ui/* won't serve the dashboard");
-      }
-    }
-  }
-
   // ── Step 4: Register initial pairing code with relay ────────────────
-  if (tunnelURL && !tunnelToken) {
-    // Already registered inside startOrReconnectTunnel()
-  } else if (!tunnelURL) {
-    // Local mode — register code for local resolution
+  // Both quick-tunnel and named-tunnel register inside startOrReconnectTunnel()
+  if (!tunnelURL) {
+    // Local mode — no relay registration needed
   }
 
   // ── Step 5: Show connection info ──────────────────────────────────────
@@ -1492,9 +1378,9 @@ module.exports = {
   // ── Show OC Web UI access + routing info ─────────────────────────────
   const uiURL = tunnelURL ? `${tunnelURL}/ui/` : `http://localhost:${port}/ui/`;
   console.log(`  ${BOLD}OC Web UI:${RESET} ${CYAN}${uiURL}${RESET}`);
-  info(`  /ui/*  → localhost:${ocUIPort} (web UI)`);
-  info(`  /api/* → localhost:${ocGatewayPort} (gateway API)`);
-  info(`  /ws    → localhost:${ocGatewayPort} (WebSocket)`);
+  info(`  /ui/*   → localhost:${ocUIPort} (web UI proxy)`);
+  info(`  /api/*  → localhost:${ocGatewayPort} (OC gateway)`);
+  info(`  /ws     → localhost:${ocGatewayPort} (WebSocket proxy)`);
 
   // ── Startup health checks ──────────────────────────────────────────
   console.log("");
@@ -1627,7 +1513,9 @@ module.exports = {
 
       mkdirSync(mcporterDir, { recursive: true });
       writeFileSync(mcporterConfigPath, JSON.stringify(mcporterConfig, null, 2) + "\n", "utf8");
-      ok("Registered MCP server with mcporter (31 tools: 16 browser + 10 AI + 5 profiling)");
+      ok(
+        "Registered MCP server with mcporter (34 tools: 16 browser + 10 AI + 5 profiling + 3 chat)",
+      );
       info(`  Config: ${mcporterConfigPath}`);
 
       // Step 3: Install the navigator-bridge skill so the OC agent knows about all tools
@@ -1672,7 +1560,7 @@ module.exports = {
         "mcporter call navigator.navigator_status",
         BT,
         "",
-        "## All 31 tools",
+        "## All 34 tools",
         "",
         "### Browser Control (16 tools)",
         "",
@@ -1720,6 +1608,14 @@ module.exports = {
         "| `navigator_get_user_profile` | Get aggregated user interest profile |",
         "| `navigator_save_user_profile` | Save/update user profile from browsing patterns |",
         "",
+        "### Chat (3 tools)",
+        "",
+        "| Tool | What it does |",
+        "|------|-------------|",
+        "| `navigator_get_chat_messages` | Get recent messages from the Navigator chat pane |",
+        "| `navigator_chat_respond` | Send a response message to the Navigator chat pane |",
+        "| `navigator_chat_stream` | Stream partial text to the chat pane (typing effect) |",
+        "",
         "## Usage",
         "",
         BT + "bash",
@@ -1814,7 +1710,7 @@ module.exports = {
         '  url="<page_url>" \\',
         '  title="<page_title>" \\',
         '  summary="<haiku_generated_summary>" \\',
-        "  signals='{\"names\":[],\"interests\":[],\"services\":[],\"purchases\":[],\"intent\":[],\"topics\":[]}'",
+        '  signals=\'{"names":[],"interests":[],"services":[],"purchases":[],"intent":[],"topics":[]}\'',
         BT,
         "",
         "### 3. Daily Profile Synthesis (You Do This — Use Opus 4.6)",
@@ -1862,7 +1758,7 @@ module.exports = {
         "",
         "- **Be smart about noise**: Ignore login pages, error pages, redirects",
         "- **Respect privacy**: Don't store passwords, tokens, or PII like SSNs/credit cards",
-        "- **Extract signal from noise**: A visit to \"Nike Air Max\" tells you about shopping interest, not just a URL",
+        '- **Extract signal from noise**: A visit to "Nike Air Max" tells you about shopping interest, not just a URL',
         "- **Cross-reference**: If user visits Stripe docs AND Vercel, they're likely a developer building a SaaS",
         "- **Temporal awareness**: Morning habits vs evening habits, weekday vs weekend",
         "- **Don't hallucinate**: Only include signals backed by actual browsing data",
@@ -1871,7 +1767,7 @@ module.exports = {
         "",
         "- **Summarization**: Every 10 minutes while the user is actively browsing",
         "- **Profile synthesis**: Once daily, preferably at end of day",
-        "- **On demand**: User can ask \"update my profile\" or \"what do you know about me\"",
+        '- **On demand**: User can ask "update my profile" or "what do you know about me"',
         "",
       ].join("\n");
       mkdirSync(profilerSkillDir, { recursive: true });
@@ -1908,6 +1804,19 @@ module.exports = {
         }
         const npxForPlist = join(dirname(nodeForPlist), "npx");
 
+        // Build ProgramArguments — include named tunnel flags if set
+        let tunnelPlistArgs = "";
+        if (tunnelToken) {
+          tunnelPlistArgs += `
+        <string>--tunnel-token</string>
+        <string>${tunnelToken}</string>`;
+        }
+        if (tunnelHostname) {
+          tunnelPlistArgs += `
+        <string>--tunnel-hostname</string>
+        <string>${tunnelHostname}</string>`;
+        }
+
         const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -1920,7 +1829,7 @@ module.exports = {
         <string>openclaw-navigator@latest</string>
         <string>--mcp</string>
         <string>--port</string>
-        <string>${port}</string>
+        <string>${port}</string>${tunnelPlistArgs}
     </array>
     <key>EnvironmentVariables</key>
     <dict>
@@ -1972,10 +1881,6 @@ module.exports = {
   // ── Graceful shutdown ─────────────────────────────────────────────────
   const shutdown = () => {
     console.log(`\n${DIM}Shutting down bridge...${RESET}`);
-    if (uiProcess) {
-      uiProcess.kill();
-      uiProcess = null;
-    }
     if (mcpProcess) {
       mcpProcess.kill();
     }

package/mcp.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * openclaw-navigator MCP server v5.0.1
+ * openclaw-navigator MCP server v5.1.0
  *
  * Exposes the Navigator bridge HTTP API as MCP tools so the OpenClaw agent
  * can control the browser natively via its tool schema.
@@ -18,8 +18,8 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { ListToolsRequestSchema, CallToolRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import { homedir } from "node:os";
+import { join } from "node:path";
 
 // ── Configuration ─────────────────────────────────────────────────────────
 
@@ -204,7 +204,7 @@ async function sendCommand(command, payload, poll) {
   };
 }
 
-// ── Tool definitions (31 tools: 16 browser + 10 AI intelligence + 5 profiling) ────────────────
+// ── Tool definitions (34 tools: 16 browser + 10 AI intelligence + 5 profiling + 3 chat) ────────────────
 
 const TOOLS = [
   // ── Direct HTTP ──
@@ -596,6 +596,59 @@ const TOOLS = [
       required: ["profile"],
     },
   },
+
+  // ── Chat Tools ──
+  {
+    name: "navigator_get_chat_messages",
+    description:
+      "Get recent chat messages from the Navigator chat pane. Use this to see what the user is asking.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        sessionKey: {
+          type: "string",
+          description: "Chat session key (default: main)",
+          default: "main",
+        },
+        limit: { type: "number", description: "Max messages to return (default: 20)", default: 20 },
+      },
+    },
+  },
+  {
+    name: "navigator_chat_respond",
+    description:
+      "Send a response message to the Navigator chat pane. The user will see this as an agent message.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        message: { type: "string", description: "The response message to send" },
+        sessionKey: {
+          type: "string",
+          description: "Chat session key (default: main)",
+          default: "main",
+        },
+      },
+      required: ["message"],
+    },
+  },
+  {
+    name: "navigator_chat_stream",
+    description:
+      "Stream a partial response to the Navigator chat pane (for real-time typing effect).",
+    inputSchema: {
+      type: "object",
+      properties: {
+        text: { type: "string", description: "Partial text to stream" },
+        sessionKey: {
+          type: "string",
+          description: "Chat session key (default: main)",
+          default: "main",
+        },
+        runId: { type: "string", description: "Run ID for grouping streamed chunks" },
+      },
+      required: ["text"],
+    },
+  },
 ];
 
 // ── Tool handler dispatch ─────────────────────────────────────────────────
@@ -720,9 +773,7 @@ async function handleTool(name, args) {
 
       // ── AI Browser Intelligence ──
       case "navigator_analyze_page":
-        return jsonResult(
-          await sendCommand("ai.analyze", {}, { commandName: "ai.analyze" }),
-        );
+        return jsonResult(await sendCommand("ai.analyze", {}, { commandName: "ai.analyze" }));
 
       case "navigator_find_element":
         return jsonResult(
@@ -730,9 +781,7 @@ async function handleTool(name, args) {
         );
 
       case "navigator_is_ready":
-        return jsonResult(
-          await sendCommand("ai.ready", {}, { commandName: "ai.ready" }),
-        );
+        return jsonResult(await sendCommand("ai.ready", {}, { commandName: "ai.ready" }));
 
       case "navigator_wait_for_element":
         return jsonResult(
@@ -754,36 +803,22 @@ async function handleTool(name, args) {
 
       case "navigator_smart_fill":
         return jsonResult(
-          await sendCommand(
-            "ai.fill",
-            { data: args.data },
-            { commandName: "ai.fill" },
-          ),
+          await sendCommand("ai.fill", { data: args.data }, { commandName: "ai.fill" }),
         );
 
       case "navigator_intercept_api":
-        return jsonResult(
-          await sendCommand("ai.intercept", {}, { commandName: "ai.intercept" }),
-        );
+        return jsonResult(await sendCommand("ai.intercept", {}, { commandName: "ai.intercept" }));
 
       case "navigator_set_cookies":
         return jsonResult(
-          await sendCommand(
-            "ai.cookies",
-            { cookies: args.cookies },
-            { commandName: "ai.cookies" },
-          ),
+          await sendCommand("ai.cookies", { cookies: args.cookies }, { commandName: "ai.cookies" }),
         );
 
       case "navigator_get_performance":
-        return jsonResult(
-          await sendCommand("ai.metrics", {}, { commandName: "ai.metrics" }),
-        );
+        return jsonResult(await sendCommand("ai.metrics", {}, { commandName: "ai.metrics" }));
 
       case "navigator_get_page_state":
-        return jsonResult(
-          await sendCommand("ai.state", {}, { commandName: "ai.state" }),
-        );
+        return jsonResult(await sendCommand("ai.state", {}, { commandName: "ai.state" }));
 
       // ── User Profiling Tools ──
       case "navigator_get_page_visits": {
@@ -823,6 +858,36 @@ async function handleTool(name, args) {
           }),
         );
 
+      // ── Chat Tools ──
+      case "navigator_get_chat_messages": {
+        const sessionKey = args.sessionKey || "main";
+        const limit = args.limit ?? 20;
+        const data = await bridgeGet(
+          `/api/sessions/history?sessionKey=${encodeURIComponent(sessionKey)}`,
+        );
+        if (data.ok && Array.isArray(data.messages)) {
+          return jsonResult({ ok: true, messages: data.messages.slice(-limit) });
+        }
+        return jsonResult(data);
+      }
+
+      case "navigator_chat_respond":
+        return jsonResult(
+          await bridgePost("/api/sessions/respond", {
+            content: args.message,
+            sessionKey: args.sessionKey || "main",
+          }),
+        );
+
+      case "navigator_chat_stream":
+        return jsonResult(
+          await bridgePost("/api/sessions/stream", {
+            text: args.text,
+            sessionKey: args.sessionKey || "main",
+            runId: args.runId || null,
+          }),
+        );
+
       default:
         return errorResult(`Unknown tool: ${name}`);
     }
@@ -835,7 +900,7 @@ async function handleTool(name, args) {
 // ── MCP server wiring ─────────────────────────────────────────────────────
 
 const server = new Server(
-  { name: "openclaw-navigator", version: "5.0.0" },
+  { name: "openclaw-navigator", version: "5.1.0" },
   { capabilities: { tools: {} } },
 );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-navigator",
-  "version": "5.0.2",
+  "version": "5.2.0",
   "description": "One-command bridge + tunnel for the Navigator browser — works on any machine, any OS",
   "keywords": [
     "browser",