@opengeni/react 0.57.0 → 2.2.0-canary.0

package/src/components/sandbox-workspace.tsx

@@ -55,7 +55,7 @@ import {
 import { useSandboxTerminal } from "../hooks/use-sandbox-terminal";
 import { useWorkspaceCapture } from "../hooks/use-workspace-capture";
 import { useMachineChip, type MachineChip } from "../hooks/use-machine-chip";
-import { useMachines } from "../hooks/use-machines";
+import { MACHINES_SESSION_POLL_MS, useMachines } from "../hooks/use-machines";
 import type { MachineView } from "../types/machines";
 import { SandboxFiles } from "./sandbox-files";
 import { WorkbenchChanges } from "./workbench-changes";
@@ -63,13 +63,13 @@ import { SandboxTerminal, type XtermTheme } from "./sandbox-terminal";
 import { WorkspaceDock, type WorkspaceDockProps, type WorkspaceTab } from "./workspace-dock";
 
 const LazyBrowserViewer = lazy(async () => {
-  const viewers = await import("./interactive-workbench-viewers");
-  return { default: viewers.BrowserViewer };
+  const { BrowserViewer } = await import("./browser-viewer");
+  return { default: BrowserViewer };
 });
 
 const LazyComputerViewer = lazy(async () => {
-  const viewers = await import("./interactive-workbench-viewers");
-  return { default: viewers.ComputerViewer };
+  const { ComputerViewer } = await import("./computer-viewer");
+  return { default: ComputerViewer };
 });
 
 /** A host-routed notification (replaces the app-only `sonner` toast coupling). */
@@ -125,18 +125,7 @@ function captureDegradedMessage(reason: string): string {
   }
 }
 
