@opengeni/react 0.48.0 → 0.52.1

package/dist/index.js

@@ -1,58 +1,3 @@
-import {
-  CONNECTION_STATUS_META,
-  ConnectionDot,
-  ConnectionStatusPill,
-  EnrollmentConsent,
-  EnrollmentDeviceFlow,
-  HEALTH_TOKEN,
-  MACHINE_STATE_BADGE_META,
-  METRICS,
-  METRIC_WINDOWS,
-  MachineCard,
-  MachineDetail,
-  MachineDockBar,
-  MachineHealthPill,
-  MachineMetrics,
-  MachineStatusPill,
-  MachinesDashboard,
-  MetricHistoryChart,
-  MetricSparkline,
-  OpenGeniProvider,
-  SharedMachineDisclosure,
-  WINDOW_LABEL,
-  connectionStatusForState,
-  deriveHealth,
-  healthPulses,
-  pointsFor,
-  useMachines
-} from "./chunk-OL6QVXGF.js";
-import {
-  SESSION_EVENT_BROWSER_MAX_BYTES,
-  SESSION_EVENT_BROWSER_MAX_COUNT,
-  SESSION_EVENT_BROWSER_PENDING_MAX_BYTES,
-  SESSION_EVENT_BROWSER_PENDING_MAX_COUNT,
-  SESSION_EVENT_BROWSER_SINGLE_EVENT_MAX_BYTES,
-  approvalsFromRequiresAction,
-  boundBrowserSessionEventWindow,
-  humanInputRequestFromEvent,
-  isGoalEvent,
-  isHumanInputEvent,
-  isLineageRefreshEvent,
-  isSessionMcpApprovalPolicyEvent,
-  isTitleEvent,
-  isTurnQueueEvent,
-  projectPendingApprovals,
-  projectPendingHumanInputRequests,
-  useFileAttachments,
-  useGoal,
-  useHumanInputRequests,
-  useSession,
-  useSessionControl,
-  useSessionEvents,
-  useSessionLineage,
-  useSessionMcpApprovalPolicy,
-  useTurnQueue
-} from "./chunk-I4MPFDRP.js";
 import {
   ActivityDisclosure,
   ActivityRail,
@@ -61,6 +6,7 @@ import {
   CopyButton,
   CopyHoverFrame,
   DisclosureDefaultsProvider,
+  GeneratedVideoPlayer,
   HumanInputForm,
   HumanInputSurface,
   LightboxProvider,
@@ -85,7 +31,6 @@ import {
   applyPatchOps,
   applyPatchOpsFromToolItem,
   controlCaret,
-  copyTextToClipboard,
   createDefaultToolRegistry,
   createToolRegistry,
   defaultHumanInputFormMessages,
@@ -102,7 +47,6 @@ import {
   sandboxCommandExitCode,
   sessionChromeGoalPillState,
   stripExecBanner,
-  tableElementToTsv,
   tailPeek,
   unwrapMcpOutput,
   useLightbox,
@@ -110,16 +54,7 @@ import {
   useThemeType,
   userMessageLikelyNeedsDisclosure,
   v4aToGitFileDiff
-} from "./chunk-XCNTXWBB.js";
-import "./chunk-O4VXOBGF.js";
-import {
-  buildTimeline,
-  creditExhaustedFromEvents,
-  extractSessionRef,
-  groupTimeline,
-  sessionStatusFromEvents,
-  toolDisplayName
-} from "./chunk-LHLYWG5R.js";
+} from "./chunk-JAGDUCZQ.js";
 import {
   Actions,
   AttachButton,
@@ -172,20 +107,7 @@ import {
   useSlashCommands,
   useTranscription,
   useVoiceInput
-} from "./chunk-NJ7M2B6Z.js";
-import {
-  FILE_ONLY_MESSAGE_TEXT,
-  composeSendInput,
-  shouldSteerOnKey,
-  shouldSubmitOnKey,
-  useComposer
-} from "./chunk-FWXGSNXT.js";
-import {
-  useMutationRunner,
-  usePageLiveActivity,
-  usePolledValue,
-  useSessionEventTrigger
-} from "./chunk-KZ73RL76.js";
+} from "./chunk-ROIRTM37.js";
 import {
   BillingClassMark,
   ModelPolicyPicker,
@@ -195,10 +117,6 @@ import {
   PickerNavRow,
   defaultModelPolicyPickerMessages
 } from "./chunk-WYA65Y3F.js";
-import {
-  useOpenGeni,
-  useOpenGeniClient
-} from "./chunk-EKZH6IDG.js";
 import {
   advancedSourceSummary,
   availabilityReasonLabel,
@@ -223,6 +141,83 @@ import {
   TooltipProvider,
   TooltipTrigger
 } from "./chunk-FK6VG4LL.js";
+import {
+  TimelineAnnotationsChip
+} from "./chunk-WSK7G5LE.js";
+import {
+  usePortalTokenSource,
+  usePortalTokenStyle
+} from "./chunk-VZTQ73XT.js";
+import {
+  CONNECTION_STATUS_META,
+  ConnectionDot,
+  ConnectionStatusPill,
+  EnrollmentConsent,
+  EnrollmentDeviceFlow,
+  HEALTH_TOKEN,
+  MACHINE_STATE_BADGE_META,
+  METRICS,
+  METRIC_WINDOWS,
+  MachineCard,
+  MachineDetail,
+  MachineDockBar,
+  MachineHealthPill,
+  MachineMetrics,
+  MachineStatusPill,
+  MachinesDashboard,
+  MetricHistoryChart,
+  MetricSparkline,
+  OpenGeniProvider,
+  SharedMachineDisclosure,
+  WINDOW_LABEL,
+  connectionStatusForState,
+  deriveHealth,
+  healthPulses,
+  pointsFor,
+  useMachines
+} from "./chunk-X4S56Y2H.js";
+import {
+  SESSION_EVENT_BROWSER_MAX_BYTES,
+  SESSION_EVENT_BROWSER_MAX_COUNT,
+  SESSION_EVENT_BROWSER_PENDING_MAX_BYTES,
+  SESSION_EVENT_BROWSER_PENDING_MAX_COUNT,
+  SESSION_EVENT_BROWSER_SINGLE_EVENT_MAX_BYTES,
+  approvalsFromRequiresAction,
+  boundBrowserSessionEventWindow,
+  humanInputRequestFromEvent,
+  isGoalEvent,
+  isHumanInputEvent,
+  isLineageRefreshEvent,
+  isSessionMcpApprovalPolicyEvent,
+  isTitleEvent,
+  isTurnQueueEvent,
+  projectPendingApprovals,
+  projectPendingHumanInputRequests,
+  useFileAttachments,
+  useGoal,
+  useHumanInputRequests,
+  useSession,
+  useSessionControl,
+  useSessionEvents,
+  useSessionLineage,
+  useSessionMcpApprovalPolicy,
+  useTurnQueue
+} from "./chunk-FWS3KC3Z.js";
+import {
+  buildTimeline,
+  creditExhaustedFromEvents,
+  extractSessionRef,
+  groupTimeline,
+  sessionStatusFromEvents,
+  toolDisplayName
+} from "./chunk-JR3QFY6B.js";
+import {
+  FILE_ONLY_MESSAGE_TEXT,
+  composeSendInput,
+  shouldSteerOnKey,
+  shouldSubmitOnKey,
+  useComposer
+} from "./chunk-724BW4TW.js";
 import {
   COMPOSER_PAYMENT_REQUIRED_MESSAGE,
   CREDIT_EXHAUSTION_MESSAGE,
@@ -237,12 +232,48 @@ import {
   tryParseJson
 } from "./chunk-LAKLF4PA.js";
 import {
-  usePortalTokenSource,
-  usePortalTokenStyle
-} from "./chunk-VZTQ73XT.js";
+  STREAM_KIND_DESKTOP,
+  STREAM_ROLE_CLIENT,
+  decodeStreamFrame,
+  decodeStreamOpenAck,
+  encodeStreamOpen
+} from "./chunk-6BBWWOOU.js";
+import {
+  useMutationRunner,
+  usePageLiveActivity,
+  usePolledValue,
+  useSessionEventTrigger
+} from "./chunk-KZ73RL76.js";
+import {
+  useOpenGeni,
+  useOpenGeniClient
+} from "./chunk-HDBG7XGO.js";
 import {
   cn
 } from "./chunk-22KP6LR5.js";
+import {
+  copyTextToClipboard,
+  tableElementToTsv
+} from "./chunk-JVYQRRC4.js";
+
+// src/hooks/use-video-artifact-playback.ts
+import { useMemo } from "react";
+function useVideoArtifactPlaybackLoader(options = {}) {
+  const { client, workspaceId } = useOpenGeni(options);
+  return useMemo(
+    () => async (artifactId, signal) => {
+      if (typeof client.createVideoArtifactPlaybackSource !== "function") {
+        throw new Error("This OpenGeni host does not expose retained-video playback.");
+      }
+      return await client.createVideoArtifactPlaybackSource(
+        workspaceId,
+        artifactId,
+        signal ? { signal } : {}
+      );
+    },
+    [client, workspaceId]
+  );
+}
 
 // src/hooks/use-last-started-turn-policy.ts
 import { useCallback, useEffect } from "react";
@@ -379,7 +410,7 @@ function useWorkspaceSessions(options = {}) {
 }
 
 // src/hooks/use-environments.ts
-import { useCallback as useCallback4, useMemo } from "react";
+import { useCallback as useCallback4, useMemo as useMemo2 } from "react";
 function useVariableSets(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
   const load = useCallback4(
@@ -470,7 +501,7 @@ function useVariableSets(options = {}) {
   };
 }
 function useEnvironments(options = {}) {
-  const legacyClient = useMemo(() => {
+  const legacyClient = useMemo2(() => {
     if (!options.client) {
       return void 0;
     }
@@ -737,6 +768,30 @@ function usePacks(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
+  const previewInstallation = useCallback6(
+    async (packId, request = {}) => await run(() => client.previewPackInstallation(workspaceId, packId, request)),
+    [client, workspaceId, run]
+  );
+  const install = useCallback6(
+    async (packId, request) => {
+      const result = await run(() => client.installPack(workspaceId, packId, request));
+      if (result) await refresh();
+      return result;
+    },
+    [client, workspaceId, run, refresh]
+  );
+  const previewUninstall = useCallback6(
+    async (packId) => await run(() => client.previewPackUninstall(workspaceId, packId)),
+    [client, workspaceId, run]
+  );
+  const uninstall = useCallback6(
+    async (packId, request) => {
+      const result = await run(() => client.uninstallPack(workspaceId, packId, request));
+      if (result) await refresh();
+      return result;
+    },
+    [client, workspaceId, run, refresh]
+  );
   const remove = useCallback6(
     async (packId) => {
       const result = await run(async () => {
@@ -764,6 +819,10 @@ function usePacks(options = {}) {
     refresh,
     register,
     enable,
+    previewInstallation,
+    install,
+    previewUninstall,
+    uninstall,
     remove,
     mutating,
     mutationError,
@@ -893,16 +952,24 @@ import {
   applyUrlRotation
 } from "@opengeni/sdk";
 import { useCallback as useCallback10, useEffect as useEffect3, useRef as useRef2, useState } from "react";
+
+// src/lib/sandbox-liveness.ts
+function sandboxAcceptsLiveIo(liveness) {
+  return liveness === "warm";
+}
+
+// src/lib/terminal-capability.ts
+function terminalCanAcquirePty(cell) {
+  if (!cell?.ptyCapable) return false;
+  if (cell.transport === "pty-ws") return true;
+  return cell.reason === "lease_cold" || cell.reason === "not_provisioned";
+}
+
+// src/hooks/use-session-capabilities.ts
 function desktopAttachable(cell) {
   if (cell.transport !== null) return true;
   return cell.reason === "lease_cold" || cell.reason === "not_provisioned" || cell.reason === null;
 }
-function terminalAttachable(cell) {
-  if (cell.transport === null) {
-    return cell.reason === "lease_cold" || cell.reason === "not_provisioned" || cell.reason === null;
-  }
-  return true;
-}
 function rotationsFrom(events) {
   const out = [];
   for (const event of events) {
@@ -954,8 +1021,12 @@ function useSessionCapabilities(sessionId, options = {}) {
     if (!lifecycleEnabled || !sessionId) {
       setState("idle");
       setCapabilities(null);
+      viewerIdRef.current = null;
+      setViewerId(null);
       return;
     }
+    viewerIdRef.current = null;
+    setViewerId(null);
     let cancelled = false;
     let pollTimer = null;
     let heartbeatTimer = null;
@@ -1004,7 +1075,7 @@ function useSessionCapabilities(sessionId, options = {}) {
         void client.getStreamCapabilities(workspaceId, sessionId, { signal: requestAbort.signal }).then((caps) => {
           if (cancelled) return;
           settle(caps);
-          if (caps.liveness === "warm" || caps.liveness === "draining") {
+          if (sandboxAcceptsLiveIo(caps.liveness)) {
             setState("ready");
             return;
           }
@@ -1033,18 +1104,25 @@ function useSessionCapabilities(sessionId, options = {}) {
         if (cancelled) return;
         settle(caps);
         const wantDesktopAttach = attachDesktop && desktopAttachable(caps.DesktopStream);
-        const wantTerminalAttach = attachTerminal && terminalAttachable(caps.Terminal);
+        const wantTerminalAttach = attachTerminal && terminalCanAcquirePty(caps.Terminal);
         const wantFilesAttach = attachFiles && caps.FileSystem.available;
         if (wantDesktopAttach || wantTerminalAttach || wantFilesAttach) {
           try {
             const holder = await client.attachViewer(workspaceId, sessionId, {
-              desktop: wantDesktopAttach
+              desktop: wantDesktopAttach,
+              terminal: wantTerminalAttach,
+              files: wantFilesAttach
             });
             if (cancelled) {
               void client.detachViewer(workspaceId, sessionId, holder.viewerId).catch(() => {
               });
               return;
             }
+            if (wantDesktopAttach && (!holder.dataPlaneUrl || !holder.transport || !holder.client) || wantTerminalAttach && (!holder.terminalUrl || !holder.terminalTransport)) {
+              await client.detachViewer(workspaceId, sessionId, holder.viewerId).catch(() => {
+              });
+              throw new Error("live plane unavailable");
+            }
             localViewerId = holder.viewerId;
             viewerIdRef.current = holder.viewerId;
             setViewerId(holder.viewerId);
@@ -1059,19 +1137,20 @@ function useSessionCapabilities(sessionId, options = {}) {
                   ...prev.DesktopStream,
                   transport: holder.transport ?? prev.DesktopStream.transport,
                   client: holder.client ?? prev.DesktopStream.client,
-                  url: holder.dataPlaneUrl ?? prev.DesktopStream.url,
-                  token: holder.streamToken ?? prev.DesktopStream.token,
-                  expiresAt: holder.streamExpiresAt ?? prev.DesktopStream.expiresAt,
+                  url: holder.dataPlaneUrl,
+                  token: holder.streamToken,
+                  expiresAt: holder.streamExpiresAt,
                   resolution: holder.resolution ?? prev.DesktopStream.resolution
                 } : prev.DesktopStream,
-                Terminal: holder.terminalUrl && holder.terminalTransport ? {
+                Terminal: wantTerminalAttach ? {
                   ...prev.Terminal,
-                  transport: holder.terminalTransport,
+                  transport: holder.terminalTransport ?? prev.Terminal.transport,
                   url: holder.terminalUrl,
-                  token: holder.terminalToken ?? prev.Terminal.token,
+                  token: holder.terminalToken,
+                  expiresAt: holder.terminalExpiresAt,
                   // A live pty-ws means the box is pty-capable for real.
-                  ptyCapable: true,
-                  reason: null
+                  ptyCapable: holder.terminalTransport ? true : prev.Terminal.ptyCapable,
+                  reason: holder.terminalTransport ? null : prev.Terminal.reason
                 } : prev.Terminal
               } : prev
             );
@@ -1090,6 +1169,8 @@ function useSessionCapabilities(sessionId, options = {}) {
                 setState("error");
                 setError(cause);
                 return;
+              } else {
+                throw cause;
               }
             } else {
               throw cause;
@@ -1097,7 +1178,7 @@ function useSessionCapabilities(sessionId, options = {}) {
           }
         }
         const warmUpRequested = wantDesktopAttach || wantTerminalAttach || wantFilesAttach;
-        if (caps.liveness === "warm" || caps.liveness === "draining" || localViewerId) {
+        if (sandboxAcceptsLiveIo(caps.liveness) || localViewerId) {
           setState("ready");
           startHeartbeat(caps);
         } else if (warmUpRequested) {
@@ -1180,76 +1261,6 @@ import {
 } from "@opengeni/sdk";
 import { useEffect as useEffect5, useRef as useRef4, useState as useState3 } from "react";
 
-// src/lib/relay-wire.ts
-import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-var STREAM_KIND_DESKTOP = 2;
-var STREAM_ROLE_CLIENT = 2;
-function encodeChannel(message, writer) {
-  if (message.channelId !== "") writer.uint32(10).string(message.channelId);
-  if (message.workspaceId !== "") writer.uint32(18).string(message.workspaceId);
-  if (message.agentId !== "") writer.uint32(26).string(message.agentId);
-  if (message.kind !== 0) writer.uint32(32).int32(message.kind);
-  if (message.port !== 0) writer.uint32(40).uint32(message.port);
-  return writer;
-}
-function encodeStreamOpen(message) {
-  const writer = new BinaryWriter();
-  encodeChannel(message.channel, writer.uint32(10).fork()).join();
-  if (message.token !== "") writer.uint32(18).string(message.token);
-  if (message.role !== 0) writer.uint32(24).int32(message.role);
-  if (message.resumeFromSeq !== "0") writer.uint32(32).uint64(message.resumeFromSeq);
-  return writer.finish();
-}
-function decodeAgentErrorMessage(reader, length) {
-  const end = reader.pos + length;
-  let message;
-  while (reader.pos < end) {
-    const tag = reader.uint32();
-    if (tag >>> 3 === 2 && tag === 18) {
-      message = reader.string();
-      continue;
-    }
-    if ((tag & 7) === 4 || tag === 0) break;
-    reader.skip(tag & 7);
-  }
-  return message !== void 0 ? { message } : {};
-}
-function decodeStreamOpenAck(bytes) {
-  const reader = new BinaryReader(bytes);
-  const end = reader.len;
-  let accepted = false;
-  let error;
-  while (reader.pos < end) {
-    const tag = reader.uint32();
-    if (tag >>> 3 === 1 && tag === 8) {
-      accepted = reader.bool();
-      continue;
-    }
-    if (tag >>> 3 === 2 && tag === 18) {
-      error = decodeAgentErrorMessage(reader, reader.uint32());
-      continue;
-    }
-    if ((tag & 7) === 4 || tag === 0) break;
-    reader.skip(tag & 7);
-  }
-  return error !== void 0 ? { accepted, error } : { accepted };
-}
-function decodeStreamFrame(bytes) {
-  const reader = new BinaryReader(bytes);
-  const end = reader.len;
-  let data = new Uint8Array(0);
-  while (reader.pos < end) {
-    const tag = reader.uint32();
-    if (tag >>> 3 === 3 && tag === 26) {
-      data = new Uint8Array(reader.bytes());
-      continue;
-    }
-    if ((tag & 7) === 4 || tag === 0) break;
-    reader.skip(tag & 7);
-  }
-  return { data };
-}
-
 // src/hooks/use-relay-frame-stream.ts
 import { useEffect as useEffect4, useRef as useRef3, useState as useState2 } from "react";
 var TAG_OPEN = 1;
@@ -1580,7 +1591,15 @@ import {
   ttydResizeFrame,
   TtydServerCommand
 } from "@opengeni/sdk";
-import { useEffect as useEffect6, useMemo as useMemo2, useRef as useRef5, useState as useState4 } from "react";
+import { useEffect as useEffect6, useMemo as useMemo3, useRef as useRef5, useState as useState4 } from "react";
+var MAX_PENDING_TERMINAL_INPUT_CODE_UNITS = 64 * 1024;
+var TERMINAL_CONNECT_EXPIRY_SKEW_MS = 5e3;
+function terminalStreamCredentialUsable(capability, nowMs = Date.now()) {
+  if (capability?.transport !== "pty-ws" || !capability.url) return false;
+  if (!capability.expiresAt) return true;
+  const expiresAt = Date.parse(capability.expiresAt);
+  return Number.isFinite(expiresAt) && expiresAt > nowMs + TERMINAL_CONNECT_EXPIRY_SKEW_MS;
+}
 function decodeFrame(data) {
   if (typeof data === "string") {
     return { command: data.charAt(0), payload: data.slice(1) };
@@ -1590,10 +1609,19 @@ function decodeFrame(data) {
   const payload = bytes.length > 1 ? new TextDecoder().decode(bytes.subarray(1)) : "";
   return { command, payload };
 }
+function closeSocket(socket) {
+  try {
+    socket?.close();
+  } catch {
+  }
+}
 function useTerminalStream(options) {
   const { capability, onOutput, onTitle, initialCols, initialRows } = options;
   const [status, setStatus] = useState4("closed");
   const wsRef = useRef5(null);
+  const pendingInputRef = useRef5("");
+  const socketFailedRef = useRef5(false);
+  const socketAuthenticatedRef = useRef5(false);
   const sizeRef = useRef5({
     cols: initialCols ?? 80,
     rows: initialRows ?? 24
@@ -1605,9 +1633,22 @@ function useTerminalStream(options) {
   const transport = capability?.transport ?? null;
   const url = capability?.url ?? null;
   const token = capability?.token ?? null;
+  const expiresAt = capability?.expiresAt ?? null;
   useEffect6(() => {
     if (typeof window === "undefined" || typeof WebSocket === "undefined") return;
-    if (transport !== "pty-ws" || !url) {
+    if (transport !== "pty-ws") {
+      pendingInputRef.current = "";
+      socketAuthenticatedRef.current = false;
+      setStatus("closed");
+      return;
+    }
+    socketFailedRef.current = false;
+    socketAuthenticatedRef.current = false;
+    if (!url) {
+      setStatus("closed");
+      return;
+    }
+    if (!terminalStreamCredentialUsable({ transport, url, expiresAt })) {
       setStatus("closed");
       return;
     }
@@ -1617,6 +1658,7 @@ function useTerminalStream(options) {
     try {
       socket = new WebSocket(terminalSocketUrl({ url }), TTYD_SUBPROTOCOL);
     } catch {
+      socketFailedRef.current = true;
       setStatus("error");
       return;
     }
@@ -1627,7 +1669,16 @@ function useTerminalStream(options) {
       try {
         socket.send(ttydAuthFrame({ columns: sizeRef.current.cols, rows: sizeRef.current.rows }));
         socket.send(ttydResizeFrame(sizeRef.current.cols, sizeRef.current.rows));
+        if (pendingInputRef.current.length > 0) {
+          socket.send(ttydInputFrame(pendingInputRef.current));
+          pendingInputRef.current = "";
+        }
+        socketAuthenticatedRef.current = true;
       } catch {
+        socketFailedRef.current = true;
+        setStatus("error");
+        closeSocket(socket);
+        return;
       }
       setStatus("open");
     };
@@ -1647,39 +1698,55 @@ function useTerminalStream(options) {
       }
     };
     socket.onerror = () => {
-      if (!disposed) setStatus("error");
+      if (!disposed) {
+        socketFailedRef.current = true;
+        setStatus("error");
+      }
     };
     socket.onclose = () => {
-      if (!disposed) setStatus("closed");
+      if (wsRef.current === socket) wsRef.current = null;
+      socketAuthenticatedRef.current = false;
+      if (!disposed) setStatus(socketFailedRef.current ? "error" : "closed");
     };
     return () => {
       disposed = true;
       wsRef.current = null;
+      socketAuthenticatedRef.current = false;
       socket.onopen = null;
       socket.onmessage = null;
       socket.onerror = null;
       socket.onclose = null;
-      try {
-        socket.close();
-      } catch {
-      }
+      closeSocket(socket);
     };
-  }, [transport, url, token]);
-  return useMemo2(() => {
+  }, [transport, url, token, expiresAt]);
+  return useMemo3(() => {
     const write = (data) => {
       const ws = wsRef.current;
-      if (ws && ws.readyState === WebSocket.OPEN) {
+      if (ws && ws.readyState === WebSocket.OPEN && socketAuthenticatedRef.current) {
         try {
           ws.send(ttydInputFrame(data));
         } catch {
+          socketFailedRef.current = true;
+          setStatus("error");
+          closeSocket(ws);
+        }
+      } else if (transport === "pty-ws" && !socketFailedRef.current) {
+        const nextSize = pendingInputRef.current.length + data.length;
+        if (nextSize > MAX_PENDING_TERMINAL_INPUT_CODE_UNITS) {
+          pendingInputRef.current = "";
+          socketFailedRef.current = true;
+          setStatus("error");
+          closeSocket(ws);
+          return;
         }
+        pendingInputRef.current += data;
       }
     };
     const resize = (cols, rows) => {
       if (cols <= 0 || rows <= 0) return;
       sizeRef.current = { cols, rows };
       const ws = wsRef.current;
-      if (ws && ws.readyState === WebSocket.OPEN) {
+      if (ws && ws.readyState === WebSocket.OPEN && socketAuthenticatedRef.current) {
         try {
           ws.send(ttydResizeFrame(cols, rows));
         } catch {
@@ -1689,20 +1756,19 @@ function useTerminalStream(options) {
     const disconnect = () => {
       const ws = wsRef.current;
       wsRef.current = null;
-      if (ws) {
-        try {
-          ws.close();
-        } catch {
-        }
-      }
+      pendingInputRef.current = "";
+      socketFailedRef.current = false;
+      socketAuthenticatedRef.current = false;
+      setStatus("closed");
+      closeSocket(ws);
     };
     return { connected: status === "open", status, write, resize, disconnect };
-  }, [status]);
+  }, [status, transport]);
 }
 
 // src/hooks/use-sandbox-terminal.ts
 import { OpenGeniApiError as OpenGeniApiError2 } from "@opengeni/sdk";
-import { useCallback as useCallback11, useEffect as useEffect7, useMemo as useMemo3, useRef as useRef6, useState as useState5 } from "react";
+import { useCallback as useCallback11, useEffect as useEffect7, useMemo as useMemo4, useRef as useRef6, useState as useState5 } from "react";
 function useSandboxTerminal(sessionId, options) {
   const { client, workspaceId } = useOpenGeni(options);
   const includeAgentFirehose = options.includeAgentFirehose ?? true;
@@ -1722,7 +1788,7 @@ function useSandboxTerminal(sessionId, options) {
     setOpenError(null);
   }, [identityKey]);
   const openInFlight = useRef6(false);
-  const boxWarm = liveness === void 0 || liveness === "warm" || liveness === "draining";
+  const boxWarm = liveness === void 0 || sandboxAcceptsLiveIo(liveness);
   useEffect7(() => {
     if (!interactive || !sessionId || ptyFilter || !boxWarm) {
       setOpenError(null);
@@ -1753,7 +1819,7 @@ function useSandboxTerminal(sessionId, options) {
       });
     };
   }, [interactive, client, workspaceId, sessionId, ptyFilter, boxWarm, reopenNonce]);
-  const { chunks, openPty, supportsInput } = useMemo3(() => {
+  const { chunks, openPty, supportsInput } = useMemo4(() => {
     const out = [];
     const open = /* @__PURE__ */ new Map();
     let lastOpened = null;
@@ -1806,7 +1872,7 @@ function useSandboxTerminal(sessionId, options) {
   const identityMatches = stateIdentity === identityKey;
   const activePtyId = identityMatches ? openedPtyId ?? openPty : null;
   const canWrite = openedPtyId !== null || supportsInput;
-  const write = useMemo3(() => {
+  const write = useMemo4(() => {
     if (!activePtyId || !canWrite || !sessionId) return null;
     const writeIdentity = identityKey;
     return (data) => {
@@ -1834,7 +1900,7 @@ function useSandboxTerminal(sessionId, options) {
 }
 
 // src/hooks/use-sandbox-files.ts
-import { useCallback as useCallback12, useEffect as useEffect8, useMemo as useMemo4, useRef as useRef7, useState as useState6 } from "react";
+import { useCallback as useCallback12, useEffect as useEffect8, useMemo as useMemo5, useRef as useRef7, useState as useState6 } from "react";
 var CapturedFileUnavailableError = class extends Error {
   constructor(path, reason) {
     super(
@@ -2068,9 +2134,13 @@ function useSandboxFiles(sessionId, options = {}) {
   const repoPathsKey = [
     ...new Set((options.repoPaths?.length ? options.repoPaths : [rootPath]).map(normalizeRoot))
   ].join("\0");
-  const repoPaths = useMemo4(() => repoPathsKey.split("\0"), [repoPathsKey]);
+  const repoPaths = useMemo5(() => repoPathsKey.split("\0"), [repoPathsKey]);
   const capture = options.capture ?? null;
-  const isLive2 = options.liveness === "warm" || options.liveness === "draining";
+  const isLive2 = sandboxAcceptsLiveIo(options.liveness);
+  const acceptsEventReads = options.liveness === void 0 || isLive2;
+  const acceptsEventReadsRef = useRef7(acceptsEventReads);
+  acceptsEventReadsRef.current = acceptsEventReads;
+  const hasLiveIoFence = options.liveness !== void 0;
   const identityKey = `${workspaceId}\0${sessionId ?? ""}\0${rootPath}\0${repoPathsKey}`;
   const [tree, setTree] = useState6([]);
   const treeRef = useRef7([]);
@@ -2087,6 +2157,7 @@ function useSandboxFiles(sessionId, options = {}) {
   const refreshGenerationRef = useRef7(0);
   const refreshAbortRef = useRef7(null);
   const identityAbortRef = useRef7(new AbortController());
+  const eventReadAbortRef = useRef7(new AbortController());
   const identityGenerationRef = useRef7(0);
   const lastSeqRef = useRef7(0);
   const pendingParentsRef = useRef7(/* @__PURE__ */ new Set());
@@ -2345,18 +2416,14 @@ function useSandboxFiles(sessionId, options = {}) {
     [client, workspaceId, sessionId, capture, source]
   );
   const reconcilePath = useCallback12(
-    async (path) => {
+    async (path, requestSignal) => {
       if (!sessionId) return;
       const identityGeneration = identityGenerationRef.current;
       const identitySignal = identityAbortRef.current.signal;
+      const signal = requestSignal ? AbortSignal.any([identitySignal, requestSignal]) : identitySignal;
       if (!parentIsLoaded(treeRef.current, path)) return;
       try {
-        const listed = await client.fsList(
-          workspaceId,
-          sessionId,
-          { path, depth: 1 },
-          { signal: identitySignal }
-        );
+        const listed = await client.fsList(workspaceId, sessionId, { path, depth: 1 }, { signal });
         if (identityGenerationRef.current !== identityGeneration) return;
         const children = (listed.root.children ?? []).map((node) => fsNodeToTree(node));
         if (path === "") setTree((prev) => applyStatus(mergeRootChildren(prev, children)));
@@ -2532,6 +2599,8 @@ function useSandboxFiles(sessionId, options = {}) {
     refreshAbortRef.current?.abort();
     refreshAbortRef.current = null;
     refreshGenerationRef.current += 1;
+    eventReadAbortRef.current.abort();
+    eventReadAbortRef.current = new AbortController();
     const identityChanged = previousIdentityRef.current !== identityKey;
     previousIdentityRef.current = identityKey;
     if (identityChanged || !enabled) {
@@ -2575,55 +2644,76 @@ function useSandboxFiles(sessionId, options = {}) {
       }
       return;
     }
-    if (isLive2 || !currentCapture) {
+    if (isLive2 || !hasLiveIoFence && !currentCapture) {
       void refresh();
     }
     return () => {
       refreshAbortRef.current?.abort();
       refreshAbortRef.current = null;
       refreshGenerationRef.current += 1;
+      eventReadAbortRef.current.abort();
     };
-  }, [enabled, active, isLive2, captureRevision, identityKey, refresh, seedFromCapture]);
-  const refreshGitOverlay = useCallback12(async () => {
-    if (!sessionId) return;
-    const identityGeneration = identityGenerationRef.current;
-    const identitySignal = identityAbortRef.current.signal;
-    setGitLoading(true);
-    try {
-      const batch = await client.gitReadBatch(
-        workspaceId,
-        sessionId,
-        { requests: repoPaths.map((root) => ({ status: { path: root } })) },
-        { signal: identitySignal }
-      );
-      const statuses = batch.results.map((result, index) => ({
-        root: repoPaths[index] ?? "",
-        status: result.status
-      }));
-      if (identityGenerationRef.current !== identityGeneration) return;
-      const overlay = /* @__PURE__ */ new Map();
-      for (const { root, status } of statuses) {
-        for (const file of status.files) {
-          const code = file.worktree ?? file.index;
-          const mapped = code ? GIT_STATUS_TO_TREE[code] : void 0;
-          if (mapped) overlay.set(qualifyStatusPath(root, file.path), mapped);
+  }, [
+    enabled,
+    active,
+    isLive2,
+    hasLiveIoFence,
+    captureRevision,
+    identityKey,
+    refresh,
+    seedFromCapture
+  ]);
+  const refreshGitOverlay = useCallback12(
+    async (requestSignal) => {
+      if (!sessionId) return;
+      const identityGeneration = identityGenerationRef.current;
+      const identitySignal = identityAbortRef.current.signal;
+      const signal = requestSignal ? AbortSignal.any([identitySignal, requestSignal]) : identitySignal;
+      setGitLoading(true);
+      try {
+        const batch = await client.gitReadBatch(
+          workspaceId,
+          sessionId,
+          { requests: repoPaths.map((root) => ({ status: { path: root } })) },
+          { signal }
+        );
+        const statuses = batch.results.map((result, index) => ({
+          root: repoPaths[index] ?? "",
+          status: result.status
+        }));
+        if (identityGenerationRef.current !== identityGeneration) return;
+        const overlay = /* @__PURE__ */ new Map();
+        for (const { root, status } of statuses) {
+          for (const file of status.files) {
+            const code = file.worktree ?? file.index;
+            const mapped = code ? GIT_STATUS_TO_TREE[code] : void 0;
+            if (mapped) overlay.set(qualifyStatusPath(root, file.path), mapped);
+          }
         }
+        statusRef.current = overlay;
+        setGitSummary(summarizeStatuses(statuses));
+        setTree((prev) => applyStatus(prev));
+      } catch {
+      } finally {
+        if (identityGenerationRef.current === identityGeneration) setGitLoading(false);
       }
-      statusRef.current = overlay;
-      setGitSummary(summarizeStatuses(statuses));
-      setTree((prev) => applyStatus(prev));
-    } catch {
-    } finally {
-      if (identityGenerationRef.current === identityGeneration) setGitLoading(false);
-    }
-  }, [client, workspaceId, sessionId, repoPaths, applyStatus]);
+    },
+    [client, workspaceId, sessionId, repoPaths, applyStatus]
+  );
   const events = options.events;
   useEffect8(() => {
     if (!enabled || !events) return;
-    if (!active) {
+    if (!active || !acceptsEventReads) {
       for (const event of events) {
         if (event.sequence > lastSeqRef.current) lastSeqRef.current = event.sequence;
       }
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+        debounceRef.current = null;
+      }
+      pendingParentsRef.current = /* @__PURE__ */ new Set();
+      pendingGitRef.current = false;
+      pendingAgentToolRef.current = false;
       return;
     }
     let sawNew = false;
@@ -2672,6 +2762,12 @@ function useSandboxFiles(sessionId, options = {}) {
     debounceRef.current = setTimeout(() => {
       debounceRef.current = null;
       if (identityGenerationRef.current !== identityGeneration) return;
+      if (!acceptsEventReadsRef.current) {
+        pendingParentsRef.current = /* @__PURE__ */ new Set();
+        pendingGitRef.current = false;
+        pendingAgentToolRef.current = false;
+        return;
+      }
       if (sawCommandDelta) {
         lastCommandRefreshAtRef.current = Date.now();
         setContentRevision((revision) => revision + 1);
@@ -2682,17 +2778,18 @@ function useSandboxFiles(sessionId, options = {}) {
       pendingGitRef.current = false;
       const wantAgentTool = pendingAgentToolRef.current;
       pendingAgentToolRef.current = false;
+      const eventReadSignal = eventReadAbortRef.current.signal;
       void (async () => {
         const paths = wantAgentTool ? loadedDirectoryPaths(treeRef.current) : [...parents];
         await Promise.all([
-          wantGit ? refreshGitOverlay() : Promise.resolve(),
-          Promise.all(paths.map((path) => reconcilePath(path)))
+          wantGit ? refreshGitOverlay(eventReadSignal) : Promise.resolve(),
+          Promise.all(paths.map((path) => reconcilePath(path, eventReadSignal)))
         ]);
       })();
     }, delay);
-  }, [enabled, active, events, reconcilePath, refreshGitOverlay]);
+  }, [enabled, active, acceptsEventReads, events, reconcilePath, refreshGitOverlay]);
   useEffect8(() => {
-    if (active) return;
+    if (active && acceptsEventReads) return;
     if (debounceRef.current) {
       clearTimeout(debounceRef.current);
       debounceRef.current = null;
@@ -2700,11 +2797,12 @@ function useSandboxFiles(sessionId, options = {}) {
     pendingParentsRef.current = /* @__PURE__ */ new Set();
     pendingGitRef.current = false;
     pendingAgentToolRef.current = false;
-  }, [active]);
+  }, [active, acceptsEventReads]);
   useEffect8(
     () => () => {
       refreshAbortRef.current?.abort();
       identityAbortRef.current.abort();
+      eventReadAbortRef.current.abort();
       identityGenerationRef.current += 1;
       if (debounceRef.current) clearTimeout(debounceRef.current);
     },
@@ -2733,7 +2831,7 @@ function useSandboxFiles(sessionId, options = {}) {
 }
 
 // src/hooks/use-sandbox-git.ts
-import { useCallback as useCallback13, useEffect as useEffect9, useMemo as useMemo5, useRef as useRef8, useState as useState7 } from "react";
+import { useCallback as useCallback13, useEffect as useEffect9, useMemo as useMemo6, useRef as useRef8, useState as useState7 } from "react";
 function normalizeRoot2(root) {
   const normalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "").replace(/\/+$/, "");
   return normalized === "." ? "" : normalized;
@@ -2754,6 +2852,7 @@ function qualifyDiff(repoRoot, file) {
 function uniqueRoots(roots) {
   return [...new Set(roots.map(normalizeRoot2))].sort((a, b) => a.localeCompare(b));
 }
+var GIT_READ_BATCH_REQUEST_LIMIT = 32;
 function repoForPath(manifest, repoPath) {
   const want = normalizeRoot2(repoPath);
   const exact = manifest.repos.find((r) => normalizeRoot2(r.root) === want);
@@ -2798,11 +2897,15 @@ function useSandboxGit(sessionId, options = {}) {
   const repoPathsKey = uniqueRoots(
     options.repoPaths && options.repoPaths.length > 0 ? options.repoPaths : [repoPath]
   ).join("\0");
-  const repoPaths = useMemo5(() => repoPathsKey.split("\0"), [repoPathsKey]);
+  const repoPaths = useMemo6(() => repoPathsKey.split("\0"), [repoPathsKey]);
   const comparison = options.comparison ?? (options.staged ? "staged" : "working");
   const hasAdvertisedRepoPaths = (options.repoPaths?.length ?? 0) > 0;
   const capture = comparison === "staged" ? null : options.capture ?? null;
-  const isLive2 = options.liveness === "warm" || options.liveness === "draining";
+  const isLive2 = sandboxAcceptsLiveIo(options.liveness);
+  const acceptsEventReads = options.liveness === void 0 || isLive2;
+  const acceptsEventReadsRef = useRef8(acceptsEventReads);
+  acceptsEventReadsRef.current = acceptsEventReads;
+  const hasLiveIoFence = options.liveness !== void 0;
   const identityKey = `${workspaceId}\0${sessionId ?? ""}\0${repoPathsKey}\0${workspaceWide}\0${comparison}`;
   const [diff, setDiff] = useState7([]);
   const [branch, setBranch] = useState7(null);
@@ -2837,29 +2940,42 @@ function useSandboxGit(sessionId, options = {}) {
         },
         { signal: refreshAbort.signal }
       );
-      const prefetched = hasAdvertisedRepoPaths ? await client.gitReadBatch(
-        workspaceId,
-        sessionId,
-        {
-          requests: repoPaths.map((root) => ({
-            status: { path: root },
-            diff: {
-              path: root,
-              ...comparison === "branch" ? { fromRef: "origin/HEAD", includeUntracked: true } : comparison === "working" ? { fromRef: "HEAD", includeUntracked: true } : { staged: true, includeUntracked: false }
-            }
-          }))
-        },
-        { signal: refreshAbort.signal }
-      ).then(
-        (batch) => batch.results.map((item, index) => ({
-          root: repoPaths[index] ?? "",
-          status: item.status,
-          result: item.diff ?? {
-            files: [],
-            revision: item.status.revision
+      const prefetched = hasAdvertisedRepoPaths ? await (async () => {
+        const prefetchedRepos = [];
+        for (let offset = 0; offset < repoPaths.length; offset += GIT_READ_BATCH_REQUEST_LIMIT) {
+          const roots2 = repoPaths.slice(offset, offset + GIT_READ_BATCH_REQUEST_LIMIT);
+          const batch = await client.gitReadBatch(
+            workspaceId,
+            sessionId,
+            {
+              requests: roots2.map((root) => ({
+                status: { path: root },
+                diff: {
+                  path: root,
+                  ...comparison === "branch" ? { fromRef: "origin/HEAD", includeUntracked: true } : comparison === "working" ? { fromRef: "HEAD", includeUntracked: true } : { staged: true, includeUntracked: false }
+                }
+              }))
+            },
+            { signal: refreshAbort.signal }
+          );
+          if (batch.results.length !== roots2.length) {
+            throw new Error(
+              `Workspace Git batch returned ${batch.results.length} results for ${roots2.length} repositories.`
+            );
           }
-        }))
-      ) : null;
+          batch.results.forEach((item, index) => {
+            prefetchedRepos.push({
+              root: roots2[index],
+              status: item.status,
+              result: item.diff ?? {
+                files: [],
+                revision: item.status.revision
+              }
+            });
+          });
+        }
+        return prefetchedRepos;
+      })() : null;
       const statuses = prefetched ?? await Promise.all(
         repoPaths.map(async (root) => ({
           root,
@@ -2991,7 +3107,7 @@ function useSandboxGit(sessionId, options = {}) {
       if (!active) setLoading(false);
       return;
     }
-    if (isLive2 || !currentCapture) {
+    if (isLive2 || !hasLiveIoFence && !currentCapture) {
       void refresh();
     }
     return () => {
@@ -2999,10 +3115,29 @@ function useSandboxGit(sessionId, options = {}) {
       refreshAbortRef.current = null;
       refreshGenerationRef.current += 1;
     };
-  }, [enabled, active, isLive2, captureRevision, identityKey, refresh, seedFromCapture]);
+  }, [
+    enabled,
+    active,
+    isLive2,
+    hasLiveIoFence,
+    captureRevision,
+    identityKey,
+    refresh,
+    seedFromCapture
+  ]);
   const events = options.events;
   useEffect9(() => {
-    if (!enabled || !active || !events) {
+    if (!enabled || !events) {
+      if (commandRefreshTimerRef.current) {
+        clearTimeout(commandRefreshTimerRef.current);
+        commandRefreshTimerRef.current = null;
+      }
+      return;
+    }
+    if (!active || !acceptsEventReads) {
+      for (const event of events) {
+        if (event.sequence > lastChangeRef.current) lastChangeRef.current = event.sequence;
+      }
       if (commandRefreshTimerRef.current) {
         clearTimeout(commandRefreshTimerRef.current);
         commandRefreshTimerRef.current = null;
@@ -3027,15 +3162,15 @@ function useSandboxGit(sessionId, options = {}) {
       if (immediate) {
         if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
         commandRefreshTimerRef.current = null;
-        void refresh();
+        if (acceptsEventReadsRef.current) void refresh();
       } else if (commandDelta && !commandRefreshTimerRef.current) {
         commandRefreshTimerRef.current = setTimeout(() => {
           commandRefreshTimerRef.current = null;
-          void refresh();
+          if (acceptsEventReadsRef.current) void refresh();
         }, 1e3);
       }
     }
-  }, [enabled, active, events, refresh]);
+  }, [enabled, active, acceptsEventReads, events, refresh]);
   useEffect9(
     () => () => {
       if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
@@ -3258,7 +3393,7 @@ function useWorkspaceCapture(sessionId, options = {}) {
 // src/hooks/use-workspace-edit.ts
 import { useCallback as useCallback15, useEffect as useEffect11, useRef as useRef10, useState as useState9 } from "react";
 function isLive(liveness) {
-  return liveness === "warm" || liveness === "draining";
+  return sandboxAcceptsLiveIo(liveness);
 }
 function useWorkspaceEdit(sessionId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
@@ -3415,7 +3550,7 @@ function useWorkspaceEdit(sessionId, options = {}) {
 }
 
 // src/hooks/use-machine-chip.ts
-import { useMemo as useMemo6 } from "react";
+import { useMemo as useMemo7 } from "react";
 function formatAsOf(capturedAt, now) {
   const then = Date.parse(capturedAt);
   if (Number.isNaN(then)) return "recently";
@@ -3432,7 +3567,7 @@ function deriveMachineChip(input) {
   const now = input.now ?? Date.now();
   const asOf = input.capturedAt ?? null;
   const offlineLabel = asOf ? `Offline \u2014 as of ${formatAsOf(asOf, now)}` : "Offline";
-  if (input.liveness === "warm" || input.liveness === "draining") {
+  if (sandboxAcceptsLiveIo(input.liveness)) {
     return { state: "live", label: "Live", asOf: null };
   }
   const selfhostedOffline = input.activeIsSelfhosted === true && input.activeMachineState === "offline";
@@ -3452,7 +3587,7 @@ function useMachineChip(input) {
     capturedAt,
     now
   } = input;
-  return useMemo6(
+  return useMemo7(
     () => deriveMachineChip({
       liveness,
       capabilitiesState,
@@ -3679,6 +3814,17 @@ function ChatComposer({
         /* @__PURE__ */ jsx2(RestoredResources, {}),
         /* @__PURE__ */ jsx2(Attachments, {}),
         header,
+        composer.annotations && composer.annotations.length > 0 ? /* @__PURE__ */ jsx2("div", { className: "px-3 pt-2 sm:px-4", children: /* @__PURE__ */ jsx2(
+          TimelineAnnotationsChip,
+          {
+            annotations: composer.annotations,
+            editable: true,
+            focusAnnotationId: composer.annotationReviewTargetId,
+            onFocusConsumed: composer.clearAnnotationReviewTarget,
+            onUpdate: composer.updateAnnotation,
+            onRemove: composer.removeAnnotation
+          }
+        ) }) : null,
         /* @__PURE__ */ jsx2(Input, { placeholder, autoFocus }),
         controller.confirmState ? /* @__PURE__ */ jsx2(Confirmation, {}) : /* @__PURE__ */ jsx2(
           Footer,
@@ -3964,6 +4110,19 @@ async function attachRenderer(prefer, loaders, onTier) {
 
 // src/components/sandbox-terminal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+function terminalSurfaceState(input) {
+  if (!input.ready) return "loading";
+  if (input.acceptsInput) return "interactive";
+  if (input.inputPending) return "connecting";
+  if (input.ptyStatus === "connecting") return "connecting";
+  if (input.ptyStatus === "error") return "error";
+  if (input.booting) return "waking";
+  return "output-only";
+}
+function subscribeTerminalInput(term, sink, enabled) {
+  if (!enabled || !term || !sink) return null;
+  return term.onData(sink);
+}
 function clearTerminalBootStatus(term) {
   term.write("\r\x1B[2K\x1B[2J\x1B[H");
 }
@@ -3999,31 +4158,49 @@ function SandboxTerminal({
   const wroteFirehoseRef = useRef12(false);
   const bootActiveRef = useRef12(false);
   const [ready, setReady] = useState11(false);
+  const [inputReady, setInputReady] = useState11(false);
   const [activated, setActivated] = useState11(false);
-  const ptyWs = terminalCapability?.transport === "pty-ws" && Boolean(terminalCapability?.url);
-  const ptyOutputQueueRef = useRef12([]);
+  const ptyDescriptor = terminalCapability?.transport === "pty-ws";
+  const ptyAttachable = terminalCanAcquirePty(terminalCapability);
   const {
     status: ptyStatus,
     write: ptyWrite,
     resize: resizePty,
     connected: ptyConnected
   } = useTerminalStream({
-    capability: ptyWs ? {
-      transport: terminalCapability.transport,
-      url: terminalCapability.url,
-      token: terminalCapability.token
+    // Connect only after xterm exists. This makes the renderer the sole output
+    // owner from the first websocket frame and removes an otherwise unbounded
+    // pre-mount output queue during large command bursts.
+    capability: ptyAttachable && ready ? {
+      transport: "pty-ws",
+      url: ptyDescriptor ? terminalCapability.url : null,
+      token: ptyDescriptor ? terminalCapability.token : null,
+      expiresAt: ptyDescriptor ? terminalCapability.expiresAt : null
     } : null,
     onOutput: (data) => {
-      const term = termRef.current;
-      if (term) term.write(data);
-      else ptyOutputQueueRef.current.push(data);
+      termRef.current?.write(data);
     }
   });
-  const ptyMode = ptyWs && ptyStatus !== "closed";
-  const interactive = !readOnly && (ptyMode ? ptyConnected : result.write !== null);
-  const terminalModeLabel = interactive ? null : readOnly ? "read-only" : ptyMode && ptyStatus === "connecting" ? "connecting" : ptyMode && ptyStatus === "error" ? "connection error" : "output only";
-  const warm = liveness === "warm" || liveness === "draining";
+  const ptyMode = ptyDescriptor;
+  const ptyCapturesInput = ptyAttachable && ptyStatus !== "error";
+  const interactive = !readOnly && (ptyAttachable ? ptyCapturesInput : result.write !== null);
+  const acceptsInput = inputReady && (!ptyAttachable || ptyConnected);
+  const inputPending = inputReady && ptyAttachable && !ptyConnected && activated;
+  let terminalModeLabel;
+  if (readOnly) terminalModeLabel = "read-only";
+  else if (!ptyAttachable) terminalModeLabel = acceptsInput ? null : "output only";
+  else if (ptyStatus === "error") terminalModeLabel = "connection error";
+  else if (acceptsInput) terminalModeLabel = null;
+  else terminalModeLabel = activated ? "connecting" : "connect on input";
+  const warm = sandboxAcceptsLiveIo(liveness);
   const booting = activated && !ptyMode && !warm && liveness !== null && liveness !== void 0 && result.chunks.length === 0;
+  const surfaceState = terminalSurfaceState({
+    ready,
+    acceptsInput,
+    inputPending,
+    ptyStatus,
+    booting
+  });
   function handleActivate() {
     if (!activated) setActivated(true);
     onActivate?.();
@@ -4110,10 +4287,6 @@ function SandboxTerminal({
       requestAnimationFrame(() => {
         if (disposed) return;
         settle();
-        if (ptyOutputQueueRef.current.length > 0) {
-          for (const data of ptyOutputQueueRef.current) term.write(data);
-          ptyOutputQueueRef.current = [];
-        }
         el.setAttribute("data-og-term-ready", "true");
         if (typeof globalThis.__OG_TERMINAL_DEBUG__ === "function") {
           globalThis.__OG_TERMINAL_DEBUG__({
@@ -4185,12 +4358,19 @@ function SandboxTerminal({
   }, [ready, result.chunks, ptyMode]);
   useEffect13(() => {
     const term = termRef.current;
-    if (!ready || !term || !interactive) return;
-    const sink = ptyMode ? ptyWrite : result.write;
-    if (!sink) return;
-    const sub = term.onData((data) => sink(data));
-    return () => sub.dispose();
-  }, [ready, interactive, ptyMode, ptyWrite, result.write]);
+    if (!ready || !term || !interactive) {
+      setInputReady(false);
+      return;
+    }
+    const sink = ptyAttachable ? ptyWrite : result.write;
+    if (!sink) {
+      setInputReady(false);
+      return;
+    }
+    const sub = subscribeTerminalInput(term, sink, true);
+    setInputReady(sub !== null);
+    return () => sub?.dispose();
+  }, [ready, interactive, ptyAttachable, ptyWrite, result.write]);
   useEffect13(() => {
     const term = termRef.current;
     if (!ready || !term || !ptyMode) return;
@@ -4273,7 +4453,11 @@ function SandboxTerminal({
               ref: containerRef,
               className: "h-full w-full",
               style: { visibility: ready ? "visible" : "hidden" },
-              "data-opengeni-terminal": true
+              "data-opengeni-terminal": true,
+              "data-opengeni-terminal-ready": ready ? "true" : "false",
+              "data-opengeni-terminal-interactive": surfaceState === "interactive" ? "true" : "false",
+              "data-opengeni-terminal-state": surfaceState,
+              "data-opengeni-terminal-status": ptyAttachable ? ptyStatus : "firehose"
             }
           )
         ]
@@ -4343,7 +4527,7 @@ import {
   useEffect as useEffect15,
   useId as useId2,
   useLayoutEffect,
-  useMemo as useMemo8,
+  useMemo as useMemo9,
   useRef as useRef13,
   useState as useState12
 } from "react";
@@ -4351,11 +4535,11 @@ import { AlertDialog } from "radix-ui";
 import { VList } from "virtua";
 
 // src/lib/use-unicode-fonts.ts
-import { useEffect as useEffect14, useMemo as useMemo7 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo8 } from "react";
 var japaneseScript = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff]/u;
 var arabicScript = /[\u0600-\u06ff\u0750-\u077f\u0870-\u08ff\ufb50-\ufdff\ufe70-\ufefc]/u;
 function useUnicodeFallbackFonts(values) {
-  const content = useMemo7(() => collectUnicodeContent(values), [values]);
+  const content = useMemo8(() => collectUnicodeContent(values), [values]);
   useEffect14(() => {
     if (content.japanese) {
       void import("./noto-sans-jp-loader.generated-HFGLYBR3.js").then(({ loadNotoSansJp }) => loadNotoSansJp(content.japanese)).catch(() => void 0);
@@ -4502,7 +4686,7 @@ function FileBrowser({
     [expanded, expand]
   );
   const cold = result.source !== "live";
-  const renderItems = useMemo8(() => {
+  const renderItems = useMemo9(() => {
     const items = [];
     if (draftCreate && draftCreate.parent === "") {
       items.push({ type: "create", parent: "", kind: draftCreate.kind, depth: 0 });
@@ -4533,22 +4717,22 @@ function FileBrowser({
     walk(result.tree, 0);
     return items;
   }, [result.tree, expanded, draftCreate, loadingPaths, result.expandingPaths, cold]);
-  const unicodeFontPaths = useMemo8(
+  const unicodeFontPaths = useMemo9(
     () => renderItems.flatMap((item) => item.type === "node" ? [item.node.path] : []),
     [renderItems]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const flatRows = useMemo8(
+  const flatRows = useMemo9(
     () => renderItems.flatMap(
       (item) => item.type === "node" ? [{ node: item.node, depth: item.depth }] : []
     ),
     [renderItems]
   );
-  const rowIndexByPath = useMemo8(
+  const rowIndexByPath = useMemo9(
     () => new Map(flatRows.map((row, index) => [row.node.path, index])),
     [flatRows]
   );
-  const treePositionByPath = useMemo8(() => {
+  const treePositionByPath = useMemo9(() => {
     const positions = /* @__PURE__ */ new Map();
     const visit = (nodes) => {
       nodes.forEach((node, index) => {
@@ -5489,18 +5673,19 @@ function ContextMenu({
 // src/components/workbench-changes.tsx
 import { ArrowUpRightIcon, FileWarningIcon, HistoryIcon } from "lucide-react";
 import {
+  Component,
   useCallback as useCallback18,
   useEffect as useEffect17,
   useId as useId3,
   useLayoutEffect as useLayoutEffect2,
-  useMemo as useMemo10,
+  useMemo as useMemo11,
   useRef as useRef15,
   useState as useState14
 } from "react";
 import { VList as VList2 } from "virtua";
 
 // src/hooks/use-windowed-sections.ts
-import { useCallback as useCallback17, useEffect as useEffect16, useMemo as useMemo9, useRef as useRef14, useState as useState13 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect16, useMemo as useMemo10, useRef as useRef14, useState as useState13 } from "react";
 function computeWindowRange(heights, scrollTop, viewport, overscan) {
   const n = heights.length;
   if (n === 0) return { start: 0, end: 0 };
@@ -5583,7 +5768,7 @@ function useWindowedSections(opts) {
       return next;
     });
   }, []);
-  const offsets = useMemo9(() => {
+  const offsets = useMemo10(() => {
     const out = new Array(count + 1);
     out[0] = 0;
     for (let i = 0; i < count; i++) out[i + 1] = (out[i] ?? 0) + Math.max(heights[i] ?? 0, 0);
@@ -5648,6 +5833,101 @@ function compactFileLabel(file) {
   const parent = slash >= 0 ? file.path.slice(0, slash + 1) : "";
   return `${STATUS_LETTER[file.status]} \xB7 ${basename}${parent ? ` \u2014 ${parent}` : ""}`;
 }
+var ChangesRailVList = class extends Component {
+  state = {
+    renderedRowCount: this.props.rowCount,
+    resetVersion: 0
+  };
+  host = null;
+  listHandle = null;
+  pendingFocusedPath = null;
+  restoreFrame = null;
+  static getDerivedStateFromProps(props, state) {
+    if (props.rowCount === state.renderedRowCount) return null;
+    return {
+      renderedRowCount: props.rowCount,
+      resetVersion: props.rowCount < state.renderedRowCount ? state.resetVersion + 1 : state.resetVersion
+    };
+  }
+  getSnapshotBeforeUpdate(_previousProps, previousState) {
+    if (previousState.resetVersion === this.state.resetVersion) return null;
+    const scroller = this.host?.firstElementChild;
+    if (!(scroller instanceof HTMLElement)) return null;
+    const active = document.activeElement;
+    const focusedRow = active instanceof HTMLElement && scroller.contains(active) ? active.closest("[data-rail-file-path]") : null;
+    return {
+      focusedPath: focusedRow?.dataset.railFilePath ?? this.pendingFocusedPath,
+      scrollOffset: scroller.scrollTop
+    };
+  }
+  componentDidUpdate(_previousProps, _previousState, snapshot) {
+    if (!snapshot || !this.listHandle) return;
+    this.cancelRestoreFrame();
+    const maxOffset = Math.max(0, this.listHandle.scrollSize - this.listHandle.viewportSize);
+    this.listHandle.scrollTo(Math.min(Math.max(snapshot.scrollOffset, 0), maxOffset));
+    const focusedPath = snapshot.focusedPath;
+    if (!focusedPath) return;
+    this.pendingFocusedPath = focusedPath;
+    this.continueFocusRestore();
+  }
+  componentWillUnmount() {
+    this.cancelRestoreFrame();
+    this.pendingFocusedPath = null;
+  }
+  cancelRestoreFrame() {
+    if (this.restoreFrame === null) return;
+    if (typeof cancelAnimationFrame === "function") cancelAnimationFrame(this.restoreFrame);
+    this.restoreFrame = null;
+  }
+  continueFocusRestore = () => {
+    const path = this.pendingFocusedPath;
+    if (!path) return;
+    if (this.restoreFocusedPath(path)) {
+      this.pendingFocusedPath = null;
+      return;
+    }
+    if (this.restoreFrame === null && typeof requestAnimationFrame === "function") {
+      this.restoreFrame = requestAnimationFrame(() => {
+        this.restoreFrame = null;
+        this.continueFocusRestore();
+      });
+    }
+  };
+  restoreFocusedPath(path) {
+    const host = this.host;
+    if (!host) return true;
+    const active = document.activeElement;
+    if (active instanceof HTMLElement && active.isConnected && active !== document.body) {
+      return true;
+    }
+    if (!this.props.files.some((file) => file.path === path)) return true;
+    const row = Array.from(host.querySelectorAll("[data-rail-file-path]")).find(
+      (candidate) => candidate.dataset.railFilePath === path
+    );
+    if (!row) return false;
+    row.focus({ preventScroll: true });
+    return true;
+  }
+  setHost = (host) => {
+    this.host = host;
+  };
+  setListHandle = (handle) => {
+    this.listHandle = handle;
+  };
+  render() {
+    return /* @__PURE__ */ jsx6("div", { ref: this.setHost, "data-opengeni-changes-rail": true, className: this.props.className, children: /* @__PURE__ */ jsx6(
+      VList2,
+      {
+        ref: this.setListHandle,
+        className: "h-full",
+        itemSize: this.props.coarsePointer ? 44 : 28,
+        ssrCount: Math.min(30, this.props.rowCount),
+        children: this.props.children
+      },
+      this.state.resetVersion
+    ) });
+  }
+};
 function buildRail(files) {
   const roots = new Set(
     files.flatMap((file) => file.repoRoot === void 0 ? [] : [file.repoRoot])
@@ -5706,12 +5986,12 @@ function WorkbenchChanges({
   const [layout, setLayout] = useState14("unified");
   const [activePath, setActivePath] = useState14(null);
   const pickerId = useId3();
-  const unicodeFontPaths = useMemo10(
+  const unicodeFontPaths = useMemo11(
     () => diff.flatMap((file) => file.oldPath ? [file.path, file.oldPath] : [file.path]),
     [diff]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const { orderedFiles, rows, grouped } = useMemo10(() => buildRail(diff), [diff]);
+  const { orderedFiles, rows, grouped } = useMemo11(() => buildRail(diff), [diff]);
   const selectedIndex = orderedFiles.findIndex((file) => file.path === activePath);
   const activeIndex = selectedIndex >= 0 ? selectedIndex : 0;
   useChangesLayoutEffect(() => {
@@ -5741,8 +6021,8 @@ function WorkbenchChanges({
       return () => query.removeListener(update);
     }
   }, []);
-  const additions = useMemo10(() => diff.reduce((sum, f) => sum + f.additions, 0), [diff]);
-  const deletions = useMemo10(() => diff.reduce((sum, f) => sum + f.deletions, 0), [diff]);
+  const additions = useMemo11(() => diff.reduce((sum, f) => sum + f.additions, 0), [diff]);
+  const deletions = useMemo11(() => diff.reduce((sum, f) => sum + f.deletions, 0), [diff]);
   const estimateHeight = useCallback18(
     (index) => {
       const file = orderedFiles[index];
@@ -5860,22 +6140,33 @@ function WorkbenchChanges({
               }
             )
           ] }),
-          /* @__PURE__ */ jsx6("div", { className: "min-h-0 min-w-0 flex-1 overflow-auto", "data-opengeni-changes-pane": true, children: activeFile ? /* @__PURE__ */ jsx6(
-            DiffSection,
+          /* @__PURE__ */ jsx6(
+            "div",
             {
-              file: activeFile,
-              layout: "unified",
-              themeType: resolvedTheme,
-              ...onOpenFile ? { onOpenFile } : {}
+              "aria-label": "Changed file diff",
+              className: "min-h-0 min-w-0 flex-1 overflow-auto outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
+              "data-opengeni-changes-pane": true,
+              role: "region",
+              tabIndex: 0,
+              children: activeFile ? /* @__PURE__ */ jsx6(
+                DiffSection,
+                {
+                  file: activeFile,
+                  layout: "unified",
+                  themeType: resolvedTheme,
+                  ...onOpenFile ? { onOpenFile } : {}
+                }
+              ) : null
             }
-          ) : null })
+          )
         ] }) : /* @__PURE__ */ jsxs6("div", { className: "flex min-h-0 flex-1", children: [
-          /* @__PURE__ */ jsx6("div", { className: "w-[clamp(12rem,28%,15rem)] shrink-0 border-r border-og-border bg-og-surface-1/35", children: /* @__PURE__ */ jsx6(
-            VList2,
+          /* @__PURE__ */ jsx6(
+            ChangesRailVList,
             {
-              className: "h-full",
-              itemSize: coarsePointer ? 44 : 28,
-              ssrCount: Math.min(30, rows.length),
+              rowCount: rows.length,
+              coarsePointer,
+              files: orderedFiles,
+              className: "w-[clamp(12rem,28%,15rem)] shrink-0 border-r border-og-border bg-og-surface-1/35",
               children: rows.map(
                 (row) => row.kind === "group" ? /* @__PURE__ */ jsxs6(
                   "div",
@@ -5900,13 +6191,16 @@ function WorkbenchChanges({
                 )
               )
             }
-          ) }),
+          ),
           /* @__PURE__ */ jsx6(
             "div",
             {
               ref: windowed.scrollRef,
-              className: "min-h-0 min-w-0 flex-1 overflow-auto",
+              "aria-label": "Changed files diff",
+              className: "min-h-0 min-w-0 flex-1 overflow-auto outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
               "data-opengeni-changes-pane": true,
+              role: "region",
+              tabIndex: 0,
               children: /* @__PURE__ */ jsx6("div", { style: { position: "relative", height: windowed.totalHeight }, children: orderedFiles.map((file, index) => {
                 if (index < windowed.range.start || index >= windowed.range.end) return null;
                 return /* @__PURE__ */ jsx6(
@@ -5975,6 +6269,7 @@ function RailFileRow({
       onClick,
       title: file.path,
       "data-rail-file": true,
+      "data-rail-file-path": file.path,
       className: cn(
         "relative flex min-h-7 w-full items-center gap-1.5 truncate px-2 py-0.5 text-left text-og-sm transition-colors hover:bg-og-surface-2 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent pointer-coarse:min-h-11",
         grouped && "pl-3",
@@ -6212,7 +6507,7 @@ import { Loader2Icon, SaveIcon } from "lucide-react";
 import {
   useCallback as useCallback19,
   useEffect as useEffect19,
-  useMemo as useMemo11,
+  useMemo as useMemo12,
   useRef as useRef16,
   useState as useState16
 } from "react";
@@ -6260,6 +6555,19 @@ function languageForPath(path) {
       return null;
   }
 }
+function reconcileEditorBuffer(current, incoming) {
+  if (current.path === incoming.path && current.value !== current.baseline) {
+    return current;
+  }
+  if (current.path === incoming.path && current.value === incoming.contents && current.baseline === incoming.contents) {
+    return current;
+  }
+  return {
+    path: incoming.path,
+    value: incoming.contents,
+    baseline: incoming.contents
+  };
+}
 function CodeEditor({
   path,
   initialContents,
@@ -6275,28 +6583,30 @@ function CodeEditor({
 }) {
   const [failed, setFailed] = useState16(false);
   const [bundle, setBundle] = useState16(null);
-  const [value, setValue] = useState16(initialContents);
-  const [baseline, setBaseline] = useState16(initialContents);
+  const [buffer, setBuffer] = useState16(() => ({
+    path,
+    value: initialContents,
+    baseline: initialContents
+  }));
+  const { value, baseline } = buffer;
   const [saving, setSaving] = useState16(false);
   const [saveError, setSaveError] = useState16(null);
   const [savedTick, setSavedTick] = useState16(false);
+  const saveInFlightRef = useRef16(false);
   const dirty = value !== baseline;
   const saveConflict = saveError !== null && saveError.code === "file_write_conflict";
   const editIntentFiredRef = useRef16(false);
-  const lastSeed = useRef16({ path, contents: initialContents });
   useEffect19(() => {
-    const seedChanged = lastSeed.current.path !== path || lastSeed.current.contents !== initialContents;
-    if (!seedChanged) return;
-    lastSeed.current = { path, contents: initialContents };
+    setBuffer((current) => reconcileEditorBuffer(current, { path, contents: initialContents }));
+  }, [path, initialContents]);
+  useEffect19(() => {
     editIntentFiredRef.current = false;
-    setValue(initialContents);
-    setBaseline(initialContents);
     setSaveError(null);
     setSavedTick(false);
-  }, [path, initialContents]);
+  }, [path]);
   const noteEdit = useCallback19(
     (next) => {
-      setValue(next);
+      setBuffer((current) => ({ ...current, value: next }));
       setSavedTick(false);
       if (!editIntentFiredRef.current && next !== baseline) {
         editIntentFiredRef.current = true;
@@ -6305,7 +6615,7 @@ function CodeEditor({
     },
     [baseline, onEditIntent]
   );
-  const langKey = useMemo11(() => languageForPath(path), [path]);
+  const langKey = useMemo12(() => languageForPath(path), [path]);
   useEffect19(() => {
     let cancelled = false;
     void (async () => {
@@ -6349,38 +6659,44 @@ function CodeEditor({
   const saveRef = useRef16(() => {
   });
   const save = useCallback19(async () => {
-    if (readOnly) return;
+    if (readOnly || saveInFlightRef.current) return;
     const snapshot = value;
     if (snapshot === baseline) return;
+    saveInFlightRef.current = true;
     setSaving(true);
     setSaveError(null);
     setSavedTick(false);
     try {
-      await onSave(snapshot);
-      setBaseline(snapshot);
-      lastSeed.current = { path, contents: snapshot };
+      await onSave(snapshot, baseline);
+      setBuffer(
+        (current) => current.path === path ? { ...current, baseline: snapshot } : current
+      );
       setSavedTick(true);
     } catch (cause) {
       setSaveError(cause instanceof Error ? cause : new Error(String(cause)));
     } finally {
+      saveInFlightRef.current = false;
       setSaving(false);
     }
   }, [readOnly, value, baseline, onSave, path]);
   const overwrite = useCallback19(async () => {
-    if (readOnly || !onOverwrite) return;
+    if (readOnly || !onOverwrite || saveInFlightRef.current) return;
     const snapshot = value;
     if (snapshot === baseline) return;
+    saveInFlightRef.current = true;
     setSaving(true);
     setSaveError(null);
     setSavedTick(false);
     try {
       await onOverwrite(snapshot);
-      setBaseline(snapshot);
-      lastSeed.current = { path, contents: snapshot };
+      setBuffer(
+        (current) => current.path === path ? { ...current, baseline: snapshot } : current
+      );
       setSavedTick(true);
     } catch (cause) {
       setSaveError(cause instanceof Error ? cause : new Error(String(cause)));
     } finally {
+      saveInFlightRef.current = false;
       setSaving(false);
     }
   }, [readOnly, onOverwrite, value, baseline, path]);
@@ -6393,18 +6709,26 @@ function CodeEditor({
     return () => clearTimeout(t);
   }, [savedTick]);
   const fileName = path.split("/").filter(Boolean).pop() ?? path;
-  const cmExtensions = useMemo11(() => {
+  const cmExtensions = useMemo12(() => {
     if (!bundle) return [];
     const exts = [bundle.saveKeymapExtension(() => saveRef.current())];
     if (bundle.languageExtension) exts.push(bundle.languageExtension);
     return exts;
   }, [bundle]);
   const Editor = bundle?.Editor;
+  const reload = useCallback19(() => {
+    setBuffer({ path, value: initialContents, baseline: initialContents });
+    editIntentFiredRef.current = false;
+    setSaveError(null);
+    setSavedTick(false);
+    onReload?.();
+  }, [initialContents, onReload, path]);
   return /* @__PURE__ */ jsxs7(
     "div",
     {
       className: cn("flex h-full min-h-0 flex-col", className),
       "data-opengeni-code-editor": true,
+      "data-opengeni-editor-dirty": dirty ? "true" : "false",
       style: editorVars,
       children: [
         /* @__PURE__ */ jsxs7("div", { className: "flex min-h-9 shrink-0 items-center gap-2 border-b border-og-border bg-og-surface-1 px-2 py-1", children: [
@@ -6431,7 +6755,7 @@ function CodeEditor({
                 children: saveError.message
               }
             ),
-            !saveError && savedTick && /* @__PURE__ */ jsx9("span", { className: "text-og-xs text-og-status-idle", children: "Saved" }),
+            !saveError && savedTick && !dirty && /* @__PURE__ */ jsx9("span", { className: "text-og-xs text-og-status-idle", children: "Saved" }),
             readOnly ? /* @__PURE__ */ jsx9("span", { className: "text-og-xs uppercase tracking-wide text-og-fg-subtle", children: "Read-only" }) : !saveConflict ? /* @__PURE__ */ jsxs7(
               "button",
               {
@@ -6468,8 +6792,7 @@ function CodeEditor({
                   {
                     type: "button",
                     onClick: () => {
-                      setSaveError(null);
-                      onReload();
+                      reload();
                     },
                     className: "min-h-8 rounded-og-sm border border-og-border bg-og-surface-1 px-2 text-og-xs font-medium text-og-fg hover:bg-og-surface-2 pointer-coarse:min-h-11",
                     children: "Reload live"
@@ -6756,7 +7079,7 @@ function SandboxFiles({
                     path: viewPath,
                     initialContents: fileView.content,
                     themeType: resolvedTheme,
-                    onSave: (contents) => files.writeFile(viewPath, contents, { expectedContent: fileView.content }),
+                    onSave: (contents, expectedContents) => files.writeFile(viewPath, contents, { expectedContent: expectedContents }),
                     onOverwrite: (contents) => files.writeFile(viewPath, contents, { force: true }),
                     onReload: () => setViewReloadRevision((revision) => revision + 1),
                     ...onEditIntent ? { onEditIntent } : {},
@@ -7080,7 +7403,7 @@ function DesktopViewer({
   scaleViewport,
   rfbFactory,
   webSocketFactory,
-  renderConsentGate,
+  onActivate,
   onAcknowledge,
   watching,
   onWarm,
@@ -7092,22 +7415,55 @@ function DesktopViewer({
   className
 }) {
   const containerRef = useRef18(null);
-  const [consented, setConsented] = useState18(false);
+  const onActivateRef = useRef18(onActivate);
+  const onAcknowledgeRef = useRef18(onAcknowledge);
+  onActivateRef.current = onActivate;
+  onAcknowledgeRef.current = onAcknowledge;
+  const acknowledgmentAttemptedRef = useRef18(false);
+  const [acknowledgmentError, setAcknowledgmentError] = useState18(null);
+  const [acknowledgmentRetryNonce, setAcknowledgmentRetryNonce] = useState18(0);
   const [takeControl, setTakeControl] = useState18(interactive ?? false);
   const externallyControlled = interactive !== void 0;
   const serverAllowsControl = capability?.mode !== "read-only";
   const wantControl = externallyControlled ? interactive : takeControl;
   const inControl = Boolean(wantControl) && serverAllowsControl;
-  const isWatching = watching ?? consented;
+  const isWatching = watching ?? true;
   const transportNull = !capability || capability.transport === null;
   const reason = capability?.reason ?? null;
-  const needsAck = capability?.requiresAcknowledgment === true && capability.acknowledged !== true && !consented;
+  const needsAcknowledgment = capability?.requiresAcknowledgment === true && capability.acknowledged !== true;
   const noLiveAddress = Boolean(capability) && !transportNull && !capability.url;
   const coldWarmable = transportNull && reason === "lease_cold" || !transportNull && noLiveAddress;
   const hardUnavailable = transportNull && isHardUnavailable(reason);
-  const accept = () => {
-    setConsented(true);
-    onAcknowledge?.();
+  useEffect21(() => {
+    onActivateRef.current?.();
+  }, []);
+  useEffect21(() => {
+    if (!needsAcknowledgment) {
+      acknowledgmentAttemptedRef.current = false;
+      setAcknowledgmentError(null);
+      return;
+    }
+    if (acknowledgmentAttemptedRef.current) return;
+    acknowledgmentAttemptedRef.current = true;
+    setAcknowledgmentError(null);
+    const acknowledge = onAcknowledgeRef.current;
+    if (!acknowledge) {
+      setAcknowledgmentError(new Error("Desktop acknowledgment is not configured."));
+      return;
+    }
+    let active = true;
+    void Promise.resolve().then(() => acknowledge()).catch((cause) => {
+      if (!active) return;
+      setAcknowledgmentError(cause instanceof Error ? cause : new Error(String(cause)));
+    });
+    return () => {
+      active = false;
+    };
+  }, [needsAcknowledgment, acknowledgmentRetryNonce]);
+  const retryAcknowledgment = () => {
+    acknowledgmentAttemptedRef.current = false;
+    setAcknowledgmentError(null);
+    setAcknowledgmentRetryNonce((nonce) => nonce + 1);
   };
   useEffect21(() => {
     if (!inControl || externallyControlled) return;
@@ -7122,7 +7478,7 @@ function DesktopViewer({
       window.removeEventListener("keydown", onKey);
     };
   }, [inControl, externallyControlled]);
-  const connectCapability = !transportNull && !needsAck && !viewerCapReached ? capability : null;
+  const connectCapability = !transportNull && !needsAcknowledgment && !viewerCapReached ? capability : null;
   const stream = useDesktopStream({
     capability: connectCapability,
     containerRef,
@@ -7137,17 +7493,16 @@ function DesktopViewer({
   streamStateRef.current = stream.state;
   const warmKeyRef = useRef18(null);
   useEffect21(() => {
-    if (!isWatching || !coldWarmable || needsAck || viewerCapReached) {
+    if (!isWatching || !coldWarmable || needsAcknowledgment || viewerCapReached) {
       if (!coldWarmable) warmKeyRef.current = null;
       return;
     }
-    const warm = onWarm ?? onAcknowledge;
-    if (!warm) return;
+    if (!onWarm) return;
     const key = `${capability?.reason ?? ""}:${capability?.url ?? ""}:${capability?.expiresAt ?? ""}`;
     if (warmKeyRef.current === key) return;
     warmKeyRef.current = key;
-    warm();
-  }, [isWatching, coldWarmable, needsAck, viewerCapReached, capability, onWarm, onAcknowledge]);
+    onWarm();
+  }, [isWatching, coldWarmable, needsAcknowledgment, viewerCapReached, capability, onWarm]);
   useEffect21(() => {
     if (!hasLiveUrl || typeof document === "undefined") return;
     const maybeReattach = () => {
@@ -7180,13 +7535,14 @@ function DesktopViewer({
   let uiState;
   if (viewerCapReached) uiState = "viewer_cap";
   else if (hardUnavailable) uiState = "unavailable";
-  else if (needsAck && !isWatching) uiState = "consent";
+  else if (acknowledgmentError) uiState = "acknowledgment_error";
+  else if (needsAcknowledgment) uiState = "opening";
   else if (coldWarmable) uiState = "warming";
   else if (connected) uiState = "connected";
   else if (stream.error) uiState = "error";
   else if (connectTimedOut) uiState = "connect_failed";
   else uiState = "connecting";
-  const overlayShown = uiState !== "connected" && uiState !== "connecting";
+  const overlayShown = uiState !== "connected" && uiState !== "connecting" && uiState !== "opening";
   const showToggle = showControlToggle && !overlayShown;
   let overlay = null;
   switch (uiState) {
@@ -7199,8 +7555,12 @@ function DesktopViewer({
     case "unavailable":
       overlay = renderUnavailable?.(reason) ?? defaultNotice("Desktop unavailable", unavailableCopy(reason));
       break;
-    case "consent":
-      overlay = renderConsentGate ? renderConsentGate(accept, capability?.shared ?? false) : /* @__PURE__ */ jsx11(DefaultConsentGate, { shared: capability?.shared ?? false, onAccept: accept });
+    case "acknowledgment_error":
+      overlay = defaultNotice(
+        "Couldn\u2019t open desktop",
+        acknowledgmentError?.message ?? "The desktop acknowledgment failed.",
+        retryAcknowledgment
+      );
       break;
     case "warming":
       overlay = renderWarming?.() ?? /* @__PURE__ */ jsx11(WarmingNotice, {});
@@ -7219,6 +7579,7 @@ function DesktopViewer({
         reconnect
       );
       break;
+    case "opening":
     case "connecting":
     case "connected":
       overlay = null;
@@ -7247,7 +7608,7 @@ function DesktopViewer({
             "data-state": stream.state
           }
         ),
-        uiState === "connecting" && /* @__PURE__ */ jsxs9("div", { className: "pointer-events-none absolute inset-0 flex flex-col items-center justify-center gap-3 text-og-fg-subtle", children: [
+        (uiState === "opening" || uiState === "connecting") && /* @__PURE__ */ jsxs9("div", { className: "pointer-events-none absolute inset-0 flex flex-col items-center justify-center gap-3 text-og-fg-subtle", children: [
           /* @__PURE__ */ jsxs9("span", { className: "relative flex items-center justify-center", children: [
             /* @__PURE__ */ jsx11(MonitorIcon, { className: "size-8 opacity-30", strokeWidth: 1.5 }),
             /* @__PURE__ */ jsx11(
@@ -7258,7 +7619,7 @@ function DesktopViewer({
               }
             )
           ] }),
-          /* @__PURE__ */ jsx11("span", { className: "text-og-sm", children: "Connecting to the desktop\u2026" })
+          /* @__PURE__ */ jsx11("span", { className: "text-og-sm", children: uiState === "opening" ? "Opening the desktop\u2026" : "Connecting to the desktop\u2026" })
         ] }),
         showToggle && !externallyControlled && inControl && /* @__PURE__ */ jsx11(
           InControlBar,
@@ -7396,26 +7757,6 @@ function WarmingNotice({ onRetry }) {
     )
   ] });
 }
-function DefaultConsentGate({ shared, onAccept }) {
-  return /* @__PURE__ */ jsxs9("div", { className: "max-w-sm rounded-og-lg border border-og-border bg-og-bg p-4 text-center text-og-base text-og-fg", children: [
-    /* @__PURE__ */ jsx11("div", { className: "mb-1 font-medium", children: "Watch the live desktop?" }),
-    /* @__PURE__ */ jsxs9("p", { className: "mb-3 text-og-sm text-og-fg-subtle", children: [
-      "The desktop pixel stream is ",
-      /* @__PURE__ */ jsx11("strong", { children: "un-redacted" }),
-      " \u2014 it can show secrets the agent prints on screen.",
-      shared ? " This sandbox is shared: you'll also see other sessions' agents on the same screen." : ""
-    ] }),
-    /* @__PURE__ */ jsx11(
-      "button",
-      {
-        type: "button",
-        onClick: onAccept,
-        className: "rounded-og-sm bg-og-accent px-3 py-1.5 text-og-sm font-medium text-og-accent-fg pointer-coarse:min-h-11",
-        children: "I understand \u2014 show the desktop"
-      }
-    )
-  ] });
-}
 function defaultNotice(title, body, onRetry) {
   return /* @__PURE__ */ jsxs9("div", { className: "max-w-sm rounded-og-lg border border-og-border bg-og-bg p-4 text-center text-og-base text-og-fg", children: [
     /* @__PURE__ */ jsxs9("div", { className: "mb-1 flex items-center justify-center gap-1.5 font-medium", children: [
@@ -7965,12 +8306,21 @@ function DockChrome({
 }
 
 // src/components/sandbox-workspace.tsx
-import { useCallback as useCallback22, useEffect as useEffect23, useMemo as useMemo12, useRef as useRef20, useState as useState20 } from "react";
+import {
+  lazy as lazy2,
+  Suspense as Suspense2,
+  useCallback as useCallback22,
+  useEffect as useEffect23,
+  useMemo as useMemo13,
+  useRef as useRef20,
+  useState as useState20
+} from "react";
 import {
   CircleCheckIcon,
   CpuIcon,
   FileCode2Icon as FileCode2Icon2,
   GitCompareArrowsIcon,
+  Globe2Icon,
   LoaderCircleIcon as LoaderCircleIcon3,
   MonitorIcon as MonitorIcon2,
   RefreshCwIcon as RefreshCwIcon2,
@@ -7978,14 +8328,24 @@ import {
   TriangleAlertIcon as TriangleAlertIcon2
 } from "lucide-react";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+var LazyBrowserViewer = lazy2(async () => {
+  const viewers = await import("./interactive-workbench-viewers-KHNOHWQE.js");
+  return { default: viewers.BrowserViewer };
+});
+var LazyComputerViewer = lazy2(async () => {
+  const viewers = await import("./interactive-workbench-viewers-KHNOHWQE.js");
+  return { default: viewers.ComputerViewer };
+});
 var WORKBENCH_TAB_CHANGES = "changes";
 var WORKBENCH_TAB_FILES = "files";
 var WORKBENCH_TAB_TERMINAL = "terminal";
+var WORKBENCH_TAB_BROWSER = "browser";
 var WORKBENCH_TAB_DESKTOP = "desktop";
 var WORKBENCH_SURFACES = [
   WORKBENCH_TAB_CHANGES,
   WORKBENCH_TAB_FILES,
   WORKBENCH_TAB_TERMINAL,
+  WORKBENCH_TAB_BROWSER,
   WORKBENCH_TAB_DESKTOP
 ];
 function isWorkbenchSurface(value) {
@@ -8015,6 +8375,18 @@ function WorkbenchTabLabel({ icon, children }) {
     /* @__PURE__ */ jsx13("span", { children })
   ] });
 }
+function WorkbenchSurfaceLoading({ name }) {
+  return /* @__PURE__ */ jsx13(
+    CenteredState,
+    {
+      icon: /* @__PURE__ */ jsx13(LoaderCircleIcon3, { className: "size-5 animate-spin motion-reduce:animate-none", "aria-hidden": true }),
+      children: /* @__PURE__ */ jsxs11("p", { className: "text-og-sm font-medium text-og-fg", children: [
+        "Opening ",
+        name
+      ] })
+    }
+  );
+}
 function initialWorkspaceTab(events, override) {
   if (override) return override;
   let bestSeq = -1;
@@ -8026,7 +8398,17 @@ function initialWorkspaceTab(events, override) {
     bestSeq = event.sequence;
     bestFileCount = typeof stats?.fileCount === "number" ? stats.fileCount : 0;
   }
-  return bestFileCount > 0 ? WORKBENCH_TAB_CHANGES : WORKBENCH_TAB_FILES;
+  if (bestFileCount > 0) return WORKBENCH_TAB_CHANGES;
+  let latestGitSeq = -1;
+  let committedOnly = false;
+  for (const event of events ?? []) {
+    if (event.type !== "git.changed" || event.sequence > bestSeq) continue;
+    if (event.sequence <= latestGitSeq) continue;
+    const payload = event.payload;
+    latestGitSeq = event.sequence;
+    committedOnly = typeof payload?.ahead === "number" && payload.ahead > 0 || payload?.reason === "commit";
+  }
+  return committedOnly ? WORKBENCH_TAB_CHANGES : WORKBENCH_TAB_FILES;
 }
 function sandboxProvisionInFlight(events) {
   let inFlight = false;
@@ -8048,14 +8430,25 @@ function sandboxProvisionInFlight(events) {
 function emptyWarmIntents(sessionId) {
   return {
     sessionId,
-    watchDesktop: false,
     warmTerminal: false,
     warmFiles: false
   };
 }
 function useSandboxWorkspaceTabs(options) {
   const { client, workspaceId } = useOpenGeni(options);
-  const { sessionId, events, onNotify, requestedFilePath, requestedFileRequestId, onOpenFile } = options;
+  const {
+    sessionId,
+    events,
+    onNotify,
+    browserWebSocketFactory,
+    computerWebSocketFactory,
+    requestedFilePath,
+    requestedFileRequestId,
+    onOpenFile,
+    onOpenComputerSession,
+    requestedComputerSessionId,
+    requestedComputerRequestId
+  } = options;
   const initialTab = options.initialTab ?? null;
   const activeTab = options.activeTab ?? initialTab;
   const requestedSurfaces = options.surfaces ?? WORKBENCH_SURFACES;
@@ -8063,9 +8456,24 @@ function useSandboxWorkspaceTabs(options) {
   const changesEnabled = surfaceSet.has(WORKBENCH_TAB_CHANGES);
   const filesEnabled = surfaceSet.has(WORKBENCH_TAB_FILES);
   const terminalEnabled = surfaceSet.has(WORKBENCH_TAB_TERMINAL);
+  const browserEnabled = surfaceSet.has(WORKBENCH_TAB_BROWSER);
   const desktopEnabled = surfaceSet.has(WORKBENCH_TAB_DESKTOP);
+  const createLinkedComputer = useCallback22(
+    async (name) => {
+      const response = await client.createComputerSession(workspaceId, {
+        operationId: crypto.randomUUID(),
+        sessionId,
+        name
+      });
+      return {
+        id: response.session.id,
+        placement: response.session.placement
+      };
+    },
+    [client, sessionId, workspaceId]
+  );
   const workspaceDataEnabled = changesEnabled || filesEnabled;
-  const anySurfaceEnabled = workspaceDataEnabled || terminalEnabled || desktopEnabled;
+  const machineSurfaceEnabled = workspaceDataEnabled || terminalEnabled || desktopEnabled;
   const resolvedActiveTab = activeTab ?? initialTab;
   const changesActive = resolvedActiveTab === WORKBENCH_TAB_CHANGES;
   const filesActive = resolvedActiveTab === WORKBENCH_TAB_FILES;
@@ -8074,7 +8482,7 @@ function useSandboxWorkspaceTabs(options) {
     () => emptyWarmIntents(sessionId)
   );
   const warmIntents = storedWarmIntents.sessionId === sessionId ? storedWarmIntents : emptyWarmIntents(sessionId);
-  const { watchDesktop, warmTerminal, warmFiles } = warmIntents;
+  const { warmTerminal, warmFiles } = warmIntents;
   const requestWarmIntent = useCallback22(
     (intent) => {
       setStoredWarmIntents((previous) => {
@@ -8088,13 +8496,13 @@ function useSandboxWorkspaceTabs(options) {
     workspaceId,
     sessionId,
     pollIntervalMs: 8e3,
-    enabled: anySurfaceEnabled
+    enabled: machineSurfaceEnabled
   });
   const activeMachine = machines.machines.find((m) => m.sandboxId === machines.activeSandboxId) ?? machines.machines.find((m) => m.active) ?? null;
   const caps = useSessionCapabilities(sessionId, {
     events,
-    enabled: anySurfaceEnabled,
-    attachDesktop: desktopEnabled && watchDesktop,
+    enabled: machineSurfaceEnabled,
+    attachDesktop: false,
     attachTerminal: terminalEnabled && warmTerminal,
     // Explicit live-file intent only — NOT "the Files tab is open". A cold edit
     // or guarded-file open wakes the box; a glance at the tree/diff does not.
@@ -8102,19 +8510,18 @@ function useSandboxWorkspaceTabs(options) {
   });
   const capabilities = caps.capabilities;
   const liveness = capabilities?.liveness;
+  const liveIoLiveness = liveness ?? null;
   const fileSystemOn = capabilities?.FileSystem.available ?? false;
   const fsReadOnly = capabilities?.FileSystem.readOnly ?? false;
-  const filesEditable = fileSystemOn && !fsReadOnly && (liveness === "warm" || liveness === "draining");
+  const filesEditable = fileSystemOn && !fsReadOnly && sandboxAcceptsLiveIo(liveness);
   const gitOn = capabilities?.Git.available ?? false;
   const terminalOn = terminalEnabled && (capabilities?.Terminal.transport ?? null) !== null;
-  const ptyWsLive = capabilities?.Terminal.transport === "pty-ws" && Boolean(capabilities?.Terminal.url);
-  const ptyCapable = (capabilities?.Terminal.ptyCapable ?? false) && !ptyWsLive;
+  const ptyCapable = warmTerminal && (capabilities?.Terminal.ptyCapable ?? false) && capabilities?.Terminal.transport === "sse-events" && capabilities?.Terminal.reason === null;
   const terminal = useSandboxTerminal(sessionId, {
     events: terminalEnabled ? events : [],
     interactive: terminalEnabled && ptyCapable,
     liveness
   });
-  const desktopAdvertised = desktopEnabled && ((capabilities?.DesktopStream.transport ?? null) !== null || capabilities?.DesktopStream.reason === "lease_cold");
   const provisioning = sandboxProvisionInFlight(events);
   const renegotiate = caps.renegotiate;
   const provisioningRef = useRef20({ sessionId, provisioning });
@@ -8130,9 +8537,9 @@ function useSandboxWorkspaceTabs(options) {
     enabled: workspaceDataEnabled
   });
   const captureAvailable = captureState.available;
-  const liveWorkspaceExpected = liveness === "warm" || liveness === "draining";
+  const liveWorkspaceExpected = sandboxAcceptsLiveIo(liveness);
   const capturePending = !liveWorkspaceExpected && (captureState.fileCount === null || captureState.loading);
-  const repoPaths = useMemo12(() => {
+  const repoPaths = useMemo13(() => {
     const advertised = capabilities?.Git.repos ?? [];
     if (advertised.length > 0) return advertised;
     return captureState.capture?.repos.map((repo) => repo.root) ?? [];
@@ -8157,7 +8564,7 @@ function useSandboxWorkspaceTabs(options) {
     enabled: filesEnabled && (captureAvailable || fileSystemOn && liveWorkspaceExpected),
     active: filesActive,
     repoPaths,
-    liveness,
+    liveness: liveIoLiveness,
     capture: captureState.capture,
     // A reverted optimistic mutation (e.g. a 409 rename collision) surfaces as a
     // host notification — the tree silently rolls back, the user sees why.
@@ -8181,7 +8588,7 @@ function useSandboxWorkspaceTabs(options) {
     // dormant, avoiding the old duplicate full-tree read.
     active: changesActive || resolvedActiveTab === null,
     repoPaths,
-    liveness,
+    liveness: liveIoLiveness,
     comparison: changesComparison,
     capture: changesComparison === "staged" ? null : captureState.capture
   });
@@ -8202,33 +8609,13 @@ function useSandboxWorkspaceTabs(options) {
     });
     return () => observer.disconnect();
   }, [terminalEnabled]);
-  async function acknowledgeAndWatch() {
-    try {
-      const shared = capabilities?.DesktopStream.shared ?? false;
-      await client.acknowledgeStream(workspaceId, sessionId, {
-        acknowledgeUnredacted: true,
-        acknowledgeShared: shared
-      });
-      requestWarmIntent("watchDesktop");
-      caps.renegotiate();
-    } catch (error) {
-      onNotify?.({
-        kind: "error",
-        message: `Could not start the desktop stream: ${error instanceof Error ? error.message : String(error)}`
-      });
-    }
-  }
-  function rewarmDesktop() {
-    if (!watchDesktop) requestWarmIntent("watchDesktop");
-    caps.renegotiate();
-  }
   const dirtyCount = git.diff.length;
   const chip = useMachineChip({
     liveness,
     capabilitiesState: caps.state,
     activeMachineState: activeMachine?.state ?? null,
     activeIsSelfhosted: activeMachine?.kind === "selfhosted",
-    wantsWarm: terminalEnabled && warmTerminal || desktopEnabled && watchDesktop || workspaceDataEnabled && warmFiles,
+    wantsWarm: terminalEnabled && warmTerminal || workspaceDataEnabled && warmFiles,
     capturedAt: captureState.capturedAt
   });
   const workspaceWaking = chip.state === "waking";
@@ -8241,7 +8628,8 @@ function useSandboxWorkspaceTabs(options) {
     defaultTabRef.current = { identity: defaultIdentity, value: null };
   }
   const captureIsAuthoritative = !liveWorkspaceExpected && (liveness !== void 0 || caps.error !== null);
-  const captureUnavailable = captureState.fileCount === 0 || captureState.error !== null;
+  const captureHasChanges = (captureState.fileCount ?? 0) > 0 || (captureState.capture?.repos.some((repo) => (repo.branchDiff?.length ?? 0) > 0) ?? false);
+  const captureUnavailable = captureState.fileCount === 0 && !captureHasChanges || captureState.error !== null;
   const implicitBranchFallbackPending = changesComparison === "branch" && git.error !== null && storedChangesComparison?.sessionId !== sessionId;
   if (defaultTabRef.current.value === null) {
     if (initialTab && (!isWorkbenchSurface(initialTab) || surfaceSet.has(initialTab))) {
@@ -8254,7 +8642,7 @@ function useSandboxWorkspaceTabs(options) {
       );
     } else if (captureIsAuthoritative && captureState.fileCount !== null && captureState.available) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(
-        captureState.fileCount > 0,
+        captureHasChanges,
         changesEnabled,
         filesEnabled
       );
@@ -8266,7 +8654,7 @@ function useSandboxWorkspaceTabs(options) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
     } else if (captureState.available && git.error && captureState.fileCount !== null) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(
-        captureState.fileCount > 0,
+        captureHasChanges,
         changesEnabled,
         filesEnabled
       );
@@ -8275,7 +8663,7 @@ function useSandboxWorkspaceTabs(options) {
     }
   }
   const defaultTab = defaultTabRef.current.value;
-  const tabs = useMemo12(() => {
+  const tabs = useMemo13(() => {
     const list = [];
     if (changesEnabled)
       list.push({
@@ -8324,7 +8712,7 @@ function useSandboxWorkspaceTabs(options) {
             ...requestedFilePath ? {
               requestedPath: requestedFilePath,
               ...requestedFileRequestId !== null && requestedFileRequestId !== void 0 ? { requestedPathRequestId: requestedFileRequestId } : {},
-              requestedPathReady: liveness === "warm" || liveness === "draining"
+              requestedPathReady: sandboxAcceptsLiveIo(liveness)
             } : {},
             onEditIntent: () => requestWarmIntent("warmFiles"),
             className: "h-full"
@@ -8346,26 +8734,49 @@ function useSandboxWorkspaceTabs(options) {
             shell: capabilities?.Terminal.shell ?? void 0,
             liveness,
             ...xtermTheme ? { theme: xtermTheme } : {}
-          }
+          },
+          sessionId
         ) })
       });
     }
-    if (desktopAdvertised) {
+    if (browserEnabled) {
+      list.push({
+        id: WORKBENCH_TAB_BROWSER,
+        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(Globe2Icon, {}), children: "Browser" }),
+        content: /* @__PURE__ */ jsx13(Suspense2, { fallback: /* @__PURE__ */ jsx13(WorkbenchSurfaceLoading, { name: "Browser" }), children: /* @__PURE__ */ jsx13(
+          LazyBrowserViewer,
+          {
+            client,
+            workspaceId,
+            sessionId,
+            onNotify,
+            ...desktopEnabled ? { createLinkedComputer } : {},
+            ...onOpenComputerSession ? { onOpenComputer: onOpenComputerSession } : {},
+            ...browserWebSocketFactory ? { webSocketFactory: browserWebSocketFactory } : {},
+            className: "h-full"
+          },
+          sessionId
+        ) })
+      });
+    }
+    if (desktopEnabled) {
       list.push({
         id: WORKBENCH_TAB_DESKTOP,
-        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(MonitorIcon2, {}), children: "Desktop" }),
-        badge: watchDesktop ? /* @__PURE__ */ jsx13("span", { className: "rounded-og-xs bg-og-status-running/20 px-1 text-og-xs text-og-status-running", children: "Live" }) : void 0,
-        content: /* @__PURE__ */ jsx13(
-          DesktopViewer,
+        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(MonitorIcon2, {}), children: "Computer" }),
+        content: /* @__PURE__ */ jsx13(Suspense2, { fallback: /* @__PURE__ */ jsx13(WorkbenchSurfaceLoading, { name: "Computer" }), children: /* @__PURE__ */ jsx13(
+          LazyComputerViewer,
           {
-            capability: capabilities?.DesktopStream ?? null,
-            viewerCapReached: caps.viewerCapReached,
-            watching: watchDesktop,
-            onAcknowledge: () => void acknowledgeAndWatch(),
-            onWarm: rewarmDesktop,
+            client,
+            workspaceId,
+            sessionId,
+            onNotify,
+            requestedComputerSessionId,
+            requestedComputerRequestId,
+            ...computerWebSocketFactory ? { webSocketFactory: computerWebSocketFactory } : {},
             className: "h-full"
-          }
-        )
+          },
+          sessionId
+        ) })
       });
     }
     return list;
@@ -8374,14 +8785,22 @@ function useSandboxWorkspaceTabs(options) {
     changesEnabled,
     filesEnabled,
     terminalOn,
-    desktopAdvertised,
+    browserEnabled,
+    desktopEnabled,
     captureAvailable,
     dirtyCount,
-    watchDesktop,
     warmTerminal,
     requestedFilePath,
     requestedFileRequestId,
     onOpenFile,
+    onOpenComputerSession,
+    requestedComputerSessionId,
+    requestedComputerRequestId,
+    onNotify,
+    browserWebSocketFactory,
+    computerWebSocketFactory,
+    client,
+    workspaceId,
     liveness,
     sessionId,
     files,
@@ -8394,13 +8813,14 @@ function useSandboxWorkspaceTabs(options) {
     caps.state,
     caps.error,
     caps.viewerCapReached,
-    requestWarmIntent
+    requestWarmIntent,
+    createLinkedComputer
   ]);
   return {
     tabs,
     defaultTab,
     machine: {
-      enabled: anySurfaceEnabled,
+      enabled: machineSurfaceEnabled,
       chip,
       activeMachine,
       loading: machines.loading,
@@ -8419,6 +8839,8 @@ function SandboxWorkspace(props) {
     trailingTabs,
     initialTab,
     onNotify,
+    browserWebSocketFactory,
+    computerWebSocketFactory,
     collapsed,
     onCollapsedChange,
     showCollapseControl,
@@ -8431,7 +8853,9 @@ function SandboxWorkspace(props) {
   } = props;
   const [storedSelection, setStoredSelection] = useState20(null);
   const [requestedFile, setRequestedFile] = useState20(null);
+  const [requestedComputer, setRequestedComputer] = useState20(null);
   const nextFileRequestId = useRef20(0);
+  const nextComputerRequestId = useRef20(0);
   const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
   const activeTabHint = selectedTab ?? initialTab ?? leadingTabs?.[0]?.id ?? null;
   const openFile = useCallback22(
@@ -8442,6 +8866,18 @@ function SandboxWorkspace(props) {
     },
     [sessionId]
   );
+  const openComputer = useCallback22(
+    (computerSessionId) => {
+      nextComputerRequestId.current += 1;
+      setRequestedComputer({
+        sessionId,
+        computerSessionId,
+        requestId: nextComputerRequestId.current
+      });
+      setStoredSelection({ sessionId, tab: WORKBENCH_TAB_DESKTOP });
+    },
+    [sessionId]
+  );
   const {
     tabs: workbenchTabs,
     machine,
@@ -8455,9 +8891,14 @@ function SandboxWorkspace(props) {
     ...initialTab ? { initialTab } : {},
     activeTab: activeTabHint,
     ...onNotify ? { onNotify } : {},
+    ...browserWebSocketFactory ? { browserWebSocketFactory } : {},
+    ...computerWebSocketFactory ? { computerWebSocketFactory } : {},
     requestedFilePath: requestedFile?.sessionId === sessionId ? requestedFile.path : null,
     requestedFileRequestId: requestedFile?.sessionId === sessionId ? requestedFile.requestId : null,
-    onOpenFile: openFile
+    onOpenFile: openFile,
+    onOpenComputerSession: openComputer,
+    requestedComputerSessionId: requestedComputer?.sessionId === sessionId ? requestedComputer.computerSessionId : null,
+    requestedComputerRequestId: requestedComputer?.sessionId === sessionId ? requestedComputer.requestId : null
   });
   const tabs = [...leadingTabs ?? [], ...workbenchTabs, ...trailingTabs ?? []];
   const preferredTab = selectedTab ?? defaultTab;
@@ -8849,6 +9290,7 @@ export {
   FileBrowser,
   FileWriteConflictError,
   FleetTile,
+  GeneratedVideoPlayer,
   HEALTH_TOKEN,
   HumanInputForm,
   HumanInputSurface,
@@ -8917,6 +9359,7 @@ export {
   VoiceRecordingStorageUnavailableError,
   WINDOW_LABEL,
   WORKBENCH_SURFACES,
+  WORKBENCH_TAB_BROWSER,
   WORKBENCH_TAB_CHANGES,
   WORKBENCH_TAB_DESKTOP,
   WORKBENCH_TAB_FILES,
@@ -9058,6 +9501,7 @@ export {
   useTranscription,
   useTurnQueue,
   useVariableSets,
+  useVideoArtifactPlaybackLoader,
   useVoiceInput,
   useWorkspaceCapture,
   useWorkspaceEdit,