@opengeni/react 0.45.0 → 0.48.0

package/dist/index.js

@@ -25,7 +25,7 @@ import {
   healthPulses,
   pointsFor,
   useMachines
-} from "./chunk-6EDV6YFE.js";
+} from "./chunk-OL6QVXGF.js";
 import {
   SESSION_EVENT_BROWSER_MAX_BYTES,
   SESSION_EVENT_BROWSER_MAX_COUNT,
@@ -52,7 +52,7 @@ import {
   useSessionLineage,
   useSessionMcpApprovalPolicy,
   useTurnQueue
-} from "./chunk-SRFUT2ZU.js";
+} from "./chunk-I4MPFDRP.js";
 import {
   ActivityDisclosure,
   ActivityRail,
@@ -99,7 +99,6 @@ import {
   parseFreeformApplyPatch,
   parseToolArgs,
   rawTypeOf,
-  redactSecrets,
   sandboxCommandExitCode,
   sessionChromeGoalPillState,
   stripExecBanner,
@@ -111,8 +110,8 @@ import {
   useThemeType,
   userMessageLikelyNeedsDisclosure,
   v4aToGitFileDiff
-} from "./chunk-FD72GJMK.js";
-import "./chunk-VCBFUSUZ.js";
+} from "./chunk-XCNTXWBB.js";
+import "./chunk-O4VXOBGF.js";
 import {
   buildTimeline,
   creditExhaustedFromEvents,
@@ -120,7 +119,7 @@ import {
   groupTimeline,
   sessionStatusFromEvents,
   toolDisplayName
-} from "./chunk-LWR4MXSS.js";
+} from "./chunk-LHLYWG5R.js";
 import {
   Actions,
   AttachButton,
@@ -173,19 +172,20 @@ import {
   useSlashCommands,
   useTranscription,
   useVoiceInput
-} from "./chunk-L3EWO3UK.js";
+} from "./chunk-NJ7M2B6Z.js";
 import {
   FILE_ONLY_MESSAGE_TEXT,
   composeSendInput,
   shouldSteerOnKey,
   shouldSubmitOnKey,
   useComposer
-} from "./chunk-HFO4ERGQ.js";
+} from "./chunk-FWXGSNXT.js";
 import {
   useMutationRunner,
+  usePageLiveActivity,
   usePolledValue,
   useSessionEventTrigger
-} from "./chunk-EB67J347.js";
+} from "./chunk-KZ73RL76.js";
 import {
   BillingClassMark,
   ModelPolicyPicker,
@@ -194,7 +194,7 @@ import {
   PickerBackHeader,
   PickerNavRow,
   defaultModelPolicyPickerMessages
-} from "./chunk-EHSYZ4KP.js";
+} from "./chunk-WYA65Y3F.js";
 import {
   useOpenGeni,
   useOpenGeniClient
@@ -222,7 +222,7 @@ import {
   TooltipContent,
   TooltipProvider,
   TooltipTrigger
-} from "./chunk-U3CSCMWA.js";
+} from "./chunk-FK6VG4LL.js";
 import {
   COMPOSER_PAYMENT_REQUIRED_MESSAGE,
   CREDIT_EXHAUSTION_MESSAGE,
@@ -237,8 +237,9 @@ import {
   tryParseJson
 } from "./chunk-LAKLF4PA.js";
 import {
+  usePortalTokenSource,
   usePortalTokenStyle
-} from "./chunk-JB5725BI.js";
+} from "./chunk-VZTQ73XT.js";
 import {
   cn
 } from "./chunk-22KP6LR5.js";
