callwalkietalkie 0.8.0 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "callwalkietalkie",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Chat into cmux from your phone. Run npx callwalkietalkie.",
   "license": "MIT",
   "repository": {

package/runtime/agent_ui.html

@@ -81,6 +81,17 @@
     -webkit-overflow-scrolling: touch;
     border-top: 1px solid var(--line);
   }
+  .sess-section-title {
+    margin: 0;
+    padding: 12px 16px;
+    background: var(--ground);
+    border-bottom: 1px solid var(--line);
+    color: var(--muted);
+    font-size: 12px;
+    font-weight: 600;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+  }
   .sess-row {
     position: relative;
     overflow: hidden;
@@ -135,6 +146,112 @@
     background: transparent;
   }
   .sess.active .dot { background: var(--live); }
+  .sess.browser .dot { background: #94a3b8; }
+  .sess.browser.active .dot { background: var(--sent); }
+  .sess .kind {
+    flex: none;
+    font-size: 10px;
+    font-weight: 700;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+    color: var(--muted);
+    border: 1px solid var(--line);
+    border-radius: 6px;
+    padding: 2px 6px;
+    align-self: flex-start;
+    margin-top: 2px;
+  }
+  .sess.browser .kind {
+    color: var(--sent);
+    border-color: color-mix(in srgb, var(--sent) 35%, var(--line));
+    background: color-mix(in srgb, var(--sent) 8%, transparent);
+  }
+  #browser {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    background: #0b0d10;
+  }
+  #browser[hidden] { display: none !important; }
+  #btop {
+    flex: none;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 8px 14px 10px;
+    border-bottom: 1px solid rgba(255,255,255,.08);
+    background: rgba(12,14,18,.96);
+    color: #f4f4f5;
+  }
+  #bback {
+    flex: none;
+    width: 36px;
+    height: 36px;
+    border: none;
+    background: transparent;
+    color: #7dd3fc;
+    font-size: 28px;
+    line-height: 1;
+    padding: 0;
+    cursor: pointer;
+  }
+  #btitlewrap { flex: 1; min-width: 0; }
+  #btitle {
+    font-size: 16px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  #btitle .live {
+    width: 7px;
+    height: 7px;
+    border-radius: 4px;
+    background: var(--live);
+    flex: none;
+  }
+  #bstatus {
+    font-size: 12px;
+    color: #a1a1aa;
+    font-family: var(--mono);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  #bstage {
+    flex: 1;
+    min-height: 0;
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #0b0d10;
+    overflow: hidden;
+  }
+  #bframe {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+    display: block;
+    background: #111;
+  }
+  #bframe[hidden] { display: none; }
+  #bempty {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #a1a1aa;
+    font-size: 14px;
+    padding: 24px;
+    text-align: center;
+  }
+  #bempty[hidden] { display: none; }
+  #bempty.err { color: #fda4af; }
   .sess .body { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
   .sess .top { display: flex; justify-content: space-between; gap: 8px; }
   .sess .name {
@@ -459,7 +576,7 @@
   </div>
   <div id="sess-list"></div>
   <div id="sessions-foot">
-    <span class="hint">Swipe left to hide · <button id="restore-sessions" type="button">Restore hidden</button></span>
+    <span class="hint">Terminals chat · browsers live-stream · <button id="restore-sessions" type="button">Restore</button></span>
     <button id="leave" type="button">Disconnect</button>
   </div>
 </div>
@@ -482,6 +599,20 @@
   </div>
 </div>
 
+<div id="browser" hidden>
+  <div id="btop">
+    <button id="bback" type="button" aria-label="Back to sessions">‹</button>
+    <div id="btitlewrap">
+      <div id="btitle"><span class="live" id="blivedot" hidden></span><span id="btitletext">Browser</span></div>
+      <div id="bstatus">…</div>
+    </div>
+  </div>
+  <div id="bstage">
+    <img id="bframe" alt="Live browser view" hidden />
+    <div id="bempty">Starting live view…</div>
+  </div>
+</div>
+
 <script>
 (function() {
   var TOKEN = __TOKEN_JSON__;
@@ -489,6 +620,7 @@
   var API = __API_BASE_JSON__;
   var sessionsView = document.getElementById("sessions");
   var threadView = document.getElementById("thread");
+  var browserView = document.getElementById("browser");
   var sessList = document.getElementById("sess-list");
   var sessionsMeta = document.getElementById("sessions-meta");
   var log = document.getElementById("log");
@@ -501,6 +633,12 @@
   var backBtn = document.getElementById("back");
   var leaveBtn = document.getElementById("leave");
   var restoreBtn = document.getElementById("restore-sessions");
+  var bbackBtn = document.getElementById("bback");
+  var btitleText = document.getElementById("btitletext");
+  var bstatusEl = document.getElementById("bstatus");
+  var bliveDot = document.getElementById("blivedot");
+  var bframe = document.getElementById("bframe");
+  var bempty = document.getElementById("bempty");
 
   var misses = 0;
   var lastSig = "";
@@ -520,6 +658,13 @@
   var lastSessions = [];
   var hiddenSessions = loadHidden();
   var openSwipeRow = null;
+  var activeType = "terminal";
+  var activeUrl = "";
+  var activeSurface = null;
+  var activeWorkspace = null;
+  var inBrowser = false;
+  var previewTimer = null;
+  var previewBusy = false;
 
   function loadHidden() {
     try {
@@ -575,16 +720,92 @@
     return String(p).replace(/^\/Users\/[^\/]+/, "~");
   }
 
+  function shortUrl(u) {
+    if (!u) return "";
+    try {
+      var x = new URL(u);
+      var path = x.pathname === "/" ? "" : x.pathname;
+      return x.host + path + (x.search || "");
+    } catch (e) {
+      return String(u);
+    }
+  }
+
+  function stopBrowserStream() {
+    if (previewTimer) {
+      clearTimeout(previewTimer);
+      previewTimer = null;
+    }
+    previewBusy = false;
+    if (bframe) {
+      bframe.removeAttribute("src");
+      bframe.hidden = true;
+    }
+  }
+
   function showSessions() {
     inThread = false;
+    inBrowser = false;
+    stopBrowserStream();
     sessionsView.hidden = false;
     threadView.hidden = true;
+    if (browserView) browserView.hidden = true;
   }
 
   function showThread() {
     inThread = true;
+    inBrowser = false;
+    stopBrowserStream();
     sessionsView.hidden = true;
     threadView.hidden = false;
+    if (browserView) browserView.hidden = true;
+  }
+
+  function showBrowserLive() {
+    inThread = false;
+    inBrowser = true;
+    sessionsView.hidden = true;
+    threadView.hidden = true;
+    if (browserView) browserView.hidden = false;
+    if (btitleText) btitleText.textContent = titleText.textContent || "Browser";
+    if (bstatusEl) bstatusEl.textContent = activeUrl ? shortUrl(activeUrl) : "live view";
+    if (bempty) {
+      bempty.hidden = false;
+      bempty.classList.remove("err");
+      bempty.textContent = "Starting live view…";
+    }
+    if (bliveDot) bliveDot.hidden = true;
+    stopBrowserStream();
+    pullBrowserFrame();
+  }
+
+  function pullBrowserFrame() {
+    if (!inBrowser || previewBusy) return;
+    previewBusy = true;
+    var url = API + "/preview?t=" + encodeURIComponent(TOKEN) + "&_=" + Date.now();
+    if (activeSurface) url += "&surface=" + encodeURIComponent(activeSurface);
+    if (activeWorkspace) url += "&workspace=" + encodeURIComponent(activeWorkspace);
+    var img = new Image();
+    img.onload = function() {
+      if (!inBrowser) { previewBusy = false; return; }
+      bframe.src = img.src;
+      bframe.hidden = false;
+      if (bempty) bempty.hidden = true;
+      if (bliveDot) bliveDot.hidden = false;
+      previewBusy = false;
+      previewTimer = setTimeout(pullBrowserFrame, 800);
+    };
+    img.onerror = function() {
+      previewBusy = false;
+      if (!inBrowser) return;
+      if (bframe.hidden && bempty) {
+        bempty.hidden = false;
+        bempty.classList.add("err");
+        bempty.textContent = "Can't stream this browser tab yet";
+      }
+      previewTimer = setTimeout(pullBrowserFrame, 1600);
+    };
+    img.src = url;
   }
 
   function inlineMd(s) {
@@ -809,38 +1030,58 @@
       return hiddenSessions.indexOf(sessionKey(s)) === -1;
     });
     if (!visible.length) {
-      var msg = lastSessions.length
+      var emptyMsg = lastSessions.length
         ? "All sessions hidden. Swipe deleted rows are stored on this phone."
-        : "No cmux terminals open.";
-      sessList.innerHTML = '<div class="turn system" style="padding:24px 16px"><div class="bubble">' + msg + "</div></div>";
+        : "No cmux terminals or browsers open.";
+      sessList.innerHTML = '<div class="turn system" style="padding:24px 16px"><div class="bubble">' + emptyMsg + "</div></div>";
       return;
     }
-    sessList.innerHTML = visible.map(function(s) {
+    function renderSession(s) {
       var surface = s.surface || s.surface_id || "";
       var workspace = s.workspace || s.workspace_id || "";
-      var title = esc(s.title || surface || "session");
-      var cwd = esc(shortPath(s.cwd || s.current_directory || ""));
+      var kind = s.type || "terminal";
+      var isBrowser = kind === "browser";
+      var title = esc(s.title || surface || (isBrowser ? "browser" : "session"));
+      var path = isBrowser
+        ? esc(shortUrl(s.url || ""))
+        : esc(shortPath(s.cwd || s.current_directory || ""));
       var key = esc(sessionKey(s));
       var active = surface === currentSurface;
-      var snip = active ? "Open in this chat" : "Tap to open";
+      var snip = isBrowser
+        ? (active ? "Live stream" : "Browser · tap for live view")
+        : (active ? "Open in this chat" : "Terminal · tap to chat");
       return '<div class="sess-row" data-key="' + key + '">' +
         '<button type="button" class="sess-delete">Delete</button>' +
-        '<button type="button" class="sess' + (active ? " active" : "") + '"' +
+        '<button type="button" class="sess' + (active ? " active" : "") + (isBrowser ? " browser" : "") + '"' +
         ' data-surface="' + esc(surface) + '"' +
         ' data-workspace="' + esc(workspace) + '"' +
         ' data-window="' + esc(s.window || "") + '"' +
-        ' data-title="' + title + '">' +
+        ' data-title="' + title + '"' +
+        ' data-type="' + esc(kind) + '"' +
+        ' data-url="' + esc(s.url || "") + '">' +
         '<span class="dot"></span>' +
         '<span class="body">' +
-          '<span class="top"><span class="name">' + title + '</span></span>' +
+          '<span class="top"><span class="name">' + title + '</span><span class="kind">' + (isBrowser ? "Browser" : "Terminal") + "</span></span>" +
           '<span class="snip">' + snip + "</span>" +
-          (cwd ? '<span class="path">' + cwd + "</span>" : "") +
+          (path ? '<span class="path">' + path + "</span>" : "") +
         "</span></button></div>";
+    }
+    sessList.innerHTML = [
+      { type: "browser", title: "Browsers" },
+      { type: "terminal", title: "Terminals" }
+    ].map(function(group) {
+      var items = visible.filter(function(s) {
+        return (s.type || "terminal") === group.type;
+      });
+      if (!items.length) return "";
+      return '<section aria-labelledby="sess-' + group.type + '-heading">' +
+        '<h2 class="sess-section-title" id="sess-' + group.type + '-heading">' + group.title + '</h2>' +
+        items.map(renderSession).join("") + '</section>';
     }).join("");
     bindSwipeRows();
   }
 
-  async function selectSession(surface, workspace, windowRef, title) {
+  async function selectSession(surface, workspace, windowRef, title, typeHint, urlHint) {
     try {
       var r = await fetch(API + "/select?t=" + encodeURIComponent(TOKEN), {
         method: "POST",
@@ -853,9 +1094,12 @@
         return;
       }
       activeKey = j.surface || surface;
+      activeSurface = j.surface || surface || null;
+      activeWorkspace = j.workspace || workspace || null;
+      activeType = j.type || typeHint || "terminal";
+      activeUrl = j.url || urlHint || "";
       titleText.textContent = title || j.title || "cmux";
       liveDot.hidden = false;
-      // Hard-reset thread so the previous surface's messages can't linger.
       known = [];
       pendingUser = null;
       lastSig = "";
@@ -864,9 +1108,13 @@
       agentBusy = false;
       log.innerHTML = "";
       updateComposerMode();
-      showThread();
-      await refreshStatus();
-      await refreshTranscript();
+      if (activeType === "browser") {
+        showBrowserLive();
+      } else {
+        showThread();
+        await refreshStatus();
+        await refreshTranscript();
+      }
     } catch (err) {
       setSessionsMeta("switch failed", "err");
     }
@@ -884,7 +1132,9 @@
       btn.getAttribute("data-surface"),
       btn.getAttribute("data-workspace"),
       btn.getAttribute("data-window"),
-      btn.getAttribute("data-title")
+      btn.getAttribute("data-title"),
+      btn.getAttribute("data-type"),
+      btn.getAttribute("data-url")
     );
   });
 
@@ -892,11 +1142,18 @@
     showSessions();
     refreshStatus();
   });
+  if (bbackBtn) {
+    bbackBtn.addEventListener("click", function() {
+      showSessions();
+      refreshStatus();
+    });
+  }
 
   function disconnect() {
     if (leaving) return;
     leaving = true;
     clearInterval(poller);
+    stopBrowserStream();
     fetch(API + "/shutdown?t=" + encodeURIComponent(TOKEN), {
       method: "POST",
       keepalive: true,
@@ -924,10 +1181,19 @@
       setSessionsMeta("localhost · live", "ok");
       titleText.textContent = j.title || "cmux";
       liveDot.hidden = false;
+      activeType = j.type || activeType || "terminal";
+      activeUrl = j.url || activeUrl || "";
+      if (j.surface) activeSurface = j.surface;
+      if (j.workspace) activeWorkspace = j.workspace;
       var bits = [];
-      if (j.cwd) bits.push(shortPath(j.cwd));
+      if (j.type === "browser" && j.url) bits.push(shortUrl(j.url));
+      else if (j.cwd) bits.push(shortPath(j.cwd));
       if (j.surface) bits.push(j.surface);
       setStatus(bits.join(" · ") || "live", "ok");
+      if (inBrowser) {
+        if (btitleText) btitleText.textContent = j.title || "Browser";
+        if (bstatusEl) bstatusEl.textContent = j.url ? shortUrl(j.url) : "live view";
+      }
       renderPicker(j.sessions || j.workspaces || [], j.surface);
       return true;
     } catch (e) {
@@ -940,7 +1206,7 @@
   }
 
   async function refreshTranscript() {
-    if (!inThread) return;
+    if (!inThread || inBrowser) return;
     try {
       var r = await fetch(API + "/transcript?t=" + encodeURIComponent(TOKEN));
       var j = await r.json();

package/runtime/cmux-adapter/cmux_adapter.py

@@ -207,6 +207,12 @@ class Target:
     window_ref: Optional[str] = None
     title: str = "cmux"
     cwd: Optional[str] = None
+    surface_type: str = "terminal"
+    url: Optional[str] = None
+
+    @property
+    def is_browser(self) -> bool:
+        return (self.surface_type or "terminal") == "browser"
 
 
 @dataclass
@@ -243,6 +249,10 @@ class Session:
                         self.target.cwd = item["cwd"]
                     if item.get("window"):
                         self.target.window_ref = item.get("window")
+                    if item.get("type"):
+                        self.target.surface_type = item["type"]
+                    if "url" in item:
+                        self.target.url = item.get("url")
                     return
         except CmuxError:
             pass
@@ -259,6 +269,8 @@ class Session:
                 break
 
     def read_text(self, *, lines: int = 800, scrollback: bool = True) -> str:
+        if self.target.is_browser:
+            return ""
         result = rpc(
             "surface.read_text",
             {
@@ -280,6 +292,8 @@ class Session:
         Agents disagree on the cancel key (Ctrl+C vs Escape), and some cmux
         builds only honor one of send_key / send_text — so we fire all of them.
         """
+        if self.target.is_browser:
+            raise CmuxError("Can't interrupt a browser tab")
         self.focus()
         base = {
             "workspace_id": self.target.workspace_ref,
@@ -316,6 +330,8 @@ class Session:
             pass
 
     def send(self, text: str) -> None:
+        if self.target.is_browser:
+            raise CmuxError("This is a browser live view — open a terminal to chat")
         text = text.rstrip("\n")
         if not text:
             raise CmuxError("empty message")
@@ -334,6 +350,8 @@ class Session:
         self._sent.append(text)
 
     def transcript(self) -> list[ChatMessage]:
+        if self.target.is_browser:
+            return []
         screen = self.read_text()
         self._last_text = screen
         parsed = parse_screen(screen)
@@ -341,6 +359,8 @@ class Session:
         return merge_sent(parsed, self._sent)
 
     def busy(self) -> bool:
+        if self.target.is_browser:
+            return False
         return is_busy(self._last_text or self.read_text())
 
     def notify_linked(self) -> None:
@@ -371,6 +391,29 @@ class Session:
             pass
 
 
+def browser_screenshot(
+    *,
+    surface: Optional[str] = None,
+    workspace: Optional[str] = None,
+    socket_path: Optional[str] = None,
+) -> bytes:
+    """Capture a cmux browser surface as PNG bytes. Does not focus/steal foreground."""
+    path = socket_path or find_socket()
+    params: dict[str, Any] = {}
+    if surface:
+        params["surface_id"] = surface
+    if workspace:
+        params["workspace_id"] = workspace
+    result = rpc("browser.screenshot", params, socket_path=path) or {}
+    b64 = result.get("png_base64") or result.get("base64")
+    if b64:
+        return base64.b64decode(b64)
+    file_path = result.get("path")
+    if file_path and Path(file_path).is_file():
+        return Path(file_path).read_bytes()
+    raise CmuxError("browser screenshot returned no image")
+
+
 # ---------------------------------------------------------------- discovery
 
 
@@ -399,7 +442,7 @@ def list_surfaces(workspace_ref: str, socket_path: Optional[str] = None) -> list
 
 
 def inventory(socket_path: Optional[str] = None) -> list[dict]:
-    """Flat list of pickable terminal sessions across windows/workspaces."""
+    """Flat list of pickable terminal + browser sessions across windows/workspaces."""
     path = socket_path or find_socket()
     items: list[dict] = []
     tree = None
@@ -411,6 +454,25 @@ def inventory(socket_path: Optional[str] = None) -> list[dict]:
         except CmuxError:
             tree = None
 
+    def _append(win_ref, ws_ref, ws_id, ws_title, ws_cwd, surf):
+        kind = surf.get("type") or "terminal"
+        if kind not in ("terminal", "browser"):
+            return
+        items.append(
+            {
+                "window": win_ref,
+                "workspace": ws_ref or ws_id,
+                "workspace_id": ws_id,
+                "surface": surf.get("ref") or surf.get("id"),
+                "surface_id": surf.get("id"),
+                "title": surf.get("title") or ws_title or kind,
+                "cwd": ws_cwd if kind == "terminal" else None,
+                "url": surf.get("url") if kind == "browser" else None,
+                "type": kind,
+                "active": bool(surf.get("active") or surf.get("focused")),
+            }
+        )
+
     if isinstance(tree, dict) and tree.get("windows"):
         for win in tree.get("windows") or []:
             win_ref = win.get("ref") or win.get("window_ref")
@@ -421,20 +483,7 @@ def inventory(socket_path: Optional[str] = None) -> list[dict]:
                 ws_cwd = ws.get("current_directory")
                 for pane in ws.get("panes") or []:
                     for surf in pane.get("surfaces") or []:
-                        if (surf.get("type") or "terminal") != "terminal":
-                            continue
-                        items.append(
-                            {
-                                "window": win_ref,
-                                "workspace": ws_ref or ws_id,
-                                "workspace_id": ws_id,
-                                "surface": surf.get("ref") or surf.get("id"),
-                                "surface_id": surf.get("id"),
-                                "title": surf.get("title") or ws_title or "terminal",
-                                "cwd": ws_cwd,
-                                "active": bool(surf.get("active") or surf.get("focused")),
-                            }
-                        )
+                        _append(win_ref, ws_ref, ws_id, ws_title, ws_cwd, surf)
         if items:
             return items
 
@@ -442,22 +491,13 @@ def inventory(socket_path: Optional[str] = None) -> list[dict]:
     for ws in list_workspaces(socket_path=path):
         ws_ref = ws.get("ref") or ws.get("id")
         for surf in list_surfaces(ws_ref, socket_path=path):
-            if (surf.get("type") or "terminal") != "terminal":
-                continue
-            items.append(
-                {
-                    "window": None,
-                    "workspace": ws_ref,
-                    "workspace_id": ws.get("id"),
-                    "surface": surf.get("ref") or surf.get("id"),
-                    "surface_id": surf.get("id"),
-                    "title": surf.get("title")
-                    or ws.get("custom_title")
-                    or ws.get("title")
-                    or "terminal",
-                    "cwd": ws.get("current_directory"),
-                    "active": bool(surf.get("focused") or surf.get("selected_in_pane")),
-                }
+            _append(
+                None,
+                ws_ref,
+                ws.get("id"),
+                ws.get("custom_title") or ws.get("title") or ws_ref,
+                ws.get("current_directory"),
+                surf,
             )
     return items
 
@@ -491,11 +531,21 @@ def resolve_target(
                 continue
             pick = item
             break
+    if pick is None:
+        for item in inv:
+            if item.get("active") and (item.get("type") or "terminal") == "terminal":
+                pick = item
+                break
     if pick is None:
         for item in inv:
             if item.get("active"):
                 pick = item
                 break
+    if pick is None:
+        for item in inv:
+            if (item.get("type") or "terminal") == "terminal":
+                pick = item
+                break
     if pick is None and inv:
         pick = inv[0]
     if pick is None:
@@ -510,10 +560,14 @@ def resolve_target(
             "window": focused.get("window_ref"),
             "title": "cmux",
             "cwd": None,
+            "type": focused.get("surface_type") or "terminal",
+            "url": None,
         }
 
     # Enrich title/cwd from workspace.list when tree omitted them
-    if not pick.get("cwd") or pick.get("title") in (None, "terminal", "cmux"):
+    if (pick.get("type") or "terminal") == "terminal" and (
+        not pick.get("cwd") or pick.get("title") in (None, "terminal", "cmux")
+    ):
         for ws in list_workspaces(socket_path=path):
             if pick.get("workspace") in (ws.get("ref"), ws.get("id")):
                 pick["cwd"] = pick.get("cwd") or ws.get("current_directory")
@@ -530,6 +584,8 @@ def resolve_target(
         window_ref=pick.get("window") or focused.get("window_ref"),
         title=pick.get("title") or "cmux",
         cwd=pick.get("cwd"),
+        surface_type=pick.get("type") or "terminal",
+        url=pick.get("url"),
     )
 
 
@@ -595,6 +651,14 @@ def _is_chrome(line: str) -> bool:
     s = line.strip()
     if not s:
         return True
+    label = re.sub(r"^[→›>►▶•·▸▹➤➜\-\s]+", "", s).strip().lower()
+    if label in {
+        "add a follow-up",
+        "add follow-up",
+        "follow-up",
+        "follow up",
+    } or label.startswith("add a follow-up"):
+        return True
     if _BOXY.search(s) and len(_BOXY.findall(s)) >= 3:
         return True
     if s.startswith(("→ ", "→")) and ("ctrl+" in s.lower() or "stop" in s.lower()):

package/runtime/winproxy.py

@@ -35,6 +35,7 @@ if _ADAPTER_DIR not in sys.path:
     sys.path.insert(0, _ADAPTER_DIR)
 from cmux_adapter import (  # noqa: E402
     CmuxError,
+    browser_screenshot,
     inventory,
     open_session,
     ping as cmux_ping,
@@ -703,6 +704,8 @@ def agent_status():
                 "app": "cmux",
                 "title": t.title,
                 "cwd": t.cwd,
+                "url": t.url,
+                "type": t.surface_type,
                 "workspace": t.workspace_ref,
                 "surface": t.surface_ref,
                 "window": t.window_ref,
@@ -715,9 +718,11 @@ def agent_status():
                         "ref": s.get("workspace"),
                         "title": s.get("title"),
                         "custom_title": None,
-                        "current_directory": s.get("cwd"),
+                        "current_directory": s.get("cwd") or s.get("url"),
                         "selected": s.get("active"),
                         "surface": s.get("surface"),
+                        "type": s.get("type"),
+                        "url": s.get("url"),
                     }
                     for s in sessions
                 ],
@@ -741,6 +746,16 @@ def agent_select():
                 workspace=workspace, surface=surface, window=window, force=True
             )
             session.focus()
+            # Bring cmux to the foreground so the selected tab is actually visible.
+            try:
+                subprocess.run(
+                    ["/usr/bin/open", "-a", "cmux"],
+                    check=False,
+                    capture_output=True,
+                    timeout=5,
+                )
+            except Exception:
+                pass
             t = session.target
         return jsonify(
             {
@@ -750,6 +765,8 @@ def agent_select():
                 "window": t.window_ref,
                 "title": t.title,
                 "cwd": t.cwd,
+                "url": t.url,
+                "type": t.surface_type,
             }
         )
     except KeyboardInterrupt:
@@ -758,6 +775,43 @@ def agent_select():
         return jsonify({"ok": False, "error": _agent_error_message(e)}), 503
 
 
+@app.route("/agent/preview")
+def agent_preview():
+    """Live PNG frame of a cmux browser tab. Runs outside the agent lock."""
+    surface = (request.args.get("surface") or "").strip() or None
+    workspace = (request.args.get("workspace") or "").strip() or None
+    try:
+        with _agent_lock:
+            session = _get_session()
+            path = session.socket_path
+            t = session.target
+            if not surface:
+                if not t.is_browser:
+                    return jsonify(
+                        {"ok": False, "error": "select a browser tab first"}
+                    ), 400
+                surface = t.surface_ref
+                workspace = t.workspace_ref
+            elif not workspace:
+                workspace = t.workspace_ref
+        # Screenshot outside the lock so chat/select stay responsive.
+        png = browser_screenshot(
+            surface=surface, workspace=workspace, socket_path=path
+        )
+        return Response(
+            png,
+            mimetype="image/png",
+            headers={
+                "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
+                "Pragma": "no-cache",
+            },
+        )
+    except KeyboardInterrupt:
+        raise
+    except BaseException as e:
+        return jsonify({"ok": False, "error": _agent_error_message(e)}), 503
+
+
 @app.route("/agent/transcript")
 def agent_transcript():
     try: