@opengeni/react 3.3.2 → 3.4.1-canary.38960406141001

package/src/components/sandbox-workspace.tsx

@@ -58,11 +58,39 @@ import { useWorkspaceCapture } from "../hooks/use-workspace-capture";
 import { useMachineChip, type MachineChip } from "../hooks/use-machine-chip";
 import { MACHINES_SESSION_POLL_MS, useMachines } from "../hooks/use-machines";
 import type { MachineView } from "../types/machines";
-import { SandboxFiles } from "./sandbox-files";
+import type { SandboxFilesProps } from "./sandbox-files";
 import { WorkbenchChanges } from "./workbench-changes";
 import { SandboxTerminal, type XtermTheme } from "./sandbox-terminal";
 import { WorkspaceDock, type WorkspaceDockProps, type WorkspaceTab } from "./workspace-dock";
 
+const LazySandboxFiles = lazy(() =>
+  import("./sandbox-files")
+    .then(({ SandboxFiles }) => ({ default: SandboxFiles }))
+    // A host may already have attempted stale-deployment recovery. Keep an
+    // optional chunk failure inside Files rather than unmounting the chat.
+    .catch(() => ({ default: FilesLoadFailed })),
+);
+
+function FilesLoadFailed() {
+  return (
+    <CenteredState tone="danger" icon={<TriangleAlertIcon className="size-5" aria-hidden />}>
+      <p className="text-og-sm font-medium text-og-fg">Files could not be loaded.</p>
+      <DockActionButton onClick={() => window.location.reload()}>
+        <RefreshCwIcon className="size-3" aria-hidden />
+        Reload
+      </DockActionButton>
+    </CenteredState>
+  );
+}
+
+function FilesTabBody(props: SandboxFilesProps) {
+  return (
+    <Suspense fallback={<WorkbenchSurfaceLoading name="Files" />}>
+      <LazySandboxFiles {...props} />
+    </Suspense>
+  );
+}
+
 const LazyBrowserViewer = lazy(async () => {
   const { BrowserViewer } = await import("./browser-viewer");
   return { default: BrowserViewer };
@@ -102,6 +130,12 @@ function isWorkbenchSurface(value: string): value is SandboxWorkspaceSurface {
   return (WORKBENCH_SURFACES as readonly string[]).includes(value);
 }
 
+function isCanonicalAbsoluteSandboxPath(value: string | null | undefined): boolean {
+  if (!value) return false;
+  const portable = value.replaceAll("\\", "/");
+  return portable.startsWith("/") || /^[A-Za-z]:\//u.test(portable);
+}
+
 function sourceDrivenDefaultTab(
   hasChanges: boolean,
   changesEnabled: boolean,
@@ -113,20 +147,7 @@ function sourceDrivenDefaultTab(
   return null;
 }
 
-function captureDegradedMessage(reason: string): string {
-  switch (reason) {
-    case "repository_discovery_timed_out":
-      return "Workspace capture is incomplete because repository discovery timed out. Live files remain authoritative.";
-    case "repository_discovery_result_limit_exceeded":
-      return "Workspace capture is incomplete because the repository limit was exceeded. Live files remain authoritative.";
-    case "repository_read_unavailable":
-      return "Workspace capture is incomplete because repository changes could not be read. Live files remain authoritative.";
-    default:
-      return "Workspace capture is incomplete because repository discovery failed. Live files remain authoritative.";
-  }
-}
-
-function WorkbenchSurfaceLoading({ name }: { name: "Browser" | "Desktop" }) {
+function WorkbenchSurfaceLoading({ name }: { name: "Files" | "Browser" | "Desktop" }) {
   return (
     <CenteredState
       icon={
@@ -272,6 +293,13 @@ export type UseSandboxWorkspaceTabsOptions = ClientOverride & {
    * attachment, and navigation callbacks are not activated.
    */
   surfaces?: readonly SandboxWorkspaceSurface[] | undefined;
+  /**
+   * Whether this viewer may read the workspace machine fleet
+   * (`GET /machines`, permission `enrollments:read`). Defaults to true. Pass
+   * false for a viewer without it: the dock then never requests the fleet and
+   * the machine chip derives from the session's own capabilities alone.
+   */
+  machinesEnabled?: boolean | undefined;
   /** Override the source-driven default tab (e.g. a host landing tab id). When
    *  omitted the workbench picks Changes-vs-Files from capture or live Git. */
   initialTab?: string | null | undefined;
@@ -376,6 +404,7 @@ export function useSandboxWorkspaceTabs(
   const initialTab = options.initialTab ?? null;
   const activeTab = options.activeTab ?? initialTab;
   const workspaceVisible = options.workspaceVisible ?? true;
+  const machinesEnabled = options.machinesEnabled ?? true;
   const requestedSurfaces = options.surfaces ?? WORKBENCH_SURFACES;
   const surfaceSet = new Set<SandboxWorkspaceSurface>(requestedSurfaces);
   const changesEnabled = surfaceSet.has(WORKBENCH_TAB_CHANGES);
@@ -424,6 +453,11 @@ export function useSandboxWorkspaceTabs(
   const warmIntents =
     storedWarmIntents.sessionId === sessionId ? storedWarmIntents : emptyWarmIntents(sessionId);
   const { warmTerminal, warmFiles } = warmIntents;
+  // A host-requested file is itself explicit live-file intent. Derive the wake
+  // directly from the request instead of relying on a follow-up effect to copy
+  // it into local state; otherwise a missing or delayed effect leaves the file
+  // waiting for a sandbox that this hook never asks to start.
+  const filesWarmRequested = warmFiles || Boolean(requestedFilePath);
   const requestWarmIntent = useCallback(
     (intent: Exclude<keyof SessionWarmIntents, "sessionId">) => {
       setStoredWarmIntents((previous) => {
@@ -433,17 +467,13 @@ 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). Shares the session list poll.
   const machines = useMachines({
     workspaceId,
     sessionId,
     pollIntervalMs: MACHINES_SESSION_POLL_MS,
-    enabled: machineSurfaceEnabled,
+    enabled: machineSurfaceEnabled && machinesEnabled,
   });
   const activeMachine: MachineView | null =
     machines.machines.find((m) => m.sandboxId === machines.activeSandboxId) ??
@@ -457,7 +487,7 @@ export function useSandboxWorkspaceTabs(
     attachTerminal: terminalEnabled && warmTerminal,
     // Explicit live-file intent only — NOT "the Files tab is open". A cold edit
     // or guarded-file open wakes the box; a glance at the tree/diff does not.
-    attachFiles: workspaceDataEnabled && warmFiles,
+    attachFiles: workspaceDataEnabled && filesWarmRequested,
   });
   const capabilities = caps.capabilities;
   const liveness = capabilities?.liveness;
@@ -467,6 +497,9 @@ export function useSandboxWorkspaceTabs(
   // is still pending.
   const liveIoLiveness = liveness ?? null;
   const fileSystemOn = capabilities?.FileSystem.available ?? false;
+  const fileSystemRoute = capabilities
+    ? { epoch: capabilities.leaseEpoch, root: capabilities.FileSystem.root }
+    : undefined;
   // The FS is writable only when it's live AND not read-only. A self-hosted box
   // that's offline (or any read-only advertisement) or a capture-served cold tree
   // must not offer create/rename/delete/edit affordances — you cannot mutate a
@@ -545,23 +578,6 @@ export function useSandboxWorkspaceTabs(
     if (advertised.length > 0) return advertised;
     return captureState.capture?.repos.map((repo) => repo.root) ?? [];
   }, [capabilities?.Git.repos, captureState.capture]);
-  const notifiedCaptureDegradedReason = useRef<{
-    sessionId: string;
-    reason: string | null;
-  }>({
-    sessionId,
-    reason: null,
-  });
-  if (notifiedCaptureDegradedReason.current.sessionId !== sessionId) {
-    notifiedCaptureDegradedReason.current = { sessionId, reason: null };
-  }
-  useEffect(() => {
-    const reason = captureState.degradedReason;
-    if (!reason || notifiedCaptureDegradedReason.current.reason === reason) return;
-    notifiedCaptureDegradedReason.current = { sessionId, reason };
-    onNotify?.({ kind: "error", message: captureDegradedMessage(reason) });
-  }, [sessionId, captureState.degradedReason, onNotify]);
-
   const files = useSandboxFiles(sessionId, {
     events,
     // No passive Channel-A reads while cold, even after a conclusive capture
@@ -574,9 +590,10 @@ export function useSandboxWorkspaceTabs(
     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
+    ...(isCanonicalAbsoluteSandboxPath(requestedFilePath) && capabilities?.FileSystem.root
       ? { rootPath: capabilities.FileSystem.root }
       : {}),
+    ...(fileSystemRoute ? { route: fileSystemRoute } : {}),
     repoPaths,
     liveness: liveIoLiveness,
     capture: captureState.capture,
@@ -665,7 +682,7 @@ export function useSandboxWorkspaceTabs(
     capabilitiesState: caps.state,
     activeMachineState: activeMachine?.state ?? null,
     activeIsSelfhosted: activeMachine?.kind === "selfhosted",
-    wantsWarm: (terminalEnabled && warmTerminal) || (workspaceDataEnabled && warmFiles),
+    wantsWarm: (terminalEnabled && warmTerminal) || (workspaceDataEnabled && filesWarmRequested),
     capturedAt: captureState.capturedAt,
   });
   const workspaceWaking = chip.state === "waking";
@@ -688,7 +705,8 @@ export function useSandboxWorkspaceTabs(
     (captureState.fileCount ?? 0) > 0 ||
     (captureState.capture?.repos.some((repo) => (repo.branchDiff?.length ?? 0) > 0) ?? false);
   const captureUnavailable =
-    (captureState.fileCount === 0 && !captureHasChanges) || captureState.error !== null;
+    !captureState.loading &&
+    ((captureState.fileCount === 0 && !captureHasChanges) || captureState.error !== null);
   if (defaultTabRef.current.value === null) {
     if (initialTab && (!isWorkbenchSurface(initialTab) || surfaceSet.has(initialTab))) {
       defaultTabRef.current.value = initialTab;
@@ -700,7 +718,13 @@ export function useSandboxWorkspaceTabs(
       );
     } else if (captureUnavailable && initialWorkspaceTab(events) === WORKBENCH_TAB_CHANGES) {
       defaultTabRef.current.value = sourceDrivenDefaultTab(true, changesEnabled, filesEnabled);
-    } else if (captureState.fileCount !== null || captureState.error !== null) {
+    } else if (
+      !captureState.loading &&
+      (captureState.fileCount !== null || captureState.error !== null)
+    ) {
+      // Metadata may arrive before a signed manifest. While that manifest is
+      // loading, neither a positive count nor zero (committed-only changes)
+      // proves an unavailable capture, so leave the default unresolved.
       // 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);
@@ -725,6 +749,7 @@ export function useSandboxWorkspaceTabs(
             comparison={changesComparison}
             onComparisonChange={setChangesComparison}
             captureAvailable={captureAvailable}
+            captureDegraded={captureState.degradedReason !== null}
             captureRevision={captureState.revision}
             capturePending={capturePending}
             liveWorkspaceExpected={liveWorkspaceExpected}
@@ -752,7 +777,7 @@ export function useSandboxWorkspaceTabs(
         label: "Files",
         icon: <FileCode2Icon />,
         content: (
-          <SandboxFiles
+          <FilesTabBody
             key={sessionId}
             files={files}
             git={git}
@@ -770,7 +795,20 @@ export function useSandboxWorkspaceTabs(
             }
             workspaceWaking={!liveWorkspaceExpected && !captureAvailable && workspaceWaking}
             liveWorkspaceReady={liveWorkspaceExpected}
-            onWakeWorkspace={() => requestWarmIntent("warmFiles")}
+            workspaceError={
+              caps.error ??
+              (caps.viewerCapReached
+                ? new Error(
+                    "The live workspace viewer limit has been reached. Close another viewer and retry.",
+                  )
+                : filesWarmRequested && caps.state === "on-demand" && !fileSystemOn
+                  ? new Error("This machine does not currently expose a live file system.")
+                  : null)
+            }
+            onWakeWorkspace={() => {
+              if (filesWarmRequested) caps.renegotiate();
+              else requestWarmIntent("warmFiles");
+            }}
             {...(requestedFilePath
               ? {
                   requestedPath: requestedFilePath,
@@ -841,6 +879,7 @@ export function useSandboxWorkspaceTabs(
               // start BrowserViewer—the lazy panel is still unmounted until the
               // user/agent first visits it.
               enabled={workspaceVisible}
+              active={resolvedActiveTab === WORKBENCH_TAB_BROWSER}
               onNotify={onNotify}
               initialBrowserSessionId={initialBrowserSessionId}
               onBrowserSessionIdChange={onBrowserSessionIdChange}
@@ -897,6 +936,7 @@ export function useSandboxWorkspaceTabs(
     browserEnabled,
     desktopEnabled,
     captureAvailable,
+    captureState.degradedReason,
     dirtyCount,
     warmTerminal,
     requestedFilePath,
@@ -932,6 +972,8 @@ export function useSandboxWorkspaceTabs(
     caps.state,
     caps.error,
     caps.viewerCapReached,
+    caps.renegotiate,
+    filesWarmRequested,
     requestWarmIntent,
     createLinkedComputer,
   ]);
@@ -961,6 +1003,12 @@ export type SandboxWorkspaceProps = ClientOverride & {
    * Terminal, Browser, and Desktop. Disabled surfaces remain behaviorally dormant.
    */
   surfaces?: readonly SandboxWorkspaceSurface[] | undefined;
+  /**
+   * Whether this viewer may read the workspace machine fleet
+   * (`GET /machines`, permission `enrollments:read`). Defaults to true. Pass
+   * false for a viewer without it so the dock never requests the fleet.
+   */
+  machinesEnabled?: boolean | undefined;
   /** Host tabs injected BEFORE the workbench tabs (e.g. a "Run" landing tab). */
   leadingTabs?: WorkspaceTab[] | undefined;
   /** Host tabs injected AFTER the workbench tabs (e.g. a "Debug" tab). */
@@ -969,6 +1017,8 @@ export type SandboxWorkspaceProps = ClientOverride & {
    *  omitted the workbench decides from the durable workspace capture. */
   initialTab?: string | undefined;
   onActiveTabChange?: ((activeTab: string) => void) | undefined;
+  /** Open a built-in or host-injected tab. A new requestId reopens the same tab. */
+  openTabRequest?: { tab: string; requestId: number } | null | undefined;
   initialFilePath?: string | null | undefined;
   onFilePathChange?: ((path: string | null) => void) | undefined;
   /** Presentation-only filter for Files tree nodes and selected-file viewing. */
@@ -1024,10 +1074,12 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
     events,
     primary,
     surfaces,
+    machinesEnabled,
     leadingTabs,
     trailingTabs,
     initialTab,
     onActiveTabChange,
+    openTabRequest,
     initialFilePath,
     onFilePathChange,
     isFileNodeVisible,
@@ -1069,6 +1121,32 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
   const nextFileRequestId = useRef(0);
   const nextComputerRequestId = useRef(0);
   const selectedTab = storedSelection?.sessionId === sessionId ? storedSelection.tab : null;
+  const handledTabRequest = useRef<{ sessionId: string; requestId: number } | null>(null);
+  useEffect(() => {
+    if (
+      !openTabRequest ||
+      (handledTabRequest.current?.sessionId === sessionId &&
+        handledTabRequest.current.requestId === openTabRequest.requestId)
+    )
+      return;
+    const available =
+      [...(leadingTabs ?? []), ...(trailingTabs ?? [])].some(
+        (tab) => tab.id === openTabRequest.tab,
+      ) || (surfaces ?? WORKBENCH_SURFACES).some((tab) => tab === openTabRequest.tab);
+    if (!available) return;
+    handledTabRequest.current = { sessionId, requestId: openTabRequest.requestId };
+    setStoredSelection({ sessionId, tab: openTabRequest.tab });
+    onActiveTabChange?.(openTabRequest.tab);
+    onCollapsedChange?.(false);
+  }, [
+    openTabRequest,
+    sessionId,
+    leadingTabs,
+    trailingTabs,
+    surfaces,
+    onActiveTabChange,
+    onCollapsedChange,
+  ]);
   const activeTabHint = selectedTab ?? initialTab ?? leadingTabs?.[0]?.id ?? null;
   const openFile = useCallback(
     (path: string, line?: number | null) => {
@@ -1117,6 +1195,7 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
     sessionId,
     events,
     ...(surfaces ? { surfaces } : {}),
+    ...(machinesEnabled !== undefined ? { machinesEnabled } : {}),
     ...(initialTab ? { initialTab } : {}),
     activeTab: activeTabHint,
     workspaceVisible: collapsed !== true,
@@ -1172,7 +1251,12 @@ export function SandboxWorkspace(props: SandboxWorkspaceProps): ReactNode {
       tabs={tabs}
       {...(activeTab !== undefined ? { activeTab } : {})}
       onActiveTabChange={selectTab}
-      {...(machine.enabled
+      // Browser and Desktop select independent workspace resources, potentially
+      // on another placement. Their own viewers report runtime status; the
+      // agent-session machine chip must not describe those resources.
+      {...(machine.enabled &&
+      activeTab !== WORKBENCH_TAB_BROWSER &&
+      activeTab !== WORKBENCH_TAB_DESKTOP
         ? {
             headerAccessory: <MachineStateChip chip={machine.chip} />,
           }
@@ -1292,6 +1376,7 @@ function ChangesTabContent({
   git,
   comparison,
   captureAvailable,
+  captureDegraded,
   captureRevision,
   capturePending,
   liveWorkspaceExpected,
@@ -1305,6 +1390,7 @@ function ChangesTabContent({
   git: UseSandboxGitResult;
   comparison: SandboxGitComparison;
   captureAvailable: boolean;
+  captureDegraded: boolean;
   captureRevision: number | null;
   capturePending: boolean;
   liveWorkspaceExpected: boolean;
@@ -1398,6 +1484,8 @@ function ChangesTabContent({
   }
 
   if (!liveWorkspaceExpected && (comparison !== "working" || !captureAvailable)) {
+    // Staged changes are live-only; a failed saved preview is not their blocker.
+    const previewUnavailable = captureDegraded && !captureAvailable && comparison !== "staged";
     return (
       <CenteredState
         icon={
@@ -1406,22 +1494,30 @@ function ChangesTabContent({
               className="size-5 animate-spin motion-reduce:animate-none"
               aria-hidden
             />
+          ) : previewUnavailable ? (
+            <TriangleAlertIcon className="size-5" aria-hidden />
           ) : (
             <CpuIcon className="size-5" aria-hidden />
           )
         }
       >
         <p className="text-og-sm font-medium text-og-fg">
-          {workspaceWaking ? "Waking workspace" : "Workspace is resting"}
+          {workspaceWaking
+            ? "Waking workspace"
+            : previewUnavailable
+              ? "Saved changes preview is unavailable"
+              : "Workspace is resting"}
         </p>
         <p className="text-og-sm leading-5 text-og-fg-subtle">
           {workspaceWaking
             ? "Connecting to the live working tree…"
-            : comparison === "branch"
-              ? "Wake the sandbox to compare this branch with the remote default branch."
-              : comparison === "staged"
-                ? "Wake the sandbox to inspect staged changes."
-                : "No captured revision is available yet. Wake the sandbox to inspect uncommitted changes."}
+            : previewUnavailable
+              ? "Open the live workspace to view current changes."
+              : comparison === "branch"
+                ? "Wake the sandbox to compare this branch with the remote default branch."
+                : comparison === "staged"
+                  ? "Wake the sandbox to inspect staged changes."
+                  : "No captured revision is available yet. Wake the sandbox to inspect uncommitted changes."}
         </p>
         {!workspaceWaking ? (
           <DockActionButton onClick={onWake}>