openclaw-navigator 5.7.3 → 5.7.5

package/cli.mjs

@@ -1193,10 +1193,28 @@ function handleRequest(req, res) {
 
         // 3. Background: relay to BFF (port 4000) /api/chat for AI processing
         //    Format: OpenAI-compatible chat completions with message history
-        const chatHistory = session.messages.map((m) => ({
-          role: m.role,
-          content: m.content,
-        }));
+        //    Sanitize: BFF expects alternating user/assistant roles, starting with user.
+        //    Drop orphaned assistant messages at the start (from web UI SSE tap).
+        let chatHistory = session.messages
+          .map((m) => ({ role: m.role, content: m.content }))
+          .filter((m) => m.role === "user" || m.role === "assistant" || m.role === "system");
+        // Ensure first non-system message is 'user' — drop leading assistant messages
+        while (chatHistory.length > 0 && chatHistory[0].role === "assistant") {
+          chatHistory.shift();
+        }
+        // Collapse consecutive same-role messages (merge them)
+        chatHistory = chatHistory.reduce((acc, msg) => {
+          if (acc.length > 0 && acc[acc.length - 1].role === msg.role) {
+            acc[acc.length - 1].content += "\n" + msg.content;
+          } else {
+            acc.push({ ...msg });
+          }
+          return acc;
+        }, []);
+        // Must have at least one user message
+        if (chatHistory.length === 0 || chatHistory[0].role !== "user") {
+          chatHistory.unshift({ role: "user", content: message });
+        }
         const proxyBody = JSON.stringify({
           messages: chatHistory,
           stream: true,
@@ -1217,6 +1235,7 @@ 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}`);
 
         // Helper: send the relay request (with optional retry after login)
         function sendBFFRelay(opts, body, retryCount = 0) {
@@ -1341,7 +1360,15 @@ function handleRequest(req, res) {
             if (!isSSE && sseBuffer) {
               try {
                 const jsonBody = JSON.parse(sseBuffer);
-                fullText = jsonBody.choices?.[0]?.message?.content || jsonBody.response || jsonBody.message || jsonBody.text || "";
+                // 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}`);
               }
@@ -1359,7 +1386,7 @@ function handleRequest(req, res) {
               });
               console.log(`  ${GREEN}✓${RESET} AI response (${fullText.length} chars): ${fullText.substring(0, 80)}...`);
             } else {
-              console.log(`  ${DIM}BFF returned no content${RESET}`);
+              console.log(`  ${DIM}BFF returned no content (status ${proxyRes.statusCode})${RESET}`);
             }
           });
 
@@ -1640,16 +1667,15 @@ function handleRequest(req, res) {
           res.writeHead(200, headers);
           res.end(JSON.stringify(result));
 
-          // Store in bridge session + broadcast via WebSocket
+          // Broadcast via WebSocket for live updates (but DON'T store in
+          // bridge chat session — web UI manages its own conversation state
+          // separately from sidepane chat. Mixing them causes 400 errors from
+          // the BFF due to malformed message history.)
           if (fullText) {
-            const session = getChatSession("main");
-            session.messages.push({ role: "assistant", content: fullText, timestamp: Date.now() });
-
             broadcastToWS({
-              type: "chat.final",
+              type: "chat.webui",
               text: fullText,
               content: fullText,
-              sessionKey: "main",
               role: "assistant",
               timestamp: Date.now(),
             });
@@ -1703,6 +1729,23 @@ async function registerWithRelay(code, url, token, name) {
     });
     clearTimeout(timeout);
     const data = await res.json();
+
+    // Also register with token as the lookup key — so Navigator can
+    // resolve by saved token even after the pairing code rotates.
+    // Uses first 8 chars of token as a "token code" (avoids relay key limits).
+    const tokenCode = `T${token.substring(0, 7)}`;
+    try {
+      const c2 = new AbortController();
+      const t2 = setTimeout(() => c2.abort(), 5000);
+      await fetch(`${RELAY_URL}/register`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ code: tokenCode, url, token, name }),
+        signal: c2.signal,
+      });
+      clearTimeout(t2);
+    } catch { /* non-critical */ }
+
     return data.ok === true;
   } catch {
     return false;
@@ -1927,25 +1970,30 @@ module.exports = {
   await killPort(ocUIPort);
   startWebUI();
 
-  // ── Step 2: Persistent identity ─────────────────────────────────────
-  // Reuse the same pairing code + token across restarts so Navigator
-  // doesn't need to re-pair. The code resolves to the NEW tunnel URL
-  // via the relay, so everything reconnects automatically.
+  // ── Step 2: Identity — persistent token, rotating code ──────────────
+  // Token is persistent: Navigator stores it after first pairing and uses
+  // it for all future requests. This is the real auth credential.
+  // Pairing code rotates every startup: it's a one-time handshake to
+  // exchange the token. A new code every time means nobody can reuse
+  // an old code to hijack the connection.
   const displayName = hostname().replace(/\.local$/, "");
   let token;
 
   const savedIdentity = freshIdentity ? null : loadBridgeIdentity();
   if (savedIdentity) {
-    pairingCode = savedIdentity.pairingCode;
+    // Keep the token (Navigator already has it) but rotate the code
     token = savedIdentity.token;
     validTokens.add(token);
-    ok(`Restored pairing code: ${BOLD}${GREEN}${pairingCode}${RESET} (same as last session)`);
+    pairingCode = generatePairingCode(); // fresh code every startup
+    saveBridgeIdentity(pairingCode, token, displayName);
+    ok(`Token restored (Navigator will auto-reconnect)`);
+    ok(`New pairing code: ${BOLD}${GREEN}${pairingCode}${RESET} (rotated for security)`);
   } else {
     token = randomUUID().replace(/-/g, "");
     validTokens.add(token);
     pairingCode = generatePairingCode();
     saveBridgeIdentity(pairingCode, token, displayName);
-    ok(`New pairing code generated: ${BOLD}${GREEN}${pairingCode}${RESET}`);
+    ok(`New pairing code: ${BOLD}${GREEN}${pairingCode}${RESET}`);
   }
 
   let gatewayURL = `http://localhost:${port}`;

package/package.json

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