-function WorkbenchTabLabel({ icon, children }: { icon: ReactNode; children: ReactNode }) {
-  return (
-    <span className="inline-flex items-center gap-1.5">
-      <span className="[&>svg]:size-3.5" aria-hidden>
-        {icon}
-      </span>
-      <span>{children}</span>
-    </span>
-  );
-}
-
-function WorkbenchSurfaceLoading({ name }: { name: "Browser" | "Computer" }) {
+function WorkbenchSurfaceLoading({ name }: { name: "Browser" | "Desktop" }) {
   return (
     <CenteredState
       icon={
@@ -218,10 +207,51 @@ function sandboxProvisionInFlight(events: SessionEvent[]): boolean {
   return inFlight;
 }
 
+/**
+ * Whether this session currently owns an admitted agent turn. Automatic live
+ * Files/Git reads pause across the whole turn: command boundaries are not a safe
+ * gap because the next tool can dispatch before a remote provider read releases
+ * its sandbox holder. Existing/captured content remains usable, and the terminal
+ * turn event resumes one authoritative refresh.
+ */
+function workspaceTurnInFlight(events: SessionEvent[]): boolean {
+  const activeTurnIds = new Set<string>();
+  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 as Record<string, unknown>).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;
+  }
+  // The retained event window preserves the latest status even after a very
+  // long turn has evicted its original turn.started event.
+  return sessionOwnsWorkspace || anonymousTurnInFlight || activeTurnIds.size > 0;
+}
+
 export type WorkspaceMachine = {
   /** Whether at least one built-in workbench surface is enabled. */
   enabled: boolean;
-  /** The derived live/waking/offline chip model. */
+  /** The derived live/waking/sleeping-or-offline chip model. */
   chip: MachineChip;
   /** The machine these surfaces are bound to (the Modal group box or a
    *  self-hosted machine), or null while the fleet is still resolving. */
@@ -256,14 +286,25 @@ export type UseSandboxWorkspaceTabsOptions = ClientOverride & {
   browserWebSocketFactory?: BrowserFrameWebSocketFactory | undefined;
   /** Alternate Computer frame transport for non-browser runtimes and deterministic tests. */
   computerWebSocketFactory?: ComputerFrameWebSocketFactory | undefined;
+  /** Host-owned setup page or store listing for attaching an existing Chrome profile. */
+  browserExtensionSetupUrl?: string | undefined;
   /** File requested by a Changes guard. The Files surface defers the read until
    *  the sandbox is live, then reveals this path. */
   requestedFilePath?: string | null | undefined;
   /** Unique identity for `requestedFilePath`, including repeated requests for the
    *  same path. */
   requestedFileRequestId?: string | number | null | undefined;
+  /** 1-based line to reveal after `requestedFilePath` opens. */
+  requestedFileLine?: number | null | undefined;
   /** Route a guarded diff into the host's Files tab. */
   onOpenFile?: ((path: string) => void) | undefined;
+  /** Restore and report navigation inside the built-in workbench surfaces. */
+  initialFilePath?: string | null | undefined;
+  onFilePathChange?: ((path: string | null) => void) | undefined;
+  initialBrowserSessionId?: string | null | undefined;
+  onBrowserSessionIdChange?: ((browserSessionId: string | null) => void) | undefined;
+  initialComputerSessionId?: string | null | undefined;
+  onComputerSessionIdChange?: ((computerSessionId: string | null) => void) | undefined;
   /** Navigate the host dock to one exact linked ComputerSession. */
   onOpenComputerSession?: ((computerSessionId: string) => void) | undefined;
   requestedComputerSessionId?: string | null | undefined;
@@ -274,7 +315,8 @@ export type UseSandboxWorkspaceTabsResult = {
   /** Changes | Files | Terminal | Browser | Desktop (capability-gated where noted). */
   tabs: WorkspaceTab[];
   /** The source-driven default tab: Changes when the first authoritative capture
-   *  or live Git result has changes, else Files (a host `initialTab` overrides).
+   *  has changes, else Files (a host `initialTab` overrides). Choosing a tab
+   *  never performs hidden live workspace I/O.
    *  null while that source resolves, or permanently when neither Changes nor
    *  Files is enabled; the choice latches once. */
   defaultTab: string | null;
@@ -312,9 +354,17 @@ export function useSandboxWorkspaceTabs(
     onNotify,
     browserWebSocketFactory,
     computerWebSocketFactory,
+    browserExtensionSetupUrl,
     requestedFilePath,
     requestedFileRequestId,
+    requestedFileLine,
     onOpenFile,
+    initialFilePath,
+    onFilePathChange,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onOpenComputerSession,
     requestedComputerSessionId,
     requestedComputerRequestId,
@@ -338,7 +388,7 @@ export function useSandboxWorkspaceTabs(
         ...(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,
@@ -356,6 +406,7 @@ export function useSandboxWorkspaceTabs(
   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(",");
 
   // The two box-warming INTENTS, each off by default and each
@@ -378,13 +429,16 @@ export function useSandboxWorkspaceTabs(
     },
     [sessionId],
   );
+  useEffect(() => {
+    if (requestedFilePath) requestWarmIntent("warmFiles");
+  }, [requestWarmIntent, requestedFilePath, requestedFileRequestId]);
 
   // The session's machine fleet + the active-sandbox pointer. Drives the header
-  // chip (which machine + its connection state). Polls slowly — ambient context.
+  // chip (which machine + its connection state). Shares the session list poll.
   const machines = useMachines({
     workspaceId,
     sessionId,
-    pollIntervalMs: 8000,
+    pollIntervalMs: MACHINES_SESSION_POLL_MS,
     enabled: machineSurfaceEnabled,
   });
   const activeMachine: MachineView | null =
@@ -509,7 +563,16 @@ export function useSandboxWorkspaceTabs(
     // 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,
@@ -550,10 +613,11 @@ export function useSandboxWorkspaceTabs(
         : 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,
@@ -602,14 +666,12 @@ export function useSandboxWorkspaceTabs(
   });
   const workspaceWaking = chip.state === "waking";
 
-  // The pre-paint default tab is decided from the first AUTHORITATIVE workspace
-  // source. A capture wins immediately on the cold/offline fast path; a warm box
-  // waits for live Git so a prior snapshot can never outrank the current tree.
-  // When the GET says no capture exists, `fileCount: 0` does NOT itself mean the
-  // working tree is clean. A captured-revision announce can
-  // resolve Changes earlier, but a pure embedder with no event preload still gets
-  // the correct live default. The choice latches once so later edits never steal
-  // the user's current tab.
+  // The pre-paint default comes only from the durable capture. Default selection
+  // must never dispatch live provider work: a live Git probe can overlap the
+  // agent's first command, and an uncontrolled dock used to keep that probe
+  // active forever after it visibly selected Files. A capture with reviewable
+  // changes opens Changes; no capture (or an empty one) opens Files. The choice
+  // latches once so later edits never steal the user's current tab.
   const defaultIdentity = `${sessionId}\u0000${surfaceIdentity}`;
   const defaultTabRef = useRef<{ identity: string; value: string | null }>({
     identity: defaultIdentity,
@@ -618,62 +680,25 @@ export function useSandboxWorkspaceTabs(
   if (defaultTabRef.current.identity !== defaultIdentity) {
     defaultTabRef.current = { identity: defaultIdentity, value: null };
   }
-  const captureIsAuthoritative =
-    !liveWorkspaceExpected && (liveness !== undefined || 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
-    ) {
+    } else if (captureUnavailable && initialWorkspaceTab(events) === WORKBENCH_TAB_CHANGES) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(true, changesEnabled, filesEnabled);
-    } else if (captureUnavailable && caps.error) {
-      // The Changes surface owns the truthful sandbox-unavailable state + retry.
-      // Files would misleadingly describe this as a missing filesystem.
-      defaultTabRef.current.value = sourceDrivenDefaultTab(true, changesEnabled, filesEnabled);
-    } else if (captureIsAuthoritative && captureState.fileCount !== null && captureUnavailable) {
-      // No durable review surface exists and the machine is resting. Files owns
-      // the explicit wake gate; do not issue a live Git probe merely to choose a
-      // tab.
-      defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
-    } else if (captureState.available && git.error && captureState.fileCount !== null) {
-      // A warm live read failed but the durable capture is intact: retain an
-      // immediate, deterministic review surface instead of hanging unresolved.
-      defaultTabRef.current.value = sourceDrivenDefaultTab(
-        captureHasChanges,
-        changesEnabled,
-        filesEnabled,
-      );
-    } else if (captureUnavailable && git.error && !implicitBranchFallbackPending) {
-      // No capture and live Git failed: Files is the least surprising fallback
-      // after the implicit branch-to-working fallback has also had its chance.
+    } else if (captureState.fileCount !== null || captureState.error !== null) {
+      // No durable review surface exists. Files owns the explicit live-workspace
+      // gate; a user can open Changes deliberately if they need a fresh Git read.
       defaultTabRef.current.value = sourceDrivenDefaultTab(false, changesEnabled, filesEnabled);
     }
   }
@@ -687,7 +712,8 @@ export function useSandboxWorkspaceTabs(
     if (changesEnabled)
       list.push({
         id: WORKBENCH_TAB_CHANGES,
-        label: <WorkbenchTabLabel icon={<GitCompareArrowsIcon />}>Changes</WorkbenchTabLabel>,
+        label: "Changes",
+        icon: <GitCompareArrowsIcon />,
         badge: dirtyCount > 0 ? <DirtyBadge count={dirtyCount} /> : undefined,
         content: (
           <ChangesTabBody
@@ -719,7 +745,8 @@ export function useSandboxWorkspaceTabs(
     if (filesEnabled)
       list.push({
         id: WORKBENCH_TAB_FILES,
-        label: <WorkbenchTabLabel icon={<FileCode2Icon />}>Files</WorkbenchTabLabel>,
+        label: "Files",
+        icon: <FileCode2Icon />,
         content: (
           <SandboxFiles
             key={sessionId}
@@ -746,11 +773,16 @@ export function useSandboxWorkspaceTabs(
                     ? { requestedPathRequestId: requestedFileRequestId }
                     : {}),
                   requestedPathReady: sandboxAcceptsLiveIo(liveness),
+                  ...(requestedFileLine != null && requestedFileLine > 0
+                    ? { requestedLine: requestedFileLine }
+                    : {}),
                 }
               : {})}
             // Ordinary capture browsing does not warm a box. The first edit — or an
             // explicit guarded-file open from Changes — is deliberate live-file intent.
             onEditIntent={() => requestWarmIntent("warmFiles")}
+            initialSelectedPath={initialFilePath}
+            onSelectedPathChange={onFilePathChange}
             className="h-full"
           />
         ),
@@ -760,7 +792,8 @@ export function useSandboxWorkspaceTabs(
     if (terminalOn) {
       list.push({
         id: WORKBENCH_TAB_TERMINAL,
-        label: <WorkbenchTabLabel icon={<SquareTerminalIcon />}>Terminal</WorkbenchTabLabel>,
+        label: "Terminal",
+        icon: <SquareTerminalIcon />,
         content: (
           <div className="h-full bg-og-bg p-1">
             <SandboxTerminal
@@ -785,7 +818,8 @@ export function useSandboxWorkspaceTabs(
     if (browserEnabled) {
       list.push({
         id: WORKBENCH_TAB_BROWSER,
-        label: <WorkbenchTabLabel icon={<Globe2Icon />}>Browser</WorkbenchTabLabel>,
+        label: "Browser",
+        icon: <Globe2Icon />,
         content: (
           <Suspense fallback={<WorkbenchSurfaceLoading name="Browser" />}>
             <LazyBrowserViewer
@@ -803,9 +837,12 @@ export function useSandboxWorkspaceTabs(
               // user/agent first visits it.
               enabled={workspaceVisible}
               onNotify={onNotify}
+              initialBrowserSessionId={initialBrowserSessionId}
+              onBrowserSessionIdChange={onBrowserSessionIdChange}
               {...(desktopEnabled ? { createLinkedComputer } : {})}
               {...(onOpenComputerSession ? { onOpenComputer: onOpenComputerSession } : {})}
               {...(browserWebSocketFactory ? { webSocketFactory: browserWebSocketFactory } : {})}
+              {...(browserExtensionSetupUrl ? { browserExtensionSetupUrl } : {})}
               className="h-full"
             />
           </Suspense>
@@ -818,9 +855,10 @@ export function useSandboxWorkspaceTabs(
     if (desktopEnabled) {
       list.push({
         id: WORKBENCH_TAB_DESKTOP,
-        label: <WorkbenchTabLabel icon={<MonitorIcon />}>Computer</WorkbenchTabLabel>,
+        label: "Desktop",
+        icon: <MonitorIcon />,
         content: (
-          <Suspense fallback={<WorkbenchSurfaceLoading name="Computer" />}>
+          <Suspense fallback={<WorkbenchSurfaceLoading name="Desktop" />}>
             <LazyComputerViewer
               key={sessionId}
               client={client}
@@ -832,6 +870,8 @@ export function useSandboxWorkspaceTabs(
               // second and later Computer opens local-machine fast.
               enabled={workspaceVisible}
               onNotify={onNotify}
+              initialComputerSessionId={initialComputerSessionId}
+              onComputerSessionIdChange={onComputerSessionIdChange}
               requestedComputerSessionId={requestedComputerSessionId}
               requestedComputerRequestId={requestedComputerRequestId}
               {...(computerWebSocketFactory ? { webSocketFactory: computerWebSocketFactory } : {})}
@@ -856,7 +896,14 @@ export function useSandboxWorkspaceTabs(
     warmTerminal,
     requestedFilePath,
     requestedFileRequestId,
+    requestedFileLine,
     onOpenFile,
+    initialFilePath,
+    onFilePathChange,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onOpenComputerSession,
     requestedComputerSessionId,
     requestedComputerRequestId,
@@ -913,14 +960,35 @@ export type SandboxWorkspaceProps = ClientOverride & {
   /** Host tabs injected AFTER the workbench tabs (e.g. a "Debug" tab). */
   trailingTabs?: WorkspaceTab[] | undefined;
   /** Override the pre-paint default tab (e.g. a host landing tab id). When
-   *  omitted the workbench decides from capture, then live Git when no capture exists. */
+   *  omitted the workbench decides from the durable workspace capture. */
   initialTab?: string | undefined;
+  onActiveTabChange?: ((activeTab: string) => void) | undefined;
+  initialFilePath?: string | null | undefined;
+  onFilePathChange?: ((path: string | null) => void) | undefined;
+  /**
+   * Host request to open a workspace file (and optional line) in Files. A new
+   * `requestId` re-opens even the same path.
+   */
+  openFileRequest?:
+    | {
+        path: string;
+        line?: number | null;
+        requestId: number;
+      }
+    | null
+    | undefined;
+  initialBrowserSessionId?: string | null | undefined;
+  onBrowserSessionIdChange?: ((browserSessionId: string | null) => void) | undefined;
+  initialComputerSessionId?: string | null | undefined;
+  onComputerSessionIdChange?: ((computerSessionId: string | null) => void) | undefined;
   /** Host-routed notifications (no toast dependency in the package). */
   onNotify?: ((notification: WorkspaceNotification) => void) | undefined;
   /** Alternate Browser frame transport for non-browser runtimes and deterministic tests. */
   browserWebSocketFactory?: BrowserFrameWebSocketFactory | undefined;
   /** Alternate Computer frame transport for non-browser runtimes and deterministic tests. */
   computerWebSocketFactory?: ComputerFrameWebSocketFactory | undefined;
+  /** Host-owned setup page or store listing for attaching an existing Chrome profile. */
+  browserExtensionSetupUrl?: string | undefined;
   /** Controlled collapsed state for hosts with their own dock toggle. */
   collapsed?: boolean | undefined;
   onCollapsedChange?: ((collapsed: boolean) => void) | undefined;
@@ -951,9 +1019,18 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
     leadingTabs,
     trailingTabs,
     initialTab,
+    onActiveTabChange,
+    initialFilePath,
+    onFilePathChange,
+    openFileRequest,
+    initialBrowserSessionId,
+    onBrowserSessionIdChange,
+    initialComputerSessionId,
+    onComputerSessionIdChange,
     onNotify,
     browserWebSocketFactory,
     computerWebSocketFactory,
+    browserExtensionSetupUrl,
     collapsed,
     onCollapsedChange,
     showCollapseControl,
@@ -972,6 +1049,7 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
   const [requestedFile, setRequestedFile] = useState<{
     sessionId: string;
     path: string;
+    line: number | null;
     requestId: number;
   } | null>(null);
   const [requestedComputer, setRequestedComputer] = useState<{
@@ -984,13 +1062,27 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
   const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
   const activeTabHint = selectedTab ?? initialTab ?? leadingTabs?.[0]?.id ?? null;
   const openFile = useCallback(
-    (path: string) => {
-      nextFileRequestId.current += 1;
-      setRequestedFile({ sessionId, path, requestId: nextFileRequestId.current });
+    (path: string, line?: number | null) => {
+      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 handledOpenFileRequestId = useRef<number | null>(null);
+  useEffect(() => {
+    if (!openFileRequest) return;
+    if (handledOpenFileRequestId.current === openFileRequest.requestId) return;
+    handledOpenFileRequestId.current = openFileRequest.requestId;
+    openFile(openFileRequest.path, openFileRequest.line);
+  }, [openFile, openFileRequest]);
   const openComputer = useCallback(
     (computerSessionId: string) => {
       nextComputerRequestId.current += 1;
@@ -1000,8 +1092,10 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
         requestId: nextComputerRequestId.current,
       });
       setStoredSelection({ sessionId, tab: WORKBENCH_TAB_DESKTOP });
+      onActiveTabChange?.(WORKBENCH_TAB_DESKTOP);
+      onComputerSessionIdChange?.(computerSessionId);
     },
-    [sessionId],
+    [onActiveTabChange, onComputerSessionIdChange, sessionId],
   );
 
   const {
@@ -1020,8 +1114,16 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
     ...(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:
@@ -1040,9 +1142,19 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
   const activeTab =
     preferredTab && tabs.some((tab) => tab.id === preferredTab) ? preferredTab : tabs[0]?.id;
   const selectTab = useCallback(
-    (tab: string) => setStoredSelection({ sessionId, tab }),
-    [sessionId],
+    (tab: string) => {
+      setStoredSelection({ sessionId, tab });
+      onActiveTabChange?.(tab);
+    },
+    [onActiveTabChange, sessionId],
   );
+  useEffect(() => {
+    if (selectedTab !== null || defaultTab === null) return;
+    // Once the source-driven choice resolves, make it the real controlled
+    // selection. Without this handoff the dock could visibly show Files while
+    // the data hooks continued treating the selection as unresolved.
+    setStoredSelection({ sessionId, tab: defaultTab });
+  }, [defaultTab, selectedTab, sessionId]);
 
   return (
     <WorkspaceDock
@@ -1086,7 +1198,7 @@ function chipDotClass(state: MachineChip["state"]): string {
 }
 
 /**
- * The dock-header machine status: one quiet, truthful live/waking/offline
+ * The dock-header machine status: one quiet, truthful live/waking/resting
  * indicator. It is intentionally not interactive; detailed machine controls do
  * not belong in a transient popover above the workspace tabs.
  */