@opengeni/react 0.57.0 → 2.2.0-canary.0

package/dist/index.js

@@ -24,7 +24,7 @@ import {
   useSessionLineage,
   useSessionMcpApprovalPolicy,
   useTurnQueue
-} from "./chunk-B6WPZSTT.js";
+} from "./chunk-UOLJWT5Y.js";
 import {
   CONNECTION_STATUS_META,
   ConnectionDot,
@@ -32,6 +32,9 @@ import {
   EnrollmentConsent,
   EnrollmentDeviceFlow,
   HEALTH_TOKEN,
+  MACHINES_COMPOSER_POLL_MS,
+  MACHINES_DASHBOARD_POLL_MS,
+  MACHINES_SESSION_POLL_MS,
   MACHINE_STATE_BADGE_META,
   METRICS,
   METRIC_WINDOWS,
@@ -40,6 +43,7 @@ import {
   MachineDockBar,
   MachineHealthPill,
   MachineMetrics,
+  MachineOperationPolicyEditor,
   MachineStatusPill,
   MachinesDashboard,
   MetricHistoryChart,
@@ -52,7 +56,7 @@ import {
   healthPulses,
   pointsFor,
   useMachines
-} from "./chunk-HA46CYQK.js";
+} from "./chunk-XXWH2JLC.js";
 import {
   Actions,
   AttachButton,
@@ -105,14 +109,14 @@ import {
   useSlashCommands,
   useTranscription,
   useVoiceInput
-} from "./chunk-5UQPNLIO.js";
+} from "./chunk-LTCHJ4MS.js";
 import {
   FILE_ONLY_MESSAGE_TEXT,
   composeSendInput,
   shouldSteerOnKey,
   shouldSubmitOnKey,
   useComposer
-} from "./chunk-IGC6A2ZI.js";
+} from "./chunk-JOAVA2TW.js";
 import {
   BillingClassMark,
   ModelPolicyPicker,
@@ -121,7 +125,7 @@ import {
   PickerBackHeader,
   PickerNavRow,
   defaultModelPolicyPickerMessages
-} from "./chunk-MKPIAGVL.js";
+} from "./chunk-W6NFJXSA.js";
 import {
   advancedSourceSummary,
   availabilityReasonLabel,
@@ -139,7 +143,7 @@ import {
   projectPickerRows,
   runnableLatencyModesForModel,
   sortPickerRows
-} from "./chunk-XBZWOM2K.js";
+} from "./chunk-X4A66EWZ.js";
 import {
   ActivityDisclosure,
   ActivityRail,
@@ -185,8 +189,13 @@ import {
   parseExecBannerSessionId,
   parseFreeformApplyPatch,
   parseToolArgs,
+  prefersReducedMotion,
   rawTypeOf,
   sandboxCommandExitCode,
+  sandboxFileLocationFromHref,
+  sandboxFilePathFromHref,
+  sessionChromeGoalPillExplanation,
+  sessionChromeGoalPillLabel,
   sessionChromeGoalPillState,
   stripExecBanner,
   tailPeek,
@@ -196,7 +205,7 @@ import {
   useThemeType,
   userMessageLikelyNeedsDisclosure,
   v4aToGitFileDiff
-} from "./chunk-Y7OEDUJ5.js";
+} from "./chunk-5RZN3DD5.js";
 import {
   buildTimeline,
   creditExhaustedFromEvents,
@@ -204,7 +213,7 @@ import {
   groupTimeline,
   sessionStatusFromEvents,
   toolDisplayName
-} from "./chunk-6KLX2RH5.js";
+} from "./chunk-XSA2QAKP.js";
 import {
   TimelineAnnotationsChip
 } from "./chunk-WSK7G5LE.js";
@@ -220,15 +229,17 @@ import {
 } from "./chunk-VZTQ73XT.js";
 import {
   DesktopViewer,
+  useDesktopStream,
+  useRelayFrameStream
+} from "./chunk-4MDLEHXL.js";
+import {
   STREAM_KIND_PTY,
   STREAM_ROLE_CLIENT,
   decodeStreamFrame,
   decodeStreamOpenAck,
   encodeStreamFrame,
-  encodeStreamOpen,
-  useDesktopStream,
-  useRelayFrameStream
-} from "./chunk-R3AZOAB5.js";
+  encodeStreamOpen
+} from "./chunk-5YK2ZDIG.js";
 import {
   useMutationRunner,
   usePageLiveActivity,
@@ -238,7 +249,7 @@ import {
 import {
   useOpenGeni,
   useOpenGeniClient
-} from "./chunk-C5ZPSSS5.js";
+} from "./chunk-NEXLLTP4.js";
 import {
   COMPOSER_PAYMENT_REQUIRED_MESSAGE,
   CREDIT_EXHAUSTION_MESSAGE,
@@ -289,7 +300,7 @@ function policyFromTurn(turn) {
   return {
     model: turn.model,
     reasoningEffort: turn.reasoningEffort,
-    latencyMode: turn.latencyMode ?? "standard",
+    latencyMode: turn.latencyMode,
     turnId: turn.id
   };
 }
@@ -361,6 +372,7 @@ function useWorkspaceSessions(options = {}) {
   const cursor = options.cursor;
   const search = options.search;
   const pinsOnly = options.pinsOnly;
+  const archivedOnly = options.archivedOnly;
   const enabled = options.enabled ?? true;
   const queryKey = [
     workspaceId,
@@ -368,7 +380,8 @@ function useWorkspaceSessions(options = {}) {
     parentSessionId === null ? "null" : parentSessionId ?? "",
     cursor ?? "",
     search ?? "",
-    pinsOnly ? "1" : ""
+    pinsOnly ? "1" : "",
+    archivedOnly ? "archived" : "active"
   ].join("\0");
   const previousQueryKey = useRef(queryKey);
   const queryKeyTransition = previousQueryKey.current !== queryKey;
@@ -383,10 +396,11 @@ function useWorkspaceSessions(options = {}) {
         ...parentSessionId !== void 0 ? { parentSessionId } : {},
         ...cursor !== void 0 ? { cursor } : {},
         ...search !== void 0 ? { search } : {},
-        ...pinsOnly ? { pinsOnly: true } : {}
+        ...pinsOnly ? { pinsOnly: true } : {},
+        ...archivedOnly ? { archivedOnly: true } : {}
       })
     }),
-    [client, workspaceId, limit, parentSessionId, cursor, search, pinsOnly, queryKey]
+    [client, workspaceId, limit, parentSessionId, cursor, search, pinsOnly, archivedOnly, queryKey]
   );
   const state = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
@@ -413,11 +427,48 @@ function useWorkspaceSessions(options = {}) {
   };
 }
 
+// src/hooks/use-session-background-commands.ts
+import { useCallback as useCallback4 } from "react";
+function useSessionBackgroundCommands(sessionId, options = {}) {
+  const { client, workspaceId } = useOpenGeni(options);
+  const enabled = (options.enabled ?? true) && Boolean(sessionId);
+  const load = useCallback4(async () => {
+    if (!sessionId) return { commands: [] };
+    if (!client.listSessionBackgroundCommands) {
+      throw new Error("The configured OpenGeni client does not support background commands");
+    }
+    return await client.listSessionBackgroundCommands(workspaceId, sessionId);
+  }, [client, workspaceId, sessionId]);
+  const state = usePolledValue(load, {
+    enabled,
+    pollIntervalMs: options.pollIntervalMs
+  });
+  const refresh = state.refresh;
+  const cancel = useCallback4(
+    async (commandId) => {
+      if (!sessionId) return;
+      if (!client.cancelSessionBackgroundCommand) {
+        throw new Error("The configured OpenGeni client does not support background commands");
+      }
+      await client.cancelSessionBackgroundCommand(workspaceId, sessionId, commandId);
+      await refresh();
+    },
+    [client, workspaceId, sessionId, refresh]
+  );
+  return {
+    commands: state.data?.commands ?? [],
+    loading: state.loading,
+    error: state.error,
+    refresh,
+    cancel
+  };
+}
+
 // src/hooks/use-environments.ts