@@ -423,6 +424,10 @@ function useVariableSets(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
+  const readVariable = useCallback4(
+    async (variableSetId, name) => await run(() => client.getVariableSetVariable(workspaceId, variableSetId, name)),
+    [client, workspaceId, run]
+  );
   const setVariable = useCallback4(
     async (variableSetId, name, value) => {
       const result = await run(
@@ -456,6 +461,7 @@ function useVariableSets(options = {}) {
     create,
     update,
     remove,
+    readVariable,
     setVariable,
     deleteVariable,
     mutating,
@@ -478,7 +484,10 @@ function useEnvironments(options = {}) {
       deleteVariableSetVariable: options.client.deleteEnvironmentVariable ?? options.client.deleteVariableSetVariable
     };
   }, [options.client]);
-  const result = useVariableSets({ ...options, ...legacyClient ? { client: legacyClient } : {} });
+  const result = useVariableSets({
+    ...options,
+    ...legacyClient ? { client: legacyClient } : {}
+  });
   return { ...result, environments: result.variableSets };
 }
 
@@ -906,6 +915,8 @@ function rotationsFrom(events) {
 function useSessionCapabilities(sessionId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
   const enabled = (options.enabled ?? true) && Boolean(sessionId);
+  const pageLive = usePageLiveActivity();
+  const lifecycleEnabled = enabled && pageLive;
   const attachDesktop = options.attachDesktop ?? false;
   const attachTerminal = options.attachTerminal ?? false;
   const attachFiles = options.attachFiles ?? false;
@@ -940,7 +951,7 @@ function useSessionCapabilities(sessionId, options = {}) {
       epochRef.current = 0;
       viewerIdRef.current = null;
     }
-    if (!enabled || !sessionId) {
+    if (!lifecycleEnabled || !sessionId) {
       setState("idle");
       setCapabilities(null);
       return;
@@ -953,7 +964,7 @@ function useSessionCapabilities(sessionId, options = {}) {
     const startedAt = Date.now();
     const clearTimers = () => {
       if (pollTimer !== null) clearTimeout(pollTimer);
-      if (heartbeatTimer !== null) clearInterval(heartbeatTimer);
+      if (heartbeatTimer !== null) clearTimeout(heartbeatTimer);
       pollTimer = null;
       heartbeatTimer = null;
     };
@@ -966,19 +977,26 @@ function useSessionCapabilities(sessionId, options = {}) {
     const startHeartbeat = (caps) => {
       if (!localViewerId || heartbeatTimer !== null) return;
       const intervalMs = caps.viewerHeartbeatIntervalMs > 0 ? caps.viewerHeartbeatIntervalMs : 3e4;
-      heartbeatTimer = setInterval(() => {
+      const schedule = () => {
         if (cancelled || !localViewerId) return;
-        void client.heartbeatViewer(workspaceId, sessionId, localViewerId, { leaseEpoch: epochRef.current }).then((res) => {
-          if (!res.alive && !cancelled) {
-            renegotiate();
-          }
-        }).catch((cause) => {
-          if (cancelled) return;
-          if (cause instanceof OpenGeniApiError && (cause.status === 409 || cause.status === 410)) {
-            renegotiate();
-          }
-        });
-      }, intervalMs);
+        heartbeatTimer = setTimeout(() => {
+          heartbeatTimer = null;
+          if (cancelled || !localViewerId) return;
+          void client.heartbeatViewer(workspaceId, sessionId, localViewerId, {
+            leaseEpoch: epochRef.current
+          }).then((res) => {
+            if (!res.alive && !cancelled) {
+              renegotiate();
+            }
+          }).catch((cause) => {
+            if (cancelled) return;
+            if (cause instanceof OpenGeniApiError && (cause.status === 409 || cause.status === 410)) {
+              renegotiate();
+            }
+          }).finally(schedule);
+        }, intervalMs);
+      };
+      schedule();
     };
     const pollUntilWarm = () => {
       pollTimer = setTimeout(() => {
@@ -1113,7 +1131,7 @@ function useSessionCapabilities(sessionId, options = {}) {
     client,
     workspaceId,
     sessionId,
-    enabled,
+    lifecycleEnabled,
     attachDesktop,
     attachTerminal,
     attachFiles,
@@ -1816,7 +1834,7 @@ function useSandboxTerminal(sessionId, options) {
 }
 
 // src/hooks/use-sandbox-files.ts
-import { useCallback as useCallback12, useEffect as useEffect8, useRef as useRef7, useState as useState6 } from "react";
+import { useCallback as useCallback12, useEffect as useEffect8, useMemo as useMemo4, useRef as useRef7, useState as useState6 } from "react";
 var CapturedFileUnavailableError = class extends Error {
   constructor(path, reason) {
     super(
@@ -1838,6 +1856,25 @@ var FileWriteConflictError = class extends Error {
   }
   code = "file_write_conflict";
 };
+function normalizeRoot(root) {
+  const normalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "").replace(/\/+$/, "");
+  return normalized === "." ? "" : normalized;
+}
+function qualifyStatusPath(root, path) {
+  const normalized = normalizeRoot(root);
+  return normalized ? `${normalized}/${path}` : path;
+}
+function summarizeStatuses(statuses) {
+  const repositories = statuses.filter(({ status }) => status.isRepo);
+  return {
+    branch: repositories.length === 1 ? repositories[0]?.status.head ?? null : null,
+    isRepo: repositories.length > 0,
+    repoCount: repositories.length,
+    ahead: repositories.reduce((sum, { status }) => sum + status.ahead, 0),
+    behind: repositories.reduce((sum, { status }) => sum + status.behind, 0),
+    dirtyCount: repositories.reduce((sum, { status }) => sum + status.files.length, 0)
+  };
+}
 function parentOf(path) {
   const i = path.lastIndexOf("/");
   return i <= 0 ? "" : path.slice(0, i);
@@ -1881,7 +1918,10 @@ function replaceChildren(nodes, targetPath, children) {
       return { ...node, children };
     }
     if (node.kind === "dir" && node.children && targetPath.startsWith(`${node.path}/`)) {
-      return { ...node, children: replaceChildren(node.children, targetPath, children) };
+      return {
+        ...node,
+        children: replaceChildren(node.children, targetPath, children)
+      };
     }
     return node;
   });
@@ -1896,6 +1936,30 @@ function findNodeByPath(nodes, path) {
   }
   return void 0;
 }
+function loadedDirectoryPaths(nodes) {
+  const paths = [""];
+  const walk = (list) => {
+    for (const node of list) {
+      if (node.kind !== "dir" || node.children === void 0) continue;
+      paths.push(node.path);
+      walk(node.children);
+    }
+  };
+  walk(nodes);
+  return paths;
+}
+function initialDirectoryFrontier(rootPath, repoPaths) {
+  const rootParts = normalizeRoot(rootPath).split("/").filter(Boolean);
+  const paths = /* @__PURE__ */ new Set();
+  for (const repoPath of repoPaths) {
+    const parts = normalizeRoot(repoPath).split("/").filter(Boolean);
+    if (rootParts.some((part, index) => parts[index] !== part)) continue;
+    for (let depth = rootParts.length + 1; depth <= parts.length; depth += 1) {
+      paths.add(parts.slice(0, depth).join("/"));
+    }
+  }
+  return [...paths].sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b)).slice(0, 8);
+}
 function parentIsLoaded(nodes, parent) {
   if (parent === "") return true;
   const node = findNodeByPath(nodes, parent);
@@ -1927,7 +1991,10 @@ function removeNode(nodes, path) {
   return nodes.map((node) => {
     if (node.path === parent) {
       if (node.kind !== "dir" || node.children === void 0) return node;
-      return { ...node, children: node.children.filter((n) => n.path !== path) };
+      return {
+        ...node,
+        children: node.children.filter((n) => n.path !== path)
+      };
     }
     if (node.kind === "dir" && node.children && parent.startsWith(`${node.path}/`)) {
       return { ...node, children: removeNode(node.children, path) };
@@ -1996,15 +2063,23 @@ async function assertCapturedHash(bytes, expected) {
 function useSandboxFiles(sessionId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
   const enabled = (options.enabled ?? true) && Boolean(sessionId);
+  const active = options.active ?? true;
   const rootPath = options.rootPath ?? "";
+  const repoPathsKey = [
+    ...new Set((options.repoPaths?.length ? options.repoPaths : [rootPath]).map(normalizeRoot))
+  ].join("\0");
+  const repoPaths = useMemo4(() => repoPathsKey.split("\0"), [repoPathsKey]);
   const capture = options.capture ?? null;
   const isLive2 = options.liveness === "warm" || options.liveness === "draining";
-  const identityKey = `${workspaceId}\0${sessionId ?? ""}\0${rootPath}`;
+  const identityKey = `${workspaceId}\0${sessionId ?? ""}\0${rootPath}\0${repoPathsKey}`;
   const [tree, setTree] = useState6([]);
   const treeRef = useRef7([]);
   const [loading, setLoading] = useState6(false);
   const [expandingPaths, setExpandingPaths] = useState6(/* @__PURE__ */ new Set());
   const [error, setError] = useState6(null);
+  const [gitSummary, setGitSummary] = useState6(null);
+  const [gitLoading, setGitLoading] = useState6(false);
+  const [contentRevision, setContentRevision] = useState6(0);
   const [stateIdentity, setStateIdentity] = useState6(identityKey);
   const [source, setSource] = useState6(null);
   const sourceRef = useRef7(null);
@@ -2016,7 +2091,9 @@ function useSandboxFiles(sessionId, options = {}) {
   const lastSeqRef = useRef7(0);
   const pendingParentsRef = useRef7(/* @__PURE__ */ new Set());
   const pendingGitRef = useRef7(false);
+  const pendingAgentToolRef = useRef7(false);
   const debounceRef = useRef7(null);
+  const lastCommandRefreshAtRef = useRef7(0);
   const ownRevisionsRef = useRef7(/* @__PURE__ */ new Set());
   const onMutationError = options.onMutationError;
   treeRef.current = tree;
@@ -2050,48 +2127,83 @@ function useSandboxFiles(sessionId, options = {}) {
     refreshAbortRef.current = refreshAbort;
     const generation = refreshGenerationRef.current += 1;
     setLoading(true);
+    setGitLoading(true);
     setError(null);
     try {
-      try {
-        const status = await client.gitStatus(
-          workspaceId,
-          sessionId,
-          { path: rootPath },
-          { signal: refreshAbort.signal }
-        );
-        if (refreshGenerationRef.current !== generation) return;
-        const overlay = /* @__PURE__ */ new Map();
-        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(file.path, mapped);
-        }
-        statusRef.current = overlay;
-      } catch {
-        if (refreshGenerationRef.current !== generation) return;
-        statusRef.current = /* @__PURE__ */ new Map();
-      }
-      const listed = await client.fsList(
+      const frontierPaths = initialDirectoryFrontier(rootPath, repoPaths);
+      const listRequests = [rootPath, ...frontierPaths].map((path) => ({
+        path,
+        depth: 1
+      }));
+      const statusPromise = repoPaths.length > 0 ? client.gitReadBatch(
         workspaceId,
         sessionId,
-        { path: rootPath, depth: 1 },
+        {
+          requests: repoPaths.map((root) => ({
+            status: { path: root }
+          }))
+        },
+        { signal: refreshAbort.signal }
+      ).then(
+        (batch) => batch.results.map((result, index) => ({
+          root: repoPaths[index] ?? "",
+          status: result.status
+        }))
+      ).catch(() => null) : Promise.resolve([]);
+      const listedBatch = await client.fsListBatch(
+        workspaceId,
+        sessionId,
+        { requests: listRequests },
         { signal: refreshAbort.signal }
       );
       if (refreshGenerationRef.current !== generation) return;
+      const listed = listedBatch.results[0];
+      if (!listed) throw new Error("Workspace list batch did not return the root result.");
       const children = (listed.root.children ?? []).map((node) => fsNodeToTree(node));
-      setTree(
-        (prev) => applyStatus(prev.length === 0 ? children : mergeRootChildren(prev, children))
-      );
+      setTree((prev) => {
+        let hydrated = prev.length === 0 ? children : mergeRootChildren(prev, children);
+        for (const [index, path] of frontierPaths.entries()) {
+          const prefetched = listedBatch.results[index + 1];
+          if (!prefetched) continue;
+          hydrated = replaceChildren(
+            hydrated,
+            path,
+            (prefetched.root.children ?? []).map((node) => fsNodeToTree(node))
+          );
+        }
+        return applyStatus(hydrated);
+      });
       sourceRef.current = "live";
       setSource("live");
+      setLoading(false);
+      const statuses = await statusPromise;
+      if (refreshGenerationRef.current !== generation) return;
+      if (statuses) {
+        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));
+      } else {
+        statusRef.current = /* @__PURE__ */ new Map();
+        setGitSummary(null);
+      }
+      setGitLoading(false);
+      setTree((prev) => applyStatus(prev));
     } catch (cause) {
       if (refreshGenerationRef.current !== generation) return;
       setError(cause instanceof Error ? cause : new Error(String(cause)));
     } finally {
       if (refreshGenerationRef.current === generation) setLoading(false);
+      if (refreshGenerationRef.current === generation) setGitLoading(false);
       if (refreshAbortRef.current === refreshAbort) refreshAbortRef.current = null;
     }
-  }, [client, workspaceId, sessionId, rootPath, applyStatus]);
+  }, [client, workspaceId, sessionId, rootPath, repoPaths, applyStatus]);
   const seedFromCapture = useCallback12(
     (manifest) => {
       const overlay = /* @__PURE__ */ new Map();
@@ -2107,6 +2219,15 @@ function useSandboxFiles(sessionId, options = {}) {
       );
       sourceRef.current = "capture";
       setSource("capture");
+      setGitSummary({
+        branch: manifest.repos.length === 1 ? manifest.repos[0]?.head ?? null : null,
+        isRepo: manifest.repos.length > 0,
+        repoCount: manifest.repos.length,
+        ahead: manifest.repos.reduce((sum, repo) => sum + repo.ahead, 0),
+        behind: manifest.repos.reduce((sum, repo) => sum + repo.behind, 0),
+        dirtyCount: manifest.files.length
+      });
+      setGitLoading(false);
       setError(null);
     },
     [applyStatus]
@@ -2287,7 +2408,12 @@ function useSandboxFiles(sessionId, options = {}) {
       const identitySignal = identityAbortRef.current.signal;
       const parent = parentOf(path);
       const exists = Boolean(findNodeByPath(tree, path));
-      const node = { path, name: leafOf(path), kind: "file", size: content.length };
+      const node = {
+        path,
+        name: leafOf(path),
+        kind: "file",
+        size: content.length
+      };
       return await runOptimistic(
         "write",
         (nodes) => exists ? nodes : insertNode(nodes, parent, node),
@@ -2325,11 +2451,20 @@ function useSandboxFiles(sessionId, options = {}) {
     async (path) => {
       if (!sessionId) throw new Error("no session");
       const parent = parentOf(path);
-      const node = { path, name: leafOf(path), kind: "file", size: 0 };
+      const node = {
+        path,
+        name: leafOf(path),
+        kind: "file",
+        size: 0
+      };
       await runOptimistic(
         "create file",
         (nodes) => insertNode(nodes, parent, node),
-        () => client.fsWrite(workspaceId, sessionId, { path, content: "", overwrite: false }),
+        () => client.fsWrite(workspaceId, sessionId, {
+          path,
+          content: "",
+          overwrite: false
+        }),
         [parent]
       );
     },
@@ -2339,7 +2474,12 @@ function useSandboxFiles(sessionId, options = {}) {
     async (path) => {
       if (!sessionId) throw new Error("no session");
       const parent = parentOf(path);
-      const node = { path, name: leafOf(path), kind: "dir", children: [] };
+      const node = {
+        path,
+        name: leafOf(path),
+        kind: "dir",
+        children: []
+      };
       await runOptimistic(
         "create folder",
         (nodes) => insertNode(nodes, parent, node),
@@ -2401,6 +2541,8 @@ function useSandboxFiles(sessionId, options = {}) {
       lastSeqRef.current = 0;
       pendingParentsRef.current = /* @__PURE__ */ new Set();
       pendingGitRef.current = false;
+      pendingAgentToolRef.current = false;
+      lastCommandRefreshAtRef.current = 0;
       if (debounceRef.current) {
         clearTimeout(debounceRef.current);
         debounceRef.current = null;
@@ -2415,6 +2557,9 @@ function useSandboxFiles(sessionId, options = {}) {
       setSource(null);
       setLoading(false);
       setError(null);
+      setGitSummary(null);
+      setGitLoading(false);
+      setContentRevision(0);
     }
     if (!enabled) {
       return;
@@ -2423,6 +2568,13 @@ function useSandboxFiles(sessionId, options = {}) {
     if (currentCapture && (identityChanged || !isLive2 || sourceRef.current !== "live")) {
       seedFromCapture(currentCapture);
     }
+    if (!active) {
+      if (!active) {
+        setLoading(false);
+        setGitLoading(false);
+      }
+      return;
+    }
     if (isLive2 || !currentCapture) {
       void refresh();
     }
@@ -2431,34 +2583,52 @@ function useSandboxFiles(sessionId, options = {}) {
       refreshAbortRef.current = null;
       refreshGenerationRef.current += 1;
     };
-  }, [enabled, isLive2, captureRevision, identityKey, refresh, seedFromCapture]);
+  }, [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 status = await client.gitStatus(
+      const batch = await client.gitReadBatch(
         workspaceId,
         sessionId,
-        { path: rootPath },
+        { 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 file of status.files) {
-        const code = file.worktree ?? file.index;
-        const mapped = code ? GIT_STATUS_TO_TREE[code] : void 0;
-        if (mapped) overlay.set(file.path, mapped);
+      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);
     }
-  }, [client, workspaceId, sessionId, rootPath, applyStatus]);
+  }, [client, workspaceId, sessionId, repoPaths, applyStatus]);
   const events = options.events;
   useEffect8(() => {
     if (!enabled || !events) return;
+    if (!active) {
+      for (const event of events) {
+        if (event.sequence > lastSeqRef.current) lastSeqRef.current = event.sequence;
+      }
+      return;
+    }
     let sawNew = false;
+    let contentChanged = false;
+    let sawCommandDelta = false;
     for (const event of events) {
       if (event.sequence <= lastSeqRef.current) continue;
       if (event.type === "fs.changed") {
@@ -2468,6 +2638,7 @@ function useSandboxFiles(sessionId, options = {}) {
         if (payload.source === "write") continue;
         if (typeof payload.revision === "number" && ownRevisionsRef.current.has(payload.revision))
           continue;
+        contentChanged = true;
         for (const change of payload.changes ?? []) {
           pendingParentsRef.current.add(parentOf(change.path));
           if (change.oldPath) pendingParentsRef.current.add(parentOf(change.oldPath));
@@ -2478,30 +2649,58 @@ function useSandboxFiles(sessionId, options = {}) {
         if (payload && typeof payload === "object" && typeof payload.revision === "number" && ownRevisionsRef.current.has(payload.revision))
           continue;
         pendingGitRef.current = true;
+      } else if (event.type === "agent.toolCall.output") {
+        sawNew = true;
+        contentChanged = true;
+        pendingAgentToolRef.current = true;
+        pendingGitRef.current = true;
+      } else if (event.type === "sandbox.command.output.delta") {
+        sawNew = true;
+        contentChanged = true;
+        sawCommandDelta = true;
+        pendingAgentToolRef.current = true;
+        pendingGitRef.current = true;
       }
     }
     for (const event of events)
       if (event.sequence > lastSeqRef.current) lastSeqRef.current = event.sequence;
     if (!sawNew) return;
+    if (contentChanged && !sawCommandDelta) setContentRevision((revision) => revision + 1);
     if (debounceRef.current) clearTimeout(debounceRef.current);
     const identityGeneration = identityGenerationRef.current;
+    const delay = sawCommandDelta ? Math.max(0, 1e3 - (Date.now() - lastCommandRefreshAtRef.current)) : 150;
     debounceRef.current = setTimeout(() => {
       debounceRef.current = null;
       if (identityGenerationRef.current !== identityGeneration) return;
+      if (sawCommandDelta) {
+        lastCommandRefreshAtRef.current = Date.now();
+        setContentRevision((revision) => revision + 1);
+      }
       const parents = pendingParentsRef.current;
       pendingParentsRef.current = /* @__PURE__ */ new Set();
       const wantGit = pendingGitRef.current;
       pendingGitRef.current = false;
+      const wantAgentTool = pendingAgentToolRef.current;
+      pendingAgentToolRef.current = false;
       void (async () => {
-        if (wantGit) await refreshGitOverlay();
-        if (identityGenerationRef.current !== identityGeneration) return;
-        for (const parent of parents) {
-          if (identityGenerationRef.current !== identityGeneration) return;
-          await reconcilePath(parent);
-        }
+        const paths = wantAgentTool ? loadedDirectoryPaths(treeRef.current) : [...parents];
+        await Promise.all([
+          wantGit ? refreshGitOverlay() : Promise.resolve(),
+          Promise.all(paths.map((path) => reconcilePath(path)))
+        ]);
       })();
-    }, 150);
-  }, [enabled, events, reconcilePath, refreshGitOverlay]);
+    }, delay);
+  }, [enabled, active, events, reconcilePath, refreshGitOverlay]);
+  useEffect8(() => {
+    if (active) return;
+    if (debounceRef.current) {
+      clearTimeout(debounceRef.current);
+      debounceRef.current = null;
+    }
+    pendingParentsRef.current = /* @__PURE__ */ new Set();
+    pendingGitRef.current = false;
+    pendingAgentToolRef.current = false;
+  }, [active]);
   useEffect8(
     () => () => {
       refreshAbortRef.current?.abort();
@@ -2523,25 +2722,28 @@ function useSandboxFiles(sessionId, options = {}) {
     deleteEntry,
     moveEntry,
     refresh,
+    contentRevision: identityMatches ? contentRevision : 0,
     source: identityMatches ? source : null,
     capturedAt: identityMatches && source === "capture" ? capture?.capturedAt ?? null : null,
+    gitSummary: identityMatches ? gitSummary : null,
+    gitLoading: identityMatches && gitLoading,
     loading: identityMatches && loading,
     error: identityMatches ? error : null
   };
 }
 
 // src/hooks/use-sandbox-git.ts
-import { useCallback as useCallback13, useEffect as useEffect9, useMemo as useMemo4, useRef as useRef8, useState as useState7 } from "react";
-function normalizeRoot(root) {
+import { useCallback as useCallback13, useEffect as useEffect9, useMemo as useMemo5, useRef as useRef8, useState as useState7 } from "react";
+function normalizeRoot2(root) {
   const normalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "").replace(/\/+$/, "");
   return normalized === "." ? "" : normalized;
 }
 function qualifyPath(repoRoot, path) {
-  const root = normalizeRoot(repoRoot);
+  const root = normalizeRoot2(repoRoot);
   return root ? `${root}/${path}` : path;
 }
 function qualifyDiff(repoRoot, file) {
-  const root = normalizeRoot(repoRoot);
+  const root = normalizeRoot2(repoRoot);
   return {
     ...file,
     path: qualifyPath(root, file.path),
@@ -2550,11 +2752,11 @@ function qualifyDiff(repoRoot, file) {
   };
 }
 function uniqueRoots(roots) {
-  return [...new Set(roots.map(normalizeRoot))].sort((a, b) => a.localeCompare(b));
+  return [...new Set(roots.map(normalizeRoot2))].sort((a, b) => a.localeCompare(b));
 }
 function repoForPath(manifest, repoPath) {
-  const want = normalizeRoot(repoPath);
-  const exact = manifest.repos.find((r) => normalizeRoot(r.root) === want);
+  const want = normalizeRoot2(repoPath);
+  const exact = manifest.repos.find((r) => normalizeRoot2(r.root) === want);
   if (exact) return exact;
   if (want === "" && manifest.repos.length === 1) return manifest.repos[0] ?? null;
   return null;
@@ -2590,16 +2792,18 @@ function mergeDiffs(current, next) {
 function useSandboxGit(sessionId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
   const enabled = (options.enabled ?? true) && Boolean(sessionId);
+  const active = options.active ?? true;
   const repoPath = options.repoPath ?? "";
   const workspaceWide = options.repoPaths !== void 0;
   const repoPathsKey = uniqueRoots(
     options.repoPaths && options.repoPaths.length > 0 ? options.repoPaths : [repoPath]
   ).join("\0");
-  const repoPaths = useMemo4(() => repoPathsKey.split("\0"), [repoPathsKey]);
-  const staged = options.staged ?? false;
-  const capture = options.capture ?? null;
+  const repoPaths = useMemo5(() => 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 identityKey = `${workspaceId}\0${sessionId ?? ""}\0${repoPathsKey}\0${workspaceWide}\0${staged}`;
+  const identityKey = `${workspaceId}\0${sessionId ?? ""}\0${repoPathsKey}\0${workspaceWide}\0${comparison}`;
   const [diff, setDiff] = useState7([]);
   const [branch, setBranch] = useState7(null);
   const [isRepo, setIsRepo] = useState7(false);
@@ -2614,6 +2818,7 @@ function useSandboxGit(sessionId, options = {}) {
   const refreshGenerationRef = useRef8(0);
   const refreshAbortRef = useRef8(null);
   const lastChangeRef = useRef8(0);
+  const commandRefreshTimerRef = useRef8(null);
   const refresh = useCallback13(async () => {
     if (!sessionId) return;
     refreshAbortRef.current?.abort();
@@ -2623,7 +2828,39 @@ function useSandboxGit(sessionId, options = {}) {
     setLoading(true);
     setError(null);
     try {
-      const statuses = await Promise.all(
+      const diffRequest = (root) => client.gitDiff(
+        workspaceId,
+        sessionId,
+        {
+          path: root,
+          ...comparison === "branch" ? { fromRef: "origin/HEAD", includeUntracked: true } : comparison === "working" ? { fromRef: "HEAD", includeUntracked: true } : { staged: true, includeUntracked: false }
+        },
+        { 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
+          }
+        }))
+      ) : null;
+      const statuses = prefetched ?? await Promise.all(
         repoPaths.map(async (root) => ({
           root,
           status: await client.gitStatus(
@@ -2648,19 +2885,11 @@ function useSandboxGit(sessionId, options = {}) {
         setSource("live");
         return;
       }
+      const prefetchedByRoot = new Map(prefetched?.map(({ root, result }) => [root, result]));
       const results = await Promise.all(
         repositories.map(async ({ root }) => ({
           root,
-          result: await client.gitDiff(
-            workspaceId,
-            sessionId,
-            {
-              path: root,
-              staged,
-              includeUntracked: !staged
-            },
-            { signal: refreshAbort.signal }
-          )
+          result: prefetchedByRoot.get(root) ?? await diffRequest(root)
         }))
       );
       if (refreshGenerationRef.current !== generation) return;
@@ -2681,10 +2910,21 @@ function useSandboxGit(sessionId, options = {}) {
       if (refreshGenerationRef.current === generation) setLoading(false);
       if (refreshAbortRef.current === refreshAbort) refreshAbortRef.current = null;
     }
-  }, [client, workspaceId, sessionId, repoPaths, staged, workspaceWide]);
+  }, [
+    client,
+    workspaceId,
+    sessionId,
+    repoPaths,
+    hasAdvertisedRepoPaths,
+    workspaceWide,
+    comparison
+  ]);
   const seedFromCapture = useCallback13(
     (manifest) => {
       const repositories = workspaceWide ? manifest.repos : [repoForPath(manifest, repoPath)].filter(Boolean);
+      if (comparison === "branch" && repositories.some((repo) => repo.branchDiff === void 0)) {
+        return;
+      }
       if (repositories.length === 0) {
         setIsRepo(false);
         setBranch(null);
@@ -2700,20 +2940,21 @@ function useSandboxGit(sessionId, options = {}) {
       setBranch(repositories.length === 1 ? repositories[0]?.head ?? null : null);
       setAhead(repositories.reduce((sum, repo) => sum + repo.ahead, 0));
       setBehind(repositories.reduce((sum, repo) => sum + repo.behind, 0));
-      setRepoRoots(repositories.map((repo) => normalizeRoot(repo.root)));
+      setRepoRoots(repositories.map((repo) => normalizeRoot2(repo.root)));
       setDiff(
         (prev) => mergeDiffs(
           prev,
-          repositories.flatMap(
-            (repo) => workspaceWide ? repo.diff.map((file) => qualifyDiff(repo.root, file)) : repo.diff
-          )
+          repositories.flatMap((repo) => {
+            const capturedDiff = comparison === "branch" ? repo.branchDiff ?? [] : repo.diff;
+            return workspaceWide ? capturedDiff.map((file) => qualifyDiff(repo.root, file)) : capturedDiff;
+          })
         )
       );
       sourceRef.current = "capture";
       setSource("capture");
       setError(null);
     },
-    [repoPath, workspaceWide]
+    [comparison, repoPath, workspaceWide]
   );
   const captureRef = useRef8(capture);
   captureRef.current = capture;
@@ -2746,6 +2987,10 @@ function useSandboxGit(sessionId, options = {}) {
     if (currentCapture && (identityChanged || !isLive2 || sourceRef.current !== "live")) {
       seedFromCapture(currentCapture);
     }
+    if (!active) {
+      if (!active) setLoading(false);
+      return;
+    }
     if (isLive2 || !currentCapture) {
       void refresh();
     }
@@ -2754,21 +2999,49 @@ function useSandboxGit(sessionId, options = {}) {
       refreshAbortRef.current = null;
       refreshGenerationRef.current += 1;
     };
-  }, [enabled, isLive2, captureRevision, identityKey, refresh, seedFromCapture]);
+  }, [enabled, active, isLive2, captureRevision, identityKey, refresh, seedFromCapture]);
   const events = options.events;
   useEffect9(() => {
-    if (!enabled || !events) return;
+    if (!enabled || !active || !events) {
+      if (commandRefreshTimerRef.current) {
+        clearTimeout(commandRefreshTimerRef.current);
+        commandRefreshTimerRef.current = null;
+      }
+      return;
+    }
     let latest = lastChangeRef.current;
+    let immediate = false;
+    let commandDelta = false;
     for (const event of events) {
-      if (event.type === "git.changed" && event.sequence > latest) {
+      if (event.sequence <= latest) continue;
+      if (event.type === "git.changed" || event.type === "agent.toolCall.output") {
+        latest = event.sequence;
+        immediate = true;
+      } else if (event.type === "sandbox.command.output.delta") {
         latest = event.sequence;
+        commandDelta = true;
       }
     }
     if (latest > lastChangeRef.current) {
       lastChangeRef.current = latest;
-      void refresh();
+      if (immediate) {
+        if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
+        commandRefreshTimerRef.current = null;
+        void refresh();
+      } else if (commandDelta && !commandRefreshTimerRef.current) {
+        commandRefreshTimerRef.current = setTimeout(() => {
+          commandRefreshTimerRef.current = null;
+          void refresh();
+        }, 1e3);
+      }
     }
-  }, [enabled, events, refresh]);
+  }, [enabled, active, events, refresh]);
+  useEffect9(
+    () => () => {
+      if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
+    },
+    []
+  );
   const identityMatches = enabled && stateIdentity === identityKey;
   const visibleRepoRoots = identityMatches ? repoRoots : [];
   return {
@@ -3142,7 +3415,7 @@ function useWorkspaceEdit(sessionId, options = {}) {
 }
 
 // src/hooks/use-machine-chip.ts
-import { useMemo as useMemo5 } from "react";
+import { useMemo as useMemo6 } from "react";
 function formatAsOf(capturedAt, now) {
   const then = Date.parse(capturedAt);
   if (Number.isNaN(then)) return "recently";
@@ -3179,7 +3452,7 @@ function useMachineChip(input) {
     capturedAt,
     now
   } = input;
-  return useMemo5(
+  return useMemo6(
     () => deriveMachineChip({
       liveness,
       capabilitiesState,
@@ -3350,6 +3623,7 @@ import { LayoutGroup, motion } from "motion/react";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 function ChatComposer({
   composer,
+  responsiveBasis,
   effectiveControl,
   queuedAheadCount,
   canControlWorkspace,
@@ -3397,7 +3671,7 @@ function ChatComposer({
     attachments || models || controlsLeading || controlsStart || transcription
   );
   const stackActions = hasControls && Boolean(actionsStart);
-  return /* @__PURE__ */ jsxs2(Root, { controller, className, children: [
+  return /* @__PURE__ */ jsxs2(Root, { controller, responsiveBasis, className, children: [
     /* @__PURE__ */ jsxs2(Frame, { children: [
       /* @__PURE__ */ jsx2(CommandPalette2, {}),
       /* @__PURE__ */ jsxs2(Surface, { children: [
@@ -3406,62 +3680,69 @@ function ChatComposer({
         /* @__PURE__ */ jsx2(Attachments, {}),
         header,
         /* @__PURE__ */ jsx2(Input, { placeholder, autoFocus }),
-        controller.confirmState ? /* @__PURE__ */ jsx2(Confirmation, {}) : /* @__PURE__ */ jsx2(Footer, { className: stackActions ? "max-sm:flex-nowrap sm:flex-wrap" : void 0, children: /* @__PURE__ */ jsxs2(LayoutGroup, { id: "og-composer-footer", children: [
-          hasControls ? /* @__PURE__ */ jsxs2(
-            Controls,
-            {
-              className: stackActions ? "min-w-0 max-sm:flex-1 sm:w-auto" : void 0,
-              children: [
-                controlsLeading,
-                /* @__PURE__ */ jsx2(AttachButton, { className: attachButtonClassName }),
-                transcription ? /* @__PURE__ */ jsx2(
-                  ComposerTranscriptionControl,
-                  {
-                    ...transcription,
-                    suppressed: transcriptionSuppressed,
-                    className: [transcription.className, transcriptionClassName].filter(Boolean).join(" ")
-                  }
-                ) : null,
-                models ? /* @__PURE__ */ jsx2(
-                  motion.span,
-                  {
-                    layout: true,
-                    transition: { duration: 0.36, ease: [0.22, 1, 0.36, 1] },
-                    className: "inline-flex min-w-0",
-                    children: /* @__PURE__ */ jsx2(
-                      ModelPicker2,
+        controller.confirmState ? /* @__PURE__ */ jsx2(Confirmation, {}) : /* @__PURE__ */ jsx2(
+          Footer,
+          {
+            "data-og-stack-actions": stackActions ? "" : void 0,
+            className: stackActions ? "max-sm:flex-nowrap sm:flex-wrap" : void 0,
+            children: /* @__PURE__ */ jsxs2(LayoutGroup, { id: "og-composer-footer", children: [
+              hasControls ? /* @__PURE__ */ jsxs2(
+                Controls,
+                {
+                  className: stackActions ? "min-w-0 max-sm:flex-1 sm:w-auto" : void 0,
+                  children: [
+                    controlsLeading,
+                    /* @__PURE__ */ jsx2(AttachButton, { className: attachButtonClassName }),
+                    transcription ? /* @__PURE__ */ jsx2(
+                      ComposerTranscriptionControl,
                       {
-                        models,
-                        value: selectedModel,
-                        onChange: onSelectModel
+                        ...transcription,
+                        suppressed: transcriptionSuppressed,
+                        className: [transcription.className, transcriptionClassName].filter(Boolean).join(" ")
                       }
-                    )
-                  }
-                ) : null,
-                controlsStart ? /* @__PURE__ */ jsx2(
-                  motion.span,
-                  {
-                    layout: true,
-                    transition: { duration: 0.36, ease: [0.22, 1, 0.36, 1] },
-                    className: "inline-flex min-w-0 items-center gap-1.5",
-                    children: controlsStart
-                  }
-                ) : null
-              ]
-            }
-          ) : /* @__PURE__ */ jsx2(Hint, { children: hint }),
-          /* @__PURE__ */ jsxs2(
-            Actions,
-            {
-              className: stackActions ? "max-sm:shrink-0 sm:w-auto sm:justify-end" : void 0,
-              children: [
-                actionsStart,
-                /* @__PURE__ */ jsx2(PauseButton, {}),
-                /* @__PURE__ */ jsx2(SendButton, {})
-              ]
-            }
-          )
-        ] }) })
+                    ) : null,
+                    models ? /* @__PURE__ */ jsx2(
+                      motion.span,
+                      {
+                        layout: true,
+                        transition: { duration: 0.36, ease: [0.22, 1, 0.36, 1] },
+                        className: "inline-flex min-w-0",
+                        children: /* @__PURE__ */ jsx2(
+                          ModelPicker2,
+                          {
+                            models,
+                            value: selectedModel,
+                            onChange: onSelectModel
+                          }
+                        )
+                      }
+                    ) : null,
+                    controlsStart ? /* @__PURE__ */ jsx2(
+                      motion.span,
+                      {
+                        layout: true,
+                        transition: { duration: 0.36, ease: [0.22, 1, 0.36, 1] },
+                        className: "inline-flex min-w-0 items-center gap-1.5",
+                        children: controlsStart
+                      }
+                    ) : null
+                  ]
+                }
+              ) : /* @__PURE__ */ jsx2(Hint, { children: hint }),
+              /* @__PURE__ */ jsxs2(
+                Actions,
+                {
+                  className: stackActions ? "max-sm:shrink-0 sm:w-auto sm:justify-end" : void 0,
+                  children: [
+                    actionsStart,
+                    /* @__PURE__ */ jsx2(PauseButton, {}),
+                    /* @__PURE__ */ jsx2(SendButton, {})
+                  ]
+                }
+              )
+            ] })
+          }
+        )
       ] })
     ] }),
     /* @__PURE__ */ jsx2(Help, {}),
@@ -3683,6 +3964,9 @@ async function attachRenderer(prefer, loaders, onTier) {
 
 // src/components/sandbox-terminal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+function clearTerminalBootStatus(term) {
+  term.write("\r\x1B[2K\x1B[2J\x1B[H");
+}
 function forcedRendererFailures() {
   const raw = typeof globalThis !== "undefined" ? globalThis.__OG_FORCE_RENDERER_FAIL__ : void 0;
   const set = /* @__PURE__ */ new Set();
@@ -3736,7 +4020,8 @@ function SandboxTerminal({
     }
   });
   const ptyMode = ptyWs && ptyStatus !== "closed";
-  const interactive = !readOnly && (ptyMode || result.write !== null);
+  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 booting = activated && !ptyMode && !warm && liveness !== null && liveness !== void 0 && result.chunks.length === 0;
   function handleActivate() {
@@ -3873,7 +4158,7 @@ function SandboxTerminal({
     if (!booting) {
       if (bootActiveRef.current) {
         bootActiveRef.current = false;
-        if (!wroteFirehoseRef.current) term.clear();
+        if (!wroteFirehoseRef.current) clearTerminalBootStatus(term);
       }
       return;
     }
@@ -3951,7 +4236,14 @@ function SandboxTerminal({
         ] })
       ] }),
       /* @__PURE__ */ jsxs4("span", { className: "flex shrink-0 items-center gap-2", children: [
-        !interactive && /* @__PURE__ */ jsx4("span", { className: "rounded-og-sm bg-og-surface-2 px-1.5 py-0.5 text-og-xs uppercase tracking-wide", children: "read-only" }),
+        terminalModeLabel && /* @__PURE__ */ jsx4(
+          "span",
+          {
+            className: "rounded-og-sm bg-og-surface-2 px-1.5 py-0.5 text-og-xs uppercase tracking-wide",
+            role: "status",
+            children: terminalModeLabel
+          }
+        ),
         /* @__PURE__ */ jsx4(
           "button",
           {
@@ -4051,7 +4343,7 @@ import {
   useEffect as useEffect15,
   useId as useId2,
   useLayoutEffect,
-  useMemo as useMemo7,
+  useMemo as useMemo8,
   useRef as useRef13,
   useState as useState12
 } from "react";
@@ -4059,11 +4351,11 @@ import { AlertDialog } from "radix-ui";
 import { VList } from "virtua";
 
 // src/lib/use-unicode-fonts.ts
-import { useEffect as useEffect14, useMemo as useMemo6 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo7 } 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 = useMemo6(() => collectUnicodeContent(values), [values]);
+  const content = useMemo7(() => collectUnicodeContent(values), [values]);
   useEffect14(() => {
     if (content.japanese) {
       void import("./noto-sans-jp-loader.generated-HFGLYBR3.js").then(({ loadNotoSansJp }) => loadNotoSansJp(content.japanese)).catch(() => void 0);
@@ -4146,10 +4438,11 @@ function FileBrowser({
   const [busy, setBusy] = useState12(false);
   const [coarsePointer, setCoarsePointer] = useState12(false);
   const treeId = useId2();
-  const containerRef = useRef13(null);
+  const container = usePortalTokenSource();
+  const containerRef = container.currentRef;
   const deleteReturnFocusRef = useRef13(null);
   const vlistRef = useRef13(null);
-  const portalTokenStyle = usePortalTokenStyle(containerRef);
+  const portalTokenStyle = usePortalTokenStyle(container.source);
   const getTreeElement = useCallback16(
     () => typeof document === "undefined" ? null : document.getElementById(treeId),
     [treeId]
@@ -4209,7 +4502,7 @@ function FileBrowser({
     [expanded, expand]
   );
   const cold = result.source !== "live";
-  const renderItems = useMemo7(() => {
+  const renderItems = useMemo8(() => {
     const items = [];
     if (draftCreate && draftCreate.parent === "") {
       items.push({ type: "create", parent: "", kind: draftCreate.kind, depth: 0 });
@@ -4240,22 +4533,22 @@ function FileBrowser({
     walk(result.tree, 0);
     return items;
   }, [result.tree, expanded, draftCreate, loadingPaths, result.expandingPaths, cold]);
-  const unicodeFontPaths = useMemo7(
+  const unicodeFontPaths = useMemo8(
     () => renderItems.flatMap((item) => item.type === "node" ? [item.node.path] : []),
     [renderItems]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const flatRows = useMemo7(
+  const flatRows = useMemo8(
     () => renderItems.flatMap(
       (item) => item.type === "node" ? [{ node: item.node, depth: item.depth }] : []
     ),
     [renderItems]
   );
-  const rowIndexByPath = useMemo7(
+  const rowIndexByPath = useMemo8(
     () => new Map(flatRows.map((row, index) => [row.node.path, index])),
     [flatRows]
   );
-  const treePositionByPath = useMemo7(() => {
+  const treePositionByPath = useMemo8(() => {
     const positions = /* @__PURE__ */ new Map();
     const visit = (nodes) => {
       nodes.forEach((node, index) => {
@@ -4517,6 +4810,7 @@ function FileBrowser({
       runDelete,
       supportsMutation,
       coarsePointer,
+      containerRef,
       rowIndexByPath,
       treeId
     ]
@@ -4537,7 +4831,7 @@ function FileBrowser({
   const showDegradedTree = result.error && result.tree.length > 0;
   const showEmpty = !result.loading && result.tree.length === 0 && !draftCreate;
   const showToolbar = supportsMutation || result.loading;
-  const usesVirtualTree = !showErrorEmpty && !showEmpty;
+  const usesVirtualTree = !showErrorEmpty && !showEmpty && renderItems.length > 500;
   const renderNodeRow = (node, depth) => {
     const isOpen = expanded.has(node.path);
     if (renderNode) {
@@ -4772,7 +5066,7 @@ function FileBrowser({
               type: "button",
               onClick: () => void result.refresh(),
               disabled: result.loading,
-              className: "inline-flex min-h-7 shrink-0 items-center gap-1 rounded-og-sm border border-og-border bg-og-surface-1 px-2 font-medium text-og-fg transition-colors hover:border-og-border-strong focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent disabled:cursor-not-allowed disabled:opacity-50 pointer-coarse:min-h-11",
+              className: "inline-flex min-h-7 shrink-0 items-center gap-1 rounded-og-sm border border-og-border bg-og-surface-1 px-2 font-medium text-og-fg transition-colors hover:border-og-border-strong focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent disabled:cursor-not-allowed disabled:opacity-50 pointer-coarse:min-h-11",
               children: [
                 /* @__PURE__ */ jsx5(
                   RefreshCwIcon,
@@ -4791,13 +5085,7 @@ function FileBrowser({
     /* @__PURE__ */ jsx5(
       "div",
       {
-        ref: containerRef,
-        id: usesVirtualTree ? void 0 : treeId,
-        role: usesVirtualTree ? void 0 : "tree",
-        "aria-label": usesVirtualTree ? void 0 : "Workspace files",
-        "aria-activedescendant": usesVirtualTree ? void 0 : activeDescendantId,
-        tabIndex: usesVirtualTree ? void 0 : 0,
-        "aria-multiselectable": usesVirtualTree ? void 0 : false,
+        ref: container.ref,
         onFocus: (event) => {
           if (event.target.id === treeId && cursorIndex < 0) {
             const first = flatRows[0];
@@ -4816,7 +5104,7 @@ function FileBrowser({
           void onDropOnto("", src);
         } : void 0,
         className: cn(
-          "flex min-h-0 min-w-0 flex-1 flex-col p-1 outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
+          "flex min-h-0 min-w-0 flex-1 flex-col p-1",
           dragOver === "" && "ring-1 ring-inset ring-og-accent"
         ),
         "data-opengeni-file-tree": true,
@@ -4841,7 +5129,19 @@ function FileBrowser({
               ]
             }
           )
-        ] }) : showEmpty ? /* @__PURE__ */ jsx5("div", { className: "p-2 text-og-sm text-og-fg-subtle", children: emptyState ?? "This directory is empty" }) : (
+        ] }) : showEmpty ? /* @__PURE__ */ jsx5("div", { className: "p-2 text-og-sm text-og-fg-subtle", children: emptyState ?? "This directory is empty" }) : !usesVirtualTree ? /* @__PURE__ */ jsx5(
+          "div",
+          {
+            id: treeId,
+            role: "tree",
+            "aria-label": "Workspace files",
+            "aria-activedescendant": activeDescendantId,
+            "aria-multiselectable": false,
+            tabIndex: 0,
+            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",
+            children: renderItems.map((item) => /* @__PURE__ */ jsx5("div", { className: "min-w-0", children: renderItem(item) }, itemKey(item)))
+          }
+        ) : (
           // Virtualized: only the rows in/near the viewport mount, so a 3k-node
           // tree stays responsive. The flat item list already carries the
           // expanded subtree + synthetic (create/skeleton/residue) rows.
@@ -4855,7 +5155,7 @@ function FileBrowser({
               "aria-activedescendant": activeDescendantId,
               "aria-multiselectable": false,
               tabIndex: 0,
-              className: "min-h-0 flex-1 outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
+              className: "min-h-0 flex-1 outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
               itemSize: coarsePointer ? 44 : 28,
               ssrCount: Math.min(32, renderItems.length),
               children: renderItems.map((item) => /* @__PURE__ */ jsx5("div", { className: "min-w-0", children: renderItem(item) }, itemKey(item)))
@@ -4941,11 +5241,11 @@ function DeleteDialog({
         }
       },
       children: /* @__PURE__ */ jsxs5(AlertDialog.Portal, { container: typeof document === "undefined" ? null : document.body, children: [
-        /* @__PURE__ */ jsx5(AlertDialog.Overlay, { className: "fixed inset-0 z-[100] bg-black/45 backdrop-blur-[2px]" }),
+        /* @__PURE__ */ jsx5(AlertDialog.Overlay, { className: "og-root fixed inset-0 z-[100] bg-black/45 backdrop-blur-[2px]" }),
         /* @__PURE__ */ jsxs5(
           AlertDialog.Content,
           {
-            className: "og-root fixed left-1/2 top-1/2 z-[101] max-h-[calc(100dvh-2rem)] w-[calc(100%-2rem)] max-w-sm -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-og-lg border border-og-border-strong bg-og-surface-1 p-4 text-og-fg shadow-2xl outline-none",
+            className: "og-root fixed left-1/2 top-1/2 z-[101] max-h-[calc(100dvh-2rem)] w-[calc(100%-2rem)] max-w-sm -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-og-lg border border-og-border-strong bg-og-surface-1 p-4 text-og-fg shadow-2xl outline-hidden",
             style: portalTokenStyle,
             onOpenAutoFocus: (event) => {
               event.preventDefault();
@@ -5090,7 +5390,7 @@ function InlineInput({
             className: cn(
               "min-w-0 flex-1 rounded-og-sm border bg-og-bg px-1 py-0 text-og-sm",
               "border-og-accent text-og-fg",
-              "outline-none"
+              "outline-hidden"
             )
           }
         )
@@ -5193,14 +5493,14 @@ import {
   useEffect as useEffect17,
   useId as useId3,
   useLayoutEffect as useLayoutEffect2,
-  useMemo as useMemo9,
+  useMemo as useMemo10,
   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 useMemo8, useRef as useRef14, useState as useState13 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect16, useMemo as useMemo9, 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 };
@@ -5237,10 +5537,10 @@ function useWindowedSections(opts) {
   );
   useEffect16(() => {
     setHeights((prev) => {
-      if (prev.length === count) return prev;
-      return Array.from({ length: count }, (_, i) => prev[i] ?? estimateHeight(i));
+      const next = Array.from({ length: count }, (_, i) => estimateHeight(i));
+      return prev.length === next.length && prev.every((height, index) => height === next[index]) ? prev : next;
     });
-  }, [count]);
+  }, [count, estimateHeight]);
   const heightsRef = useRef14(heights);
   heightsRef.current = heights;
   const [range, setRange] = useState13(() => ({
@@ -5283,7 +5583,7 @@ function useWindowedSections(opts) {
       return next;
     });
   }, []);
-  const offsets = useMemo8(() => {
+  const offsets = useMemo9(() => {
     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);
@@ -5406,12 +5706,12 @@ function WorkbenchChanges({
   const [layout, setLayout] = useState14("unified");
   const [activePath, setActivePath] = useState14(null);
   const pickerId = useId3();
-  const unicodeFontPaths = useMemo9(
+  const unicodeFontPaths = useMemo10(
     () => diff.flatMap((file) => file.oldPath ? [file.path, file.oldPath] : [file.path]),
     [diff]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const { orderedFiles, rows, grouped } = useMemo9(() => buildRail(diff), [diff]);
+  const { orderedFiles, rows, grouped } = useMemo10(() => buildRail(diff), [diff]);
   const selectedIndex = orderedFiles.findIndex((file) => file.path === activePath);
   const activeIndex = selectedIndex >= 0 ? selectedIndex : 0;
   useChangesLayoutEffect(() => {
@@ -5441,8 +5741,8 @@ function WorkbenchChanges({
       return () => query.removeListener(update);
     }
   }, []);
-  const additions = useMemo9(() => diff.reduce((sum, f) => sum + f.additions, 0), [diff]);
-  const deletions = useMemo9(() => diff.reduce((sum, f) => sum + f.deletions, 0), [diff]);
+  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 estimateHeight = useCallback18(
     (index) => {
       const file = orderedFiles[index];
@@ -5555,7 +5855,7 @@ function WorkbenchChanges({
                 },
                 title: activeFile?.path,
                 "data-compact-file-picker": true,
-                className: "h-11 w-full rounded-og-md border border-og-border bg-og-bg px-3 font-og-mono text-og-sm text-og-fg outline-none transition-colors focus:border-og-accent focus:ring-2 focus:ring-og-accent-soft",
+                className: "h-11 w-full rounded-og-md border border-og-border bg-og-bg px-3 font-og-mono text-og-sm text-og-fg outline-hidden transition-colors focus:border-og-accent focus:ring-2 focus:ring-og-accent-soft",
                 children: orderedFiles.map((file, index) => /* @__PURE__ */ jsx6("option", { value: index, children: compactFileLabel(file) }, file.path))
               }
             )
@@ -5676,7 +5976,7 @@ function RailFileRow({
       title: file.path,
       "data-rail-file": true,
       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-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent pointer-coarse:min-h-11",
+        "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",
         active && "bg-og-accent-soft text-og-fg before:absolute before:inset-y-1 before:left-0 before:w-0.5 before:rounded-r-full before:bg-og-accent"
       ),
@@ -5774,7 +6074,7 @@ function GuardBody({
       {
         type: "button",
         onClick: () => onOpenFile(file.path),
-        className: "inline-flex min-h-8 shrink-0 items-center gap-1.5 rounded-og-sm border border-og-border px-2 py-1 text-og-xs font-medium text-og-fg-muted transition-colors hover:border-og-border-strong hover:bg-og-surface-2 hover:text-og-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:min-h-11",
+        className: "inline-flex min-h-8 shrink-0 items-center gap-1.5 rounded-og-sm border border-og-border px-2 py-1 text-og-xs font-medium text-og-fg-muted transition-colors hover:border-og-border-strong hover:bg-og-surface-2 hover:text-og-fg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent pointer-coarse:min-h-11",
         children: [
           "Open in Files",
           /* @__PURE__ */ jsx6(ArrowUpRightIcon, { className: "size-3.5", "aria-hidden": true })
@@ -5793,7 +6093,7 @@ function LayoutToggle({
       type: "button",
       onClick: () => onChange(value),
       className: cn(
-        "min-h-7 rounded-og-xs px-1.5 py-0.5 text-og-xs capitalize focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
+        "min-h-7 rounded-og-xs px-1.5 py-0.5 text-og-xs capitalize focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
         layout === value ? "bg-og-accent-soft text-og-fg" : "text-og-fg-subtle hover:text-og-fg"
       ),
       children: value
@@ -5912,7 +6212,7 @@ import { Loader2Icon, SaveIcon } from "lucide-react";
 import {
   useCallback as useCallback19,
   useEffect as useEffect19,
-  useMemo as useMemo10,
+  useMemo as useMemo11,
   useRef as useRef16,
   useState as useState16
 } from "react";
@@ -6005,7 +6305,7 @@ function CodeEditor({
     },
     [baseline, onEditIntent]
   );
-  const langKey = useMemo10(() => languageForPath(path), [path]);
+  const langKey = useMemo11(() => languageForPath(path), [path]);
   useEffect19(() => {
     let cancelled = false;
     void (async () => {
@@ -6093,7 +6393,7 @@ function CodeEditor({
     return () => clearTimeout(t);
   }, [savedTick]);
   const fileName = path.split("/").filter(Boolean).pop() ?? path;
-  const cmExtensions = useMemo10(() => {
+  const cmExtensions = useMemo11(() => {
     if (!bundle) return [];
     const exts = [bundle.saveKeymapExtension(() => saveRef.current())];
     if (bundle.languageExtension) exts.push(bundle.languageExtension);
@@ -6239,7 +6539,7 @@ function PlainTextarea({
         }
       },
       "aria-label": "Plain text file editor",
-      className: "h-full w-full resize-none bg-transparent p-2 font-og-mono text-og-sm text-og-fg outline-none"
+      className: "h-full w-full resize-none bg-transparent p-2 font-og-mono text-og-sm text-og-fg outline-hidden"
     }
   );
 }
@@ -6250,6 +6550,7 @@ function EditorSkeleton() {
 // src/components/sandbox-files.tsx
 import { FileCode2Icon, FileWarningIcon as FileWarningIcon2, LoaderCircleIcon } from "lucide-react";
 import { useCallback as useCallback20, useEffect as useEffect20, useRef as useRef17, useState as useState17 } from "react";
+import { Group, Panel, Separator } from "react-resizable-panels";
 import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
 function SandboxFiles({
   files,
@@ -6297,17 +6598,30 @@ function SandboxFiles({
   const [wide, setWide] = useState17(false);
   useEffect20(() => {
     const el = rootRef.current;
-    if (!el || typeof ResizeObserver === "undefined") return;
-    const observer = new ResizeObserver((entries) => {
-      const w = entries[0]?.contentRect.width ?? 0;
-      setWide(w >= 720);
-    });
+    if (!el) return;
+    const update = () => setWide(el.getBoundingClientRect().width >= 720);
+    update();
+    if (typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver(update);
     observer.observe(el);
-    return () => observer.disconnect();
+    const surface = el.closest("[data-workspace-surface]");
+    const surfaceObserver = surface && typeof MutationObserver !== "undefined" ? new MutationObserver(update) : null;
+    surfaceObserver?.observe(surface, {
+      attributes: true,
+      attributeFilter: ["class", "style"]
+    });
+    return () => {
+      observer.disconnect();
+      surfaceObserver?.disconnect();
+    };
   }, []);
   const resolvedTheme = useThemeType(themeType);
   const viewPath = selected;
-  const fileView = useFileView(viewPath, files.readFile, viewReloadRevision);
+  const fileView = useFileView(
+    viewPath,
+    files.readFile,
+    (files.contentRevision ?? 0) + viewReloadRevision
+  );
   const selectFile = useCallback20((path) => {
     if (pendingRequestRef.current !== null) {
       handledRequestRef.current = pendingRequestRef.current;
@@ -6322,18 +6636,6 @@ function SandboxFiles({
   const showEditor = canEdit && editMode;
   const captureFileUnavailable = fileView.error instanceof CapturedFileUnavailableError ? fileView.error : null;
   const waitingForSelectedFile = liveRequestedPath === viewPath && (!liveWorkspaceReady || files.loading) && captureFileUnavailable !== null;
-  if (!fileSystemAvailable) {
-    return /* @__PURE__ */ jsx10(
-      Notice,
-      {
-        className,
-        icon: /* @__PURE__ */ jsx10(FileWarningIcon2, { className: "size-5", "aria-hidden": true }),
-        title: "Files unavailable",
-        announce: "alert",
-        children: "This sandbox does not expose a file system."
-      }
-    );
-  }
   if (workspaceResting || workspaceWaking) {
     return /* @__PURE__ */ jsx10("div", { className: cn("h-full", className), "data-opengeni-workspace-resting": true, children: /* @__PURE__ */ jsxs8(
       Notice,
@@ -6354,162 +6656,206 @@ function SandboxFiles({
       }
     ) });
   }
+  if (!fileSystemAvailable) {
+    return /* @__PURE__ */ jsx10(
+      Notice,
+      {
+        className,
+        icon: /* @__PURE__ */ jsx10(FileWarningIcon2, { className: "size-5", "aria-hidden": true }),
+        title: "Files unavailable",
+        announce: "alert",
+        children: "This sandbox does not expose a file system."
+      }
+    );
+  }
   return /* @__PURE__ */ jsxs8("div", { ref: rootRef, className: cn("flex h-full min-h-0 min-w-0 flex-col", className), children: [
-    /* @__PURE__ */ jsx10(GitHeader, { git, dirtyCount: git.diff.length }),
-    /* @__PURE__ */ jsxs8("div", { className: cn("flex min-h-0 flex-1", wide ? "flex-row" : "flex-col"), children: [
-      /* @__PURE__ */ jsx10(
-        "div",
-        {
-          className: cn(
-            "flex min-h-0 flex-col",
-            wide ? "w-[280px] shrink-0 border-r border-og-border" : "flex-1"
-          ),
-          children: /* @__PURE__ */ jsx10(
-            FileBrowser,
-            {
-              result: files,
-              selectedPath: selected ?? void 0,
-              onSelectFile: selectFile,
-              editable,
-              emptyState: "This directory is empty",
-              className: "min-w-0 flex-1"
-            }
-          )
+    /* @__PURE__ */ jsx10(
+      GitHeader,
+      {
+        loading: Boolean(files.loading || files.gitLoading || files.source === null || git?.loading) && files.gitSummary === null,
+        git: files.gitSummary ?? {
+          branch: git?.branch ?? null,
+          isRepo: git?.isRepo ?? false,
+          repoCount: git?.repoCount ?? 0,
+          ahead: git?.ahead ?? 0,
+          behind: git?.behind ?? 0,
+          dirtyCount: git?.diff.length ?? 0
         }
-      ),
-      /* @__PURE__ */ jsxs8(
-        "div",
-        {
-          className: cn(
-            "flex min-h-0 min-w-0 flex-col",
-            wide ? "flex-1" : "flex-[1.4] border-t border-og-border"
-          ),
-          children: [
-            /* @__PURE__ */ jsxs8("div", { className: "flex shrink-0 items-center justify-between gap-2 border-b border-og-border bg-og-surface-1 px-2 py-1", children: [
-              /* @__PURE__ */ jsx10(
-                "span",
-                {
-                  "data-opengeni-selected-file": true,
-                  className: "min-w-0 truncate font-og-mono text-og-xs text-og-fg-muted",
-                  children: selected ?? "No file selected"
-                }
-              ),
-              canEdit && /* @__PURE__ */ jsx10(
-                Segmented,
+      }
+    ),
+    /* @__PURE__ */ jsxs8(
+      Group,
+      {
+        orientation: wide ? "horizontal" : "vertical",
+        className: cn("min-h-0 flex-1", wide ? "flex-row" : "flex-col"),
+        children: [
+          /* @__PURE__ */ jsx10(
+            Panel,
+            {
+              id: "sandbox-files-tree",
+              defaultSize: wide ? "280px" : "40%",
+              minSize: wide ? "180px" : "120px",
+              maxSize: wide ? "60%" : "70%",
+              className: "flex min-h-0 min-w-0 flex-col",
+              children: /* @__PURE__ */ jsx10(
+                FileBrowser,
                 {
-                  options: [
-                    { value: "view", label: "View" },
-                    { value: "edit", label: "Edit" }
-                  ],
-                  value: editMode ? "edit" : "view",
-                  onChange: (v) => setEditMode(v === "edit")
+                  result: files,
+                  selectedPath: selected ?? void 0,
+                  onSelectFile: selectFile,
+                  editable,
+                  emptyState: "This directory is empty",
+                  className: "min-w-0 flex-1"
                 }
               )
-            ] }),
-            /* @__PURE__ */ jsx10("div", { className: "min-h-0 flex-1 overflow-auto", children: viewPath ? showEditor && fileView.content !== null ? /* @__PURE__ */ jsx10(
-              CodeEditor,
-              {
-                path: viewPath,
-                initialContents: fileView.content,
-                themeType: resolvedTheme,
-                onSave: (contents) => files.writeFile(viewPath, contents, { expectedContent: fileView.content }),
-                onOverwrite: (contents) => files.writeFile(viewPath, contents, { force: true }),
-                onReload: () => setViewReloadRevision((revision) => revision + 1),
-                ...onEditIntent ? { onEditIntent } : {},
-                className: "h-full"
-              },
-              viewPath
-            ) : waitingForSelectedFile ? /* @__PURE__ */ jsxs8(
-              Notice,
-              {
-                icon: /* @__PURE__ */ jsx10(
-                  LoaderCircleIcon,
+            }
+          ),
+          /* @__PURE__ */ jsx10(
+            Separator,
+            {
+              "aria-label": "Resize file tree",
+              className: cn(
+                "group relative z-10 shrink-0 cursor-col-resize outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent",
+                "w-px bg-og-border after:absolute after:inset-y-0 after:left-1/2 after:w-3 after:-translate-x-1/2",
+                "hover:bg-og-accent focus-visible:bg-og-accent data-[separator-state=dragging]:bg-og-accent",
+                !wide && "h-px w-full cursor-row-resize after:inset-x-0 after:inset-y-auto after:top-1/2 after:h-3 after:w-full after:-translate-x-0 after:-translate-y-1/2"
+              )
+            }
+          ),
+          /* @__PURE__ */ jsxs8(
+            Panel,
+            {
+              id: "sandbox-files-viewer",
+              minSize: wide ? "240px" : "160px",
+              className: cn("flex min-h-0 min-w-0 flex-col", !wide && "border-t border-og-border"),
+              children: [
+                /* @__PURE__ */ jsxs8("div", { className: "flex shrink-0 items-center justify-between gap-2 border-b border-og-border bg-og-surface-1 px-2 py-1", children: [
+                  /* @__PURE__ */ jsx10(
+                    "span",
+                    {
+                      "data-opengeni-selected-file": true,
+                      className: "min-w-0 truncate font-og-mono text-og-xs text-og-fg-muted",
+                      children: selected ?? "No file selected"
+                    }
+                  ),
+                  canEdit && /* @__PURE__ */ jsx10(
+                    Segmented,
+                    {
+                      options: [
+                        { value: "view", label: "View" },
+                        { value: "edit", label: "Edit" }
+                      ],
+                      value: editMode ? "edit" : "view",
+                      onChange: (v) => setEditMode(v === "edit")
+                    }
+                  )
+                ] }),
+                /* @__PURE__ */ jsx10("div", { className: "min-h-0 flex-1 overflow-auto", children: viewPath ? showEditor && fileView.content !== null ? /* @__PURE__ */ jsx10(
+                  CodeEditor,
                   {
-                    className: "size-5 animate-spin motion-reduce:animate-none",
-                    "aria-hidden": true
+                    path: viewPath,
+                    initialContents: fileView.content,
+                    themeType: resolvedTheme,
+                    onSave: (contents) => files.writeFile(viewPath, contents, { expectedContent: fileView.content }),
+                    onOverwrite: (contents) => files.writeFile(viewPath, contents, { force: true }),
+                    onReload: () => setViewReloadRevision((revision) => revision + 1),
+                    ...onEditIntent ? { onEditIntent } : {},
+                    className: "h-full"
+                  },
+                  viewPath
+                ) : waitingForSelectedFile ? /* @__PURE__ */ jsxs8(
+                  Notice,
+                  {
+                    icon: /* @__PURE__ */ jsx10(
+                      LoaderCircleIcon,
+                      {
+                        className: "size-5 animate-spin motion-reduce:animate-none",
+                        "aria-hidden": true
+                      }
+                    ),
+                    title: "Waking workspace",
+                    announce: "status",
+                    children: [
+                      "Opening ",
+                      viewPath,
+                      " when the live file system is ready\u2026"
+                    ]
                   }
-                ),
-                title: "Waking workspace",
-                announce: "status",
-                children: [
-                  "Opening ",
+                ) : captureFileUnavailable ? /* @__PURE__ */ jsxs8(Notice, { icon: /* @__PURE__ */ jsx10(FileCode2Icon, { className: "size-5", "aria-hidden": true }), title: "On machine", children: [
+                  /* @__PURE__ */ jsx10("p", { children: captureFileUnavailable.reason === "too-large" ? "This file is larger than the captured preview limit." : captureFileUnavailable.reason === "content-missing" ? "The captured copy is no longer available." : "This file was indexed, but it was not changed in the captured turn." }),
+                  onWakeWorkspace ? /* @__PURE__ */ jsx10(
+                    WakeButton,
+                    {
+                      onClick: () => {
+                        setLiveRequestedPath(viewPath);
+                        if (liveWorkspaceReady) void files.refresh();
+                        else onWakeWorkspace();
+                      },
+                      children: liveWorkspaceReady ? "Retry live file" : "Open live file"
+                    }
+                  ) : null
+                ] }) : fileView.error ? /* @__PURE__ */ jsxs8(Notice, { announce: "alert", children: [
+                  "Could not open ",
                   viewPath,
-                  " when the live file system is ready\u2026"
-                ]
-              }
-            ) : captureFileUnavailable ? /* @__PURE__ */ jsxs8(Notice, { icon: /* @__PURE__ */ jsx10(FileCode2Icon, { className: "size-5", "aria-hidden": true }), title: "On machine", children: [
-              /* @__PURE__ */ jsx10("p", { children: captureFileUnavailable.reason === "too-large" ? "This file is larger than the captured preview limit." : captureFileUnavailable.reason === "content-missing" ? "The captured copy is no longer available." : "This file was indexed, but it was not changed in the captured turn." }),
-              onWakeWorkspace ? /* @__PURE__ */ jsx10(
-                WakeButton,
-                {
-                  onClick: () => {
-                    setLiveRequestedPath(viewPath);
-                    if (liveWorkspaceReady) void files.refresh();
-                    else onWakeWorkspace();
-                  },
-                  children: liveWorkspaceReady ? "Retry live file" : "Open live file"
-                }
-              ) : null
-            ] }) : fileView.error ? /* @__PURE__ */ jsxs8(Notice, { announce: "alert", children: [
-              "Could not open ",
-              viewPath,
-              ": ",
-              fileView.error.message
-            ] }) : fileView.loading ? /* @__PURE__ */ jsxs8(Notice, { announce: "status", children: [
-              "Loading ",
-              viewPath,
-              "\u2026"
-            ] }) : fileView.isBinary ? /* @__PURE__ */ jsxs8(Notice, { children: [
-              viewPath,
-              " is a binary file (",
-              fileView.sizeBytes ?? 0,
-              " bytes)."
-            ] }) : fileView.content !== null ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
-              fileView.truncated && /* @__PURE__ */ jsxs8("div", { className: "border-b border-og-border bg-og-surface-1 px-2 py-1 text-og-xs text-og-status-running", children: [
-                "Large file \u2014 showing a truncated preview (",
-                fileView.sizeBytes ?? 0,
-                " bytes loaded). Editing is disabled to avoid corrupting the file."
-              ] }),
-              usePierre ? /* @__PURE__ */ jsx10(
-                PierreFile,
-                {
-                  path: viewPath,
-                  contents: fileView.content,
-                  themeType: resolvedTheme,
-                  fallback: /* @__PURE__ */ jsx10("pre", { className: "overflow-auto whitespace-pre p-2 font-og-mono text-og-sm text-og-fg", children: fileView.content }),
-                  className: "p-1"
-                }
-              ) : /* @__PURE__ */ jsx10("pre", { className: "overflow-auto whitespace-pre p-2 font-og-mono text-og-sm text-og-fg", children: fileView.content })
-            ] }) : /* @__PURE__ */ jsxs8(Notice, { announce: "status", children: [
-              "Loading ",
-              viewPath,
-              "\u2026"
-            ] }) : (
-              // Nothing selected — the tree shows the whole workspace; pick a file.
-              requestedPath && !requestedPathReady ? /* @__PURE__ */ jsxs8(
-                Notice,
-                {
-                  icon: /* @__PURE__ */ jsx10(
-                    LoaderCircleIcon,
+                  ": ",
+                  fileView.error.message
+                ] }) : fileView.loading ? /* @__PURE__ */ jsxs8(Notice, { announce: "status", children: [
+                  "Loading ",
+                  viewPath,
+                  "\u2026"
+                ] }) : fileView.isBinary ? /* @__PURE__ */ jsxs8(Notice, { children: [
+                  viewPath,
+                  " is a binary file (",
+                  fileView.sizeBytes ?? 0,
+                  " bytes)."
+                ] }) : fileView.content !== null ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
+                  fileView.truncated && /* @__PURE__ */ jsxs8("div", { className: "border-b border-og-border bg-og-surface-1 px-2 py-1 text-og-xs text-og-status-running", children: [
+                    "Large file \u2014 showing a truncated preview (",
+                    fileView.sizeBytes ?? 0,
+                    " bytes loaded). Editing is disabled to avoid corrupting the file."
+                  ] }),
+                  usePierre ? /* @__PURE__ */ jsx10(
+                    PierreFile,
                     {
-                      className: "size-5 animate-spin motion-reduce:animate-none",
-                      "aria-hidden": true
+                      path: viewPath,
+                      contents: fileView.content,
+                      themeType: resolvedTheme,
+                      fallback: /* @__PURE__ */ jsx10("pre", { className: "overflow-auto whitespace-pre p-2 font-og-mono text-og-sm text-og-fg", children: fileView.content }),
+                      className: "p-1"
                     }
-                  ),
-                  title: "Waking sandbox",
-                  announce: "status",
-                  children: [
-                    "Opening ",
-                    requestedPath,
-                    " when the live workspace is ready\u2026"
-                  ]
-                }
-              ) : /* @__PURE__ */ jsx10(Notice, { icon: /* @__PURE__ */ jsx10(FileCode2Icon, { className: "size-5", "aria-hidden": true }), title: "Choose a file", children: "Select a file in the tree to preview it." })
-            ) })
-          ]
-        }
-      )
-    ] })
+                  ) : /* @__PURE__ */ jsx10("pre", { className: "overflow-auto whitespace-pre p-2 font-og-mono text-og-sm text-og-fg", children: fileView.content })
+                ] }) : /* @__PURE__ */ jsxs8(Notice, { announce: "status", children: [
+                  "Loading ",
+                  viewPath,
+                  "\u2026"
+                ] }) : (
+                  // Nothing selected — the tree shows the whole workspace; pick a file.
+                  requestedPath && !requestedPathReady ? /* @__PURE__ */ jsxs8(
+                    Notice,
+                    {
+                      icon: /* @__PURE__ */ jsx10(
+                        LoaderCircleIcon,
+                        {
+                          className: "size-5 animate-spin motion-reduce:animate-none",
+                          "aria-hidden": true
+                        }
+                      ),
+                      title: "Waking sandbox",
+                      announce: "status",
+                      children: [
+                        "Opening ",
+                        requestedPath,
+                        " when the live workspace is ready\u2026"
+                      ]
+                    }
+                  ) : /* @__PURE__ */ jsx10(Notice, { icon: /* @__PURE__ */ jsx10(FileCode2Icon, { className: "size-5", "aria-hidden": true }), title: "Choose a file", children: "Select a file in the tree to preview it." })
+                ) })
+              ]
+            }
+          )
+        ]
+      }
+    )
   ] });
 }
 function WakeButton({ children, onClick }) {
@@ -6518,13 +6864,33 @@ function WakeButton({ children, onClick }) {
     {
       type: "button",
       onClick,
-      className: "mt-1 inline-flex min-h-11 items-center justify-center rounded-og-md bg-og-accent-deep px-3 py-2 text-og-sm font-medium text-og-accent-fg shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent focus-visible:ring-offset-2 focus-visible:ring-offset-og-bg",
+      className: "mt-1 inline-flex min-h-11 items-center justify-center rounded-og-md bg-og-accent-deep px-3 py-2 text-og-sm font-medium text-og-accent-fg shadow-sm transition-opacity hover:opacity-90 focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent focus-visible:ring-offset-2 focus-visible:ring-offset-og-bg",
       children
     }
   );
 }
-function GitHeader({ git, dirtyCount }) {
-  const dirty = dirtyCount > 0;
+function GitHeader({ git, loading }) {
+  if (loading) {
+    return /* @__PURE__ */ jsxs8(
+      "div",
+      {
+        className: "flex shrink-0 items-center gap-2 border-b border-og-border bg-og-surface-1 px-2 py-1 text-og-sm text-og-fg-muted",
+        role: "status",
+        "aria-live": "polite",
+        children: [
+          /* @__PURE__ */ jsx10(
+            LoaderCircleIcon,
+            {
+              className: "size-3.5 shrink-0 animate-spin motion-reduce:animate-none",
+              "aria-hidden": true
+            }
+          ),
+          /* @__PURE__ */ jsx10("span", { children: "Loading repository\u2026" })
+        ]
+      }
+    );
+  }
+  const dirty = git.dirtyCount > 0;
   return /* @__PURE__ */ jsxs8("div", { className: "flex shrink-0 items-center gap-2 border-b border-og-border bg-og-surface-1 px-2 py-1 text-og-sm", children: [
     /* @__PURE__ */ jsx10(
       "span",
@@ -6536,7 +6902,7 @@ function GitHeader({ git, dirtyCount }) {
         )
       }
     ),
-    /* @__PURE__ */ jsx10("span", { className: "sr-only", children: dirty ? `Working tree has ${dirtyCount} changed files` : "Working tree clean" }),
+    /* @__PURE__ */ jsx10("span", { className: "sr-only", children: dirty ? `Uncommitted changes in ${git.dirtyCount} files` : "No uncommitted changes" }),
     /* @__PURE__ */ jsx10("span", { className: "truncate font-og-mono text-og-fg", children: git.repoCount > 1 ? `${git.repoCount} repositories` : git.branch ?? (git.isRepo ? "(detached)" : "no repo") }),
     (git.ahead > 0 || git.behind > 0) && /* @__PURE__ */ jsxs8("span", { className: "flex shrink-0 items-center gap-1.5 text-og-xs text-og-fg-subtle", children: [
       git.ahead > 0 && /* @__PURE__ */ jsxs8("span", { children: [
@@ -6555,7 +6921,7 @@ function GitHeader({ git, dirtyCount }) {
         "data-contrast-audited": true,
         className: "ml-auto shrink-0 text-og-xs text-og-fg-subtle",
         children: [
-          dirtyCount,
+          git.dirtyCount,
           " changed"
         ]
       }
@@ -6573,7 +6939,7 @@ function Segmented({
       type: "button",
       onClick: () => onChange(opt.value),
       className: cn(
-        "min-h-7 rounded-og-xs px-1.5 py-0.5 text-og-xs focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
+        "min-h-7 rounded-og-xs px-1.5 py-0.5 text-og-xs focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
         opt.value === value ? "bg-og-accent-soft text-og-fg" : "text-og-fg-subtle hover:text-og-fg"
       ),
       children: opt.label
@@ -6582,6 +6948,7 @@ function Segmented({
   )) });
 }
 function useFileView(path, readFile, reloadRevision = 0) {
+  const previousPathRef = useRef17(null);
   const [state, setState] = useState17({
     content: null,
     isBinary: false,
@@ -6592,6 +6959,7 @@ function useFileView(path, readFile, reloadRevision = 0) {
   });
   useEffect20(() => {
     if (!path) {
+      previousPathRef.current = null;
       setState({
         content: null,
         isBinary: false,
@@ -6602,16 +6970,22 @@ function useFileView(path, readFile, reloadRevision = 0) {
       });
       return;
     }
+    const pathChanged = previousPathRef.current !== path;
+    previousPathRef.current = path;
     let cancelled = false;
     const abort = new AbortController();
-    setState({
-      content: null,
-      isBinary: false,
-      truncated: false,
-      sizeBytes: null,
-      loading: true,
-      error: null
-    });
+    if (pathChanged) {
+      setState({
+        content: null,
+        isBinary: false,
+        truncated: false,
+        sizeBytes: null,
+        loading: true,
+        error: null
+      });
+    } else {
+      setState((previous) => ({ ...previous, error: null }));
+    }
     void readFile(path, { signal: abort.signal }).then((res) => {
       if (cancelled) return;
       const content = res.isBinary ? null : res.encoding === "base64" ? decodeBase64Utf8(res.content) : res.content;
@@ -6625,14 +6999,17 @@ function useFileView(path, readFile, reloadRevision = 0) {
       });
     }).catch((cause) => {
       if (cancelled) return;
-      setState({
-        content: null,
-        isBinary: false,
-        truncated: false,
-        sizeBytes: null,
-        loading: false,
-        error: cause instanceof Error ? cause : new Error(String(cause))
-      });
+      const error = cause instanceof Error ? cause : new Error(String(cause));
+      setState(
+        (previous) => pathChanged ? {
+          content: null,
+          isBinary: false,
+          truncated: false,
+          sizeBytes: null,
+          loading: false,
+          error
+        } : { ...previous, loading: false, error }
+      );
     });
     return () => {
       cancelled = true;
@@ -6924,7 +7301,7 @@ function TakeControlCallToAction({
           "border-og-border",
           "bg-og-bg/85 backdrop-blur-md",
           "shadow-og-lg",
-          "outline-none transition-all duration-150 ease-out",
+          "outline-hidden transition-all duration-150 ease-out",
           "focus-visible:ring-2 focus-visible:ring-og-accent focus-visible:ring-offset-2 focus-visible:ring-offset-og-bg",
           disabled ? "cursor-not-allowed opacity-60" : cn(
             "cursor-pointer opacity-90 hover:-translate-y-0.5 hover:opacity-100",
@@ -6972,7 +7349,7 @@ function InControlBar({ shared, onRelease }) {
           className: cn(
             "inline-flex items-center gap-1.5 rounded-og-sm border px-2.5 py-1 text-og-xs font-semibold shadow-og-md transition-colors",
             "border-og-accent bg-og-bg/90 text-og-fg backdrop-blur-sm",
-            "outline-none hover:bg-og-accent hover:text-og-accent-fg focus-visible:ring-2 focus-visible:ring-og-accent"
+            "outline-hidden hover:bg-og-accent hover:text-og-accent-fg focus-visible:ring-2 focus-visible:ring-og-accent"
           ),
           children: [
             /* @__PURE__ */ jsx11(MonitorIcon, { className: "size-3.5", strokeWidth: 2, "aria-hidden": true }),
@@ -7075,9 +7452,9 @@ import {
   XIcon as XIcon2
 } from "lucide-react";
 import {
-  Group,
-  Panel,
-  Separator,
+  Group as Group2,
+  Panel as Panel2,
+  Separator as Separator2,
   useDefaultLayout,
   usePanelRef
 } from "react-resizable-panels";
@@ -7122,6 +7499,7 @@ function WorkspaceDock({
   onActiveTabChange,
   collapsed: collapsedProp,
   onCollapsedChange,
+  showCollapseControl = false,
   headerAccessory,
   mobileLeadingControl,
   autoSaveId = "og.session.dock",
@@ -7298,6 +7676,11 @@ function WorkspaceDock({
           className: "fixed inset-0 z-40 flex flex-col bg-og-bg",
           hidden: collapsed,
           style: {
+            // Author utility classes can override the user-agent `[hidden]`
+            // rule (for example this surface's `flex` class). Keep an inline
+            // display guard so a collapsed mobile workspace is actually gone
+            // visually as well as from the accessibility tree.
+            display: collapsed ? "none" : void 0,
             paddingTop: "env(safe-area-inset-top)",
             paddingBottom: "env(safe-area-inset-bottom)"
           },
@@ -7322,7 +7705,7 @@ function WorkspaceDock({
           onClick: expand,
           title: "Open workspace",
           "aria-label": "Open workspace",
-          className: "absolute right-3 top-3 z-30 inline-flex size-11 items-center justify-center rounded-og-md border border-og-border bg-og-surface-1 text-og-fg-muted shadow-lg transition-colors hover:border-og-border-strong hover:text-og-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent",
+          className: "absolute right-3 top-3 z-30 inline-flex size-11 items-center justify-center rounded-og-md border border-og-border bg-og-surface-1 text-og-fg-muted shadow-lg transition-colors hover:border-og-border-strong hover:text-og-fg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent",
           style: { marginTop: "env(safe-area-inset-top)" },
           children: /* @__PURE__ */ jsx12(ChevronsLeftRightIcon, { className: "size-4", "aria-hidden": true })
         }
@@ -7346,20 +7729,20 @@ function WorkspaceDock({
             children: maximized ? /* @__PURE__ */ jsx12(Minimize2Icon, { className: "size-3.5" }) : /* @__PURE__ */ jsx12(Maximize2Icon, { className: "size-3.5" })
           }
         ),
-        hostControlled ? null : /* @__PURE__ */ jsx12(ChromeButton, { onClick: collapse, title: "Collapse", label: "Collapse dock", children: /* @__PURE__ */ jsx12(PanelRightCloseIcon, { className: "size-3.5" }) })
+        hostControlled && !showCollapseControl ? null : /* @__PURE__ */ jsx12(ChromeButton, { onClick: collapse, title: "Collapse", label: "Collapse dock", children: /* @__PURE__ */ jsx12(PanelRightCloseIcon, { className: "size-3.5" }) })
       ] })
     }
   );
   return /* @__PURE__ */ jsxs10("div", { ref: rootRef, className: cn("relative flex h-full min-h-0 w-full min-w-0", className), children: [
     /* @__PURE__ */ jsxs10(
-      Group,
+      Group2,
       {
         orientation: "horizontal",
         className: "min-h-0 flex-1",
         ...defaultLayout ? { defaultLayout } : {},
         onLayoutChanged,
         children: [
-          /* @__PURE__ */ jsx12(Panel, { id: "primary", minSize: "30%", className: "min-h-0 min-w-0", children: /* @__PURE__ */ jsx12(
+          /* @__PURE__ */ jsx12(Panel2, { id: "primary", minSize: "30%", className: "min-h-0 min-w-0", children: /* @__PURE__ */ jsx12(
             "div",
             {
               "data-workspace-primary": true,
@@ -7369,9 +7752,9 @@ function WorkspaceDock({
               children: primary
             }
           ) }),
-          !collapsed && /* @__PURE__ */ jsx12(Separator, { className: "group relative z-10 w-1.5 shrink-0 outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent max-[1023px]:-mx-[19px] max-[1023px]:w-11 pointer-coarse:-mx-[19px] pointer-coarse:w-11", children: /* @__PURE__ */ jsx12("span", { className: "absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-og-border transition-colors group-hover:bg-og-accent group-focus-visible:bg-og-accent group-data-[separator-state=dragging]:bg-og-accent" }) }),
+          !collapsed && /* @__PURE__ */ jsx12(Separator2, { className: "group relative z-10 w-1.5 shrink-0 outline-hidden focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-og-accent max-[1023px]:-mx-[19px] max-[1023px]:w-11 pointer-coarse:-mx-[19px] pointer-coarse:w-11", children: /* @__PURE__ */ jsx12("span", { className: "absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-og-border transition-colors group-hover:bg-og-accent group-focus-visible:bg-og-accent group-data-[separator-state=dragging]:bg-og-accent" }) }),
           /* @__PURE__ */ jsx12(
-            Panel,
+            Panel2,
             {
               id: "dock",
               panelRef: dockPanelRef,
@@ -7435,7 +7818,7 @@ function ChromeButton({
       onClick,
       title,
       "aria-label": label,
-      className: "inline-flex size-7 items-center justify-center rounded-og-sm p-1 transition-colors hover:bg-og-surface-2 hover:text-og-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:size-11 pointer-coarse:size-11",
+      className: "inline-flex size-7 items-center justify-center rounded-og-sm p-1 transition-colors hover:bg-og-surface-2 hover:text-og-fg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:size-11 pointer-coarse:size-11",
       children
     }
   );
@@ -7547,7 +7930,7 @@ function DockChrome({
               onClick: () => onTab(tab.id),
               onKeyDown: (event) => onTabKeyDown(event, index),
               className: cn(
-                "flex min-h-7 shrink-0 items-center justify-center gap-1 rounded-og-sm px-2 py-1 text-og-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
+                "flex min-h-7 shrink-0 items-center justify-center gap-1 rounded-og-sm px-2 py-1 text-og-xs font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 max-[1023px]:min-w-11 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
                 tab.id === current ? "bg-og-accent-soft text-og-fg" : "text-og-fg-subtle hover:text-og-fg"
               ),
               children: [
@@ -7582,14 +7965,16 @@ function DockChrome({
 }
 
 // src/components/sandbox-workspace.tsx
-import { useCallback as useCallback22, useEffect as useEffect23, useMemo as useMemo11, useRef as useRef20, useState as useState20 } from "react";
-import { Popover } from "radix-ui";
+import { useCallback as useCallback22, useEffect as useEffect23, useMemo as useMemo12, useRef as useRef20, useState as useState20 } from "react";
 import {
   CircleCheckIcon,
   CpuIcon,
-  LaptopIcon,
+  FileCode2Icon as FileCode2Icon2,
+  GitCompareArrowsIcon,
   LoaderCircleIcon as LoaderCircleIcon3,
+  MonitorIcon as MonitorIcon2,
   RefreshCwIcon as RefreshCwIcon2,
+  SquareTerminalIcon,
   TriangleAlertIcon as TriangleAlertIcon2
 } from "lucide-react";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
@@ -7624,6 +8009,12 @@ function captureDegradedMessage(reason) {
       return "Workspace capture is incomplete because repository discovery failed. Live files remain authoritative.";
   }
 }
+function WorkbenchTabLabel({ icon, children }) {
+  return /* @__PURE__ */ jsxs11("span", { className: "inline-flex items-center gap-1.5", children: [
+    /* @__PURE__ */ jsx13("span", { className: "[&>svg]:size-3.5", "aria-hidden": true, children: icon }),
+    /* @__PURE__ */ jsx13("span", { children })
+  ] });
+}
 function initialWorkspaceTab(events, override) {
   if (override) return override;
   let bestSeq = -1;
@@ -7666,6 +8057,7 @@ function useSandboxWorkspaceTabs(options) {
   const { client, workspaceId } = useOpenGeni(options);
   const { sessionId, events, onNotify, requestedFilePath, requestedFileRequestId, onOpenFile } = options;
   const initialTab = options.initialTab ?? null;
+  const activeTab = options.activeTab ?? initialTab;
   const requestedSurfaces = options.surfaces ?? WORKBENCH_SURFACES;
   const surfaceSet = new Set(requestedSurfaces);
   const changesEnabled = surfaceSet.has(WORKBENCH_TAB_CHANGES);
@@ -7674,6 +8066,9 @@ function useSandboxWorkspaceTabs(options) {
   const desktopEnabled = surfaceSet.has(WORKBENCH_TAB_DESKTOP);
   const workspaceDataEnabled = changesEnabled || filesEnabled;
   const anySurfaceEnabled = workspaceDataEnabled || terminalEnabled || desktopEnabled;
+  const resolvedActiveTab = activeTab ?? initialTab;
+  const changesActive = resolvedActiveTab === WORKBENCH_TAB_CHANGES;
+  const filesActive = resolvedActiveTab === WORKBENCH_TAB_FILES;
   const surfaceIdentity = WORKBENCH_SURFACES.filter((surface) => surfaceSet.has(surface)).join(",");
   const [storedWarmIntents, setStoredWarmIntents] = useState20(
     () => emptyWarmIntents(sessionId)
@@ -7737,7 +8132,7 @@ function useSandboxWorkspaceTabs(options) {
   const captureAvailable = captureState.available;
   const liveWorkspaceExpected = liveness === "warm" || liveness === "draining";
   const capturePending = !liveWorkspaceExpected && (captureState.fileCount === null || captureState.loading);
-  const repoPaths = useMemo11(() => {
+  const repoPaths = useMemo12(() => {
     const advertised = capabilities?.Git.repos ?? [];
     if (advertised.length > 0) return advertised;
     return captureState.capture?.repos.map((repo) => repo.root) ?? [];
@@ -7760,6 +8155,8 @@ function useSandboxWorkspaceTabs(options) {
     // No passive Channel-A reads while cold, even after a conclusive capture
     // miss. A missing capture gets an explicit "Open live workspace" gate.
     enabled: filesEnabled && (captureAvailable || fileSystemOn && liveWorkspaceExpected),
+    active: filesActive,
+    repoPaths,
     liveness,
     capture: captureState.capture,
     // A reverted optimistic mutation (e.g. a 409 rename collision) surfaces as a
@@ -7769,23 +8166,30 @@ function useSandboxWorkspaceTabs(options) {
       message: `Could not ${op}: ${error.message}`
     })
   });
+  const [storedChangesComparison, setStoredChangesComparison] = useState20(null);
+  const captureSupportsBranch = captureState.capture !== null && captureState.capture.repos.length > 0 && captureState.capture.repos.every((repo) => repo.branchDiff !== void 0);
+  const changesComparison = storedChangesComparison?.sessionId === sessionId ? storedChangesComparison.value : liveWorkspaceExpected || captureSupportsBranch ? "branch" : "working";
+  const setChangesComparison = useCallback22(
+    (value) => setStoredChangesComparison({ sessionId, value }),
+    [sessionId]
+  );
   const git = useSandboxGit(sessionId, {
     events,
-    enabled: workspaceDataEnabled && (captureAvailable || gitOn && liveWorkspaceExpected),
+    enabled: changesComparison === "working" ? workspaceDataEnabled && (captureAvailable || gitOn && liveWorkspaceExpected) : changesComparison === "branch" ? workspaceDataEnabled && (captureSupportsBranch || gitOn && liveWorkspaceExpected) : workspaceDataEnabled && gitOn && liveWorkspaceExpected,
+    // Before the dock chooses its source-driven default, Git is the sole probe
+    // that may need to resolve that choice on a live workspace. Files remains
+    // dormant, avoiding the old duplicate full-tree read.
+    active: changesActive || resolvedActiveTab === null,
     repoPaths,
     liveness,
-    capture: captureState.capture
-  });
-  const stagedGit = useSandboxGit(sessionId, {
-    events,
-    // Captures intentionally expose one combined review diff, not a staged
-    // index. Never probe the live index while the lease is cold.
-    enabled: filesEnabled && gitOn && liveWorkspaceExpected,
-    staged: true,
-    repoPaths,
-    liveness,
-    capture: captureState.capture
+    comparison: changesComparison,
+    capture: changesComparison === "staged" ? null : captureState.capture
   });
+  useEffect23(() => {
+    if (changesComparison === "branch" && git.error && storedChangesComparison?.sessionId !== sessionId) {
+      setStoredChangesComparison({ sessionId, value: "working" });
+    }
+  }, [changesComparison, git.error, sessionId, storedChangesComparison?.sessionId]);
   const [xtermTheme, setXtermTheme] = useState20(void 0);
   useEffect23(() => {
     if (!terminalEnabled || typeof document === "undefined") return;
@@ -7838,6 +8242,7 @@ function useSandboxWorkspaceTabs(options) {
   }
   const captureIsAuthoritative = !liveWorkspaceExpected && (liveness !== void 0 || caps.error !== null);
   const captureUnavailable = captureState.fileCount === 0 || 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))) {
       defaultTabRef.current.value = initialTab;
@@ -7865,22 +8270,24 @@ function useSandboxWorkspaceTabs(options) {
         changesEnabled,
         filesEnabled
       );
-    } else if (captureUnavailable && git.error) {
+    } else if (captureUnavailable && git.error && !implicitBranchFallbackPending) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
     }
   }
   const defaultTab = defaultTabRef.current.value;
-  const tabs = useMemo11(() => {
+  const tabs = useMemo12(() => {
     const list = [];
     if (changesEnabled)
       list.push({
         id: WORKBENCH_TAB_CHANGES,
-        label: "Changes",
+        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(GitCompareArrowsIcon, {}), children: "Changes" }),
         badge: dirtyCount > 0 ? /* @__PURE__ */ jsx13(DirtyBadge, { count: dirtyCount }) : void 0,
         content: /* @__PURE__ */ jsx13(
           ChangesTabBody,
           {
             git,
+            comparison: changesComparison,
+            onComparisonChange: setChangesComparison,
             captureAvailable,
             captureRevision: captureState.revision,
             capturePending,
@@ -7902,13 +8309,12 @@ function useSandboxWorkspaceTabs(options) {
     if (filesEnabled)
       list.push({
         id: WORKBENCH_TAB_FILES,
-        label: "Files",
+        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(FileCode2Icon2, {}), children: "Files" }),
         content: /* @__PURE__ */ jsx13(
           SandboxFiles,
           {
             files,
             git,
-            stagedGit,
             fileSystemAvailable: fileSystemOn || captureAvailable,
             editable: filesEditable && files.source === "live" && files.error === null && !files.loading,
             workspaceResting: !liveWorkspaceExpected && liveness !== void 0 && !capturePending && !captureAvailable && !workspaceWaking,
@@ -7929,7 +8335,7 @@ function useSandboxWorkspaceTabs(options) {
     if (terminalOn) {
       list.push({
         id: WORKBENCH_TAB_TERMINAL,
-        label: "Terminal",
+        label: /* @__PURE__ */ jsx13(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx13(SquareTerminalIcon, {}), children: "Terminal" }),
         content: /* @__PURE__ */ jsx13("div", { className: "h-full bg-og-bg p-1", children: /* @__PURE__ */ jsx13(
           SandboxTerminal,
           {
@@ -7947,7 +8353,7 @@ function useSandboxWorkspaceTabs(options) {
     if (desktopAdvertised) {
       list.push({
         id: WORKBENCH_TAB_DESKTOP,
-        label: "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,
@@ -7980,7 +8386,7 @@ function useSandboxWorkspaceTabs(options) {
     sessionId,
     files,
     git,
-    stagedGit,
+    changesComparison,
     terminal,
     xtermTheme,
     capabilities,
@@ -8015,6 +8421,7 @@ function SandboxWorkspace(props) {
     onNotify,
     collapsed,
     onCollapsedChange,
+    showCollapseControl,
     mobileLeadingControl,
     autoSaveId,
     defaultSize,
@@ -8025,6 +8432,8 @@ function SandboxWorkspace(props) {
   const [storedSelection, setStoredSelection] = useState20(null);
   const [requestedFile, setRequestedFile] = useState20(null);
   const nextFileRequestId = useRef20(0);
+  const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
+  const activeTabHint = selectedTab ?? initialTab ?? leadingTabs?.[0]?.id ?? null;
   const openFile = useCallback22(
     (path) => {
       nextFileRequestId.current += 1;
@@ -8044,13 +8453,13 @@ function SandboxWorkspace(props) {
     events,
     ...surfaces ? { surfaces } : {},
     ...initialTab ? { initialTab } : {},
+    activeTab: activeTabHint,
     ...onNotify ? { onNotify } : {},
     requestedFilePath: requestedFile?.sessionId === sessionId ? requestedFile.path : null,
     requestedFileRequestId: requestedFile?.sessionId === sessionId ? requestedFile.requestId : null,
     onOpenFile: openFile
   });
   const tabs = [...leadingTabs ?? [], ...workbenchTabs, ...trailingTabs ?? []];
-  const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
   const preferredTab = selectedTab ?? defaultTab;
   const activeTab = preferredTab && tabs.some((tab) => tab.id === preferredTab) ? preferredTab : tabs[0]?.id;
   const selectTab = useCallback22(
@@ -8065,19 +8474,12 @@ function SandboxWorkspace(props) {
       ...activeTab !== void 0 ? { activeTab } : {},
       onActiveTabChange: selectTab,
       ...machine.enabled ? {
-        headerAccessory: /* @__PURE__ */ jsx13(
-          MachineStateChip,
-          {
-            chip: machine.chip,
-            activeMachine: machine.activeMachine,
-            error: machine.error,
-            onRetry: () => void machine.refresh()
-          }
-        )
+        headerAccessory: /* @__PURE__ */ jsx13(MachineStateChip, { chip: machine.chip })
       } : {},
       ...mobileLeadingControl !== void 0 ? { mobileLeadingControl } : {},
       ...collapsed !== void 0 ? { collapsed } : {},
       ...onCollapsedChange ? { onCollapsedChange } : {},
+      ...showCollapseControl !== void 0 ? { showCollapseControl } : {},
       ...autoSaveId !== void 0 ? { autoSaveId } : {},
       ...defaultSize !== void 0 ? { defaultSize } : {},
       ...minSize !== void 0 ? { minSize } : {},
@@ -8089,94 +8491,30 @@ function SandboxWorkspace(props) {
 function DirtyBadge({ count }) {
   return /* @__PURE__ */ jsx13("span", { className: "rounded-og-xs bg-og-accent-soft px-1 text-og-xs text-og-fg-muted", children: count });
 }
-function MachineKindIcon({
-  kind,
-  className
-}) {
-  const Icon = kind === "selfhosted" ? LaptopIcon : CpuIcon;
-  return /* @__PURE__ */ jsx13(Icon, { className: cn("size-3.5 shrink-0 text-og-fg-subtle", className), "aria-hidden": true });
-}
 function chipDotClass(state) {
   if (state === "live") return "bg-og-status-running";
   if (state === "waking") return "bg-og-status-idle animate-pulse motion-reduce:animate-none";
   return "bg-og-fg-subtle";
 }
-function MachineStateChip({
-  chip,
-  activeMachine,
-  error,
-  onRetry
-}) {
-  const triggerRef = useRef20(null);
-  const portalStyle = usePortalTokenStyle(triggerRef);
-  return /* @__PURE__ */ jsxs11(Popover.Root, { children: [
-    /* @__PURE__ */ jsx13(Popover.Trigger, { asChild: true, children: /* @__PURE__ */ jsxs11(
-      "button",
-      {
-        ref: triggerRef,
-        type: "button",
-        "aria-label": `Machine: ${chip.label}`,
-        className: "inline-flex min-h-7 items-center gap-1.5 rounded-og-sm px-2 py-1 text-og-xs font-medium text-og-fg-muted transition-colors hover:bg-og-surface-2 hover:text-og-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 pointer-coarse:min-h-11",
-        children: [
-          /* @__PURE__ */ jsx13(
-            "span",
-            {
-              className: cn("size-1.5 shrink-0 rounded-full", chipDotClass(chip.state)),
-              "aria-hidden": true
-            }
-          ),
-          /* @__PURE__ */ jsx13("span", { className: "max-w-[11rem] truncate", children: chip.label })
-        ]
-      }
-    ) }),
-    /* @__PURE__ */ jsx13(Popover.Portal, { forceMount: true, children: /* @__PURE__ */ jsxs11(
-      Popover.Content,
-      {
-        forceMount: true,
-        "data-machine-state-popover": true,
-        align: "end",
-        sideOffset: 6,
-        collisionPadding: 8,
-        className: "og-root z-50 w-64 max-w-[calc(100vw-1rem)] rounded-og-md border border-og-border bg-og-surface-1 p-3 text-og-sm text-og-fg shadow-lg outline-none",
-        style: portalStyle,
-        children: [
-          /* @__PURE__ */ jsxs11("div", { className: "flex min-w-0 items-center gap-1.5", children: [
-            /* @__PURE__ */ jsx13(MachineKindIcon, { kind: activeMachine?.kind }),
-            /* @__PURE__ */ jsx13("span", { className: "min-w-0 truncate font-medium", children: activeMachine?.name ?? "Sandbox" })
-          ] }),
-          /* @__PURE__ */ jsxs11("div", { className: "mt-2.5 flex items-center justify-between gap-2", children: [
-            /* @__PURE__ */ jsx13("span", { className: "text-og-xs text-og-fg-subtle", children: "Connection" }),
-            activeMachine ? /* @__PURE__ */ jsx13(
-              ConnectionStatusPill,
-              {
-                status: connectionStatusForState(activeMachine.state),
-                size: "sm"
-              }
-            ) : /* @__PURE__ */ jsx13("span", { className: "text-og-xs text-og-fg-muted", children: chip.label })
-          ] }),
-          chip.asOf ? /* @__PURE__ */ jsxs11("p", { className: "mt-2.5 text-og-xs leading-4 text-og-fg-subtle", children: [
-            "Workspace shown as of ",
-            formatAsOf(chip.asOf, Date.now()),
-            " \u2014 the machine is not live."
-          ] }) : null,
-          activeMachine && activeMachine.sharedSessionCount > 1 ? /* @__PURE__ */ jsx13("div", { className: "mt-2.5", children: /* @__PURE__ */ jsx13(
-            SharedMachineDisclosure,
-            {
-              sharedSessionCount: activeMachine.sharedSessionCount,
-              density: "full"
-            }
-          ) }) : null,
-          error ? /* @__PURE__ */ jsxs11("div", { className: "mt-2.5 space-y-1.5 border-t border-og-border pt-2.5", children: [
-            /* @__PURE__ */ jsx13("p", { className: "text-og-xs leading-4 text-og-danger", children: "Couldn't reach the sandbox for this session." }),
-            /* @__PURE__ */ jsxs11(DockActionButton, { onClick: onRetry, children: [
-              /* @__PURE__ */ jsx13(RefreshCwIcon2, { className: "size-3" }),
-              "Retry"
-            ] })
-          ] }) : null
-        ]
-      }
-    ) })
-  ] });
+function MachineStateChip({ chip }) {
+  return /* @__PURE__ */ jsxs11(
+    "div",
+    {
+      role: "status",
+      "aria-label": `Machine: ${chip.label}`,
+      className: "inline-flex min-h-7 items-center gap-1.5 px-2 py-1 text-og-xs font-medium text-og-fg-muted max-[1023px]:min-h-11 pointer-coarse:min-h-11",
+      children: [
+        /* @__PURE__ */ jsx13(
+          "span",
+          {
+            className: cn("size-1.5 shrink-0 rounded-full", chipDotClass(chip.state)),
+            "aria-hidden": true
+          }
+        ),
+        /* @__PURE__ */ jsx13("span", { className: "max-w-[11rem] truncate", children: chip.label })
+      ]
+    }
+  );
 }
 function DockActionButton({ onClick, children }) {
   return /* @__PURE__ */ jsx13(
@@ -8184,13 +8522,41 @@ function DockActionButton({ onClick, children }) {
     {
       type: "button",
       onClick,
-      className: "inline-flex items-center gap-1.5 rounded-og-sm border border-og-border px-2 py-1 text-og-xs font-medium text-og-fg-muted transition-colors hover:border-og-border-strong hover:text-og-fg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 pointer-coarse:min-h-11",
+      className: "inline-flex items-center gap-1.5 rounded-og-sm border border-og-border px-2 py-1 text-og-xs font-medium text-og-fg-muted transition-colors hover:border-og-border-strong hover:text-og-fg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 pointer-coarse:min-h-11",
       children
     }
   );
 }
 function ChangesTabBody({
+  comparison,
+  onComparisonChange,
+  ...props
+}) {
+  return /* @__PURE__ */ jsxs11("div", { className: "flex h-full min-h-0 flex-col", children: [
+    /* @__PURE__ */ jsx13("div", { className: "flex shrink-0 items-center gap-1 border-b border-og-border bg-og-surface-1 px-2 py-1.5", children: [
+      ["branch", "Branch"],
+      ["working", "Uncommitted"],
+      ["staged", "Staged"]
+    ].map(([value, label]) => /* @__PURE__ */ jsx13(
+      "button",
+      {
+        type: "button",
+        "aria-pressed": comparison === value,
+        onClick: () => onComparisonChange(value),
+        className: cn(
+          "rounded-og-sm px-2 py-1 text-og-xs font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent max-[1023px]:min-h-11 pointer-coarse:min-h-11",
+          comparison === value ? "bg-og-surface-2 text-og-fg shadow-sm" : "text-og-fg-muted hover:bg-og-surface-2 hover:text-og-fg"
+        ),
+        children: label
+      },
+      value
+    )) }),
+    /* @__PURE__ */ jsx13("div", { className: "min-h-0 flex-1", children: /* @__PURE__ */ jsx13(ChangesTabContent, { comparison, ...props }) })
+  ] });
+}
+function ChangesTabContent({
   git,
+  comparison,
   captureAvailable,
   captureRevision,
   capturePending,
@@ -8221,7 +8587,7 @@ function ChangesTabBody({
                 type: "button",
                 onClick: () => void git.refresh(),
                 disabled: git.loading,
-                className: "inline-flex min-h-7 shrink-0 items-center gap-1 rounded-og-sm border border-og-border bg-og-surface-1 px-2 font-medium text-og-fg transition-colors hover:border-og-border-strong focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-og-accent disabled:cursor-not-allowed disabled:opacity-50 pointer-coarse:min-h-11",
+                className: "inline-flex min-h-7 shrink-0 items-center gap-1 rounded-og-sm border border-og-border bg-og-surface-1 px-2 font-medium text-og-fg transition-colors hover:border-og-border-strong focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-og-accent disabled:cursor-not-allowed disabled:opacity-50 pointer-coarse:min-h-11",
                 children: [
                   /* @__PURE__ */ jsx13(
                     RefreshCwIcon2,
@@ -8277,7 +8643,7 @@ function ChangesTabBody({
       }
     );
   }
-  if (!liveWorkspaceExpected && !captureAvailable) {
+  if (!liveWorkspaceExpected && (comparison !== "working" || !captureAvailable)) {
     return /* @__PURE__ */ jsxs11(
       CenteredState,
       {
@@ -8290,7 +8656,7 @@ function ChangesTabBody({
         ) : /* @__PURE__ */ jsx13(CpuIcon, { className: "size-5", "aria-hidden": true }),
         children: [
           /* @__PURE__ */ jsx13("p", { className: "text-og-sm font-medium text-og-fg", children: workspaceWaking ? "Waking workspace" : "Workspace is resting" }),
-          /* @__PURE__ */ jsx13("p", { className: "text-og-sm leading-5 text-og-fg-subtle", children: workspaceWaking ? "Connecting to the live working tree\u2026" : "No captured revision is available yet. Wake the sandbox to inspect current changes." }),
+          /* @__PURE__ */ jsx13("p", { className: "text-og-sm leading-5 text-og-fg-subtle", children: workspaceWaking ? "Connecting to the live working tree\u2026" : comparison === "branch" ? "Wake the sandbox to compare this branch with the remote default branch." : comparison === "staged" ? "Wake the sandbox to inspect staged changes." : "No captured revision is available yet. Wake the sandbox to inspect uncommitted changes." }),
           !workspaceWaking ? /* @__PURE__ */ jsxs11(DockActionButton, { onClick: onWake, children: [
             /* @__PURE__ */ jsx13(CpuIcon, { className: "size-3" }),
             "Open live workspace"
@@ -8318,8 +8684,8 @@ function ChangesTabBody({
     );
   }
   return /* @__PURE__ */ jsxs11(CenteredState, { icon: /* @__PURE__ */ jsx13(CircleCheckIcon, { className: "size-5", "aria-hidden": true }), tone: "success", children: [
-    /* @__PURE__ */ jsx13("p", { className: "text-og-sm font-medium text-og-fg", children: "Working tree is clean" }),
-    /* @__PURE__ */ jsx13("p", { className: "text-og-sm leading-5 text-og-fg-subtle", children: "File edits from future turns will appear here." })
+    /* @__PURE__ */ jsx13("p", { className: "text-og-sm font-medium text-og-fg", children: comparison === "branch" ? "No branch changes" : comparison === "staged" ? "No staged changes" : "No uncommitted changes" }),
+    /* @__PURE__ */ jsx13("p", { className: "text-og-sm leading-5 text-og-fg-subtle", children: comparison === "branch" ? "This branch matches the remote default branch." : comparison === "staged" ? "Stage files to review the next commit here." : "Local edits not yet committed will appear here." })
   ] });
 }
 function CenteredState({
@@ -8356,7 +8722,7 @@ function CenteredState({
 // src/hooks/use-codex-accounts.ts
 import { useCallback as useCallback23, useState as useState21 } from "react";
 function isCodexAccountEvent(event) {
-  return event.type === "codex.account.switched" || event.type === "turn.started";
+  return event.type === "codex.account.switched";
 }
 var EMPTY_SETTINGS = {
   rotationEnabled: false,
@@ -8636,7 +9002,6 @@ export {
   projectPendingHumanInputRequests,
   projectPickerRows,
   rawTypeOf,
-  redactSecrets,
   runnableLatencyModesForModel,
   sandboxCommandExitCode,
   sessionChromeGoalPillState,
@@ -8671,6 +9036,7 @@ export {
   useOpenGeni,
   useOpenGeniClient,
   usePacks,
+  usePageLiveActivity,
   useRelayFrameStream,
   useRig,
   useRigChanges,