fix: route thread links and uncommitted reviews by workspace

Author: Dimillian

src/App.tsx

@@ -2338,7 +2338,8 @@ function MainApp() {
     onUnstageGitFile: handleUnstageGitFile,
     onRevertGitFile: handleRevertGitFile,
     onRevertAllGitChanges: handleRevertAllGitChanges,
-    onReviewUncommittedChanges: startUncommittedReview,
+    onReviewUncommittedChanges: (workspaceId) =>
+      startUncommittedReview(workspaceId ?? activeWorkspace?.id ?? null),
     gitDiffs: activeDiffs,
     gitDiffLoading: activeDiffLoading,
     gitDiffError: activeDiffError,

src/features/app/orchestration/useThreadOrchestration.test.ts

@@ -8,6 +8,7 @@ import type { PendingNewThreadSeed } from "@threads/utils/threadCodexParamsSeed"
 import {
   useThreadCodexSyncOrchestration,
   useThreadSelectionHandlersOrchestration,
+  useThreadUiOrchestration,
 } from "./useThreadOrchestration";
 
 vi.mock("@/services/toasts", () => ({
@@ -267,3 +268,45 @@ describe("useThreadCodexSyncOrchestration seed behavior", () => {
     expect(params.patchThreadCodexParams).not.toHaveBeenCalled();
   });
 });
+
+describe("useThreadUiOrchestration", () => {
+  it("opens thread links in their source workspace", () => {
+    const setActiveTab = vi.fn() as unknown as Dispatch<
+      SetStateAction<"home" | "projects" | "codex" | "git" | "log">
+    >;
+    const params = {
+      activeWorkspaceId: "ws-1",
+      activeThreadId: "thread-1",
+      accessMode: "current" as const,
+      selectedCollaborationModeId: null,
+      selectedCodexArgsOverride: null,
+      pendingNewThreadSeedRef: {
+        current: null,
+      } as MutableRefObject<PendingNewThreadSeed | null>,
+      runWithDraftStart: vi.fn(async (runner: () => Promise<void>) => runner()),
+      handleComposerSend: vi.fn(async () => undefined),
+      clearDraftState: vi.fn(),
+      exitDiffView: vi.fn(),
+      resetPullRequestSelection: vi.fn(),
+      selectWorkspace: vi.fn(),
+      setActiveThreadId: vi.fn(),
+      setActiveTab,
+      isCompact: false,
+      removeThread: vi.fn(),
+      clearDraftForThread: vi.fn(),
+      removeImagesForThread: vi.fn(),
+    };
+
+    const { result } = renderHook(() => useThreadUiOrchestration(params));
+
+    act(() => {
+      result.current.handleOpenThreadLink("thread-review-1", "ws-2");
+    });
+
+    expect(params.exitDiffView).toHaveBeenCalledTimes(1);
+    expect(params.resetPullRequestSelection).toHaveBeenCalledTimes(1);
+    expect(params.clearDraftState).toHaveBeenCalledTimes(1);
+    expect(params.selectWorkspace).toHaveBeenCalledWith("ws-2");
+    expect(params.setActiveThreadId).toHaveBeenCalledWith("thread-review-1", "ws-2");
+  });
+});

src/features/app/orchestration/useThreadOrchestration.ts

@@ -422,20 +422,25 @@ export function useThreadUiOrchestration({
   );
 
   const handleOpenThreadLink = useCallback(
-    (threadId: string) => {
-      if (!activeWorkspaceId) {
+    (threadId: string, workspaceId?: string | null) => {
+      const targetWorkspaceId = workspaceId ?? activeWorkspaceId;
+      if (!targetWorkspaceId) {
         return;
       }
       exitDiffView();
       resetPullRequestSelection();
       clearDraftState();
-      setActiveThreadId(threadId, activeWorkspaceId);
+      if (targetWorkspaceId !== activeWorkspaceId) {
+        selectWorkspace(targetWorkspaceId);
+      }
+      setActiveThreadId(threadId, targetWorkspaceId);
     },
     [
       activeWorkspaceId,
       clearDraftState,
       exitDiffView,
       resetPullRequestSelection,
+      selectWorkspace,
       setActiveThreadId,
     ],
   );

src/features/git/components/GitDiffPanel.test.tsx

@@ -120,6 +120,7 @@ describe("GitDiffPanel", () => {
     render(
       <GitDiffPanel
         {...baseProps}
+        workspaceId="ws-2"
         onReviewUncommittedChanges={onReviewUncommittedChanges}
         unstagedFiles={[
           { path: "src/file.ts", status: "M", additions: 4, deletions: 1 },
@@ -132,6 +133,7 @@ describe("GitDiffPanel", () => {
     });
     fireEvent.click(reviewButton);
     expect(onReviewUncommittedChanges).toHaveBeenCalledTimes(1);
+    expect(onReviewUncommittedChanges).toHaveBeenCalledWith("ws-2");
   });
 
   it("adds a show in file manager option for file context menus", async () => {

src/features/git/components/GitDiffPanel.tsx

@@ -115,7 +115,7 @@ type GitDiffPanelProps = {
   onStageFile?: (path: string) => Promise<void> | void;
   onUnstageFile?: (path: string) => Promise<void> | void;
   onRevertFile?: (path: string) => Promise<void> | void;
-  onReviewUncommittedChanges?: () => void | Promise<void>;
+  onReviewUncommittedChanges?: (workspaceId?: string | null) => void | Promise<void>;
   logEntries: GitLogEntry[];
   selectedCommitSha?: string | null;
   onSelectCommit?: (entry: GitLogEntry) => void;
@@ -739,7 +739,11 @@ export function GitDiffPanel({
           onUnstageFile={onUnstageFile}
           onDiscardFile={onRevertFile ? discardFile : undefined}
           onDiscardFiles={onRevertFile ? discardFiles : undefined}
-          onReviewUncommittedChanges={onReviewUncommittedChanges}
+          onReviewUncommittedChanges={
+            onReviewUncommittedChanges
+              ? () => onReviewUncommittedChanges(workspaceId)
+              : undefined
+          }
           selectedFiles={selectedFiles}
           selectedPath={selectedPath}
           onSelectFile={onSelectFile}

src/features/layout/hooks/layoutNodes/types.ts

@@ -169,7 +169,7 @@ export type LayoutNodesOptions = {
   onAddCloneAgent: (workspace: WorkspaceInfo) => Promise<void>;
   onToggleWorkspaceCollapse: (workspaceId: string, collapsed: boolean) => void;
   onSelectThread: (workspaceId: string, threadId: string) => void;
-  onOpenThreadLink: (threadId: string) => void;
+  onOpenThreadLink: (threadId: string, workspaceId?: string | null) => void;
   onDeleteThread: (workspaceId: string, threadId: string) => void;
   onSyncThread: (workspaceId: string, threadId: string) => void;
   pinThread: (workspaceId: string, threadId: string) => boolean;
@@ -333,7 +333,7 @@ export type LayoutNodesOptions = {
   onUnstageGitFile: (path: string) => Promise<void>;
   onRevertGitFile: (path: string) => Promise<void>;
   onRevertAllGitChanges: () => Promise<void>;
-  onReviewUncommittedChanges: () => Promise<void>;
+  onReviewUncommittedChanges: (workspaceId?: string | null) => Promise<void>;
   diffSource: GitDiffSource;
   gitDiffs: GitDiffViewerItem[];
   gitDiffLoading: boolean;

src/features/messages/components/Messages.test.tsx

@@ -195,7 +195,7 @@ describe("Messages", () => {
     );
 
     fireEvent.click(screen.getByText("Open review thread"));
-    expect(onOpenThreadLink).toHaveBeenCalledWith("thread-review-1");
+    expect(onOpenThreadLink).toHaveBeenCalledWith("thread-review-1", "ws-1");
   });
 
   it("renders file references as compact links and opens them", () => {

src/features/messages/components/Messages.tsx

@@ -59,7 +59,7 @@ type MessagesProps = {
   ) => void;
   onPlanAccept?: () => void;
   onPlanSubmitChanges?: (changes: string) => void;
-  onOpenThreadLink?: (threadId: string) => void;
+  onOpenThreadLink?: (threadId: string, workspaceId?: string | null) => void;
   onQuoteMessage?: (text: string) => void;
 };
 
@@ -121,6 +121,12 @@ export const Messages = memo(function Messages({
     openTargets,
     selectedOpenAppId,
   );
+  const handleOpenThreadLink = useCallback(
+    (threadId: string) => {
+      onOpenThreadLink?.(threadId, workspaceId ?? null);
+    },
+    [onOpenThreadLink, workspaceId],
+  );
 
   const isNearBottom = useCallback(
     (node: HTMLDivElement) =>
@@ -387,7 +393,7 @@ export const Messages = memo(function Messages({
           workspacePath={workspacePath}
           onOpenFileLink={openFileLink}
           onOpenFileLinkMenu={showFileLinkMenu}
-          onOpenThreadLink={onOpenThreadLink}
+          onOpenThreadLink={handleOpenThreadLink}
         />
       );
     }
@@ -405,7 +411,7 @@ export const Messages = memo(function Messages({
           workspacePath={workspacePath}
           onOpenFileLink={openFileLink}
           onOpenFileLinkMenu={showFileLinkMenu}
-          onOpenThreadLink={onOpenThreadLink}
+          onOpenThreadLink={handleOpenThreadLink}
         />
       );
     }
@@ -418,7 +424,7 @@ export const Messages = memo(function Messages({
           workspacePath={workspacePath}
           onOpenFileLink={openFileLink}
           onOpenFileLinkMenu={showFileLinkMenu}
-          onOpenThreadLink={onOpenThreadLink}
+          onOpenThreadLink={handleOpenThreadLink}
         />
       );
     }
@@ -437,7 +443,7 @@ export const Messages = memo(function Messages({
           workspacePath={workspacePath}
           onOpenFileLink={openFileLink}
           onOpenFileLinkMenu={showFileLinkMenu}
-          onOpenThreadLink={onOpenThreadLink}
+          onOpenThreadLink={handleOpenThreadLink}
           onRequestAutoScroll={requestAutoScroll}
         />
       );

src/features/threads/hooks/useThreadMessaging.test.tsx

@@ -488,6 +488,56 @@ describe("useThreadMessaging telemetry", () => {
     );
   });
 
+  it("routes uncommitted review to an explicit workspace override", async () => {
+    const ensureThreadForActiveWorkspace = vi.fn(async () => "thread-active");
+    const ensureThreadForWorkspace = vi.fn(async () => "thread-override");
+
+    const { result } = renderHook(() =>
+      useThreadMessaging({
+        activeWorkspace: workspace,
+        activeThreadId: "thread-active",
+        accessMode: "current",
+        model: null,
+        effort: null,
+        collaborationMode: null,
+        reviewDeliveryMode: "detached",
+        steerEnabled: false,
+        customPrompts: [],
+        threadStatusById: {},
+        activeTurnIdByThread: {},
+        rateLimitsByWorkspace: {},
+        pendingInterruptsRef: { current: new Set<string>() },
+        dispatch: vi.fn(),
+        getCustomName: vi.fn(() => undefined),
+        markProcessing: vi.fn(),
+        markReviewing: vi.fn(),
+        setActiveTurnId: vi.fn(),
+        recordThreadActivity: vi.fn(),
+        safeMessageActivity: vi.fn(),
+        onDebug: vi.fn(),
+        pushThreadErrorMessage: vi.fn(),
+        ensureThreadForActiveWorkspace,
+        ensureThreadForWorkspace,
+        refreshThread: vi.fn(async () => null),
+        forkThreadForWorkspace: vi.fn(async () => null),
+        updateThreadParent: vi.fn(),
+      }),
+    );
+
+    await act(async () => {
+      await result.current.startUncommittedReview("ws-2");
+    });
+
+    expect(ensureThreadForActiveWorkspace).not.toHaveBeenCalled();
+    expect(ensureThreadForWorkspace).toHaveBeenCalledWith("ws-2");
+    expect(startReviewService).toHaveBeenCalledWith(
+      "ws-2",
+      "thread-override",
+      { type: "uncommittedChanges" },
+      "detached",
+    );
+  });
+
   it("names detached commit review child threads from commit context", async () => {
     vi.mocked(startReviewService).mockResolvedValueOnce({
       result: {

src/features/threads/hooks/useThreadMessaging.ts

@@ -687,9 +687,13 @@ export function useThreadMessaging({
     ],
   );
 
-  const startUncommittedReview = useCallback(async () => {
-    await startReviewTarget({ type: "uncommittedChanges" });
-  }, [startReviewTarget]);
+  const startUncommittedReview = useCallback(
+    async (workspaceId?: string | null) => {
+      const workspaceOverride = workspaceId ?? undefined;
+      await startReviewTarget({ type: "uncommittedChanges" }, workspaceOverride);
+    },
+    [startReviewTarget],
+  );
 
   const startStatus = useCallback(
     async (_text: string) => {