fix(web): resolve workspace read-side fallbacks

Author: pallyoung

packages/web/src/atoms/sessions.test.ts

@@ -0,0 +1,79 @@
+import type { Session, Workspace } from "@coder-studio/core";
+import { createStore } from "jotai";
+import { describe, expect, it } from "vitest";
+import { activeSessionAtom, sessionsAtom } from "./sessions";
+import {
+  activeWorkspaceIdAtom,
+  workspaceOrderAtom,
+  workspacesAtom,
+  workspacesLoadStateAtom,
+} from "./workspaces";
+
+function createWorkspace(id: string): Workspace {
+  return {
+    id,
+    name: id,
+    path: `/tmp/${id}`,
+    targetRuntime: "native",
+    openedAt: 1,
+    lastActiveAt: 1,
+    uiState: {
+      leftPanelWidth: 280,
+      bottomPanelHeight: 200,
+      focusMode: false,
+    },
+  };
+}
+
+function createSession(id: string, workspaceId: string, state: Session["state"]): Session {
+  return {
+    id,
+    workspaceId,
+    terminalId: `${id}-terminal`,
+    providerId: "codex",
+    state,
+    capability: "full",
+    startedAt: 1,
+    lastActiveAt: 1,
+  };
+}
+
+describe("activeSessionAtom", () => {
+  it("falls back to the first ordered ready workspace when the requested workspace is missing", () => {
+    const store = createStore();
+    const ws1 = createWorkspace("ws-1");
+    const ws2 = createWorkspace("ws-2");
+    const runningSession = createSession("sess-2", ws2.id, "running");
+
+    store.set(workspacesAtom, {
+      [ws1.id]: ws1,
+      [ws2.id]: ws2,
+    });
+    store.set(workspaceOrderAtom, [ws2.id, ws1.id]);
+    store.set(workspacesLoadStateAtom, "ready");
+    store.set(activeWorkspaceIdAtom, "missing");
+    store.set(sessionsAtom, {
+      [runningSession.id]: runningSession,
+    });
+
+    expect(store.get(activeSessionAtom)?.id).toBe(runningSession.id);
+  });
+
+  it("returns null before the workspace list is ready", () => {
+    const store = createStore();
+    const ws1 = createWorkspace("ws-1");
+    const runningSession = createSession("sess-1", ws1.id, "running");
+
+    store.set(workspacesAtom, {
+      [ws1.id]: ws1,
+    });
+    store.set(workspaceOrderAtom, [ws1.id]);
+    store.set(workspacesLoadStateAtom, "loading");
+    store.set(activeWorkspaceIdAtom, ws1.id);
+    store.set(sessionsAtom, {
+      [runningSession.id]: runningSession,
+    });
+
+    expect(store.get(activeSessionAtom)).toBeNull();
+  });
+});

packages/web/src/atoms/sessions.ts

@@ -7,7 +7,7 @@
 import type { Session, SessionState } from "@coder-studio/core";
 import { atom } from "jotai";
 import { atomFamily } from "jotai-family";
-import { activeWorkspaceIdAtom } from "./workspaces";
+import { resolvedActiveWorkspaceIdAtom } from "./workspaces";
 
 /**
  * All sessions (server state projection)
@@ -40,7 +40,7 @@ export function setActiveWorkspaceIdGetter(_getter: () => string | null): void {
 }
 
 export const activeSessionAtom = atom((get) => {
-  const wsId = get(activeWorkspaceIdAtom);
+  const wsId = get(resolvedActiveWorkspaceIdAtom);
   if (!wsId) return null;
   const sessions = get(sessionsByWorkspaceAtomFamily(wsId));
   return sessions.find((s) => s.state === "running" || s.state === "idle") ?? null;

packages/web/src/features/workspace/views/shared/worktree-modal.test.tsx

@@ -4,7 +4,12 @@ import { createStore, Provider } from "jotai";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { localeAtom } from "../../../../atoms/app-ui";
 import { wsClientAtom } from "../../../../atoms/connection";
-import { activeWorkspaceIdAtom } from "../../../../atoms/workspaces";
+import {
+  activeWorkspaceIdAtom,
+  workspaceOrderAtom,
+  workspacesAtom,
+  workspacesLoadStateAtom,
+} from "../../../../atoms/workspaces";
 import { WorktreeModal } from "./worktree-modal";
 
 const viewportMocks = vi.hoisted(() => ({
@@ -23,6 +28,22 @@ const worktree: WorktreeInfo = {
   status: "dirty",
 };
 
+function createWorkspace(id: string) {
+  return {
+    id,
+    name: id,
+    path: `/tmp/${id}`,
+    targetRuntime: "native" as const,
+    openedAt: 1,
+    lastActiveAt: 1,
+    uiState: {
+      leftPanelWidth: 280,
+      bottomPanelHeight: 200,
+      focusMode: false,
+    },
+  };
+}
+
 describe("WorktreeModal", () => {
   afterEach(() => {
     viewportMocks.viewport = "desktop";
@@ -92,8 +113,14 @@ describe("WorktreeModal", () => {
     });
 
     const store = createStore();
+    const workspace = createWorkspace("ws-1");
     store.set(localeAtom, "en");
     store.set(activeWorkspaceIdAtom, "ws-1");
+    store.set(workspacesAtom, {
+      [workspace.id]: workspace,
+    });
+    store.set(workspaceOrderAtom, [workspace.id]);
+    store.set(workspacesLoadStateAtom, "ready");
     store.set(wsClientAtom, {
       sendCommand,
       subscribe: vi.fn(() => () => {}),
@@ -119,6 +146,73 @@ describe("WorktreeModal", () => {
     expect(screen.getByText("Latest Commit")).toBeInTheDocument();
   });
 
+  it("does not render without an explicit workspace until the workspace list is ready", () => {
+    const store = createStore();
+    const workspace = createWorkspace("ws-1");
+
+    store.set(localeAtom, "en");
+    store.set(activeWorkspaceIdAtom, workspace.id);
+    store.set(workspacesAtom, {
+      [workspace.id]: workspace,
+    });
+    store.set(workspaceOrderAtom, [workspace.id]);
+    store.set(workspacesLoadStateAtom, "loading");
+
+    const { container } = render(
+      <Provider store={store}>
+        <WorktreeModal worktree={worktree} onClose={vi.fn()} />
+      </Provider>
+    );
+
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it("falls back to the first ordered workspace when the requested workspace is missing", async () => {
+    const sendCommand = vi.fn().mockResolvedValue({
+      status: {
+        branch: "feature/mobile-sheet",
+        ahead: 0,
+        behind: 0,
+        headSha: "abc1234567890",
+        headShortSha: "abc1234",
+        headSubject: "Initial mobile sheet setup",
+        staged: [],
+        modified: [],
+        untracked: [],
+        deleted: [],
+      },
+    });
+
+    const store = createStore();
+    const fallbackWorkspace = createWorkspace("ws-fallback");
+    const otherWorkspace = createWorkspace("ws-other");
+    store.set(localeAtom, "en");
+    store.set(activeWorkspaceIdAtom, "ws-missing");
+    store.set(workspacesAtom, {
+      [fallbackWorkspace.id]: fallbackWorkspace,
+      [otherWorkspace.id]: otherWorkspace,
+    });
+    store.set(workspaceOrderAtom, [fallbackWorkspace.id, otherWorkspace.id]);
+    store.set(workspacesLoadStateAtom, "ready");
+    store.set(wsClientAtom, {
+      sendCommand,
+      subscribe: vi.fn(() => () => {}),
+    } as never);
+
+    render(
+      <Provider store={store}>
+        <WorktreeModal worktree={worktree} onClose={vi.fn()} />
+      </Provider>
+    );
+
+    await waitFor(() => {
+      expect(sendCommand).toHaveBeenCalledWith("worktree.status", {
+        workspaceId: fallbackWorkspace.id,
+        worktreePath: "/tmp/coder-studio-feature",
+      });
+    });
+  });
+
   it("renders inside shared Sheet on mobile and still loads data when tabs change", async () => {
     viewportMocks.viewport = "mobile";
     const sendCommand = vi.fn().mockImplementation(async (op: string) => {

packages/web/src/features/workspace/views/shared/worktree-modal.tsx

@@ -1,7 +1,7 @@
 import type { WorktreeInfo } from "@coder-studio/core";
 import { useAtomValue } from "jotai";
 import { X } from "lucide-react";
-import { activeWorkspaceIdAtom } from "../../../../atoms/workspaces";
+import { resolvedActiveWorkspaceIdAtom } from "../../../../atoms/workspaces";
 import {
   IconButton,
   Modal,
@@ -22,7 +22,7 @@ interface WorktreeModalProps {
 
 export function WorktreeModal({ workspaceId, worktree, onClose }: WorktreeModalProps) {
   const isMobile = useViewport() === "mobile";
-  const activeWorkspaceId = useAtomValue(activeWorkspaceIdAtom);
+  const activeWorkspaceId = useAtomValue(resolvedActiveWorkspaceIdAtom);
   const t = useTranslation();
   const resolvedWorkspaceId = workspaceId ?? activeWorkspaceId;