openclaw-navigator 5.8.1 → 5.8.2

package/cli.mjs

@@ -381,7 +381,9 @@ function getChatSession(sessionKey = "main") {
 let bffCookieJar = "";
 
 function captureBFFCookies(setCookieHeaders) {
-  if (!setCookieHeaders) return;
+  if (!setCookieHeaders) {
+    return;
+  }
   const cookies = Array.isArray(setCookieHeaders) ? setCookieHeaders : [setCookieHeaders];
   // Extract just the cookie name=value (strip attributes like path, domain, etc.)
   const extracted = cookies.map((c) => c.split(";")[0].trim()).filter(Boolean);
@@ -1010,11 +1012,10 @@ function handleRequest(req, res) {
   }
 
   // ── Reverse proxy: /ui/* → OC Web UI (localhost:ocUIPort) ──────────────
-  // Strip /ui prefix — the Next.js app serves at root on port 4000.
-  // /ui/ → /, /ui/dashboard → /dashboard, /ui/_next/* → /_next/*
+  // Forward /ui/* paths as-is — Next.js has basePath: "/ui" so it expects
+  // the /ui prefix on all routes: /ui/ → home, /ui/api/chat → API, etc.
   if (path === "/ui" || path.startsWith("/ui/")) {
-    const strippedPath = path === "/ui" ? "/" : path.slice(3); // remove "/ui"
-    const targetURL = `${strippedPath}${url.search}`;
+    const targetURL = `${path}${url.search}`;
     const incomingHost = req.headers.host || "localhost";
 
     const proxyOpts = {
@@ -1040,20 +1041,12 @@ function handleRequest(req, res) {
       headers["access-control-allow-headers"] = "Content-Type, Authorization, Cookie";
       headers["access-control-allow-credentials"] = "true";
 
-      // Fix redirects — rewrite Location: strip localhost, add /ui prefix back
-      // Since we stripped /ui before proxying, any redirect from the app
-      // (e.g. /login, /dashboard) needs the /ui prefix added back for the
-      // browser to stay within our /ui/* proxy.
+      // Fix redirects — strip localhost so browser stays on tunnel URL.
+      // Next.js basePath "/ui" means all redirects already include /ui/.
       if (headers.location) {
-        let loc = headers.location
+        headers.location = headers.location
           .replace(`http://127.0.0.1:${ocUIPort}`, "")
           .replace(`http://localhost:${ocUIPort}`, "");
-        // If the redirect is a relative path (starts with /), add /ui prefix
-        // BUT don't double-prefix if it already starts with /ui
-        if (loc.startsWith("/") && !loc.startsWith("/ui")) {
-          loc = "/ui" + loc;
-        }
-        headers.location = loc;
       }
 
       // Fix cookies — remove domain restriction so they work through tunnel
@@ -1225,7 +1218,7 @@ function handleRequest(req, res) {
         const proxyOpts = {
           hostname: "127.0.0.1",
           port: ocUIPort,
-          path: `/api/chat`,
+          path: `/ui/api/chat`,
           method: "POST",
           timeout: 120000, // 2 min — agent may take a while
           headers: {
@@ -1235,176 +1228,223 @@ function handleRequest(req, res) {
           },
         };
 
-        console.log(`  ${DIM}→ Relaying to BFF /api/chat (port ${ocUIPort}) with ${chatHistory.length} messages${relayCookie ? " +cookie" : " NO-COOKIE"}${RESET}`);
-        console.log(`  ${DIM}  Body: ${proxyBody.substring(0, 300)}${proxyBody.length > 300 ? "..." : ""}${RESET}`);
+        console.log(
+          `  ${DIM}→ Relaying to BFF /ui/api/chat (port ${ocUIPort}) with ${chatHistory.length} messages${relayCookie ? " +cookie" : " NO-COOKIE"}${RESET}`,
+        );
+        console.log(
+          `  ${DIM}  Body: ${proxyBody.substring(0, 300)}${proxyBody.length > 300 ? "..." : ""}${RESET}`,
+        );
 
         // Helper: send the relay request (with optional retry after login)
         function sendBFFRelay(opts, body, retryCount = 0) {
-        const proxyReq = httpRequest(opts, (proxyRes) => {
-          // Capture any cookies the BFF sends (login session, etc.)
-          if (proxyRes.headers["set-cookie"]) {
-            captureBFFCookies(proxyRes.headers["set-cookie"]);
-          }
+          const proxyReq = httpRequest(opts, (proxyRes) => {
+            // Capture any cookies the BFF sends (login session, etc.)
+            if (proxyRes.headers["set-cookie"]) {
+              captureBFFCookies(proxyRes.headers["set-cookie"]);
+            }
 
-          // If redirect (307/302 to /login) — follow it to seed cookies, then retry
-          if ((proxyRes.statusCode === 307 || proxyRes.statusCode === 302) && retryCount < 2) {
-            proxyRes.resume(); // drain
-            const loginPath = proxyRes.headers.location || "/login";
-            console.log(`  ${DIM}← BFF redirect → ${loginPath} — following to seed cookies...${RESET}`);
+            // If redirect (307/302 to /login) — follow it to seed cookies, then retry
+            if ((proxyRes.statusCode === 307 || proxyRes.statusCode === 302) && retryCount < 2) {
+              proxyRes.resume(); // drain
+              const loginPath = proxyRes.headers.location || "/login";
+              console.log(
+                `  ${DIM}← BFF redirect → ${loginPath} — following to seed cookies...${RESET}`,
+              );
+
+              // Hit the login page to get session cookies
+              const loginReq = httpRequest(
+                {
+                  hostname: "127.0.0.1",
+                  port: ocUIPort,
+                  path: loginPath,
+                  method: "GET",
+                  timeout: 5000,
+                  headers: bffCookieJar ? { cookie: bffCookieJar } : {},
+                },
+                (loginRes) => {
+                  if (loginRes.headers["set-cookie"]) {
+                    captureBFFCookies(loginRes.headers["set-cookie"]);
+                  }
+                  loginRes.resume(); // drain
+                  console.log(
+                    `  ${DIM}← Login page: ${loginRes.statusCode} — cookies: ${bffCookieJar ? "yes" : "no"}${RESET}`,
+                  );
+
+                  // Retry the original request with new cookies
+                  if (bffCookieJar) {
+                    opts.headers = { ...opts.headers, cookie: bffCookieJar };
+                    console.log(`  ${DIM}→ Retrying /ui/api/chat with cookies...${RESET}`);
+                    sendBFFRelay(opts, body, retryCount + 1);
+                  } else {
+                    console.log(
+                      `  ${DIM}No cookies from login — BFF may require real auth${RESET}`,
+                    );
+                    broadcastToWS({
+                      type: "chat.final",
+                      text: "⚠️ Could not authenticate with OC — try opening the web UI first to log in.",
+                      content:
+                        "⚠️ Could not authenticate with OC — try opening the web UI first to log in.",
+                      sessionKey,
+                      role: "assistant",
+                      timestamp: Date.now(),
+                    });
+                  }
+                },
+              );
+              loginReq.on("error", () => {
+                console.log(`  ${DIM}Login page unreachable${RESET}`);
+              });
+              loginReq.end();
+              return;
+            }
 
-            // Hit the login page to get session cookies
-            const loginReq = httpRequest(
-              {
-                hostname: "127.0.0.1",
-                port: ocUIPort,
-                path: loginPath,
-                method: "GET",
-                timeout: 5000,
-                headers: bffCookieJar ? { cookie: bffCookieJar } : {},
-              },
-              (loginRes) => {
-                if (loginRes.headers["set-cookie"]) {
-                  captureBFFCookies(loginRes.headers["set-cookie"]);
-                }
-                loginRes.resume(); // drain
-                console.log(`  ${DIM}← Login page: ${loginRes.statusCode} — cookies: ${bffCookieJar ? "yes" : "no"}${RESET}`);
-
-                // Retry the original request with new cookies
-                if (bffCookieJar) {
-                  opts.headers = { ...opts.headers, cookie: bffCookieJar };
-                  console.log(`  ${DIM}→ Retrying /api/chat with cookies...${RESET}`);
-                  sendBFFRelay(opts, body, retryCount + 1);
-                } else {
-                  console.log(`  ${DIM}No cookies from login — BFF may require real auth${RESET}`);
-                  broadcastToWS({
-                    type: "chat.final",
-                    text: "⚠️ Could not authenticate with OC — try opening the web UI first to log in.",
-                    content: "⚠️ Could not authenticate with OC — try opening the web UI first to log in.",
-                    sessionKey,
-                    role: "assistant",
-                    timestamp: Date.now(),
-                  });
-                }
-              },
+            const contentType = (proxyRes.headers["content-type"] || "").toLowerCase();
+            const isSSE = contentType.includes("text/event-stream");
+            console.log(
+              `  ${DIM}← BFF response: ${proxyRes.statusCode} ${contentType || "no-content-type"}${RESET}`,
             );
-            loginReq.on("error", () => {
-              console.log(`  ${DIM}Login page unreachable${RESET}`);
-            });
-            loginReq.end();
-            return;
-          }
 
-          const contentType = (proxyRes.headers["content-type"] || "").toLowerCase();
-          const isSSE = contentType.includes("text/event-stream");
-          console.log(`  ${DIM}← BFF response: ${proxyRes.statusCode} ${contentType || "no-content-type"}${RESET}`);
-
-          // Collect the response (SSE or JSON) and extract the assistant's text
-          let fullText = "";
-          let sseBuffer = "";
-
-          proxyRes.setEncoding("utf-8");
-          proxyRes.on("data", (chunk) => {
-            if (isSSE) {
-              sseBuffer += chunk;
-              const lines = sseBuffer.split("\n");
-              sseBuffer = lines.pop() || "";
-              for (const line of lines) {
-                if (line.startsWith("data: ")) {
-                  const raw = line.slice(6).trim();
-                  if (raw === "[DONE]" || !raw) continue;
-                  try {
-                    const evt = JSON.parse(raw);
-                    const delta =
-                      evt.choices?.[0]?.delta?.content ||
-                      evt.delta?.text ||
-                      evt.text ||
-                      evt.content ||
-                      "";
-                    if (delta) {
-                      fullText += delta;
-                      broadcastToWS({
-                        type: "chat.delta",
-                        text: fullText,
-                        delta,
-                        sessionKey,
-                        timestamp: Date.now(),
-                      });
+            // Collect the response (SSE or JSON) and extract the assistant's text
+            let fullText = "";
+            let sseBuffer = "";
+
+            proxyRes.setEncoding("utf-8");
+            proxyRes.on("data", (chunk) => {
+              if (isSSE) {
+                sseBuffer += chunk;
+                const lines = sseBuffer.split("\n");
+                sseBuffer = lines.pop() || "";
+                for (const line of lines) {
+                  if (line.startsWith("data: ")) {
+                    const raw = line.slice(6).trim();
+                    if (raw === "[DONE]" || !raw) {
+                      continue;
+                    }
+                    try {
+                      const evt = JSON.parse(raw);
+                      const delta =
+                        evt.choices?.[0]?.delta?.content ||
+                        evt.delta?.text ||
+                        evt.text ||
+                        evt.content ||
+                        "";
+                      if (delta) {
+                        fullText += delta;
+                        broadcastToWS({
+                          type: "chat.delta",
+                          text: fullText,
+                          delta,
+                          sessionKey,
+                          timestamp: Date.now(),
+                        });
+                      }
+                    } catch {
+                      if (raw && raw !== "[DONE]") {
+                        fullText += raw;
+                      }
                     }
-                  } catch {
-                    if (raw && raw !== "[DONE]") fullText += raw;
                   }
                 }
+              } else {
+                sseBuffer += chunk; // Collect JSON body
               }
-            } else {
-              sseBuffer += chunk; // Collect JSON body
-            }
-          });
+            });
 
-          proxyRes.on("end", () => {
-            // Handle remaining buffer for SSE
-            if (isSSE && sseBuffer) {
-              for (const line of sseBuffer.split("\n")) {
-                if (line.startsWith("data: ")) {
-                  const raw = line.slice(6).trim();
-                  if (raw && raw !== "[DONE]") {
-                    try {
-                      const evt = JSON.parse(raw);
-                      const delta = evt.choices?.[0]?.delta?.content || evt.delta?.text || evt.text || evt.content || "";
-                      if (delta) fullText += delta;
-                    } catch { fullText += raw; }
+            proxyRes.on("end", () => {
+              // Handle remaining buffer for SSE
+              if (isSSE && sseBuffer) {
+                for (const line of sseBuffer.split("\n")) {
+                  if (line.startsWith("data: ")) {
+                    const raw = line.slice(6).trim();
+                    if (raw && raw !== "[DONE]") {
+                      try {
+                        const evt = JSON.parse(raw);
+                        const delta =
+                          evt.choices?.[0]?.delta?.content ||
+                          evt.delta?.text ||
+                          evt.text ||
+                          evt.content ||
+                          "";
+                        if (delta) {
+                          fullText += delta;
+                        }
+                      } catch {
+                        fullText += raw;
+                      }
+                    }
                   }
                 }
               }
-            }
 
-            // Handle JSON response
-            if (!isSSE && sseBuffer) {
-              try {
-                const jsonBody = JSON.parse(sseBuffer);
-                // Check for error response (BFF returns 400/500 with error details)
-                if (proxyRes.statusCode >= 400) {
-                  const errMsg = jsonBody.error?.message || jsonBody.error || jsonBody.message || JSON.stringify(jsonBody);
-                  console.log(`  ${RED}✗${RESET} BFF error ${proxyRes.statusCode}: ${String(errMsg).substring(0, 300)}`);
-                  // Send error to Navigator so user sees it
-                  fullText = `⚠️ Error from AI: ${String(errMsg).substring(0, 200)}`;
-                } else {
-                  fullText = jsonBody.choices?.[0]?.message?.content || jsonBody.response || jsonBody.message || jsonBody.text || "";
+              // Handle JSON response
+              if (!isSSE && sseBuffer) {
+                try {
+                  const jsonBody = JSON.parse(sseBuffer);
+                  // Check for error response (BFF returns 400/500 with error details)
+                  if (proxyRes.statusCode >= 400) {
+                    const errMsg =
+                      jsonBody.error?.message ||
+                      jsonBody.error ||
+                      jsonBody.message ||
+                      JSON.stringify(jsonBody);
+                    console.log(
+                      `  ${RED}✗${RESET} BFF error ${proxyRes.statusCode}: ${String(errMsg).substring(0, 300)}`,
+                    );
+                    // Send error to Navigator so user sees it
+                    fullText = `⚠️ Error from AI: ${String(errMsg).substring(0, 200)}`;
+                  } else {
+                    fullText =
+                      jsonBody.choices?.[0]?.message?.content ||
+                      jsonBody.response ||
+                      jsonBody.message ||
+                      jsonBody.text ||
+                      "";
+                  }
+                } catch {
+                  console.log(
+                    `  ${DIM}BFF returned non-JSON (${sseBuffer.length} bytes): ${sseBuffer.substring(0, 200)}${RESET}`,
+                  );
                 }
-              } catch {
-                console.log(`  ${DIM}BFF returned non-JSON (${sseBuffer.length} bytes): ${sseBuffer.substring(0, 200)}${RESET}`);
               }
-            }
 
-            if (fullText) {
-              session.messages.push({ role: "assistant", content: fullText, timestamp: Date.now() });
-              broadcastToWS({
-                type: "chat.final",
-                text: fullText,
-                content: fullText,
-                sessionKey,
-                role: "assistant",
-                timestamp: Date.now(),
-              });
-              console.log(`  ${GREEN}✓${RESET} AI response (${fullText.length} chars): ${fullText.substring(0, 80)}...`);
-            } else {
-              console.log(`  ${DIM}BFF returned no content (status ${proxyRes.statusCode})${RESET}`);
-            }
-          });
+              if (fullText) {
+                session.messages.push({
+                  role: "assistant",
+                  content: fullText,
+                  timestamp: Date.now(),
+                });
+                broadcastToWS({
+                  type: "chat.final",
+                  text: fullText,
+                  content: fullText,
+                  sessionKey,
+                  role: "assistant",
+                  timestamp: Date.now(),
+                });
+                console.log(
+                  `  ${GREEN}✓${RESET} AI response (${fullText.length} chars): ${fullText.substring(0, 80)}...`,
+                );
+              } else {
+                console.log(
+                  `  ${DIM}BFF returned no content (status ${proxyRes.statusCode})${RESET}`,
+                );
+              }
+            });
 
-          proxyRes.on("error", () => {});
-        });
+            proxyRes.on("error", () => {});
+          });
 
-        proxyReq.on("timeout", () => {
-          proxyReq.destroy();
-          console.log(`  ${DIM}BFF relay timed out${RESET}`);
-        });
+          proxyReq.on("timeout", () => {
+            proxyReq.destroy();
+            console.log(`  ${DIM}BFF relay timed out${RESET}`);
+          });
 
-        proxyReq.on("error", (err) => {
-          console.log(`  ${DIM}BFF relay failed: ${err.message}${RESET}`);
-        });
+          proxyReq.on("error", (err) => {
+            console.log(`  ${DIM}BFF relay failed: ${err.message}${RESET}`);
+          });
 
-        proxyReq.write(body);
-        proxyReq.end();
+          proxyReq.write(body);
+          proxyReq.end();
         } // end sendBFFRelay
 
         sendBFFRelay(proxyOpts, proxyBody);
@@ -1477,12 +1517,21 @@ function handleRequest(req, res) {
   // SSE safety: If the web UI returns text/event-stream but the browser
   // expects JSON (e.g. /api/agents), we collect the SSE events and return
   // them as a JSON array. This prevents "data: ... is not valid JSON" errors.
+  //
+  // Next.js basePath is "/ui", so we prefix fallback paths with /ui/ to match.
+  // Paths already starting with /ui/ won't reach here (handled by /ui/* proxy above).
   {
-    const targetURL = `${path}${url.search}`;
+    // Add /ui prefix for Next.js basePath — browser legacy paths like /login, /api/*,
+    // /_next/* need the basePath to match Next.js routes on port 4000.
+    const needsBasePath = path.startsWith("/api/") || path.startsWith("/_next/") ||
+      path === "/login" || path.startsWith("/login?") ||
+      path === "/favicon.ico" || path.startsWith("/static/");
+    const prefixedPath = needsBasePath ? `/ui${path}` : path;
+    const targetURL = `${prefixedPath}${url.search}`;
     const incomingHost = req.headers.host || "localhost";
     // Log API calls for diagnostics (helps debug web UI chat)
     if (path.startsWith("/api/")) {
-      console.log(`  ${DIM}→ Proxy ${req.method} ${path} → localhost:${ocUIPort}${RESET}`);
+      console.log(`  ${DIM}→ Proxy ${req.method} ${path} → localhost:${ocUIPort}${prefixedPath !== path ? ` (→ ${prefixedPath})` : ""}${RESET}`);
     }
 
     // Encourage JSON responses from the web UI's API routes
@@ -1620,35 +1669,48 @@ function handleRequest(req, res) {
       if (isSSE && isStreamingEndpoint) {
         let sseData = "";
         proxyRes.setEncoding("utf-8");
-        proxyRes.on("data", (chunk) => { sseData += chunk; });
+        proxyRes.on("data", (chunk) => {
+          sseData += chunk;
+        });
         proxyRes.on("end", () => {
           // Extract text from SSE events
           let fullText = "";
           for (const line of sseData.split("\n")) {
             if (line.startsWith("data: ")) {
               const raw = line.slice(6).trim();
-              if (raw === "[DONE]" || !raw) continue;
+              if (raw === "[DONE]" || !raw) {
+                continue;
+              }
               try {
                 const evt = JSON.parse(raw);
                 const delta =
                   evt.choices?.[0]?.delta?.content ||
                   evt.delta?.text ||
                   evt.text ||
-                  evt.content || "";
-                if (delta) fullText += delta;
+                  evt.content ||
+                  "";
+                if (delta) {
+                  fullText += delta;
+                }
               } catch {
-                if (raw) fullText += raw;
+                if (raw) {
+                  fullText += raw;
+                }
               }
             }
             // Also handle Vercel AI stream format (0:"text") passthrough
             if (line.startsWith("0:")) {
               try {
                 fullText += JSON.parse(line.slice(2));
-              } catch { /* skip */ }
+              } catch {
+                /* skip */
+              }
             }
           }
 
-          console.log(`  ${GREEN}✓${RESET} Chat (${fullText.length} chars): ${fullText.substring(0, 80)}...`);
+          console.log(
+            `  ${GREEN}✓${RESET} Chat (${fullText.length} chars): ${fullText.substring(0, 80)}...`,
+          );
 
           // Return as flat JSON with text in every common field name.
           // The frontend does JSON.parse() and looks for the text at top level.
@@ -1659,7 +1721,13 @@ function handleRequest(req, res) {
             message: fullText,
             answer: fullText,
             reply: fullText,
-            choices: [{ index: 0, message: { role: "assistant", content: fullText }, finish_reason: "stop" }],
+            choices: [
+              {
+                index: 0,
+                message: { role: "assistant", content: fullText },
+                finish_reason: "stop",
+              },
+            ],
           });
           headers["content-type"] = "application/json";
           delete headers["content-length"];
@@ -1680,7 +1748,10 @@ function handleRequest(req, res) {
       if (path.startsWith("/api/")) {
         console.log(`  ${DIM}✗ Proxy error for ${path}: ${err.message}${RESET}`);
       }
-      sendJSON(res, 502, { ok: false, error: `Web UI (port ${ocUIPort}) not reachable: ${err.message}` });
+      sendJSON(res, 502, {
+        ok: false,
+        error: `Web UI (port ${ocUIPort}) not reachable: ${err.message}`,
+      });
     });
 
     req.pipe(proxyReq, { end: true });
@@ -1723,7 +1794,9 @@ async function registerWithRelay(code, url, token, name) {
         signal: c2.signal,
       });
       clearTimeout(t2);
-    } catch { /* non-critical */ }
+    } catch {
+      /* non-critical */
+    }
 
     return data.ok === true;
   } catch {

package/package.json

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