sparkecoder 0.1.65 → 0.1.66

package/dist/cli.js

@@ -2555,19 +2555,14 @@ __export(stream_proxy_exports, {
 import WebSocket from "ws";
 import { EventEmitter } from "events";
 function getOrCreateProxy(sessionId, port) {
-  let proxy = activeProxies.get(sessionId);
-  if (proxy && !proxy.connected) {
-    proxy.destroy();
-    proxy = void 0;
-  }
-  if (!proxy) {
-    proxy = new BrowserStreamProxy(port);
-    activeProxies.set(sessionId, proxy);
-    proxy.on("close", () => {
-      activeProxies.delete(sessionId);
-    });
-    proxy.connect();
-  }
+  const existing = activeProxies.get(sessionId);
+  if (existing) return existing;
+  const proxy = new BrowserStreamProxy(port);
+  activeProxies.set(sessionId, proxy);
+  proxy.on("close", () => {
+    activeProxies.delete(sessionId);
+  });
+  proxy.connect();
   return proxy;
 }
 function getProxy(sessionId) {
@@ -2584,8 +2579,8 @@ var RECONNECT_DELAY_MS, MAX_RECONNECT_ATTEMPTS, FRAME_THROTTLE_MS, BrowserStream
 var init_stream_proxy = __esm({
   "src/browser/stream-proxy.ts"() {
     "use strict";
-    RECONNECT_DELAY_MS = 500;
-    MAX_RECONNECT_ATTEMPTS = 10;
+    RECONNECT_DELAY_MS = 1e3;
+    MAX_RECONNECT_ATTEMPTS = 20;
     FRAME_THROTTLE_MS = 100;
     BrowserStreamProxy = class extends EventEmitter {
       ws = null;
@@ -2635,8 +2630,11 @@ var init_stream_proxy = __esm({
           }
         });
         this.ws.on("close", () => {
+          const wasConnected = this._connected;
           this._connected = false;
-          this.emit("status", { connected: false, screencasting: false });
+          if (wasConnected) {
+            this.emit("status", { connected: false, screencasting: false });
+          }
           if (!this.destroyed) {
             this.scheduleReconnect();
           }
@@ -2678,7 +2676,7 @@ var init_stream_proxy = __esm({
           return;
         }
         this.reconnectAttempts++;
-        const delay = RECONNECT_DELAY_MS * this.reconnectAttempts;
+        const delay = this.reconnectAttempts <= 5 ? RECONNECT_DELAY_MS : RECONNECT_DELAY_MS * (this.reconnectAttempts - 4);
         this.reconnectTimer = setTimeout(() => this.doConnect(), delay);
       }
       /**
@@ -3395,15 +3393,15 @@ function getBrowserStreamPort(sessionId) {
   }
   return port;
 }
-function isAgentBrowserOpenCommand(command) {
-  return /\bagent-browser\s+open\b/.test(command);
+function hasAgentBrowserCommand(command) {
+  return /\bagent-browser\b/.test(command);
 }
 function isAgentBrowserCloseCommand(command) {
-  return /\bagent-browser\s+close\b/.test(command);
+  return /\bagent-browser\s+(close|close\s+--all)\b/.test(command);
 }
 function injectBrowserStreamPort(command, port) {
   return command.replace(
-    /\bagent-browser\b/,
+    /\bagent-browser\b/g,
     `AGENT_BROWSER_STREAM_PORT=${port} agent-browser`
   );
 }
@@ -3573,12 +3571,14 @@ Terminal output is stored in the global SparkECoder data directory. Use the \`ta
         };
       }
       let actualCommand = command;
-      const browserOpen = isAgentBrowserOpenCommand(command);
+      const hasAgentBrowser = hasAgentBrowserCommand(command);
       const browserClose = isAgentBrowserCloseCommand(command);
       let browserPort;
-      if (browserOpen) {
+      if (hasAgentBrowser) {
         browserPort = getBrowserStreamPort(options.sessionId);
-        actualCommand = injectBrowserStreamPort(command, browserPort);
+        if (!browserClose) {
+          actualCommand = injectBrowserStreamPort(command, browserPort);
+        }
       }
       const canUseTmux = await shouldUseTmux();
       if (background) {
@@ -3594,9 +3594,6 @@ Terminal output is stored in the global SparkECoder data directory. Use the \`ta
           sessionId: options.sessionId,
           terminalId
         });
-        if (browserOpen && browserPort) {
-          options.onProgress?.({ terminalId, status: "running", command, browserStreamPort: browserPort });
-        }
         return {
           success: true,
           id: result.id,
@@ -3615,7 +3612,13 @@ Terminal output is stored in the global SparkECoder data directory. Use the \`ta
           });
           const truncatedOutput = truncateOutput(result.output, MAX_OUTPUT_CHARS2);
           options.onOutput?.(truncatedOutput);
-          options.onProgress?.({ terminalId, status: "completed", command, browserStreamPort: browserClose ? browserPort : void 0 });
+          options.onProgress?.({
+            terminalId,
+            status: "completed",
+            command,
+            browserStreamPort: browserPort,
+            browserClosed: browserClose || void 0
+          });
           return {
             success: result.exitCode === 0,
             id: result.id,
@@ -8860,42 +8863,6 @@ function enrichPromptWithDevtoolsContext(sessionId, prompt) {
 
 ${prompt}`;
 }
-async function encodAndUploadRecording(sessionId, recorder) {
-  if (!isRemoteConfigured()) {
-    console.log("[RECORDING] Remote server not configured, skipping upload");
-    recorder.clear();
-    return;
-  }
-  console.log(`[RECORDING] Encoding ${recorder.frameCount} frames for session ${sessionId}...`);
-  const result = await recorder.encode();
-  recorder.clear();
-  if (!result) {
-    console.log("[RECORDING] Encoding failed or produced no output");
-    return;
-  }
-  try {
-    const { storageQueries: storageQueries2 } = await Promise.resolve().then(() => (init_remote(), remote_exports));
-    const { readFile: readFile11, unlink: unlink3 } = await import("fs/promises");
-    const uploadInfo = await storageQueries2.getUploadUrl(
-      sessionId,
-      `browser-recording-${Date.now()}.mp4`,
-      "video/mp4",
-      "browser-recording"
-    );
-    const fileData = await readFile11(result.path);
-    await fetch(uploadInfo.uploadUrl, {
-      method: "PUT",
-      headers: { "Content-Type": "video/mp4" },
-      body: fileData
-    });
-    await storageQueries2.updateFile(uploadInfo.fileId, { sizeBytes: result.sizeBytes });
-    console.log(`[RECORDING] Uploaded recording for session ${sessionId} (${result.sizeBytes} bytes)`);
-    await unlink3(result.path).catch(() => {
-    });
-  } catch (err) {
-    console.error("[RECORDING] Upload failed:", err.message);
-  }
-}
 var agents = new Hono2();
 var attachmentSchema = z16.object({
   type: z16.enum(["image", "file"]),
@@ -9110,30 +9077,38 @@ ${prompt}` });
               await new Promise((resolve12) => setTimeout(resolve12, 0));
             }
             const browserPort = progress.data?.browserStreamPort;
-            if (progress.toolName === "bash" && browserPort && status === "started") {
+            const browserClosed = progress.data?.browserClosed;
+            if (progress.toolName === "bash" && browserClosed) {
+              console.log(`[BROWSER-STREAM] agent-browser close detected, destroying proxy`);
+              destroyProxy(sessionId);
+            } else if (progress.toolName === "bash" && browserPort) {
+              console.log(`[BROWSER-STREAM] agent-browser command detected, ensuring proxy on port ${browserPort}`);
               const proxy = getOrCreateProxy(sessionId, browserPort);
-              let recorder = sessionRecorders.get(sessionId);
-              if (!recorder) {
-                recorder = new FrameRecorder(sessionId);
+              if (!sessionRecorders.has(sessionId)) {
+                const recorder = new FrameRecorder(sessionId);
                 recorder.start();
                 sessionRecorders.set(sessionId, recorder);
               }
-              proxy.on("frame", (frame) => {
-                recorder.addFrame(frame);
-                writeSSE(JSON.stringify({
-                  type: "browser-frame",
-                  data: frame.data,
-                  metadata: frame.metadata
-                })).catch(() => {
+              if (proxy.listenerCount("frame") === 0) {
+                proxy.on("frame", (frame) => {
+                  const rec = sessionRecorders.get(sessionId);
+                  rec?.addFrame(frame);
+                  writeSSE(JSON.stringify({
+                    type: "browser-frame",
+                    data: frame.data,
+                    metadata: frame.metadata
+                  })).catch(() => {
+                  });
                 });
-              });
-              proxy.on("status", (s) => {
-                writeSSE(JSON.stringify({
-                  type: "browser-status",
-                  ...s
-                })).catch(() => {
+                proxy.on("status", (s) => {
+                  console.log(`[BROWSER-STREAM] Status:`, s);
+                  writeSSE(JSON.stringify({
+                    type: "browser-status",
+                    ...s
+                  })).catch(() => {
+                  });
                 });
-              });
+              }
             }
           },
           onStepFinish: async () => {
@@ -9245,15 +9220,6 @@ ${prompt}` });
         }
       } finally {
         cleanupAbortController();
-        destroyProxy(sessionId);
-        const recorder = sessionRecorders.get(sessionId);
-        if (recorder && recorder.frameCount > 0) {
-          sessionRecorders.delete(sessionId);
-          recorder.stop();
-          encodAndUploadRecording(sessionId, recorder).catch((err) => {
-            console.error("[RECORDING] Failed to encode/upload:", err.message);
-          });
-        }
         await writeSSE("[DONE]");
         await safeClose();
       }
@@ -9609,30 +9575,38 @@ agents.post(
                 await new Promise((resolve12) => setTimeout(resolve12, 0));
               }
               const browserPort = progress.data?.browserStreamPort;
-              if (progress.toolName === "bash" && browserPort && status === "started") {
+              const browserClosed = progress.data?.browserClosed;
+              if (progress.toolName === "bash" && browserClosed) {
+                console.log(`[BROWSER-STREAM] agent-browser close detected`);
+                destroyProxy(session.id);
+              } else if (progress.toolName === "bash" && browserPort) {
+                console.log(`[BROWSER-STREAM] agent-browser command detected, port ${browserPort}`);
                 const proxy = getOrCreateProxy(session.id, browserPort);
-                let recorder = sessionRecorders.get(session.id);
-                if (!recorder) {
-                  recorder = new FrameRecorder(session.id);
+                if (!sessionRecorders.has(session.id)) {
+                  const recorder = new FrameRecorder(session.id);
                   recorder.start();
                   sessionRecorders.set(session.id, recorder);
                 }
-                proxy.on("frame", (frame) => {
-                  recorder.addFrame(frame);
-                  writeSSE(JSON.stringify({
-                    type: "browser-frame",
-                    data: frame.data,
-                    metadata: frame.metadata
-                  })).catch(() => {
+                if (proxy.listenerCount("frame") === 0) {
+                  proxy.on("frame", (frame) => {
+                    const rec = sessionRecorders.get(session.id);
+                    rec?.addFrame(frame);
+                    writeSSE(JSON.stringify({
+                      type: "browser-frame",
+                      data: frame.data,
+                      metadata: frame.metadata
+                    })).catch(() => {
+                    });
                   });
-                });
-                proxy.on("status", (s) => {
-                  writeSSE(JSON.stringify({
-                    type: "browser-status",
-                    ...s
-                  })).catch(() => {
+                  proxy.on("status", (s) => {
+                    console.log(`[BROWSER-STREAM] Status:`, s);
+                    writeSSE(JSON.stringify({
+                      type: "browser-status",
+                      ...s
+                    })).catch(() => {
+                    });
                   });
-                });
+                }
               }
             },
             onStepFinish: async () => {
@@ -9738,15 +9712,6 @@ agents.post(
           }
         } finally {
           cleanupAbortController();
-          destroyProxy(session.id);
-          const recorder = sessionRecorders.get(session.id);
-          if (recorder && recorder.frameCount > 0) {
-            sessionRecorders.delete(session.id);
-            recorder.stop();
-            encodAndUploadRecording(session.id, recorder).catch((err) => {
-              console.error("[RECORDING] Failed to encode/upload:", err.message);
-            });
-          }
           await writeSSE("[DONE]");
           await safeClose();
         }
@@ -9806,6 +9771,19 @@ agents.post(
     return c.json({ success: true });
   }
 );
+agents.get("/:id/browser-stream", async (c) => {
+  const sessionId = c.req.param("id");
+  const proxy = getProxy(sessionId);
+  return c.json({
+    sessionId,
+    active: !!proxy?.connected,
+    hasProxy: !!proxy,
+    latestFrame: proxy?.latestFrame ? {
+      metadata: proxy.latestFrame.metadata,
+      timestamp: proxy.latestFrame.timestamp
+    } : null
+  });
+});
 
 // src/server/routes/health.ts
 init_config();