openclaw-navigator 5.7.4 → 5.7.6

package/cli.mjs

@@ -1193,12 +1193,31 @@ 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,
+          message: message, // BFF expects "message" (singular) — the current user text
+          messages: chatHistory, // Also send full history for OpenAI-compatible endpoints
           stream: true,
         });
         // Build cookie header: prefer captured BFF cookies, fall back to browser's cookies
@@ -1217,6 +1236,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 +1361,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 +1387,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}`);
             }
           });
 
@@ -1585,78 +1613,33 @@ function handleRequest(req, res) {
         return;
       }
 
-      // ── SSE→JSON for streaming endpoints (/api/chat) ──────────────────
-      // The BFF returns SSE but the web UI's parser can't handle SSE through
-      // a reverse proxy (it does JSON.parse on raw chunks without stripping
-      // the "data: " prefix). So we collect the full SSE stream, extract the
-      // text, and return a single JSON response. Also store + broadcast via WS.
+      // ── SSE passthrough for streaming endpoints (/api/chat) ────────────
+      // Pass SSE through as-is — the web UI frontend handles SSE natively.
+      // Disable response buffering so each SSE event reaches the client immediately.
       if (isSSE && isStreamingEndpoint) {
-        console.log(`  ${DIM}SSE→JSON collect: ${path}${RESET}`);
+        console.log(`  ${DIM}SSE passthrough: ${path}${RESET}`);
 
-        let fullText = "";
-        let sseData = "";
+        // Ensure SSE headers are clean for the browser
+        headers["cache-control"] = "no-cache";
+        headers["connection"] = "keep-alive";
+        // Keep content-type as text/event-stream
+        delete headers["content-length"]; // SSE is chunked
 
-        proxyRes.setEncoding("utf-8");
+        res.writeHead(proxyRes.statusCode ?? 200, headers);
+
+        // Disable buffering at every layer
+        if (res.socket) res.socket.setNoDelay(true);
+
+        // Pipe SSE events directly — no transformation
         proxyRes.on("data", (chunk) => {
-          sseData += chunk;
+          res.write(chunk);
+          // Flush after each chunk to prevent TCP buffering
+          if (typeof res.flush === "function") res.flush();
         });
 
         proxyRes.on("end", () => {
-          // Extract text from all SSE events
-          for (const line of sseData.split("\n")) {
-            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;
-              } catch {
-                if (raw) fullText += raw;
-              }
-            }
-          }
-
-          // Return as a single OpenAI-compatible JSON response
-          const result = {
-            id: "chatcmpl_bridge_" + Date.now(),
-            object: "chat.completion",
-            created: Math.floor(Date.now() / 1000),
-            choices: [{
-              index: 0,
-              message: { role: "assistant", content: fullText },
-              finish_reason: "stop",
-            }],
-          };
-
-          headers["content-type"] = "application/json";
-          delete headers["content-length"];
-          delete headers["transfer-encoding"];
-          res.writeHead(200, headers);
-          res.end(JSON.stringify(result));
-
-          // Store in bridge session + broadcast via WebSocket
-          if (fullText) {
-            const session = getChatSession("main");
-            session.messages.push({ role: "assistant", content: fullText, timestamp: Date.now() });
-
-            broadcastToWS({
-              type: "chat.final",
-              text: fullText,
-              content: fullText,
-              sessionKey: "main",
-              role: "assistant",
-              timestamp: Date.now(),
-            });
-            console.log(`  ${GREEN}✓${RESET} Chat response (${fullText.length} chars): ${fullText.substring(0, 80)}...`);
-          } else {
-            console.log(`  ${DIM}SSE stream ended with no content${RESET}`);
-          }
+          res.end();
+          console.log(`  ${GREEN}✓${RESET} SSE stream completed for ${path}`);
         });
 
         proxyRes.on("error", (err) => {

package/package.json

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