-import { useCallback as useCallback4, useMemo as useMemo2 } from "react";
+import { useCallback as useCallback5, useMemo as useMemo2 } from "react";
 function useVariableSets(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback4(
+  const load = useCallback5(
     async () => await client.listVariableSets(workspaceId),
     [client, workspaceId]
   );
@@ -426,7 +477,7 @@ function useVariableSets(options = {}) {
     enabled: options.enabled
   });
   const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const create = useCallback4(
+  const create = useCallback5(
     async (request) => {
       const result = await run(() => client.createVariableSet(workspaceId, request));
       if (result) {
@@ -436,7 +487,7 @@ function useVariableSets(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const update = useCallback4(
+  const update = useCallback5(
     async (variableSetId, request) => {
       const result = await run(() => client.updateVariableSet(workspaceId, variableSetId, request));
       if (result) {
@@ -446,7 +497,7 @@ function useVariableSets(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const remove = useCallback4(
+  const remove = useCallback5(
     async (variableSetId) => {
       const result = await run(async () => {
         await client.deleteVariableSet(workspaceId, variableSetId);
@@ -459,11 +510,11 @@ function useVariableSets(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const readVariable = useCallback4(
+  const readVariable = useCallback5(
     async (variableSetId, name) => await run(() => client.getVariableSetVariable(workspaceId, variableSetId, name)),
     [client, workspaceId, run]
   );
-  const setVariable = useCallback4(
+  const setVariable = useCallback5(
     async (variableSetId, name, value) => {
       const result = await run(
         () => client.setVariableSetVariable(workspaceId, variableSetId, name, value)
@@ -475,7 +526,7 @@ function useVariableSets(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const deleteVariable = useCallback4(
+  const deleteVariable = useCallback5(
     async (variableSetId, name) => {
       const result = await run(async () => {
         await client.deleteVariableSetVariable(workspaceId, variableSetId, name);
@@ -527,29 +578,105 @@ function useEnvironments(options = {}) {
 }
 
 // src/hooks/use-channels.ts
-import { useCallback as useCallback5 } from "react";
+import { useCallback as useCallback6, useMemo as useMemo3, useSyncExternalStore } from "react";
+
+// src/hooks/channel-cache.ts
+var EMPTY_CHANNELS = [];
+var EMPTY_SNAPSHOT = {
+  channels: EMPTY_CHANNELS,
+  ready: false
+};
+var channelCaches = /* @__PURE__ */ new WeakMap();
+function compareChannels(left, right) {
+  return Number(right.pinned) - Number(left.pinned) || left.sortOrder - right.sortOrder || left.id.localeCompare(right.id);
+}
+function orderedChannels(channels) {
+  return [...channels].sort(compareChannels);
+}
+function upsertChannel(channels, channel) {
+  const next = channels.filter((candidate) => candidate.id !== channel.id);
+  next.push(channel);
+  return orderedChannels(next);
+}
+function createChannelCacheStore() {
+  let base = null;
+  let snapshot = EMPTY_SNAPSHOT;
+  let nextLoadTicket = 0;
+  let acceptedLoadTicket = 0;
+  const pending = /* @__PURE__ */ new Map();
+  const listeners = /* @__PURE__ */ new Set();
+  const publish = () => {
+    let channels = base ?? EMPTY_CHANNELS;
+    for (const { channel } of pending.values()) {
+      channels = upsertChannel(channels, channel);
+    }
+    snapshot = { channels, ready: base !== null || pending.size > 0 };
+    for (const listener of listeners) listener();
+  };
+  return {
+    getSnapshot: () => snapshot,
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    beginLoad: () => ++nextLoadTicket,
+    acceptLoad: (ticket, channels) => {
+      if (ticket < acceptedLoadTicket) return;
+      acceptedLoadTicket = ticket;
+      base = orderedChannels(channels);
+      for (const [id, created] of pending) {
+        if (ticket > created.committedAfterLoad) pending.delete(id);
+      }
+      publish();
+    },
+    publishCreated: (channel) => {
+      pending.set(channel.id, { channel, committedAfterLoad: nextLoadTicket });
+      publish();
+    }
+  };
+}
+function channelCacheFor(client, workspaceId) {
+  let byWorkspace = channelCaches.get(client);
+  if (!byWorkspace) {
+    byWorkspace = /* @__PURE__ */ new Map();
+    channelCaches.set(client, byWorkspace);
+  }
+  let cache = byWorkspace.get(workspaceId);
+  if (!cache) {
+    cache = createChannelCacheStore();
+    byWorkspace.set(workspaceId, cache);
+  }
+  return cache;
+}
+
+// src/hooks/use-channels.ts
 function useChannels(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback5(
-    async () => await client.listChannels(workspaceId),
-    [client, workspaceId]
-  );
-  const { data, loading, error, refresh } = usePolledValue(load, {
+  const cache = useMemo3(() => channelCacheFor(client, workspaceId), [client, workspaceId]);
+  const snapshot = useSyncExternalStore(cache.subscribe, cache.getSnapshot, cache.getSnapshot);
+  const load = useCallback6(async () => {
+    const ticket = cache.beginLoad();
+    const channels = await client.listChannels(workspaceId);
+    cache.acceptLoad(ticket, channels);
+    return channels;
+  }, [cache, client, workspaceId]);
+  const { loading, error, refresh } = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
     enabled: options.enabled
   });
-  const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const create = useCallback5(
+  const { run, mutating, mutationError, clearMutationError } = useMutationRunner(cache);
+  const create = useCallback6(
     async (request) => {
       const result = await run(() => client.createChannel(workspaceId, request));
       if (result) {
+        cache.publishCreated(result);
         await refresh();
       }
       return result;
     },
-    [client, workspaceId, run, refresh]
+    [cache, client, workspaceId, run, refresh]
   );
-  const update = useCallback5(
+  const update = useCallback6(
     async (channelId, request) => {
       const result = await run(() => client.updateChannel(workspaceId, channelId, request));
       if (result) {
@@ -559,7 +686,7 @@ function useChannels(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const remove = useCallback5(
+  const remove = useCallback6(
     async (channelId) => {
       const result = await run(async () => {
         await client.deleteChannel(workspaceId, channelId);
@@ -572,19 +699,30 @@ function useChannels(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const moveSession = useCallback5(
+  const reorder = useCallback6(
+    async (channelIds) => {
+      const result = await run(() => client.reorderChannels(workspaceId, { channelIds }));
+      if (result) await refresh();
+      return result;
+    },
+    [client, workspaceId, run, refresh]
+  );
+  const moveSession = useCallback6(
     async (sessionId, channelId) => {
       return await run(() => client.updateSessionChannel(workspaceId, sessionId, { channelId }));
     },
     [client, workspaceId, run]
   );
   return {
-    channels: data ?? [],
-    loading,
+    // Cache snapshots replace arrays instead of mutating them, so preserve the
+    // stable reference expected from the previous polled-value implementation.
+    channels: snapshot.channels,
+    loading: loading && !snapshot.ready,
     error,
     refresh,
     create,
     update,
+    reorder,
     remove,
     moveSession,
     mutating,
@@ -594,16 +732,16 @@ function useChannels(options = {}) {
 }
 
 // src/hooks/use-rigs.ts
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback7 } from "react";
 function useRigs(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback6(async () => await client.listRigs(workspaceId), [client, workspaceId]);
+  const load = useCallback7(async () => await client.listRigs(workspaceId), [client, workspaceId]);
   const { data, loading, error, refresh } = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
     enabled: options.enabled
   });
   const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const create = useCallback6(
+  const create = useCallback7(
     async (request) => {
       const result = await run(() => client.createRig(workspaceId, request));
       if (result) {
@@ -613,7 +751,7 @@ function useRigs(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const update = useCallback6(
+  const update = useCallback7(
     async (rigId, request) => {
       const result = await run(() => client.updateRig(workspaceId, rigId, request));
       if (result) {
@@ -623,7 +761,7 @@ function useRigs(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const remove = useCallback6(
+  const remove = useCallback7(
     async (rigId) => {
       const result = await run(async () => {
         await client.deleteRig(workspaceId, rigId);
@@ -636,13 +774,13 @@ function useRigs(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const listVersions = useCallback6(
+  const listVersions = useCallback7(
     async (rigId) => {
       return await run(() => client.listRigVersions(workspaceId, rigId));
     },
     [client, workspaceId, run]
   );
-  const activateVersion = useCallback6(
+  const activateVersion = useCallback7(
     async (rigId, versionId) => {
       const result = await run(() => client.activateRigVersion(workspaceId, rigId, versionId));
       if (result) {
@@ -652,13 +790,13 @@ function useRigs(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const listChanges = useCallback6(
+  const listChanges = useCallback7(
     async (rigId) => {
       return await run(() => client.listRigChanges(workspaceId, rigId));
     },
     [client, workspaceId, run]
   );
-  const proposeChange = useCallback6(
+  const proposeChange = useCallback7(
     async (rigId, request) => {
       const result = await run(() => client.proposeRigChange(workspaceId, rigId, request));
       if (result) {
@@ -687,7 +825,7 @@ function useRigs(options = {}) {
 }
 function useRig(rigId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback6(
+  const load = useCallback7(
     async () => await client.getRig(workspaceId, rigId),
     [client, workspaceId, rigId]
   );
@@ -696,7 +834,7 @@ function useRig(rigId, options = {}) {
     enabled: options.enabled
   });
   const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const update = useCallback6(
+  const update = useCallback7(
     async (request) => {
       const result = await run(() => client.updateRig(workspaceId, rigId, request));
       if (result) {
@@ -706,14 +844,14 @@ function useRig(rigId, options = {}) {
     },
     [client, workspaceId, rigId, run, refresh]
   );
-  const remove = useCallback6(async () => {
+  const remove = useCallback7(async () => {
     const result = await run(async () => {
       await client.deleteRig(workspaceId, rigId);
       return true;
     });
     return result === true;
   }, [client, workspaceId, rigId, run]);
-  const activateVersion = useCallback6(
+  const activateVersion = useCallback7(
     async (versionId) => {
       const result = await run(() => client.activateRigVersion(workspaceId, rigId, versionId));
       if (result) {
@@ -723,7 +861,7 @@ function useRig(rigId, options = {}) {
     },
     [client, workspaceId, rigId, run, refresh]
   );
-  const proposeChange = useCallback6(
+  const proposeChange = useCallback7(
     async (request) => {
       const result = await run(() => client.proposeRigChange(workspaceId, rigId, request));
       if (result) {
@@ -733,7 +871,7 @@ function useRig(rigId, options = {}) {
     },
     [client, workspaceId, rigId, run, refresh]
   );
-  const verifyChange = useCallback6(
+  const verifyChange = useCallback7(
     async (changeId) => {
       const result = await run(() => client.verifyRigChange(workspaceId, rigId, changeId));
       if (result) {
@@ -743,7 +881,7 @@ function useRig(rigId, options = {}) {
     },
     [client, workspaceId, rigId, run, refresh]
   );
-  const promoteChange = useCallback6(
+  const promoteChange = useCallback7(
     async (changeId) => {
       const result = await run(() => client.promoteRigChange(workspaceId, rigId, changeId));
       if (result) {
@@ -753,7 +891,7 @@ function useRig(rigId, options = {}) {
     },
     [client, workspaceId, rigId, run, refresh]
   );
-  const verify = useCallback6(async () => {
+  const verify = useCallback7(async () => {
     return await run(() => client.verifyRig(workspaceId, rigId));
   }, [client, workspaceId, rigId, run]);
   return {
@@ -775,7 +913,7 @@ function useRig(rigId, options = {}) {
 }
 function useRigVersions(rigId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback6(
+  const load = useCallback7(
     async () => await client.listRigVersions(workspaceId, rigId),
     [client, workspaceId, rigId]
   );
@@ -792,7 +930,7 @@ function useRigVersions(rigId, options = {}) {
 }
 function useRigChanges(rigId, options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback6(
+  const load = useCallback7(
     async () => await client.listRigChanges(workspaceId, rigId),
     [client, workspaceId, rigId]
   );
@@ -809,17 +947,17 @@ function useRigChanges(rigId, options = {}) {
 }
 
 // src/hooks/use-packs.ts
-import { useCallback as useCallback7 } from "react";
+import { useCallback as useCallback8 } from "react";
 var EMPTY_INSTALLATIONS = [];
 function usePacks(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
-  const load = useCallback7(async () => await client.listPacks(workspaceId), [client, workspaceId]);
+  const load = useCallback8(async () => await client.listPacks(workspaceId), [client, workspaceId]);
   const { data, loading, error, refresh } = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
     enabled: options.enabled
   });
   const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const register = useCallback7(
+  const register = useCallback8(
     async (manifest) => {
       const result = await run(() => client.registerPack(workspaceId, manifest));
       if (result) {
@@ -829,7 +967,7 @@ function usePacks(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const enable = useCallback7(
+  const enable = useCallback8(
     async (packId, request = {}) => {
       const result = await run(() => client.enablePack(workspaceId, packId, request));
       if (result) {
@@ -839,11 +977,11 @@ function usePacks(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const previewInstallation = useCallback7(
+  const previewInstallation = useCallback8(
     async (packId, request = {}) => await run(() => client.previewPackInstallation(workspaceId, packId, request)),
     [client, workspaceId, run]
   );
-  const install = useCallback7(
+  const install = useCallback8(
     async (packId, request) => {
       const result = await run(() => client.installPack(workspaceId, packId, request));
       if (result) await refresh();
@@ -851,11 +989,11 @@ function usePacks(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const previewUninstall = useCallback7(
+  const previewUninstall = useCallback8(
     async (packId) => await run(() => client.previewPackUninstall(workspaceId, packId)),
     [client, workspaceId, run]
   );
-  const uninstall = useCallback7(
+  const uninstall = useCallback8(
     async (packId, request) => {
       const result = await run(() => client.uninstallPack(workspaceId, packId, request));
       if (result) await refresh();
@@ -863,7 +1001,7 @@ function usePacks(options = {}) {
     },
     [client, workspaceId, run, refresh]
   );
-  const remove = useCallback7(
+  const remove = useCallback8(
     async (packId) => {
       const result = await run(async () => {
         await client.deletePack(workspaceId, packId);
@@ -877,7 +1015,7 @@ function usePacks(options = {}) {
     [client, workspaceId, run, refresh]
   );
   const installations = data?.installations ?? EMPTY_INSTALLATIONS;
-  const installationFor = useCallback7(
+  const installationFor = useCallback8(
     (packId) => installations.find((installation) => installation.packId === packId) ?? null,
     [installations]
   );
@@ -902,16 +1040,16 @@ function usePacks(options = {}) {
 }
 
 // src/hooks/use-workspaces.ts
-import { useCallback as useCallback8 } from "react";
+import { useCallback as useCallback9 } from "react";
 function useWorkspaces(options = {}) {
   const client = useOpenGeniClient(options);
-  const load = useCallback8(async () => await client.listWorkspaces(), [client]);
+  const load = useCallback9(async () => await client.listWorkspaces(), [client]);
   const { data, loading, error, refresh } = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
     enabled: options.enabled
   });
   const { run, mutating, mutationError, clearMutationError } = useMutationRunner();
-  const create = useCallback8(
+  const create = useCallback9(
     async (request) => {
       const result = await run(() => client.createWorkspace(request));
       if (result) {
@@ -921,7 +1059,7 @@ function useWorkspaces(options = {}) {
     },
     [client, run, refresh]
   );
-  const update = useCallback8(
+  const update = useCallback9(
     async (workspaceId, request) => {
       const result = await run(() => client.updateWorkspace(workspaceId, request));
       if (result) {
@@ -945,12 +1083,12 @@ function useWorkspaces(options = {}) {
 }
 
 // src/hooks/use-billing-usage.ts
-import { useCallback as useCallback9 } from "react";
+import { useCallback as useCallback10 } from "react";
 function useBillingUsage(options = {}) {
   const client = useOpenGeniClient(options);
   const accountId = options.accountId;
   const workspaceId = options.workspaceId;
-  const load = useCallback9(
+  const load = useCallback10(
     async () => await client.getBillingUsage({
       ...accountId !== void 0 ? { accountId } : {},
       ...workspaceId !== void 0 ? { workspaceId } : {}
@@ -971,10 +1109,10 @@ function useBillingUsage(options = {}) {
 }
 
 // src/hooks/use-available-models.ts
-import { useCallback as useCallback10 } from "react";
+import { useCallback as useCallback11 } from "react";
 function useAvailableModels(options = {}) {
   const client = useOpenGeniClient(options);
-  const load = useCallback10(async () => await client.getClientConfig(), [client]);
+  const load = useCallback11(async () => await client.getClientConfig(), [client]);
   const state = usePolledValue(load, {
     pollIntervalMs: options.pollIntervalMs,
     enabled: options.enabled
@@ -989,7 +1127,7 @@ function useAvailableModels(options = {}) {
 }
 function useWorkspaceModelCatalog(options) {
   const client = useOpenGeniClient(options);
-  const load = useCallback10(async () => {
+  const load = useCallback11(async () => {
     if (!options.workspaceId) {
       return { models: [], defaultModel: null };
     }
@@ -1022,7 +1160,7 @@ import {
   OpenGeniApiError,
   applyUrlRotation
 } from "@opengeni/sdk";
-import { useCallback as useCallback11, useEffect as useEffect3, useRef as useRef2, useState } from "react";
+import { useCallback as useCallback12, useEffect as useEffect3, useRef as useRef2, useState } from "react";
 
 // src/lib/sandbox-liveness.ts
 function sandboxAcceptsLiveIo(liveness) {
@@ -1072,7 +1210,7 @@ function useSessionCapabilities(sessionId, options = {}) {
   const epochRef = useRef2(0);
   const viewerIdRef = useRef2(null);
   const previousIdentityRef = useRef2(identityKey);
-  const renegotiate = useCallback11(() => {
+  const renegotiate = useCallback12(() => {
     setNonce((n) => n + 1);
   }, []);
   useEffect3(() => {
@@ -1158,6 +1296,11 @@ function useSessionCapabilities(sessionId, options = {}) {
           pollUntilWarm();
         }).catch((cause) => {
           if (!cancelled) {
+            if (isSandboxOwnershipDisabledError(cause)) {
+              setState("on-demand");
+              setError(null);
+              return;
+            }
             setState("error");
             setError(cause instanceof Error ? cause : new Error(String(cause)));
           }
@@ -1260,6 +1403,11 @@ function useSessionCapabilities(sessionId, options = {}) {
         }
       } catch (cause) {
         if (cancelled) return;
+        if (isSandboxOwnershipDisabledError(cause)) {
+          setState("on-demand");
+          setError(null);
+          return;
+        }
         if (cause instanceof OpenGeniApiError && cause.status === 403) {
           setState("error");
           setError(new Error("not permitted to view this session's sandbox"));
@@ -1324,6 +1472,9 @@ function useSessionCapabilities(sessionId, options = {}) {
     renegotiate
   };
 }
+function isSandboxOwnershipDisabledError(error) {
+  return error instanceof OpenGeniApiError && error.status === 404 && error.message.includes("sandbox ownership is not enabled");
+}
 
 // src/hooks/use-terminal-stream.ts
 import {
@@ -1334,7 +1485,7 @@ import {
   ttydResizeFrame,
   TtydServerCommand
 } from "@opengeni/sdk";
-import { useCallback as useCallback12, useEffect as useEffect4, useMemo as useMemo3, useRef as useRef3, useState as useState2 } from "react";
+import { useCallback as useCallback13, useEffect as useEffect4, useMemo as useMemo4, useRef as useRef3, useState as useState2 } from "react";
 var MAX_PENDING_TERMINAL_INPUT_CODE_UNITS = 64 * 1024;
 var TERMINAL_CONNECT_EXPIRY_SKEW_MS = 5e3;
 var TERMINAL_RECONNECT_INITIAL_MS = 100;
@@ -1647,7 +1798,7 @@ function useTerminalStream(options) {
       closeSocket(socket);
     };
   }, [transport, url, token, expiresAt, reconnectGeneration]);
-  const write = useCallback12((data) => {
+  const write = useCallback13((data) => {
     const currentTransport = transportRef.current;
     const ws = wsRef.current;
     if (ws && ws.readyState === WebSocket.OPEN && socketAuthenticatedRef.current) {
@@ -1675,7 +1826,7 @@ function useTerminalStream(options) {
       pendingInputRef.current += data;
     }
   }, []);
-  const resize = useCallback12((cols, rows) => {
+  const resize = useCallback13((cols, rows) => {
     if (cols <= 0 || rows <= 0) return;
     sizeRef.current = { cols, rows };
     const ws = wsRef.current;
@@ -1686,7 +1837,7 @@ function useTerminalStream(options) {
       }
     }
   }, []);
-  const disconnect = useCallback12(() => {
+  const disconnect = useCallback13(() => {
     const ws = wsRef.current;
     wsRef.current = null;
     pendingInputRef.current = "";
@@ -1697,14 +1848,14 @@ function useTerminalStream(options) {
     if (ws) intentionalCloseRef.current.add(ws);
     closeSocket(ws);
   }, []);
-  return useMemo3(() => {
+  return useMemo4(() => {
     return { connected: status === "open", status, write, resize, disconnect };
   }, [status, write, resize, disconnect]);
 }
 
 // src/hooks/use-sandbox-terminal.ts
 import { OpenGeniApiError as OpenGeniApiError2 } from "@opengeni/sdk";
-import { useCallback as useCallback13, useEffect as useEffect5, useMemo as useMemo4, useRef as useRef4, useState as useState3 } from "react";
+import { useCallback as useCallback14, useEffect as useEffect5, useMemo as useMemo5, useRef as useRef4, useState as useState3 } from "react";
 function useSandboxTerminal(sessionId, options) {
   const { client, workspaceId } = useOpenGeni(options);
   const includeAgentFirehose = options.includeAgentFirehose ?? true;
@@ -1755,7 +1906,7 @@ function useSandboxTerminal(sessionId, options) {
       });
     };
   }, [interactive, client, workspaceId, sessionId, ptyFilter, boxWarm, reopenNonce]);
-  const { chunks, openPty, supportsInput } = useMemo4(() => {
+  const { chunks, openPty, supportsInput } = useMemo5(() => {
     const out = [];
     const open = /* @__PURE__ */ new Map();
     let lastOpened = null;
@@ -1808,7 +1959,7 @@ function useSandboxTerminal(sessionId, options) {
   const identityMatches = stateIdentity === identityKey;
   const activePtyId = identityMatches ? openedPtyId ?? openPty : null;
   const canWrite = openedPtyId !== null || supportsInput;
-  const write = useMemo4(() => {
+  const write = useMemo5(() => {
     if (!activePtyId || !canWrite || !sessionId) return null;
     const writeIdentity = identityKey;
     return (data) => {
@@ -1820,7 +1971,7 @@ function useSandboxTerminal(sessionId, options) {
       });
     };
   }, [client, workspaceId, sessionId, activePtyId, canWrite, openedPtyId, identityKey]);
-  const close = useCallback13(() => {
+  const close = useCallback14(() => {
     if (!activePtyId || !sessionId) return;
     void client.terminalPtyClose(workspaceId, sessionId, { ptyId: activePtyId }).catch(() => {
     });
@@ -1836,7 +1987,7 @@ function useSandboxTerminal(sessionId, options) {
 }
 
 // src/hooks/use-sandbox-files.ts
-import { useCallback as useCallback14, useEffect as useEffect6, useMemo as useMemo5, useRef as useRef5, useState as useState4 } from "react";
+import { useCallback as useCallback15, useEffect as useEffect6, useMemo as useMemo6, useRef as useRef5, useState as useState4 } from "react";
 var CapturedFileUnavailableError = class extends Error {
   constructor(path, reason) {
     super(
@@ -1859,12 +2010,19 @@ var FileWriteConflictError = class extends Error {
   code = "file_write_conflict";
 };
 function normalizeRoot(root) {
-  const normalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "").replace(/\/+$/, "");
+  const slashNormalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "");
+  if (slashNormalized === "/") return "/";
+  const normalized = slashNormalized.replace(/\/+$/, "");
   return normalized === "." ? "" : normalized;
 }
-function qualifyStatusPath(root, path) {
+function joinTreeRoot(root, path) {
+  if (!root || path.startsWith("/")) return path;
+  return root === "/" ? `/${path}` : `${root}/${path}`;
+}
+function qualifyStatusPath(root, path, treeRoot) {
   const normalized = normalizeRoot(root);
-  return normalized ? `${normalized}/${path}` : path;
+  const workspaceRelative = joinTreeRoot(normalized, path);
+  return joinTreeRoot(normalizeRoot(treeRoot), workspaceRelative);
 }
 function summarizeStatuses(statuses) {
   const repositories = statuses.filter(({ status }) => status.isRepo);
@@ -1881,6 +2039,10 @@ function parentOf(path) {
   const i = path.lastIndexOf("/");
   return i <= 0 ? "" : path.slice(0, i);
 }
+function parentWithinTree(path, rootPath) {
+  const parent = parentOf(path);
+  return parent === "" && normalizeRoot(rootPath) === "/" && path.startsWith("/") ? "/" : parent;
+}
 function leafOf(path) {
   const i = path.lastIndexOf("/");
   return i < 0 ? path : path.slice(i + 1);
@@ -1938,37 +2100,29 @@ 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;
-}
+var FS_LIST_BATCH_REQUEST_LIMIT = 16;
 function initialDirectoryFrontier(rootPath, repoPaths) {
-  const rootParts = normalizeRoot(rootPath).split("/").filter(Boolean);
+  const root = normalizeRoot(rootPath);
+  const rootParts = root.split("/").filter(Boolean);
   const paths = /* @__PURE__ */ new Set();
   for (const repoPath of repoPaths) {
-    const parts = normalizeRoot(repoPath).split("/").filter(Boolean);
+    const canonicalRepoPath = joinTreeRoot(root, normalizeRoot(repoPath));
+    const parts = canonicalRepoPath.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("/"));
+      const path = parts.slice(0, depth).join("/");
+      paths.add(root.startsWith("/") ? `/${path}` : path);
     }
   }
   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;
+function parentIsLoaded(nodes, parent, rootPath = "") {
+  if (parent === normalizeRoot(rootPath)) return true;
   const node = findNodeByPath(nodes, parent);
   return Boolean(node && node.kind === "dir" && node.children !== void 0);
 }
-function insertNode(nodes, parent, child) {
-  if (parent === "") {
+function insertNode(nodes, parent, child, rootPath = "") {
+  if (parent === normalizeRoot(rootPath)) {
     if (nodes.some((n) => n.path === child.path)) return nodes;
     return sortNodes([...nodes, child]);
   }
@@ -1979,14 +2133,14 @@ function insertNode(nodes, parent, child) {
       return { ...node, children: sortNodes([...node.children, child]) };
     }
     if (node.kind === "dir" && node.children && parent.startsWith(`${node.path}/`)) {
-      return { ...node, children: insertNode(node.children, parent, child) };
+      return { ...node, children: insertNode(node.children, parent, child, rootPath) };
     }
     return node;
   });
 }
-function removeNode(nodes, path) {
-  const parent = parentOf(path);
-  if (parent === "") {
+function removeNode(nodes, path, rootPath = "") {
+  const parent = parentWithinTree(path, rootPath);
+  if (parent === normalizeRoot(rootPath)) {
     if (!nodes.some((n) => n.path === path)) return nodes;
     return nodes.filter((n) => n.path !== path);
   }
@@ -1999,7 +2153,7 @@ function removeNode(nodes, path) {
       };
     }
     if (node.kind === "dir" && node.children && parent.startsWith(`${node.path}/`)) {
-      return { ...node, children: removeNode(node.children, path) };
+      return { ...node, children: removeNode(node.children, path, rootPath) };
     }
     return node;
   });
@@ -2070,7 +2224,7 @@ function useSandboxFiles(sessionId, options = {}) {
   const repoPathsKey = [
     ...new Set((options.repoPaths?.length ? options.repoPaths : [rootPath]).map(normalizeRoot))
   ].join("\0");
-  const repoPaths = useMemo5(() => repoPathsKey.split("\0"), [repoPathsKey]);
+  const repoPaths = useMemo6(() => repoPathsKey.split("\0"), [repoPathsKey]);
   const capture = options.capture ?? null;
   const isLive2 = sandboxAcceptsLiveIo(options.liveness);
   const acceptsEventReads = options.liveness === void 0 || isLive2;
@@ -2098,13 +2252,13 @@ function useSandboxFiles(sessionId, options = {}) {
   const lastSeqRef = useRef5(0);
   const pendingParentsRef = useRef5(/* @__PURE__ */ new Set());
   const pendingGitRef = useRef5(false);
-  const pendingAgentToolRef = useRef5(false);
+  const eventReconcileInFlightRef = useRef5(null);
+  const eventReconcilePendingRef = useRef5(false);
   const debounceRef = useRef5(null);
-  const lastCommandRefreshAtRef = useRef5(0);
   const ownRevisionsRef = useRef5(/* @__PURE__ */ new Set());
   const onMutationError = options.onMutationError;
   treeRef.current = tree;
-  const applyStatus = useCallback14((nodes) => {
+  const applyStatus = useCallback15((nodes) => {
     const overlay = statusRef.current;
     const walk = (list) => {
       let changed = false;
@@ -2127,7 +2281,7 @@ function useSandboxFiles(sessionId, options = {}) {
     };
     return walk(nodes);
   }, []);
-  const refresh = useCallback14(async () => {
+  const refresh = useCallback15(async () => {
     if (!sessionId) return;
     refreshAbortRef.current?.abort();
     const refreshAbort = new AbortController();
@@ -2142,21 +2296,6 @@ function useSandboxFiles(sessionId, options = {}) {
         path,
         depth: 1
       }));
-      const statusPromise = repoPaths.length > 0 ? client.gitReadBatch(
-        workspaceId,
-        sessionId,
-        {
-          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,
@@ -2183,7 +2322,21 @@ function useSandboxFiles(sessionId, options = {}) {
       sourceRef.current = "live";
       setSource("live");
       setLoading(false);
-      const statuses = await statusPromise;
+      const statuses = repoPaths.length > 0 ? await client.gitReadBatch(
+        workspaceId,
+        sessionId,
+        {
+          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) : [];
       if (refreshGenerationRef.current !== generation) return;
       if (statuses) {
         const overlay = /* @__PURE__ */ new Map();
@@ -2191,7 +2344,7 @@ function useSandboxFiles(sessionId, options = {}) {
           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);
+            if (mapped) overlay.set(qualifyStatusPath(root, file.path, rootPath), mapped);
           }
         }
         statusRef.current = overlay;
@@ -2211,7 +2364,7 @@ function useSandboxFiles(sessionId, options = {}) {
       if (refreshAbortRef.current === refreshAbort) refreshAbortRef.current = null;
     }
   }, [client, workspaceId, sessionId, rootPath, repoPaths, applyStatus]);
-  const seedFromCapture = useCallback14(
+  const seedFromCapture = useCallback15(
     (manifest) => {
       const overlay = /* @__PURE__ */ new Map();
       for (const file of manifest.files) {
@@ -2239,7 +2392,7 @@ function useSandboxFiles(sessionId, options = {}) {
     },
     [applyStatus]
   );
-  const expand = useCallback14(
+  const expand = useCallback15(
     async (path) => {
       if (!sessionId) return;
       if (source === "capture" && capture) return;
@@ -2276,7 +2429,7 @@ function useSandboxFiles(sessionId, options = {}) {
     },
     [client, workspaceId, sessionId, capture, source, applyStatus]
   );
-  const readFile = useCallback14(
+  const readFile = useCallback15(
     async (path, requestOptions = {}) => {
       if (!sessionId) throw new Error("no session");
       const identitySignal = identityAbortRef.current.signal;
@@ -2351,19 +2504,20 @@ function useSandboxFiles(sessionId, options = {}) {
     },
     [client, workspaceId, sessionId, capture, source]
   );
-  const reconcilePath = useCallback14(
+  const reconcilePath = useCallback15(
     async (path, requestSignal) => {
       if (!sessionId) return;
       const identityGeneration = identityGenerationRef.current;
       const identitySignal = identityAbortRef.current.signal;
       const signal = requestSignal ? AbortSignal.any([identitySignal, requestSignal]) : identitySignal;
-      if (!parentIsLoaded(treeRef.current, path)) return;
+      if (!parentIsLoaded(treeRef.current, path, rootPath)) return;
       try {
         const listed = await client.fsList(workspaceId, sessionId, { path, depth: 1 }, { signal });
         if (identityGenerationRef.current !== identityGeneration) return;
         const children = (listed.root.children ?? []).map((node) => fsNodeToTree(node));
-        if (path === "") setTree((prev) => applyStatus(mergeRootChildren(prev, children)));
-        else
+        if (path === normalizeRoot(rootPath)) {
+          setTree((prev) => applyStatus(mergeRootChildren(prev, children)));
+        } else
           setTree((prev) => {
             const existing = findNodeByPath(prev, path);
             const merged = existing?.children ? mergeChildren(existing.children, children) : children;
@@ -2372,9 +2526,50 @@ function useSandboxFiles(sessionId, options = {}) {
       } catch {
       }
     },
-    [client, workspaceId, sessionId, applyStatus]
+    [client, workspaceId, sessionId, rootPath, applyStatus]
+  );
+  const reconcilePaths = useCallback15(
+    async (requestedPaths, requestSignal) => {
+      if (!sessionId) return;
+      const identityGeneration = identityGenerationRef.current;
+      const identitySignal = identityAbortRef.current.signal;
+      const signal = requestSignal ? AbortSignal.any([identitySignal, requestSignal]) : identitySignal;
+      const paths = [...new Set(requestedPaths)].filter(
+        (path) => parentIsLoaded(treeRef.current, path, rootPath)
+      );
+      for (let offset = 0; offset < paths.length; offset += FS_LIST_BATCH_REQUEST_LIMIT) {
+        const chunk = paths.slice(offset, offset + FS_LIST_BATCH_REQUEST_LIMIT);
+        try {
+          const listed = await client.fsListBatch(
+            workspaceId,
+            sessionId,
+            { requests: chunk.map((path) => ({ path, depth: 1 })) },
+            { signal }
+          );
+          if (identityGenerationRef.current !== identityGeneration) return;
+          setTree((previous) => {
+            let next = previous;
+            for (const [index, path] of chunk.entries()) {
+              const result = listed.results[index];
+              if (!result) continue;
+              const children = (result.root.children ?? []).map((node) => fsNodeToTree(node));
+              if (path === normalizeRoot(rootPath)) {
+                next = mergeRootChildren(next, children);
+              } else {
+                const existing = findNodeByPath(next, path);
+                const merged = existing?.children ? mergeChildren(existing.children, children) : children;
+                next = replaceChildren(next, path, merged);
+              }
+            }
+            return applyStatus(next);
+          });
+        } catch {
+        }
+      }
+    },
+    [client, workspaceId, sessionId, rootPath, applyStatus]
   );
-  const runOptimistic = useCallback14(
+  const runOptimistic = useCallback15(
     async (opName, apply, op, reconcileParents) => {
       const identityGeneration = identityGenerationRef.current;
       const snapshot = treeRef.current;
@@ -2404,12 +2599,12 @@ function useSandboxFiles(sessionId, options = {}) {
     },
     [applyStatus, reconcilePath, onMutationError]
   );
-  const writeFile = useCallback14(
+  const writeFile = useCallback15(
     async (path, content, writeOptions = {}) => {
       if (!sessionId) throw new Error("no session");
       const identityGeneration = identityGenerationRef.current;
       const identitySignal = identityAbortRef.current.signal;
-      const parent = parentOf(path);
+      const parent = parentWithinTree(path, rootPath);
       const exists = Boolean(findNodeByPath(tree, path));
       const node = {
         path,
@@ -2419,7 +2614,7 @@ function useSandboxFiles(sessionId, options = {}) {
       };
       return await runOptimistic(
         "write",
-        (nodes) => exists ? nodes : insertNode(nodes, parent, node),
+        (nodes) => exists ? nodes : insertNode(nodes, parent, node, rootPath),
         async () => {
           if (!writeOptions.force && writeOptions.expectedContent !== void 0) {
             const live = await client.fsRead(
@@ -2448,12 +2643,12 @@ function useSandboxFiles(sessionId, options = {}) {
         exists ? [] : [parent]
       );
     },
-    [client, workspaceId, sessionId, tree, runOptimistic]
+    [client, workspaceId, sessionId, tree, rootPath, runOptimistic]
   );
-  const createFile = useCallback14(
+  const createFile = useCallback15(
     async (path) => {
       if (!sessionId) throw new Error("no session");
-      const parent = parentOf(path);
+      const parent = parentWithinTree(path, rootPath);
       const node = {
         path,
         name: leafOf(path),
@@ -2462,7 +2657,7 @@ function useSandboxFiles(sessionId, options = {}) {
       };
       await runOptimistic(
         "create file",
-        (nodes) => insertNode(nodes, parent, node),
+        (nodes) => insertNode(nodes, parent, node, rootPath),
         () => client.fsWrite(workspaceId, sessionId, {
           path,
           content: "",
@@ -2471,12 +2666,12 @@ function useSandboxFiles(sessionId, options = {}) {
         [parent]
       );
     },
-    [client, workspaceId, sessionId, runOptimistic]
+    [client, workspaceId, sessionId, rootPath, runOptimistic]
   );
-  const createDir = useCallback14(
+  const createDir = useCallback15(
     async (path) => {
       if (!sessionId) throw new Error("no session");
-      const parent = parentOf(path);
+      const parent = parentWithinTree(path, rootPath);
       const node = {
         path,
         name: leafOf(path),
@@ -2485,37 +2680,37 @@ function useSandboxFiles(sessionId, options = {}) {
       };
       await runOptimistic(
         "create folder",
-        (nodes) => insertNode(nodes, parent, node),
+        (nodes) => insertNode(nodes, parent, node, rootPath),
         () => client.fsMkdir(workspaceId, sessionId, { path, recursive: true }),
         [parent]
       );
     },
-    [client, workspaceId, sessionId, runOptimistic]
+    [client, workspaceId, sessionId, rootPath, runOptimistic]
   );
-  const deleteEntry = useCallback14(
+  const deleteEntry = useCallback15(
     async (path, recursive = false) => {
       if (!sessionId) throw new Error("no session");
       await runOptimistic(
         "delete",
-        (nodes) => removeNode(nodes, path),
+        (nodes) => removeNode(nodes, path, rootPath),
         () => client.fsDelete(workspaceId, sessionId, { path, recursive }),
-        [parentOf(path)]
+        [parentWithinTree(path, rootPath)]
       );
     },
-    [client, workspaceId, sessionId, runOptimistic]
+    [client, workspaceId, sessionId, rootPath, runOptimistic]
   );
-  const moveEntry = useCallback14(
+  const moveEntry = useCallback15(
     async (path, newPath, opts) => {
       if (!sessionId) throw new Error("no session");
-      const from = parentOf(path);
-      const to = parentOf(newPath);
+      const from = parentWithinTree(path, rootPath);
+      const to = parentWithinTree(newPath, rootPath);
       await runOptimistic(
         "move",
         (nodes) => {
           const moving = findNodeByPath(nodes, path);
           if (!moving) return nodes;
           const moved = repathNode(moving, path, newPath);
-          return insertNode(removeNode(nodes, path), to, moved);
+          return insertNode(removeNode(nodes, path, rootPath), to, moved, rootPath);
         },
         () => client.fsMove(workspaceId, sessionId, {
           path,
@@ -2525,7 +2720,7 @@ function useSandboxFiles(sessionId, options = {}) {
         to === from ? [from] : [from, to]
       );
     },
-    [client, workspaceId, sessionId, runOptimistic]
+    [client, workspaceId, sessionId, rootPath, runOptimistic]
   );
   const captureRef = useRef5(capture);
   captureRef.current = capture;
@@ -2540,14 +2735,14 @@ function useSandboxFiles(sessionId, options = {}) {
     const identityChanged = previousIdentityRef.current !== identityKey;
     previousIdentityRef.current = identityKey;
     if (identityChanged || !enabled) {
+      if (identityChanged) eventReconcileInFlightRef.current = null;
       identityAbortRef.current.abort();
       identityAbortRef.current = new AbortController();
       identityGenerationRef.current += 1;
       lastSeqRef.current = 0;
       pendingParentsRef.current = /* @__PURE__ */ new Set();
       pendingGitRef.current = false;
-      pendingAgentToolRef.current = false;
-      lastCommandRefreshAtRef.current = 0;
+      eventReconcilePendingRef.current = false;
       if (debounceRef.current) {
         clearTimeout(debounceRef.current);
         debounceRef.current = null;
@@ -2588,6 +2783,7 @@ function useSandboxFiles(sessionId, options = {}) {
       refreshAbortRef.current = null;
       refreshGenerationRef.current += 1;
       eventReadAbortRef.current.abort();
+      eventReconcilePendingRef.current = false;
     };
   }, [
     enabled,
@@ -2599,7 +2795,7 @@ function useSandboxFiles(sessionId, options = {}) {
     refresh,
     seedFromCapture
   ]);
-  const refreshGitOverlay = useCallback14(
+  const refreshGitOverlay = useCallback15(
     async (requestSignal) => {
       if (!sessionId) return;
       const identityGeneration = identityGenerationRef.current;
@@ -2623,7 +2819,7 @@ function useSandboxFiles(sessionId, options = {}) {
           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);
+            if (mapped) overlay.set(qualifyStatusPath(root, file.path, rootPath), mapped);
           }
         }
         statusRef.current = overlay;
@@ -2634,8 +2830,38 @@ function useSandboxFiles(sessionId, options = {}) {
         if (identityGenerationRef.current === identityGeneration) setGitLoading(false);
       }
     },
-    [client, workspaceId, sessionId, repoPaths, applyStatus]
+    [client, workspaceId, sessionId, repoPaths, rootPath, applyStatus]
   );
+  const performEventReconcile = useCallback15(async () => {
+    const parents = pendingParentsRef.current;
+    pendingParentsRef.current = /* @__PURE__ */ new Set();
+    const wantGit = pendingGitRef.current;
+    pendingGitRef.current = false;
+    const signal = eventReadAbortRef.current.signal;
+    const paths = [...parents];
+    await reconcilePaths(paths, signal);
+    if (wantGit) await refreshGitOverlay(signal);
+  }, [reconcilePaths, refreshGitOverlay]);
+  const performEventReconcileRef = useRef5(performEventReconcile);
+  performEventReconcileRef.current = performEventReconcile;
+  const reconcilePendingEvents = useCallback15(async () => {
+    eventReconcilePendingRef.current = true;
+    const existing = eventReconcileInFlightRef.current;
+    if (existing) return await existing;
+    const identityGeneration = identityGenerationRef.current;
+    const run = (async () => {
+      while (eventReconcilePendingRef.current && identityGenerationRef.current === identityGeneration) {
+        eventReconcilePendingRef.current = false;
+        await performEventReconcileRef.current();
+      }
+    })();
+    eventReconcileInFlightRef.current = run;
+    try {
+      await run;
+    } finally {
+      if (eventReconcileInFlightRef.current === run) eventReconcileInFlightRef.current = null;
+    }
+  }, []);
   const events = options.events;
   useEffect6(() => {
     if (!enabled || !events) return;
@@ -2649,12 +2875,11 @@ function useSandboxFiles(sessionId, options = {}) {
       }
       pendingParentsRef.current = /* @__PURE__ */ new Set();
       pendingGitRef.current = false;
-      pendingAgentToolRef.current = false;
+      eventReconcilePendingRef.current = false;
       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") {
@@ -2666,8 +2891,10 @@ function useSandboxFiles(sessionId, options = {}) {
           continue;
         contentChanged = true;
         for (const change of payload.changes ?? []) {
-          pendingParentsRef.current.add(parentOf(change.path));
-          if (change.oldPath) pendingParentsRef.current.add(parentOf(change.oldPath));
+          pendingParentsRef.current.add(parentWithinTree(change.path, rootPath));
+          if (change.oldPath) {
+            pendingParentsRef.current.add(parentWithinTree(change.oldPath, rootPath));
+          }
         }
       } else if (event.type === "git.changed") {
         sawNew = true;
@@ -2675,55 +2902,25 @@ 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 (contentChanged) 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 (!acceptsEventReadsRef.current) {
         pendingParentsRef.current = /* @__PURE__ */ new Set();
         pendingGitRef.current = false;
-        pendingAgentToolRef.current = false;
         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;
-      const eventReadSignal = eventReadAbortRef.current.signal;
-      void (async () => {
-        const paths = wantAgentTool ? loadedDirectoryPaths(treeRef.current) : [...parents];
-        await Promise.all([
-          wantGit ? refreshGitOverlay(eventReadSignal) : Promise.resolve(),
-          Promise.all(paths.map((path) => reconcilePath(path, eventReadSignal)))
-        ]);
-      })();
-    }, delay);
-  }, [enabled, active, acceptsEventReads, events, reconcilePath, refreshGitOverlay]);
+      void reconcilePendingEvents();
+    }, 150);
+  }, [enabled, active, acceptsEventReads, events, rootPath, reconcilePendingEvents]);
   useEffect6(() => {
     if (active && acceptsEventReads) return;
     if (debounceRef.current) {
@@ -2732,13 +2929,14 @@ function useSandboxFiles(sessionId, options = {}) {
     }
     pendingParentsRef.current = /* @__PURE__ */ new Set();
     pendingGitRef.current = false;
-    pendingAgentToolRef.current = false;
+    eventReconcilePendingRef.current = false;
   }, [active, acceptsEventReads]);
   useEffect6(
     () => () => {
       refreshAbortRef.current?.abort();
       identityAbortRef.current.abort();
       eventReadAbortRef.current.abort();
+      eventReconcilePendingRef.current = false;
       identityGenerationRef.current += 1;
       if (debounceRef.current) clearTimeout(debounceRef.current);
     },
@@ -2767,7 +2965,7 @@ function useSandboxFiles(sessionId, options = {}) {
 }
 
 // src/hooks/use-sandbox-git.ts
-import { useCallback as useCallback15, useEffect as useEffect7, useMemo as useMemo6, useRef as useRef6, useState as useState5 } from "react";
+import { useCallback as useCallback16, useEffect as useEffect7, useMemo as useMemo7, useRef as useRef6, useState as useState5 } from "react";
 function normalizeRoot2(root) {
   const normalized = root.replaceAll("\\", "/").replace(/^\.\/+/, "").replace(/\/+$/, "");
   return normalized === "." ? "" : normalized;
@@ -2833,7 +3031,7 @@ function useSandboxGit(sessionId, options = {}) {
   const repoPathsKey = uniqueRoots(
     options.repoPaths && options.repoPaths.length > 0 ? options.repoPaths : [repoPath]
   ).join("\0");
-  const repoPaths = useMemo6(() => repoPathsKey.split("\0"), [repoPathsKey]);
+  const repoPaths = useMemo7(() => 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;
@@ -2856,11 +3054,13 @@ function useSandboxGit(sessionId, options = {}) {
   const [stateIdentity, setStateIdentity] = useState5(identityKey);
   const refreshGenerationRef = useRef6(0);
   const refreshAbortRef = useRef6(null);
+  const refreshInFlightRef = useRef6(null);
+  const refreshPendingRef = useRef6(false);
+  const refreshWorkerEpochRef = useRef6(0);
   const lastChangeRef = useRef6(0);
-  const commandRefreshTimerRef = useRef6(null);
-  const refresh = useCallback15(async () => {
+  const eventRefreshTimerRef = useRef6(null);
+  const performRefresh = useCallback16(async () => {
     if (!sessionId) return;
-    refreshAbortRef.current?.abort();
     const refreshAbort = new AbortController();
     refreshAbortRef.current = refreshAbort;
     const generation = refreshGenerationRef.current += 1;
@@ -2971,7 +3171,27 @@ function useSandboxGit(sessionId, options = {}) {
     workspaceWide,
     comparison
   ]);
-  const seedFromCapture = useCallback15(
+  const performRefreshRef = useRef6(performRefresh);
+  performRefreshRef.current = performRefresh;
+  const refresh = useCallback16(async () => {
+    refreshPendingRef.current = true;
+    const existing = refreshInFlightRef.current;
+    if (existing) return await existing;
+    const workerEpoch = refreshWorkerEpochRef.current;
+    const run = (async () => {
+      while (refreshPendingRef.current && refreshWorkerEpochRef.current === workerEpoch) {
+        refreshPendingRef.current = false;
+        await performRefreshRef.current();
+      }
+    })();
+    refreshInFlightRef.current = run;
+    try {
+      await run;
+    } finally {
+      if (refreshInFlightRef.current === run) refreshInFlightRef.current = null;
+    }
+  }, []);
+  const seedFromCapture = useCallback16(
     (manifest) => {
       const repositories = workspaceWide ? manifest.repos : [repoForPath(manifest, repoPath)].filter(Boolean);
       if (comparison === "branch" && repositories.some((repo) => repo.branchDiff === void 0)) {
@@ -3015,9 +3235,14 @@ function useSandboxGit(sessionId, options = {}) {
   useEffect7(() => {
     refreshAbortRef.current?.abort();
     refreshAbortRef.current = null;
+    refreshPendingRef.current = false;
     refreshGenerationRef.current += 1;
     const identityChanged = previousIdentityRef.current !== identityKey;
     previousIdentityRef.current = identityKey;
+    if (identityChanged) {
+      refreshWorkerEpochRef.current += 1;
+      refreshInFlightRef.current = null;
+    }
     if (identityChanged || !enabled) {
       lastChangeRef.current = 0;
       setDiff([]);
@@ -3049,6 +3274,7 @@ function useSandboxGit(sessionId, options = {}) {
     return () => {
       refreshAbortRef.current?.abort();
       refreshAbortRef.current = null;
+      refreshPendingRef.current = false;
       refreshGenerationRef.current += 1;
     };
   }, [
@@ -3064,9 +3290,9 @@ function useSandboxGit(sessionId, options = {}) {
   const events = options.events;
   useEffect7(() => {
     if (!enabled || !events) {
-      if (commandRefreshTimerRef.current) {
-        clearTimeout(commandRefreshTimerRef.current);
-        commandRefreshTimerRef.current = null;
+      if (eventRefreshTimerRef.current) {
+        clearTimeout(eventRefreshTimerRef.current);
+        eventRefreshTimerRef.current = null;
       }
       return;
     }
@@ -3074,42 +3300,34 @@ function useSandboxGit(sessionId, options = {}) {
       for (const event of events) {
         if (event.sequence > lastChangeRef.current) lastChangeRef.current = event.sequence;
       }
-      if (commandRefreshTimerRef.current) {
-        clearTimeout(commandRefreshTimerRef.current);
-        commandRefreshTimerRef.current = null;
+      if (eventRefreshTimerRef.current) {
+        clearTimeout(eventRefreshTimerRef.current);
+        eventRefreshTimerRef.current = null;
       }
       return;
     }
     let latest = lastChangeRef.current;
-    let immediate = false;
-    let commandDelta = false;
+    let changed = false;
     for (const event of events) {
       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") {
+      if (event.type === "git.changed") {
         latest = event.sequence;
-        commandDelta = true;
+        changed = true;
       }
     }
     if (latest > lastChangeRef.current) {
       lastChangeRef.current = latest;
-      if (immediate) {
-        if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
-        commandRefreshTimerRef.current = null;
+      if (!changed) return;
+      if (eventRefreshTimerRef.current) clearTimeout(eventRefreshTimerRef.current);
+      eventRefreshTimerRef.current = setTimeout(() => {
+        eventRefreshTimerRef.current = null;
         if (acceptsEventReadsRef.current) void refresh();
-      } else if (commandDelta && !commandRefreshTimerRef.current) {
-        commandRefreshTimerRef.current = setTimeout(() => {
-          commandRefreshTimerRef.current = null;
-          if (acceptsEventReadsRef.current) void refresh();
-        }, 1e3);
-      }
+      }, 150);
     }
   }, [enabled, active, acceptsEventReads, events, refresh]);
   useEffect7(
     () => () => {
-      if (commandRefreshTimerRef.current) clearTimeout(commandRefreshTimerRef.current);
+      if (eventRefreshTimerRef.current) clearTimeout(eventRefreshTimerRef.current);
     },
     []
   );
@@ -3132,7 +3350,7 @@ function useSandboxGit(sessionId, options = {}) {
 }
 
 // src/hooks/use-workspace-capture.ts
-import { useCallback as useCallback16, useEffect as useEffect8, useRef as useRef7, useState as useState6 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect8, useRef as useRef7, useState as useState6 } from "react";
 var REVISION_CAPTURED = "workspace.revision.captured";
 var REVISION_DEGRADED = "workspace.revision.degraded";
 var MANIFEST_FETCH_TIMEOUT_MS = 15e3;
@@ -3182,7 +3400,7 @@ function useWorkspaceCapture(sessionId, options = {}) {
   const generationRef = useRef7(0);
   const requestAbortRef = useRef7(null);
   const lastSeqRef = useRef7(0);
-  const refresh = useCallback16(async () => {
+  const refresh = useCallback17(async () => {
     if (!sessionId) return;
     requestAbortRef.current?.abort();
     const requestAbort = new AbortController();
@@ -3327,7 +3545,7 @@ function useWorkspaceCapture(sessionId, options = {}) {
 }
 
 // src/hooks/use-workspace-edit.ts
-import { useCallback as useCallback17, useEffect as useEffect9, useRef as useRef8, useState as useState7 } from "react";
+import { useCallback as useCallback18, useEffect as useEffect9, useRef as useRef8, useState as useState7 } from "react";
 function isLive(liveness) {
   return sandboxAcceptsLiveIo(liveness);
 }
@@ -3370,7 +3588,7 @@ function useWorkspaceEdit(sessionId, options = {}) {
       readAbortRef.current = null;
     };
   }, [identityKey]);
-  const edit = useCallback17(
+  const edit = useCallback18(
     (content) => {
       if (stateIdentity !== identityKey) return;
       if (offline) return;
@@ -3386,7 +3604,7 @@ function useWorkspaceEdit(sessionId, options = {}) {
     },
     [offline, live, onWarmRequested, stateIdentity, identityKey]
   );
-  const doFlush = useCallback17(
+  const doFlush = useCallback18(
     async (force) => {
       if (stateIdentity !== identityKey) return;
       if (!sessionId || !path) return;
@@ -3443,10 +3661,10 @@ function useWorkspaceEdit(sessionId, options = {}) {
     if (flush === "flushed" || flush === "conflict" || flush === "flushing") return;
     void doFlush(false);
   }, [offline, live, buffer, flush, doFlush]);
-  const overwrite = useCallback17(async () => {
+  const overwrite = useCallback18(async () => {
     await doFlush(true);
   }, [doFlush]);
-  const discard = useCallback17(() => {
+  const discard = useCallback18(() => {
     setBuffer(null);
     setWantsWarm(false);
     setFlush("idle");
@@ -3486,7 +3704,7 @@ function useWorkspaceEdit(sessionId, options = {}) {
 }
 
 // src/hooks/use-machine-chip.ts
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo8 } from "react";
 function formatAsOf(capturedAt, now) {
   const then = Date.parse(capturedAt);
   if (Number.isNaN(then)) return "recently";
@@ -3502,17 +3720,29 @@ function formatAsOf(capturedAt, now) {
 function deriveMachineChip(input) {
   const now = input.now ?? Date.now();
   const asOf = input.capturedAt ?? null;
-  const offlineLabel = asOf ? `Offline \u2014 as of ${formatAsOf(asOf, now)}` : "Offline";
+  const managedRestingLabel = asOf ? `Sleeping \xB7 saved ${formatAsOf(asOf, now)}` : "Sleeping";
+  const offlineLabel = "Offline";
   const selfhostedOnline = input.activeIsSelfhosted === true && input.activeMachineState != null && connectionStatusForState(input.activeMachineState) === "online";
   if (sandboxAcceptsLiveIo(input.liveness) || selfhostedOnline) {
     return { state: "live", label: "Live", asOf: null };
   }
   const selfhostedOffline = input.activeIsSelfhosted === true && input.activeMachineState === "offline";
+  if (input.capabilitiesState === "error") {
+    return {
+      state: "offline",
+      label: input.activeIsSelfhosted === true ? offlineLabel : managedRestingLabel,
+      asOf
+    };
+  }
   const machineWarming = input.activeMachineState === "reconnecting" || input.activeMachineState === "enrolling";
   if (!selfhostedOffline && (input.capabilitiesState === "negotiating" || input.wantsWarm === true || machineWarming)) {
     return { state: "waking", label: "Waking\u2026", asOf };
   }
-  return { state: "offline", label: offlineLabel, asOf };
+  return {
+    state: "offline",
+    label: input.activeIsSelfhosted === true ? offlineLabel : managedRestingLabel,
+    asOf
+  };
 }
 function useMachineChip(input) {
   const {
@@ -3524,7 +3754,7 @@ function useMachineChip(input) {
     capturedAt,
     now
   } = input;
-  return useMemo7(
+  return useMemo8(
     () => deriveMachineChip({
       liveness,
       capabilitiesState,
@@ -3805,7 +4035,7 @@ function ChatComposer({
                       {
                         layout: true,
                         transition: { duration: 0.36, ease: [0.22, 1, 0.36, 1] },
-                        className: "inline-flex min-w-0 items-center gap-1.5",
+                        className: "inline-flex min-w-0 flex-1 items-center gap-1.5",
                         children: controlsStart
                       }
                     ) : null
@@ -4468,11 +4698,11 @@ import {
   Trash2Icon
 } from "lucide-react";
 import {
-  useCallback as useCallback18,
+  useCallback as useCallback19,
   useEffect as useEffect13,
   useId as useId2,
   useLayoutEffect as useLayoutEffect2,
-  useMemo as useMemo9,
+  useMemo as useMemo10,
   useRef as useRef11,
   useState as useState10
 } from "react";
@@ -4480,11 +4710,11 @@ import { AlertDialog } from "radix-ui";
 import { VList } from "virtua";
 
 // src/lib/use-unicode-fonts.ts
-import { useEffect as useEffect12, useMemo as useMemo8 } from "react";
+import { useEffect as useEffect12, useMemo as useMemo9 } 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 = useMemo8(() => collectUnicodeContent(values), [values]);
+  const content = useMemo9(() => collectUnicodeContent(values), [values]);
   useEffect12(() => {
     if (content.japanese) {
       void import("./noto-sans-jp-loader.generated-HFGLYBR3.js").then(({ loadNotoSansJp }) => loadNotoSansJp(content.japanese)).catch(() => void 0);
@@ -4535,21 +4765,49 @@ function itemKey(item) {
       return `residue:${item.path}`;
   }
 }
+function pathIsInsideDirectory(path, directory) {
+  if (!path.startsWith(directory) || path === directory) return false;
+  if (directory.endsWith("/") || directory.endsWith("\\")) return true;
+  const boundary = path[directory.length];
+  return boundary === "/" || boundary === "\\";
+}
 function findNode(nodes, path) {
   for (const node of nodes) {
     if (node.path === path) return node;
-    if (node.kind === "dir" && node.children && path.startsWith(`${node.path}/`)) {
+    if (node.kind === "dir" && node.children && pathIsInsideDirectory(path, node.path)) {
       const hit = findNode(node.children, path);
       if (hit) return hit;
     }
   }
   return void 0;
 }
+function traceRevealPath(nodes, targetPath) {
+  for (const node of nodes) {
+    if (node.path === targetPath) {
+      return {
+        directories: node.kind === "dir" ? [node.path] : [],
+        frontier: node.kind === "dir" && node.children === void 0 ? node.path : null
+      };
+    }
+    if (node.kind !== "dir" || !pathIsInsideDirectory(targetPath, node.path)) continue;
+    if (node.children === void 0) {
+      return { directories: [node.path], frontier: node.path };
+    }
+    const child = traceRevealPath(node.children, targetPath);
+    return {
+      directories: [node.path, ...child.directories],
+      frontier: child.frontier
+    };
+  }
+  return { directories: [], frontier: null };
+}
 function FileBrowser({
   result,
   fallback,
   onSelectFile,
   selectedPath,
+  revealPath,
+  revealPathRequestId,
   renderNode,
   emptyState,
   editable = true,
@@ -4566,13 +4824,16 @@ function FileBrowser({
   const [pendingDelete, setPendingDelete] = useState10(null);
   const [busy, setBusy] = useState10(false);
   const [coarsePointer, setCoarsePointer] = useState10(false);
+  const [revealRequest, setRevealRequest] = useState10(null);
+  const handledRevealRequestRef = useRef11(null);
+  const attemptedRevealPathsRef = useRef11(/* @__PURE__ */ new Set());
   const treeId = useId2();
   const container = usePortalTokenSource();
   const containerRef = container.currentRef;
   const deleteReturnFocusRef = useRef11(null);
   const vlistRef = useRef11(null);
   const portalTokenStyle = usePortalTokenStyle(container.source);
-  const getTreeElement = useCallback18(
+  const getTreeElement = useCallback19(
     () => typeof document === "undefined" ? null : document.getElementById(treeId),
     [treeId]
   );
@@ -4590,8 +4851,24 @@ function FileBrowser({
       return () => query.removeListener(update);
     }
   }, []);
+  const effectiveRevealRequestId = revealPath ? revealPathRequestId ?? revealPath : null;
+  useEffect13(() => {
+    if (!revealPath || effectiveRevealRequestId === null) {
+      setRevealRequest(null);
+      return;
+    }
+    const handled = handledRevealRequestRef.current;
+    if (handled?.path === revealPath && handled.requestId === effectiveRevealRequestId) return;
+    handledRevealRequestRef.current = {
+      path: revealPath,
+      requestId: effectiveRevealRequestId
+    };
+    attemptedRevealPathsRef.current = /* @__PURE__ */ new Set();
+    setActive(null);
+    setRevealRequest({ path: revealPath, requestId: effectiveRevealRequestId });
+  }, [effectiveRevealRequestId, revealPath]);
   const cursor = active ?? selectedPath ?? null;
-  const expand = useCallback18(
+  const expand = useCallback19(
     async (path) => {
       const node = findNode(result.tree, path);
       if (node && node.kind === "dir" && node.children === void 0) {
@@ -4609,14 +4886,36 @@ function FileBrowser({
     },
     [result]
   );
-  const open = useCallback18(
+  const open = useCallback19(
     (path) => {
       setExpanded((prev) => new Set(prev).add(path));
       void expand(path);
     },
     [expand]
   );
-  const toggle = useCallback18(
+  useEffect13(() => {
+    if (!revealRequest) return;
+    const trace = traceRevealPath(result.tree, revealRequest.path);
+    if (trace.directories.length > 0) {
+      setExpanded((previous) => {
+        const next = new Set(previous);
+        let changed = false;
+        for (const path of trace.directories) {
+          if (next.has(path)) continue;
+          next.add(path);
+          changed = true;
+        }
+        return changed ? next : previous;
+      });
+    }
+    const frontier = trace.frontier;
+    if (!frontier || attemptedRevealPathsRef.current.has(frontier) || loadingPaths.has(frontier) || result.expandingPaths.has(frontier)) {
+      return;
+    }
+    attemptedRevealPathsRef.current.add(frontier);
+    void expand(frontier);
+  }, [expand, loadingPaths, result.expandingPaths, result.tree, revealRequest]);
+  const toggle = useCallback19(
     async (node) => {
       if (node.kind !== "dir") return;
       const isOpen = expanded.has(node.path);
@@ -4631,7 +4930,7 @@ function FileBrowser({
     [expanded, expand]
   );
   const cold = result.source !== "live";
-  const renderItems = useMemo9(() => {
+  const renderItems = useMemo10(() => {
     const items = [];
     if (draftCreate && draftCreate.parent === "") {
       items.push({ type: "create", parent: "", kind: draftCreate.kind, depth: 0 });
@@ -4662,22 +4961,22 @@ function FileBrowser({
     walk(result.tree, 0);
     return items;
   }, [result.tree, expanded, draftCreate, loadingPaths, result.expandingPaths, cold]);
-  const unicodeFontPaths = useMemo9(
+  const unicodeFontPaths = useMemo10(
     () => renderItems.flatMap((item) => item.type === "node" ? [item.node.path] : []),
     [renderItems]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const flatRows = useMemo9(
+  const flatRows = useMemo10(
     () => renderItems.flatMap(
       (item) => item.type === "node" ? [{ node: item.node, depth: item.depth }] : []
     ),
     [renderItems]
   );
-  const rowIndexByPath = useMemo9(
+  const rowIndexByPath = useMemo10(
     () => new Map(flatRows.map((row, index) => [row.node.path, index])),
     [flatRows]
   );
-  const treePositionByPath = useMemo9(() => {
+  const treePositionByPath = useMemo10(() => {
     const positions = /* @__PURE__ */ new Map();
     const visit = (nodes) => {
       nodes.forEach((node, index) => {
@@ -4691,7 +4990,7 @@ function FileBrowser({
   const cursorIndex = cursor ? rowIndexByPath.get(cursor) ?? -1 : -1;
   const activeDescendantId = cursorIndex >= 0 ? `${treeId}-item-${cursorIndex}` : void 0;
   const supportsMutation = editable && result.source === "live" && result.error === null && !result.loading;
-  const performDelete = useCallback18(
+  const performDelete = useCallback19(
     async (node) => {
       if (!supportsMutation) return;
       const recursive = node.kind === "dir";
@@ -4705,7 +5004,7 @@ function FileBrowser({
     },
     [supportsMutation, result]
   );
-  const runDelete = useCallback18(
+  const runDelete = useCallback19(
     async (node, returnFocus) => {
       if (!supportsMutation) return;
       setMenu(null);
@@ -4718,7 +5017,7 @@ function FileBrowser({
     },
     [supportsMutation, confirmDelete, performDelete]
   );
-  const closePendingDelete = useCallback18(
+  const closePendingDelete = useCallback19(
     (restoreTrigger) => {
       const returnTarget = restoreTrigger ? deleteReturnFocusRef.current : getTreeElement();
       deleteReturnFocusRef.current = null;
@@ -4732,7 +5031,7 @@ function FileBrowser({
     },
     [getTreeElement]
   );
-  const commitCreate = useCallback18(
+  const commitCreate = useCallback19(
     async (name) => {
       const draft = draftCreate;
       setDraftCreate(null);
@@ -4757,7 +5056,7 @@ function FileBrowser({
     },
     [draftCreate, supportsMutation, result, open, onSelectFile]
   );
-  const commitRename = useCallback18(
+  const commitRename = useCallback19(
     async (name) => {
       const draft = draftRename;
       setDraftRename(null);
@@ -4780,7 +5079,7 @@ function FileBrowser({
     },
     [draftRename, supportsMutation, result, selectedPath, active, onSelectFile]
   );
-  const startCreate = useCallback18(
+  const startCreate = useCallback19(
     (kind) => {
       if (!supportsMutation) return;
       const anchor = cursor ? findNode(result.tree, cursor) : void 0;
@@ -4792,7 +5091,7 @@ function FileBrowser({
     },
     [supportsMutation, cursor, result.tree, open]
   );
-  const startRename = useCallback18(
+  const startRename = useCallback19(
     (node) => {
       if (!supportsMutation) return;
       setDraftCreate(null);
@@ -4801,7 +5100,7 @@ function FileBrowser({
     },
     [supportsMutation]
   );
-  const onDropOnto = useCallback18(
+  const onDropOnto = useCallback19(
     async (targetDir, sourcePath) => {
       setDragOver(null);
       if (!supportsMutation || !sourcePath) return;
@@ -4825,7 +5124,7 @@ function FileBrowser({
     },
     [supportsMutation, result, selectedPath, active, onSelectFile]
   );
-  const onKeyDown = useCallback18(
+  const onKeyDown = useCallback19(
     (e) => {
       if (draftCreate || draftRename) return;
       if (flatRows.length === 0) return;
@@ -5130,6 +5429,21 @@ function FileBrowser({
     const index = renderItems.findIndex((it) => it.type === "node" && it.node.path === cursor);
     if (index >= 0) vlistRef.current?.scrollToIndex(index);
   }, [cursor, renderItems]);
+  useEffect13(() => {
+    if (!revealRequest) return;
+    const index = renderItems.findIndex(
+      (item) => item.type === "node" && item.node.path === revealRequest.path
+    );
+    if (index < 0) return;
+    if (usesVirtualTree) {
+      vlistRef.current?.scrollToIndex(index);
+    } else {
+      document.getElementById(`${treeId}-item-${index}`)?.scrollIntoView?.({ block: "nearest" });
+    }
+    setRevealRequest(
+      (current) => current?.path === revealRequest.path && current.requestId === revealRequest.requestId ? null : current
+    );
+  }, [renderItems, revealRequest, treeId, usesVirtualTree]);
   return /* @__PURE__ */ jsxs5("div", { className: cn("flex min-h-0 min-w-0 flex-col", className), children: [
     showToolbar && /* @__PURE__ */ jsxs5(
       "div",
@@ -5619,18 +5933,18 @@ function ContextMenu({
 import { ArrowUpRightIcon, FileWarningIcon, HistoryIcon } from "lucide-react";
 import {
   Component,
-  useCallback as useCallback20,
+  useCallback as useCallback21,
   useEffect as useEffect15,
   useId as useId3,
   useLayoutEffect as useLayoutEffect3,
-  useMemo as useMemo11,
+  useMemo as useMemo12,
   useRef as useRef13,
   useState as useState12
 } from "react";
 import { VList as VList2 } from "virtua";
 
 // src/hooks/use-windowed-sections.ts
-import { useCallback as useCallback19, useEffect as useEffect14, useMemo as useMemo10, useRef as useRef12, useState as useState11 } from "react";
+import { useCallback as useCallback20, useEffect as useEffect14, useMemo as useMemo11, useRef as useRef12, useState as useState11 } from "react";
 function computeWindowRange(heights, scrollTop, viewport, overscan) {
   const n = heights.length;
   if (n === 0) return { start: 0, end: 0 };
@@ -5677,7 +5991,7 @@ function useWindowedSections(opts) {
     start: 0,
     end: Math.min(count, overscan + 1)
   }));
-  const recompute = useCallback19(() => {
+  const recompute = useCallback20(() => {
     const el = scrollRef.current;
     if (!el) return;
     const next = computeWindowRange(heightsRef.current, el.scrollTop, el.clientHeight, overscan);
@@ -5704,7 +6018,7 @@ function useWindowedSections(opts) {
       if (raf && typeof cancelAnimationFrame === "function") cancelAnimationFrame(raf);
     };
   }, [recompute, count]);
-  const measure = useCallback19((index, height) => {
+  const measure = useCallback20((index, height) => {
     if (height <= 0) return;
     setHeights((prev) => {
       if (Math.abs((prev[index] ?? 0) - height) < 1) return prev;
@@ -5713,7 +6027,7 @@ function useWindowedSections(opts) {
       return next;
     });
   }, []);
-  const offsets = useMemo10(() => {
+  const offsets = useMemo11(() => {
     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);
@@ -5722,7 +6036,7 @@ function useWindowedSections(opts) {
   useEffect14(() => {
     recompute();
   }, [offsets, recompute]);
-  const scrollToIndex = useCallback19(
+  const scrollToIndex = useCallback20(
     (index) => {
       const el = scrollRef.current;
       if (!el) return;
@@ -5931,12 +6245,12 @@ function WorkbenchChanges({
   const [layout, setLayout] = useState12("unified");
   const [activePath, setActivePath] = useState12(null);
   const pickerId = useId3();
-  const unicodeFontPaths = useMemo11(
+  const unicodeFontPaths = useMemo12(
     () => diff.flatMap((file) => file.oldPath ? [file.path, file.oldPath] : [file.path]),
     [diff]
   );
   useUnicodeFallbackFonts(unicodeFontPaths);
-  const { orderedFiles, rows, grouped } = useMemo11(() => buildRail(diff), [diff]);
+  const { orderedFiles, rows, grouped } = useMemo12(() => buildRail(diff), [diff]);
   const selectedIndex = orderedFiles.findIndex((file) => file.path === activePath);
   const activeIndex = selectedIndex >= 0 ? selectedIndex : 0;
   useChangesLayoutEffect(() => {
@@ -5966,9 +6280,9 @@ function WorkbenchChanges({
       return () => query.removeListener(update);
     }
   }, []);
-  const additions = useMemo11(() => diff.reduce((sum, f) => sum + f.additions, 0), [diff]);
-  const deletions = useMemo11(() => diff.reduce((sum, f) => sum + f.deletions, 0), [diff]);
-  const estimateHeight = useCallback20(
+  const additions = useMemo12(() => diff.reduce((sum, f) => sum + f.additions, 0), [diff]);
+  const deletions = useMemo12(() => diff.reduce((sum, f) => sum + f.deletions, 0), [diff]);
+  const estimateHeight = useCallback21(
     (index) => {
       const file = orderedFiles[index];
       return file ? estimateSectionHeight(file) : HEADER_PX + LINE_PX;
@@ -5980,14 +6294,14 @@ function WorkbenchChanges({
     estimateHeight,
     overscan: OVERSCAN
   });
-  const jumpTo = useCallback20(
+  const jumpTo = useCallback21(
     (index) => {
       setActivePath(orderedFiles[index]?.path ?? null);
       windowed.scrollToIndex(index);
     },
     [orderedFiles, windowed]
   );
-  const onPaneScroll = useCallback20(() => {
+  const onPaneScroll = useCallback21(() => {
     const el = windowed.scrollRef.current;
     if (!el) {
       return;
@@ -6450,9 +6764,9 @@ function FileSkeleton() {
 // src/components/code-editor.tsx
 import { Loader2Icon, SaveIcon } from "lucide-react";
 import {
-  useCallback as useCallback21,
+  useCallback as useCallback22,
   useEffect as useEffect17,
-  useMemo as useMemo12,
+  useMemo as useMemo13,
   useRef as useRef14,
   useState as useState14
 } from "react";
@@ -6549,7 +6863,7 @@ function CodeEditor({
     setSaveError(null);
     setSavedTick(false);
   }, [path]);
-  const noteEdit = useCallback21(
+  const noteEdit = useCallback22(
     (next) => {
       setBuffer((current) => ({ ...current, value: next }));
       setSavedTick(false);
@@ -6560,7 +6874,7 @@ function CodeEditor({
     },
     [baseline, onEditIntent]
   );
-  const langKey = useMemo12(() => languageForPath(path), [path]);
+  const langKey = useMemo13(() => languageForPath(path), [path]);
   useEffect17(() => {
     let cancelled = false;
     void (async () => {
@@ -6603,7 +6917,7 @@ function CodeEditor({
   }, [langKey]);
   const saveRef = useRef14(() => {
   });
-  const save = useCallback21(async () => {
+  const save = useCallback22(async () => {
     if (readOnly || saveInFlightRef.current) return;
     const snapshot = value;
     if (snapshot === baseline) return;
@@ -6624,7 +6938,7 @@ function CodeEditor({
       setSaving(false);
     }
   }, [readOnly, value, baseline, onSave, path]);
-  const overwrite = useCallback21(async () => {
+  const overwrite = useCallback22(async () => {
     if (readOnly || !onOverwrite || saveInFlightRef.current) return;
     const snapshot = value;
     if (snapshot === baseline) return;
@@ -6654,14 +6968,14 @@ function CodeEditor({
     return () => clearTimeout(t);
   }, [savedTick]);
   const fileName = path.split("/").filter(Boolean).pop() ?? path;
-  const cmExtensions = useMemo12(() => {
+  const cmExtensions = useMemo13(() => {
     if (!bundle) return [];
     const exts = [bundle.saveKeymapExtension(() => saveRef.current())];
     if (bundle.languageExtension) exts.push(bundle.languageExtension);
     return exts;
   }, [bundle]);
   const Editor = bundle?.Editor;
-  const reload = useCallback21(() => {
+  const reload = useCallback22(() => {
     setBuffer({ path, value: initialContents, baseline: initialContents });
     editIntentFiredRef.current = false;
     setSaveError(null);
@@ -6817,7 +7131,7 @@ function EditorSkeleton() {
 
 // src/components/sandbox-files.tsx
 import { FileCode2Icon, FileWarningIcon as FileWarningIcon2, LoaderCircleIcon } from "lucide-react";
-import { useCallback as useCallback22, useEffect as useEffect18, useRef as useRef15, useState as useState15 } from "react";
+import { useCallback as useCallback23, useEffect as useEffect18, useRef as useRef15, useState as useState15 } 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({
@@ -6827,7 +7141,10 @@ function SandboxFiles({
   usePierre = true,
   editable = true,
   onEditIntent,
+  initialSelectedPath,
+  onSelectedPathChange,
   requestedPath,
+  requestedLine,
   requestedPathRequestId,
   requestedPathReady = true,
   workspaceResting = false,
@@ -6837,10 +7154,13 @@ function SandboxFiles({
   themeType,
   className
 }) {
-  const [selected, setSelected] = useState15(null);
+  const [selected, setSelected] = useState15(() => initialSelectedPath ?? null);
   const [editMode, setEditMode] = useState15(false);
+  const [focusLine, setFocusLine] = useState15(null);
+  const [treeRevealRequest, setTreeRevealRequest] = useState15(null);
   const [liveRequestedPath, setLiveRequestedPath] = useState15(null);
   const [viewReloadRevision, setViewReloadRevision] = useState15(0);
+  const viewerScrollRef = useRef15(null);
   const pendingRequestRef = useRef15(null);
   const handledRequestRef = useRef15(null);
   const requestKey = requestedPath ? requestedPathRequestId ?? requestedPath : null;
@@ -6848,6 +7168,7 @@ function SandboxFiles({
     if (!requestedPath || requestKey === null) {
       pendingRequestRef.current = null;
       handledRequestRef.current = null;
+      setTreeRevealRequest(null);
       return;
     }
     if (handledRequestRef.current === requestKey) {
@@ -6855,13 +7176,18 @@ function SandboxFiles({
     }
     if (!requestedPathReady) {
       pendingRequestRef.current = requestKey;
+      setTreeRevealRequest(null);
       return;
     }
     handledRequestRef.current = requestKey;
     pendingRequestRef.current = null;
     setSelected(requestedPath);
+    onSelectedPathChange?.(requestedPath);
     setEditMode(false);
-  }, [requestKey, requestedPath, requestedPathReady]);
+    setFocusLine(requestedLine != null && requestedLine > 0 ? requestedLine : null);
+    setTreeRevealRequest({ path: requestedPath, requestId: requestKey });
+    setViewReloadRevision((revision) => revision + 1);
+  }, [onSelectedPathChange, requestKey, requestedLine, requestedPath, requestedPathReady]);
   const rootRef = useRef15(null);
   const [wide, setWide] = useState15(false);
   useEffect18(() => {
@@ -6888,18 +7214,29 @@ function SandboxFiles({
   const fileView = useFileView(
     viewPath,
     files.readFile,
-    (files.contentRevision ?? 0) + viewReloadRevision
+    `${files.contentRevision ?? 0}:${viewReloadRevision}`
   );
-  const selectFile = useCallback22((path) => {
-    if (pendingRequestRef.current !== null) {
-      handledRequestRef.current = pendingRequestRef.current;
-      pendingRequestRef.current = null;
+  useEffect18(() => {
+    if (focusLine === null && viewReloadRevision > 0 && viewerScrollRef.current) {
+      viewerScrollRef.current.scrollTop = 0;
     }
-    setSelected(path);
-    setEditMode(false);
-    setLiveRequestedPath(null);
-    setViewReloadRevision(0);
-  }, []);
+  }, [focusLine, viewReloadRevision]);
+  const selectFile = useCallback23(
+    (path) => {
+      if (pendingRequestRef.current !== null) {
+        handledRequestRef.current = pendingRequestRef.current;
+        pendingRequestRef.current = null;
+      }
+      setSelected(path);
+      onSelectedPathChange?.(path);
+      setEditMode(false);
+      setFocusLine(null);
+      setTreeRevealRequest(null);
+      setLiveRequestedPath(null);
+      setViewReloadRevision(0);
+    },
+    [onSelectedPathChange]
+  );
   const canEdit = editable && viewPath !== null && !fileView.loading && fileView.error === null && !fileView.isBinary && !fileView.truncated && fileView.content !== null;
   const showEditor = canEdit && editMode;
   const captureFileUnavailable = fileView.error instanceof CapturedFileUnavailableError ? fileView.error : null;
@@ -6970,6 +7307,10 @@ function SandboxFiles({
                 {
                   result: files,
                   selectedPath: selected ?? void 0,
+                  ...treeRevealRequest ? {
+                    revealPath: treeRevealRequest.path,
+                    revealPathRequestId: treeRevealRequest.requestId
+                  } : {},
                   onSelectFile: selectFile,
                   editable,
                   emptyState: "This directory is empty",
@@ -7003,7 +7344,7 @@ function SandboxFiles({
                     {
                       "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"
+                      children: selected ? focusLine !== null ? `${selected}:${focusLine}` : selected : "No file selected"
                     }
                   ),
                   canEdit && /* @__PURE__ */ jsx10(
@@ -7018,106 +7359,122 @@ function SandboxFiles({
                     }
                   )
                 ] }),
-                /* @__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, expectedContents) => files.writeFile(viewPath, contents, { expectedContent: expectedContents }),
-                    onOverwrite: (contents) => files.writeFile(viewPath, contents, { force: true }),
-                    onReload: () => setViewReloadRevision((revision) => revision + 1),
-                    ...onEditIntent ? { onEditIntent } : {},
-                    className: "h-full"
-                  },
-                  viewPath
-                ) : waitingForSelectedFile ? /* @__PURE__ */ jsxs8(
-                  Notice,
+                /* @__PURE__ */ jsx10(
+                  "div",
                   {
-                    icon: /* @__PURE__ */ jsx10(
-                      LoaderCircleIcon,
+                    ref: viewerScrollRef,
+                    className: "min-h-0 flex-1 overflow-auto",
+                    "data-opengeni-file-viewer-scroll": true,
+                    children: viewPath ? showEditor && fileView.content !== null ? /* @__PURE__ */ jsx10(
+                      CodeEditor,
+                      {
+                        path: viewPath,
+                        initialContents: fileView.content,
+                        themeType: resolvedTheme,
+                        onSave: (contents, expectedContents) => files.writeFile(viewPath, contents, { expectedContent: expectedContents }),
+                        onOverwrite: (contents) => files.writeFile(viewPath, contents, { force: true }),
+                        onReload: () => setViewReloadRevision((revision) => revision + 1),
+                        ...onEditIntent ? { onEditIntent } : {},
+                        className: "h-full"
+                      },
+                      viewPath
+                    ) : waitingForSelectedFile ? /* @__PURE__ */ jsxs8(
+                      Notice,
                       {
-                        className: "size-5 animate-spin motion-reduce:animate-none",
-                        "aria-hidden": true
+                        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 && focusLine === null ? /* @__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"
+                        },
+                        `${viewPath}:${viewReloadRevision}`
+                      ) : focusLine !== null ? /* @__PURE__ */ jsx10(
+                        LineNumberedFile,
+                        {
+                          path: viewPath,
+                          contents: fileView.content,
+                          focusLine
                         }
-                      ),
-                      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." })
+                    )
+                  }
+                )
               ]
             }
           )
@@ -7137,6 +7494,62 @@ function WakeButton({ children, onClick }) {
     }
   );
 }
+function LineNumberedFile({
+  path,
+  contents,
+  focusLine
+}) {
+  const lines = contents.split("\n");
+  const inRange = focusLine >= 1 && focusLine <= lines.length;
+  const targetRef = useRef15(null);
+  useEffect18(() => {
+    targetRef.current?.scrollIntoView({
+      block: "center",
+      behavior: prefersReducedMotion() ? "auto" : "smooth"
+    });
+  }, [path, focusLine, contents]);
+  return /* @__PURE__ */ jsxs8(
+    "div",
+    {
+      className: "h-full min-h-0 overflow-auto font-og-mono text-og-sm text-og-fg",
+      role: "region",
+      "aria-label": inRange ? `${path} at line ${focusLine}` : path,
+      children: [
+        !inRange ? /* @__PURE__ */ jsxs8(
+          "p",
+          {
+            className: "border-b border-og-border bg-og-surface-1 px-2 py-1 text-og-xs text-og-fg-muted",
+            role: "status",
+            children: [
+              "Line ",
+              focusLine,
+              " is past the end of this file."
+            ]
+          }
+        ) : null,
+        /* @__PURE__ */ jsx10("div", { children: lines.map((text, index) => {
+          const lineNumber = index + 1;
+          const focused = inRange && lineNumber === focusLine;
+          return /* @__PURE__ */ jsxs8(
+            "div",
+            {
+              ref: focused ? targetRef : void 0,
+              "data-opengeni-file-line": lineNumber,
+              ...focused ? { "data-opengeni-focus-line": "" } : {},
+              "aria-current": focused ? "location" : void 0,
+              className: cn("flex gap-3 px-2 py-0.5 leading-6", focused && "bg-og-accent-soft"),
+              children: [
+                /* @__PURE__ */ jsx10("span", { className: "w-11 shrink-0 select-none text-right tabular-nums text-og-fg-subtle", children: lineNumber }),
+                /* @__PURE__ */ jsx10("pre", { className: "min-w-0 flex-1 whitespace-pre-wrap break-words", children: text || " " })
+              ]
+            },
+            lineNumber
+          );
+        }) })
+      ]
+    }
+  );
+}
 function GitHeader({ git, loading }) {
   if (loading) {
     return /* @__PURE__ */ jsxs8(
@@ -7318,7 +7731,7 @@ function Notice({
       children: /* @__PURE__ */ jsxs8("div", { className: "flex max-w-sm flex-col items-center gap-2.5", children: [
         icon ? /* @__PURE__ */ jsx10("span", { className: "grid size-10 place-items-center rounded-og-lg border border-og-border bg-og-surface-1 text-og-fg-muted shadow-sm", children: icon }) : null,
         title ? /* @__PURE__ */ jsx10("p", { className: "font-medium text-og-fg", children: title }) : null,
-        /* @__PURE__ */ jsx10("div", { className: "leading-5", children })
+        /* @__PURE__ */ jsx10("div", { "data-contrast-audited": true, className: "leading-5", children })
       ] })
     }
   );
@@ -7326,7 +7739,7 @@ function Notice({
 
 // src/components/workspace-dock.tsx
 import {
-  useCallback as useCallback23,
+  useCallback as useCallback24,
   useEffect as useEffect19,
   useId as useId4,
   useLayoutEffect as useLayoutEffect4,
@@ -7388,7 +7801,7 @@ function WorkspaceDock({
   onActiveTabChange,
   collapsed: collapsedProp,
   onCollapsedChange,
-  showCollapseControl = false,
+  showCollapseControl = true,
   headerAccessory,
   mobileLeadingControl,
   autoSaveId = "og.session.dock",
@@ -7414,19 +7827,35 @@ function WorkspaceDock({
     storage: getLayoutStorage(),
     id: autoSaveId
   });
+  const expandedDefaultLayout = defaultLayout && (defaultLayout.dock ?? 0) > 1 ? defaultLayout : void 0;
+  const lastExpandedSizeRef = useRef16(expandedDefaultLayout?.dock ?? defaultSize);
+  const layoutIdentityRef = useRef16(autoSaveId);
+  if (layoutIdentityRef.current !== autoSaveId) {
+    layoutIdentityRef.current = autoSaveId;
+    lastExpandedSizeRef.current = expandedDefaultLayout?.dock ?? defaultSize;
+  }
+  const persistExpandedLayout = useCallback24(
+    (layout, meta) => {
+      const dockSize = layout.dock ?? 0;
+      if (dockSize <= 1) return;
+      lastExpandedSizeRef.current = dockSize;
+      onLayoutChanged(layout, meta);
+    },
+    [onLayoutChanged]
+  );
   const requestedTab = activeTab ?? internalTab;
   const tabIds = tabs.map((tab) => tab.id);
   const firstTabId = tabs[0]?.id ?? "";
   const requestedTabIsValid = tabIds.includes(requestedTab);
   const current = requestedTabIsValid ? requestedTab : firstTabId;
-  const setTab = useCallback23(
+  const setTab = useCallback24(
     (id) => {
       setInternalTab(id);
       onActiveTabChange?.(id);
     },
     [onActiveTabChange]
   );
-  const setCollapsed = useCallback23(
+  const setCollapsed = useCallback24(
     (next) => {
       setInternalCollapsed((previous) => previous === next ? previous : next);
       onCollapsedChange?.(next);
@@ -7441,7 +7870,7 @@ function WorkspaceDock({
       dockPanelRef.current?.collapse();
       setMaximized(false);
     } else {
-      dockPanelRef.current?.expand();
+      dockPanelRef.current?.resize(`${lastExpandedSizeRef.current}%`);
     }
   }, [collapsedProp, dockPanelRef]);
   useEffect19(() => {
@@ -7470,7 +7899,13 @@ function WorkspaceDock({
         return;
       }
       const target = returnFocusRef.current;
-      if (target?.isConnected) target.focus();
+      if (target?.isConnected) {
+        target.focus();
+        return;
+      }
+      rootRef.current?.querySelector(
+        '[data-workspace-primary] button:not([disabled]), [data-workspace-primary] a[href], [data-workspace-primary] input:not([disabled]), [data-workspace-primary] textarea:not([disabled]), [data-workspace-primary] select:not([disabled]), [data-workspace-primary] [tabindex]:not([tabindex="-1"])'
+      )?.focus();
     });
     return () => cancelAnimationFrame(frame);
   }, [collapsed, hostControlled, narrow]);
@@ -7492,11 +7927,11 @@ function WorkspaceDock({
       setTab(firstTabId);
     }
   }, [firstTabId, requestedTabIsValid, setTab]);
-  const collapse = useCallback23(() => {
+  const collapse = useCallback24(() => {
     dockPanelRef.current?.collapse();
     setCollapsed(true);
   }, [dockPanelRef, setCollapsed]);
-  const expand = useCallback23(() => {
+  const expand = useCallback24(() => {
     dockPanelRef.current?.expand();
     setCollapsed(false);
   }, [dockPanelRef, setCollapsed]);
@@ -7581,7 +8016,7 @@ function WorkspaceDock({
               onTab: setTab,
               leading: mobileLeadingControl,
               accessory: headerAccessory,
-              controls: /* @__PURE__ */ jsx11(ChromeButton, { onClick: collapse, title: "Close workspace", label: "Close workspace", children: /* @__PURE__ */ jsx11(XIcon2, { className: "size-4" }) })
+              controls: /* @__PURE__ */ jsx11(ChromeButton, { onClick: collapse, title: "Hide workspace", label: "Hide workspace", children: /* @__PURE__ */ jsx11(XIcon2, { className: "size-4" }) })
             }
           )
         }
@@ -7618,7 +8053,7 @@ function WorkspaceDock({
             children: maximized ? /* @__PURE__ */ jsx11(Minimize2Icon, { className: "size-3.5" }) : /* @__PURE__ */ jsx11(Maximize2Icon, { className: "size-3.5" })
           }
         ),
-        hostControlled && !showCollapseControl ? null : /* @__PURE__ */ jsx11(ChromeButton, { onClick: collapse, title: "Collapse", label: "Collapse dock", children: /* @__PURE__ */ jsx11(PanelRightCloseIcon, { className: "size-3.5" }) })
+        hostControlled && !showCollapseControl ? null : /* @__PURE__ */ jsx11(ChromeButton, { onClick: collapse, title: "Hide workspace", label: "Hide workspace", children: /* @__PURE__ */ jsx11(PanelRightCloseIcon, { className: "size-3.5" }) })
       ] })
     }
   );
@@ -7628,8 +8063,8 @@ function WorkspaceDock({
       {
         orientation: "horizontal",
         className: "min-h-0 flex-1",
-        ...defaultLayout ? { defaultLayout } : {},
-        onLayoutChanged,
+        ...expandedDefaultLayout ? { defaultLayout: expandedDefaultLayout } : {},
+        onLayoutChanged: persistExpandedLayout,
         children: [
           /* @__PURE__ */ jsx11(Panel2, { id: "primary", minSize: "30%", className: "min-h-0 min-w-0", children: /* @__PURE__ */ jsx11(
             "div",
@@ -7725,17 +8160,14 @@ function DockChrome({
   const active = tabs.find((t) => t.id === current) ?? tabs[0];
   const tabsetId = useId4();
   const tabRefs = useRef16([]);
-  const tabListRef = useRef16(null);
   const [visitedTabs, setVisitedTabs] = useState16(() => /* @__PURE__ */ new Set());
-  const [tabOverflow, setTabOverflow] = useState16({ start: false, end: false });
   const activeId = active?.id ?? "";
-  const activeTabIndex = tabs.findIndex((tab) => tab.id === activeId);
   useDockLayoutEffect(() => {
     const node = chromeRef.current;
     if (!node) return;
     const update = () => {
       const desktop = typeof window.matchMedia !== "function" || window.matchMedia("(min-width: 1024px)").matches;
-      const next = desktop && node.getBoundingClientRect().width < 420;
+      const next = desktop && node.getBoundingClientRect().width < 440;
       setCompact((previous) => previous === next ? previous : next);
     };
     update();
@@ -7747,10 +8179,6 @@ function DockChrome({
     observer.observe(node);
     return () => observer.disconnect();
   }, []);
-  const keepActiveTabVisible = useCallback23(() => {
-    const selected = activeTabIndex >= 0 ? tabRefs.current[activeTabIndex] : null;
-    selected?.scrollIntoView({ block: "nearest", inline: "nearest" });
-  }, [activeTabIndex]);
   useEffect19(() => {
     if (!activeId) return;
     setVisitedTabs((previous) => {
@@ -7760,35 +8188,6 @@ function DockChrome({
       return next;
     });
   }, [activeId]);
-  useDockLayoutEffect(() => {
-    keepActiveTabVisible();
-  }, [activeId, keepActiveTabVisible]);
-  useDockLayoutEffect(() => {
-    const list = tabListRef.current;
-    if (!list) return;
-    const update = () => {
-      const max = Math.max(0, list.scrollWidth - list.clientWidth);
-      const next = { start: list.scrollLeft > 1, end: list.scrollLeft < max - 1 };
-      setTabOverflow(
-        (previous) => previous.start === next.start && previous.end === next.end ? previous : next
-      );
-    };
-    update();
-    list.addEventListener("scroll", update, { passive: true });
-    const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(() => {
-      keepActiveTabVisible();
-      update();
-    });
-    observer?.observe(list);
-    for (const tab of tabRefs.current) {
-      if (tab) observer?.observe(tab);
-    }
-    return () => {
-      list.removeEventListener("scroll", update);
-      observer?.disconnect();
-    };
-  }, [activeId, keepActiveTabVisible, tabs.length]);
-  const tabMask = tabOverflow.start && tabOverflow.end ? "linear-gradient(to right, transparent 0, black 14px, black calc(100% - 14px), transparent 100%)" : tabOverflow.start ? "linear-gradient(to right, transparent 0, black 14px, black 100%)" : tabOverflow.end ? "linear-gradient(to right, black 0, black calc(100% - 14px), transparent 100%)" : void 0;
   const activateTab = (index) => {
     const tab = tabs[index];
     if (!tab) {
@@ -7800,128 +8199,114 @@ function DockChrome({
   const onTabKeyDown = (event, index) => {
     if (tabs.length === 0) return;
     let nextIndex = null;
-    if (event.key === "ArrowRight") nextIndex = (index + 1) % tabs.length;
-    else if (event.key === "ArrowLeft") nextIndex = (index - 1 + tabs.length) % tabs.length;
+    if (event.key === "ArrowDown") nextIndex = (index + 1) % tabs.length;
+    else if (event.key === "ArrowUp") nextIndex = (index - 1 + tabs.length) % tabs.length;
     else if (event.key === "Home") nextIndex = 0;
     else if (event.key === "End") nextIndex = tabs.length - 1;
     if (nextIndex === null) return;
     event.preventDefault();
     activateTab(nextIndex);
   };
-  return /* @__PURE__ */ jsxs9(Fragment4, { children: [
-    /* @__PURE__ */ jsxs9(
-      "div",
-      {
-        ref: chromeRef,
-        "data-dock-chrome": true,
-        "data-compact": compact ? "true" : void 0,
-        className: cn(
-          "grid shrink-0 grid-cols-[auto_minmax(0,1fr)_auto_auto] items-center gap-x-2 border-b border-og-border px-1.5 py-1 max-[1023px]:grid-cols-[auto_minmax(0,1fr)_auto] max-[1023px]:gap-y-0 max-[1023px]:px-2 max-[1023px]:pb-1 max-[1023px]:pt-0 min-[640px]:max-[1023px]:grid-cols-[auto_minmax(0,1fr)_auto_auto]",
-          compact && "gap-y-1"
-        ),
-        style: compact ? { gridTemplateColumns: "minmax(0, 1fr) auto" } : void 0,
-        children: [
-          /* @__PURE__ */ jsx11(
-            "div",
-            {
-              className: cn(
-                "flex min-w-0 shrink-0 items-center max-[1023px]:min-h-11 min-[640px]:max-[1023px]:col-start-1 min-[640px]:max-[1023px]:row-start-1",
-                compact && "hidden"
-              ),
-              children: leading ?? /* @__PURE__ */ jsx11("span", { className: "hidden truncate px-1 text-og-sm font-semibold text-og-fg max-[1023px]:inline", children: "Workspace" })
-            }
-          ),
+  return /* @__PURE__ */ jsxs9(
+    "div",
+    {
+      ref: chromeRef,
+      "data-dock-chrome": true,
+      "data-compact": compact ? "true" : void 0,
+      className: "flex h-full min-h-0 min-w-0 flex-col",
+      children: [
+        /* @__PURE__ */ jsxs9("div", { className: "flex min-h-10 shrink-0 items-center gap-2 border-b border-og-border px-2 max-[1023px]:min-h-12", children: [
+          /* @__PURE__ */ jsx11("div", { className: "flex min-w-0 flex-1 items-center gap-2", children: leading ?? /* @__PURE__ */ jsx11("span", { className: "hidden truncate text-og-sm font-semibold text-og-fg max-[1023px]:inline", children: "Workspace" }) }),
+          /* @__PURE__ */ jsx11("div", { className: "min-w-0 shrink text-og-fg-muted", children: accessory }),
+          /* @__PURE__ */ jsx11("div", { className: "flex shrink-0 items-center gap-0.5 text-og-fg-subtle", children: controls })
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "flex min-h-0 min-w-0 flex-1", children: [
           /* @__PURE__ */ jsx11(
             "div",
             {
-              ref: tabListRef,
               className: cn(
-                "flex min-w-0 items-center gap-0.5 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden max-[1023px]:col-span-3 max-[1023px]:row-start-2 max-[1023px]:w-full min-[640px]:max-[1023px]:col-span-1 min-[640px]:max-[1023px]:col-start-2 min-[640px]:max-[1023px]:row-start-1",
-                compact && "col-span-2 col-start-1 row-start-2 w-full"
+                "flex shrink-0 flex-col gap-1 overflow-x-hidden overflow-y-auto border-r border-og-border bg-og-surface-1/45 p-1.5",
+                compact ? "w-12" : "w-32 max-[1023px]:w-36"
               ),
               role: "tablist",
-              "aria-orientation": "horizontal",
-              style: {
-                maskImage: tabMask,
-                WebkitMaskImage: tabMask,
-                scrollPaddingInline: "16px"
-              },
-              children: tabs.map((tab, index) => /* @__PURE__ */ jsxs9(
-                "button",
-                {
-                  ref: (node) => {
-                    tabRefs.current[index] = node;
+              "aria-label": "Workspace panels",
+              "aria-orientation": "vertical",
+              children: tabs.map((tab, index) => {
+                const tabName = tab.ariaLabel ?? (typeof tab.label === "string" ? tab.label : tab.id);
+                return /* @__PURE__ */ jsxs9(
+                  "button",
+                  {
+                    ref: (node) => {
+                      tabRefs.current[index] = node;
+                    },
+                    id: `${tabsetId}-tab-${index}`,
+                    type: "button",
+                    role: "tab",
+                    "aria-label": compact && tab.icon ? tabName : void 0,
+                    title: compact && tab.icon ? tabName : void 0,
+                    "aria-selected": tab.id === current,
+                    "aria-controls": `${tabsetId}-panel-${index}`,
+                    tabIndex: tab.id === current ? 0 : -1,
+                    onClick: () => onTab(tab.id),
+                    onKeyDown: (event) => onTabKeyDown(event, index),
+                    className: cn(
+                      "group relative flex min-h-9 w-full items-center gap-2 rounded-og-md px-2 text-left 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",
+                      compact && "justify-center px-1",
+                      tab.id === current ? "bg-og-accent-soft text-og-fg shadow-[inset_2px_0_0_var(--og-color-accent)]" : "text-og-fg-subtle hover:bg-og-surface-2 hover:text-og-fg"
+                    ),
+                    children: [
+                      tab.icon ? /* @__PURE__ */ jsx11(
+                        "span",
+                        {
+                          className: "flex size-4 shrink-0 items-center justify-center [&>svg]:size-4",
+                          "aria-hidden": true,
+                          children: tab.icon
+                        }
+                      ) : null,
+                      !compact || !tab.icon ? /* @__PURE__ */ jsx11("span", { "data-contrast-audited": true, className: "min-w-0 flex-1 truncate", children: tab.label }) : null,
+                      tab.badge ? /* @__PURE__ */ jsx11(
+                        "span",
+                        {
+                          className: cn("shrink-0", compact && "absolute -right-0.5 -top-0.5 scale-90"),
+                          children: tab.badge
+                        }
+                      ) : null
+                    ]
                   },
-                  id: `${tabsetId}-tab-${index}`,
-                  type: "button",
-                  role: "tab",
-                  "aria-selected": tab.id === current,
-                  "aria-controls": `${tabsetId}-panel-${index}`,
-                  tabIndex: tab.id === current ? 0 : -1,
-                  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-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: [
-                    /* @__PURE__ */ jsx11("span", { "data-contrast-audited": true, children: tab.label }),
-                    tab.badge
-                  ]
-                },
-                tab.id
-              ))
-            }
-          ),
-          /* @__PURE__ */ jsx11(
-            "div",
-            {
-              className: cn(
-                "flex min-w-0 shrink-0 items-center justify-self-end min-[640px]:max-[1023px]:col-start-3 min-[640px]:max-[1023px]:row-start-1",
-                compact && "col-start-1 row-start-1 justify-self-start"
-              ),
-              children: accessory
+                  tab.id
+                );
+              })
             }
           ),
-          /* @__PURE__ */ jsx11(
-            "div",
-            {
-              className: cn(
-                "flex shrink-0 items-center gap-0.5 text-og-fg-subtle min-[640px]:max-[1023px]:col-start-4 min-[640px]:max-[1023px]:row-start-1",
-                compact && "col-start-2 row-start-1"
-              ),
-              children: controls
-            }
-          )
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsx11("div", { className: "min-h-0 min-w-0 flex-1 overflow-hidden", children: tabs.length > 0 ? tabs.map((tab, index) => {
-      const selected = tab.id === activeId;
-      const shouldMount = selected || visitedTabs.has(tab.id);
-      return /* @__PURE__ */ jsx11(
-        "div",
-        {
-          id: `${tabsetId}-panel-${index}`,
-          "aria-labelledby": `${tabsetId}-tab-${index}`,
-          className: "h-full min-h-0 min-w-0 overflow-hidden",
-          hidden: !selected,
-          role: "tabpanel",
-          children: shouldMount ? tab.content : null
-        },
-        tab.id
-      );
-    }) : /* @__PURE__ */ jsx11("div", { className: "h-full min-h-0 min-w-0", "aria-label": "Workspace", role: "tabpanel" }) })
-  ] });
+          /* @__PURE__ */ jsx11("div", { className: "min-h-0 min-w-0 flex-1 overflow-hidden", children: tabs.length > 0 ? tabs.map((tab, index) => {
+            const selected = tab.id === activeId;
+            const shouldMount = selected || visitedTabs.has(tab.id);
+            return /* @__PURE__ */ jsx11(
+              "div",
+              {
+                id: `${tabsetId}-panel-${index}`,
+                "aria-labelledby": `${tabsetId}-tab-${index}`,
+                className: "h-full min-h-0 min-w-0 overflow-hidden",
+                hidden: !selected,
+                role: "tabpanel",
+                children: shouldMount ? tab.content : null
+              },
+              tab.id
+            );
+          }) : /* @__PURE__ */ jsx11("div", { className: "h-full min-h-0 min-w-0", "aria-label": "Workspace", role: "tabpanel" }) })
+        ] })
+      ]
+    }
+  );
 }
 
 // src/components/sandbox-workspace.tsx
 import {
   lazy as lazy2,
   Suspense as Suspense2,
-  useCallback as useCallback24,
+  useCallback as useCallback25,
   useEffect as useEffect20,
-  useMemo as useMemo13,
+  useMemo as useMemo14,
   useRef as useRef17,
   useState as useState17
 } from "react";
@@ -7939,12 +8324,12 @@ import {
 } from "lucide-react";
 import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
 var LazyBrowserViewer = lazy2(async () => {
-  const viewers = await import("./interactive-workbench-viewers-TOHBXJEE.js");
-  return { default: viewers.BrowserViewer };
+  const { BrowserViewer } = await import("./browser-viewer-GXUICIAG.js");
+  return { default: BrowserViewer };
 });
 var LazyComputerViewer = lazy2(async () => {
-  const viewers = await import("./interactive-workbench-viewers-TOHBXJEE.js");
-  return { default: viewers.ComputerViewer };
+  const { ComputerViewer } = await import("./computer-viewer-ZOP4Q7A7.js");
+  return { default: ComputerViewer };
 });
 var WORKBENCH_TAB_CHANGES = "changes";
 var WORKBENCH_TAB_FILES = "files";
@@ -7979,12 +8364,6 @@ function captureDegradedMessage(reason) {
       return "Workspace capture is incomplete because repository discovery failed. Live files remain authoritative.";
   }
 }
-function WorkbenchTabLabel({ icon, children }) {
-  return /* @__PURE__ */ jsxs10("span", { className: "inline-flex items-center gap-1.5", children: [
-    /* @__PURE__ */ jsx12("span", { className: "[&>svg]:size-3.5", "aria-hidden": true, children: icon }),
-    /* @__PURE__ */ jsx12("span", { children })
-  ] });
-}
 function WorkbenchSurfaceLoading({ name }) {
   return /* @__PURE__ */ jsx12(
     CenteredState,
@@ -8037,6 +8416,29 @@ function sandboxProvisionInFlight(events) {
   }
   return inFlight;
 }
+function workspaceTurnInFlight(events) {
+  const activeTurnIds = /* @__PURE__ */ new Set();
+  let anonymousTurnInFlight = false;
+  let sessionOwnsWorkspace = false;
+  for (const event of events) {
+    if (event.type === "session.status.changed") {
+      const status = event.payload && typeof event.payload === "object" && !Array.isArray(event.payload) ? event.payload.status : null;
+      sessionOwnsWorkspace = status === "running" || status === "recovering";
+      continue;
+    }
+    if (event.type === "turn.started") {
+      if (event.turnId) activeTurnIds.add(event.turnId);
+      else anonymousTurnInFlight = true;
+      continue;
+    }
+    if (event.type !== "turn.completed" && event.type !== "turn.failed" && event.type !== "turn.cancelled" && event.type !== "turn.superseded") {
+      continue;
+    }
+    if (event.turnId) activeTurnIds.delete(event.turnId);
+    else anonymousTurnInFlight = false;
+  }
+  return sessionOwnsWorkspace || anonymousTurnInFlight || activeTurnIds.size > 0;
+}
 function emptyWarmIntents(sessionId) {
   return {
     sessionId,
@@ -8052,9 +8454,17 @@ function useSandboxWorkspaceTabs(options) {
     onNotify,
     browserWebSocketFactory,
     computerWebSocketFactory,
+    browserExtensionSetupUrl,
     requestedFilePath,
     requestedFileRequestId,
+    requestedFileLine,
     onOpenFile,
+    initialFilePath,
+    onFilePathChange,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onOpenComputerSession,
     requestedComputerSessionId,
     requestedComputerRequestId
@@ -8069,7 +8479,7 @@ function useSandboxWorkspaceTabs(options) {
   const terminalEnabled = surfaceSet.has(WORKBENCH_TAB_TERMINAL);
   const browserEnabled = surfaceSet.has(WORKBENCH_TAB_BROWSER);
   const desktopEnabled = surfaceSet.has(WORKBENCH_TAB_DESKTOP);
-  const createLinkedComputer = useCallback24(
+  const createLinkedComputer = useCallback25(
     async (name, placement) => {
       const response = await client.createComputerSession(workspaceId, {
         operationId: crypto.randomUUID(),
@@ -8078,7 +8488,7 @@ function useSandboxWorkspaceTabs(options) {
         ...placement ? { placement } : {}
       });
       if (response.operation.state !== "completed" || response.session.lifecycle !== "active") {
-        throw new Error(response.operation.error?.message ?? "The computer could not be opened.");
+        throw new Error(response.operation.error?.message ?? "The desktop could not be opened.");
       }
       return {
         id: response.session.id,
@@ -8092,13 +8502,14 @@ function useSandboxWorkspaceTabs(options) {
   const resolvedActiveTab = activeTab ?? initialTab;
   const changesActive = resolvedActiveTab === WORKBENCH_TAB_CHANGES;
   const filesActive = resolvedActiveTab === WORKBENCH_TAB_FILES;
+  const turnInFlight = workspaceTurnInFlight(events);
   const surfaceIdentity = WORKBENCH_SURFACES.filter((surface) => surfaceSet.has(surface)).join(",");
   const [storedWarmIntents, setStoredWarmIntents] = useState17(
     () => emptyWarmIntents(sessionId)
   );
   const warmIntents = storedWarmIntents.sessionId === sessionId ? storedWarmIntents : emptyWarmIntents(sessionId);
   const { warmTerminal, warmFiles } = warmIntents;
-  const requestWarmIntent = useCallback24(
+  const requestWarmIntent = useCallback25(
     (intent) => {
       setStoredWarmIntents((previous) => {
         const current = previous.sessionId === sessionId ? previous : emptyWarmIntents(sessionId);
@@ -8107,10 +8518,13 @@ function useSandboxWorkspaceTabs(options) {
     },
     [sessionId]
   );
+  useEffect20(() => {
+    if (requestedFilePath) requestWarmIntent("warmFiles");
+  }, [requestWarmIntent, requestedFilePath, requestedFileRequestId]);
   const machines = useMachines({
     workspaceId,
     sessionId,
-    pollIntervalMs: 8e3,
+    pollIntervalMs: MACHINES_SESSION_POLL_MS,
     enabled: machineSurfaceEnabled
   });
   const activeMachine = machines.machines.find((m) => m.sandboxId === machines.activeSandboxId) ?? machines.machines.find((m) => m.active) ?? null;
@@ -8158,7 +8572,7 @@ function useSandboxWorkspaceTabs(options) {
   const captureAvailable = captureState.available;
   const liveWorkspaceExpected = sandboxAcceptsLiveIo(liveness);
   const capturePending = !liveWorkspaceExpected && (captureState.fileCount === null || captureState.loading);
-  const repoPaths = useMemo13(() => {
+  const repoPaths = useMemo14(() => {
     const advertised = capabilities?.Git.repos ?? [];
     if (advertised.length > 0) return advertised;
     return captureState.capture?.repos.map((repo) => repo.root) ?? [];
@@ -8181,7 +8595,14 @@ 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,
+    // A cold sandbox can become warm while the first agent command still owns
+    // startup. Do not race that command with an automatic Files read. Keeping
+    // this fence at turn scope also avoids unsafe millisecond gaps between
+    // sequential tool calls; rendered state and explicit user actions remain.
+    active: filesActive && !turnInFlight,
+    // A deliberate canonical absolute-path open browses in the selected target's
+    // advertised namespace, so the authoritative tree and link share exact paths.
+    ...requestedFilePath?.startsWith("/") && capabilities?.FileSystem.root ? { rootPath: capabilities.FileSystem.root } : {},
     repoPaths,
     liveness: liveIoLiveness,
     capture: captureState.capture,
@@ -8195,17 +8616,18 @@ function useSandboxWorkspaceTabs(options) {
   const [storedChangesComparison, setStoredChangesComparison] = useState17(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 = useCallback24(
+  const setChangesComparison = useCallback25(
     (value) => setStoredChangesComparison({ sessionId, value }),
     [sessionId]
   );
   const git = useSandboxGit(sessionId, {
     events,
     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,
+    // Live Git belongs to the visible Changes surface. In particular, do not
+    // turn an unresolved/default tab into a hidden provider read: that races the
+    // agent's own sandbox commands and used to refresh after every tool output
+    // even while Files was visibly selected.
+    active: changesActive && !turnInFlight,
     repoPaths,
     liveness: liveIoLiveness,
     comparison: changesComparison,
@@ -8246,48 +8668,31 @@ function useSandboxWorkspaceTabs(options) {
   if (defaultTabRef.current.identity !== defaultIdentity) {
     defaultTabRef.current = { identity: defaultIdentity, value: null };
   }
-  const captureIsAuthoritative = !liveWorkspaceExpected && (liveness !== void 0 || caps.error !== null);
   const captureHasChanges = (captureState.fileCount ?? 0) > 0 || (captureState.capture?.repos.some((repo) => (repo.branchDiff?.length ?? 0) > 0) ?? false);
   const captureUnavailable = captureState.fileCount === 0 && !captureHasChanges || captureState.error !== null;
-  const implicitBranchFallbackPending = changesComparison === "branch" && git.error !== null && storedChangesComparison?.sessionId !== sessionId;
   if (defaultTabRef.current.value === null) {
     if (initialTab && (!isWorkbenchSurface(initialTab) || surfaceSet.has(initialTab))) {
       defaultTabRef.current.value = initialTab;
-    } else if (git.source === "live") {
-      defaultTabRef.current.value = sourceDrivenDefaultTab(
-        git.diff.length > 0,
-        changesEnabled,
-        filesEnabled
-      );
-    } else if (captureIsAuthoritative && captureState.fileCount !== null && captureState.available) {
+    } else if (captureState.fileCount !== null && captureState.available) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(
         captureHasChanges,
         changesEnabled,
         filesEnabled
       );
-    } else if (captureIsAuthoritative && captureUnavailable && initialWorkspaceTab(events) === WORKBENCH_TAB_CHANGES) {
-      defaultTabRef.current.value = sourceDrivenDefaultTab(true, changesEnabled, filesEnabled);
-    } else if (captureUnavailable && caps.error) {
+    } else if (captureUnavailable && initialWorkspaceTab(events) === WORKBENCH_TAB_CHANGES) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(true, changesEnabled, filesEnabled);
-    } else if (captureIsAuthoritative && captureState.fileCount !== null && captureUnavailable) {
-      defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
-    } else if (captureState.available && git.error && captureState.fileCount !== null) {
-      defaultTabRef.current.value = sourceDrivenDefaultTab(
-        captureHasChanges,
-        changesEnabled,
-        filesEnabled
-      );
-    } else if (captureUnavailable && git.error && !implicitBranchFallbackPending) {
+    } else if (captureState.fileCount !== null || captureState.error !== null) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
     }
   }
   const defaultTab = defaultTabRef.current.value;
-  const tabs = useMemo13(() => {
+  const tabs = useMemo14(() => {
     const list = [];
     if (changesEnabled)
       list.push({
         id: WORKBENCH_TAB_CHANGES,
-        label: /* @__PURE__ */ jsx12(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx12(GitCompareArrowsIcon, {}), children: "Changes" }),
+        label: "Changes",
+        icon: /* @__PURE__ */ jsx12(GitCompareArrowsIcon, {}),
         badge: dirtyCount > 0 ? /* @__PURE__ */ jsx12(DirtyBadge, { count: dirtyCount }) : void 0,
         content: /* @__PURE__ */ jsx12(
           ChangesTabBody,
@@ -8316,7 +8721,8 @@ function useSandboxWorkspaceTabs(options) {
     if (filesEnabled)
       list.push({
         id: WORKBENCH_TAB_FILES,
-        label: /* @__PURE__ */ jsx12(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx12(FileCode2Icon2, {}), children: "Files" }),
+        label: "Files",
+        icon: /* @__PURE__ */ jsx12(FileCode2Icon2, {}),
         content: /* @__PURE__ */ jsx12(
           SandboxFiles,
           {
@@ -8331,9 +8737,12 @@ function useSandboxWorkspaceTabs(options) {
             ...requestedFilePath ? {
               requestedPath: requestedFilePath,
               ...requestedFileRequestId !== null && requestedFileRequestId !== void 0 ? { requestedPathRequestId: requestedFileRequestId } : {},
-              requestedPathReady: sandboxAcceptsLiveIo(liveness)
+              requestedPathReady: sandboxAcceptsLiveIo(liveness),
+              ...requestedFileLine != null && requestedFileLine > 0 ? { requestedLine: requestedFileLine } : {}
             } : {},
             onEditIntent: () => requestWarmIntent("warmFiles"),
+            initialSelectedPath: initialFilePath,
+            onSelectedPathChange: onFilePathChange,
             className: "h-full"
           },
           sessionId
@@ -8342,7 +8751,8 @@ function useSandboxWorkspaceTabs(options) {
     if (terminalOn) {
       list.push({
         id: WORKBENCH_TAB_TERMINAL,
-        label: /* @__PURE__ */ jsx12(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx12(SquareTerminalIcon, {}), children: "Terminal" }),
+        label: "Terminal",
+        icon: /* @__PURE__ */ jsx12(SquareTerminalIcon, {}),
         content: /* @__PURE__ */ jsx12("div", { className: "h-full bg-og-bg p-1", children: /* @__PURE__ */ jsx12(
           SandboxTerminal,
           {
@@ -8362,7 +8772,8 @@ function useSandboxWorkspaceTabs(options) {
     if (browserEnabled) {
       list.push({
         id: WORKBENCH_TAB_BROWSER,
-        label: /* @__PURE__ */ jsx12(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx12(Globe2Icon, {}), children: "Browser" }),
+        label: "Browser",
+        icon: /* @__PURE__ */ jsx12(Globe2Icon, {}),
         content: /* @__PURE__ */ jsx12(Suspense2, { fallback: /* @__PURE__ */ jsx12(WorkbenchSurfaceLoading, { name: "Browser" }), children: /* @__PURE__ */ jsx12(
           LazyBrowserViewer,
           {
@@ -8371,9 +8782,12 @@ function useSandboxWorkspaceTabs(options) {
             sessionId,
             enabled: workspaceVisible,
             onNotify,
+            initialBrowserSessionId,
+            onBrowserSessionIdChange,
             ...desktopEnabled ? { createLinkedComputer } : {},
             ...onOpenComputerSession ? { onOpenComputer: onOpenComputerSession } : {},
             ...browserWebSocketFactory ? { webSocketFactory: browserWebSocketFactory } : {},
+            ...browserExtensionSetupUrl ? { browserExtensionSetupUrl } : {},
             className: "h-full"
           },
           sessionId
@@ -8383,8 +8797,9 @@ function useSandboxWorkspaceTabs(options) {
     if (desktopEnabled) {
       list.push({
         id: WORKBENCH_TAB_DESKTOP,
-        label: /* @__PURE__ */ jsx12(WorkbenchTabLabel, { icon: /* @__PURE__ */ jsx12(MonitorIcon, {}), children: "Computer" }),
-        content: /* @__PURE__ */ jsx12(Suspense2, { fallback: /* @__PURE__ */ jsx12(WorkbenchSurfaceLoading, { name: "Computer" }), children: /* @__PURE__ */ jsx12(
+        label: "Desktop",
+        icon: /* @__PURE__ */ jsx12(MonitorIcon, {}),
+        content: /* @__PURE__ */ jsx12(Suspense2, { fallback: /* @__PURE__ */ jsx12(WorkbenchSurfaceLoading, { name: "Desktop" }), children: /* @__PURE__ */ jsx12(
           LazyComputerViewer,
           {
             client,
@@ -8392,6 +8807,8 @@ function useSandboxWorkspaceTabs(options) {
             sessionId,
             enabled: workspaceVisible,
             onNotify,
+            initialComputerSessionId,
+            onComputerSessionIdChange,
             requestedComputerSessionId,
             requestedComputerRequestId,
             ...computerWebSocketFactory ? { webSocketFactory: computerWebSocketFactory } : {},
@@ -8414,7 +8831,14 @@ function useSandboxWorkspaceTabs(options) {
     warmTerminal,
     requestedFilePath,
     requestedFileRequestId,
+    requestedFileLine,
     onOpenFile,
+    initialFilePath,
+    onFilePathChange,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onOpenComputerSession,
     requestedComputerSessionId,
     requestedComputerRequestId,
@@ -8462,9 +8886,18 @@ function SandboxWorkspace(props) {
     leadingTabs,
     trailingTabs,
     initialTab,
+    onActiveTabChange,
+    initialFilePath,
+    onFilePathChange,
+    openFileRequest,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onNotify,
     browserWebSocketFactory,
     computerWebSocketFactory,
+    browserExtensionSetupUrl,
     collapsed,
     onCollapsedChange,
     showCollapseControl,
@@ -8482,15 +8915,29 @@ function SandboxWorkspace(props) {
   const nextComputerRequestId = useRef17(0);
   const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
   const activeTabHint = selectedTab ?? initialTab ?? leadingTabs?.[0]?.id ?? null;
-  const openFile = useCallback24(
-    (path) => {
-      nextFileRequestId.current += 1;
-      setRequestedFile({ sessionId, path, requestId: nextFileRequestId.current });
+  const openFile = useCallback25(
+    (path, line) => {
+      setRequestedFile({
+        sessionId,
+        path,
+        line: line != null && line > 0 ? line : null,
+        requestId: ++nextFileRequestId.current
+      });
       setStoredSelection({ sessionId, tab: WORKBENCH_TAB_FILES });
+      onActiveTabChange?.(WORKBENCH_TAB_FILES);
+      onFilePathChange?.(path);
+      onCollapsedChange?.(false);
     },
-    [sessionId]
+    [onActiveTabChange, onCollapsedChange, onFilePathChange, sessionId]
   );
-  const openComputer = useCallback24(
+  const handledOpenFileRequestId = useRef17(null);
+  useEffect20(() => {
+    if (!openFileRequest) return;
+    if (handledOpenFileRequestId.current === openFileRequest.requestId) return;
+    handledOpenFileRequestId.current = openFileRequest.requestId;
+    openFile(openFileRequest.path, openFileRequest.line);
+  }, [openFile, openFileRequest]);
+  const openComputer = useCallback25(
     (computerSessionId) => {
       nextComputerRequestId.current += 1;
       setRequestedComputer({
@@ -8499,8 +8946,10 @@ function SandboxWorkspace(props) {
         requestId: nextComputerRequestId.current
       });
       setStoredSelection({ sessionId, tab: WORKBENCH_TAB_DESKTOP });
+      onActiveTabChange?.(WORKBENCH_TAB_DESKTOP);
+      onComputerSessionIdChange?.(computerSessionId);
     },
-    [sessionId]
+    [onActiveTabChange, onComputerSessionIdChange, sessionId]
   );
   const {
     tabs: workbenchTabs,
@@ -8518,8 +8967,16 @@ function SandboxWorkspace(props) {
     ...onNotify ? { onNotify } : {},
     ...browserWebSocketFactory ? { browserWebSocketFactory } : {},
     ...computerWebSocketFactory ? { computerWebSocketFactory } : {},
+    ...browserExtensionSetupUrl ? { browserExtensionSetupUrl } : {},
+    initialFilePath,
+    onFilePathChange,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     requestedFilePath: requestedFile?.sessionId === sessionId ? requestedFile.path : null,
     requestedFileRequestId: requestedFile?.sessionId === sessionId ? requestedFile.requestId : null,
+    requestedFileLine: requestedFile?.sessionId === sessionId ? requestedFile.line : null,
     onOpenFile: openFile,
     onOpenComputerSession: openComputer,
     requestedComputerSessionId: requestedComputer?.sessionId === sessionId ? requestedComputer.computerSessionId : null,
@@ -8528,10 +8985,17 @@ function SandboxWorkspace(props) {
   const tabs = [...leadingTabs ?? [], ...workbenchTabs, ...trailingTabs ?? []];
   const preferredTab = selectedTab ?? defaultTab;
   const activeTab = preferredTab && tabs.some((tab) => tab.id === preferredTab) ? preferredTab : tabs[0]?.id;
-  const selectTab = useCallback24(
-    (tab) => setStoredSelection({ sessionId, tab }),
-    [sessionId]
+  const selectTab = useCallback25(
+    (tab) => {
+      setStoredSelection({ sessionId, tab });
+      onActiveTabChange?.(tab);
+    },
+    [onActiveTabChange, sessionId]
   );
+  useEffect20(() => {
+    if (selectedTab !== null || defaultTab === null) return;
+    setStoredSelection({ sessionId, tab: defaultTab });
+  }, [defaultTab, selectedTab, sessionId]);
   return /* @__PURE__ */ jsx12(
     WorkspaceDock,
     {
@@ -8786,7 +9250,7 @@ function CenteredState({
 }
 
 // src/hooks/use-codex-accounts.ts
-import { useCallback as useCallback25, useState as useState18 } from "react";
+import { useCallback as useCallback26, useState as useState18 } from "react";
 function isCodexAccountEvent(event) {
   return event.type === "codex.account.switched";
 }
@@ -8807,7 +9271,7 @@ function useCodexAccounts(options = {}) {
   const codexClient = options.codexClient ?? client;
   const sessionId = options.sessionId;
   const sharedEvents = options.events;
-  const load = useCallback25(async () => {
+  const load = useCallback26(async () => {
     const accountsP = codexClient.listCodexAccounts(workspaceId);
     const sessionP = sessionId && codexClient.getSession ? codexClient.getSession(workspaceId, sessionId).catch(() => null) : Promise.resolve(null);
     const [acc, session] = await Promise.all([accountsP, sessionP]);
@@ -8841,7 +9305,7 @@ function useCodexAccounts(options = {}) {
       ...sharedEvents !== void 0 ? { events: sharedEvents } : {}
     }
   );
-  const pin = useCallback25(
+  const pin = useCallback26(
     async (target) => {
       if (!sessionId || !codexClient.pinSessionCodexAccount) {
         return false;
@@ -8857,7 +9321,7 @@ function useCodexAccounts(options = {}) {
     },
     [codexClient, workspaceId, sessionId, runMutation, refresh]
   );
-  const refreshUsage = useCallback25(async () => {
+  const refreshUsage = useCallback26(async () => {
     if (!codexClient.refreshCodexUsage) {
       return false;
     }
@@ -8889,7 +9353,7 @@ function useCodexAccounts(options = {}) {
 }
 
 // src/hooks/use-supergrok-accounts.ts
-import { useCallback as useCallback26 } from "react";
+import { useCallback as useCallback27 } from "react";
 var EMPTY = {
   accounts: [],
   activeAccountId: null,
@@ -8902,7 +9366,7 @@ var EMPTY = {
 function useSuperGrokAccounts(options = {}) {
   const { client, workspaceId } = useOpenGeni(options);
   const supergrokClient = options.supergrokClient ?? client;
-  const load = useCallback26(
+  const load = useCallback27(
     async () => await supergrokClient.listSuperGrokAccounts(workspaceId),
     [supergrokClient, workspaceId]
   );
@@ -8911,7 +9375,7 @@ function useSuperGrokAccounts(options = {}) {
     pollIntervalMs: options.pollIntervalMs
   });
   const { run, mutating: activating, mutationError } = useMutationRunner();
-  const activate = useCallback26(
+  const activate = useCallback27(
     async (accountId) => {
       if (!supergrokClient.activateSuperGrokAccount) return false;
       const result = await run(async () => {
@@ -8970,6 +9434,9 @@ export {
   INITIAL_TRANSCRIPTION_CONTROL_STATE,
   IndexedDbVoiceRecordingStore,
   LightboxProvider,
+  MACHINES_COMPOSER_POLL_MS,
+  MACHINES_DASHBOARD_POLL_MS,
+  MACHINES_SESSION_POLL_MS,
   MACHINE_STATE_BADGE_META,
   METRICS,
   METRIC_WINDOWS,
@@ -8978,6 +9445,7 @@ export {
   MachineDockBar,
   MachineHealthPill,
   MachineMetrics,
+  MachineOperationPolicyEditor,
   MachineStatusPill,
   MachinesDashboard,
   Markdown,
@@ -9120,6 +9588,10 @@ export {
   rawTypeOf,
   runnableLatencyModesForModel,
   sandboxCommandExitCode,
+  sandboxFileLocationFromHref,
+  sandboxFilePathFromHref,
+  sessionChromeGoalPillExplanation,
+  sessionChromeGoalPillLabel,
   sessionChromeGoalPillState,
   sessionDisplayTitle,
   sessionStatusFromEvents,
@@ -9165,6 +9637,7 @@ export {
   useSandboxWorkspaceTabs,
   useScheduledTasks,
   useSession,
+  useSessionBackgroundCommands,
   useSessionCapabilities,
   useSessionControl,
   useSessionEvents,