fix(server): tell multi-repo agents which repos are in the project

.gitignore

@@ -20,6 +20,7 @@ release-mock/
 apps/web/.playwright
 apps/web/playwright-report
 apps/web/src/components/__screenshots__
+.playwright-mcp/
 .vitest-*
 __screenshots__/
 .tanstack

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -21,6 +21,7 @@ const clientSettings: ClientSettings = {
   notificationMode: "notifications-and-sound",
   inAppNotificationsEnabled: true,
   appearanceContrast: 100,
+  browseShowWorkspaceFiles: false,
   browserDefaultViewport: { _tag: "preset", width: 1024, height: 600, presetId: "nest-hub" },
   browserDefaultZoomFactor: 1.25,
   browserDefaultAppearance: "dark",

apps/mobile/src/connection/environment-cache-store.test.ts

@@ -96,6 +96,7 @@ describe("mobile SQLite environment cache store", () => {
             branch: null,
             pullRequests: [],
             worktreePath: null,
+            worktrees: [],
             latestTurn: null,
             createdAt: now,
             updatedAt: now,

apps/mobile/src/features/archive/archivedThreadList.test.ts

@@ -32,6 +32,7 @@ function makeThread(
     branch: null,
     worktreePath: null,
     pullRequests: [],
+    worktrees: [],
     latestTurn: null,
     createdAt: "2026-06-01T00:00:00.000Z",
     updatedAt: "2026-06-01T00:00:00.000Z",

apps/mobile/src/features/home/homeThreadList.test.ts

@@ -32,6 +32,7 @@ function makeThread(
     branch: null,
     worktreePath: null,
     pullRequests: [],
+    worktrees: [],
     latestTurn: null,
     createdAt: "2026-06-01T00:00:00.000Z",
     updatedAt: "2026-06-01T00:00:00.000Z",

apps/mobile/src/features/review/nativeReviewDiffAdapter.ts

@@ -420,6 +420,17 @@ function mapLineRow(
   };
 }
 
+/**
+ * The path the native list shows and review comments quote. The list has no
+ * repo header row, so files of a multi-repo diff carry their repo folder as a
+ * prefix instead; that same prefixed path names the file unambiguously in a
+ * comment the agent reads across several repos. `file.path` itself stays
+ * repo-relative for language detection.
+ */
+function displayFilePath(file: ReviewRenderableFile): string {
+  return file.repoLabel === null ? file.path : `${file.repoLabel}/${file.path}`;
+}
+
 function prepareFileRows(file: ReviewRenderableFile): PreparedNativeReviewFileRows {
   const cached = nativeReviewFileRowsCache.get(file);
   if (cached) return cached;
@@ -430,7 +441,7 @@ function prepareFileRows(file: ReviewRenderableFile): PreparedNativeReviewFileRo
       kind: "file",
       id: `${file.id}:header`,
       fileId: file.id,
-      filePath: file.path,
+      filePath: displayFilePath(file),
       previousPath: file.previousPath,
       changeType: mapChangeType(file),
       additions: file.additions,
@@ -439,6 +450,7 @@ function prepareFileRows(file: ReviewRenderableFile): PreparedNativeReviewFileRo
   ];
 
   const lineRows = file.rows.filter((row): row is ReviewRenderableLineRow => row.kind === "line");
+  const commentFilePath = displayFilePath(file);
   let lineIndex = 0;
   file.rows.forEach((row, rowIndex) => {
     if (row.kind === "hunk") {
@@ -455,7 +467,7 @@ function prepareFileRows(file: ReviewRenderableFile): PreparedNativeReviewFileRo
     rows.push(nativeRow);
     rowIdByCommentLineId.set(row.id, nativeRow.id);
     commentTargetsByRowId.set(nativeRow.id, {
-      filePath: file.path,
+      filePath: commentFilePath,
       lines: lineRows,
       lineIndex,
     });
@@ -465,7 +477,7 @@ function prepareFileRows(file: ReviewRenderableFile): PreparedNativeReviewFileRo
   rows.push(...noticeRowsForFile(file));
   const prepared: PreparedNativeReviewFileRows = {
     fileId: file.id,
-    filePath: file.path,
+    filePath: commentFilePath,
     lineCount: lineRows.length,
     // Comments must not split the source deletion/addition runs used for word matching.
     rows: addNativeWordDiffRanges(rows),
@@ -537,7 +549,7 @@ function prepareNativeReviewDiffData(parsedDiff: ReviewParsedDiff): PreparedNati
 
   const files = parsedDiff.files.map<NativeReviewDiffFile>((file) => ({
     id: file.id,
-    path: file.path,
+    path: displayFilePath(file),
     language: getLanguageForPath(file.path, file.languageHint),
     additions: file.additions,
     deletions: file.deletions,

apps/mobile/src/features/review/review-section-menu.test.ts

@@ -10,6 +10,7 @@ function section(id: string, kind: ReviewSectionKind): ReviewSectionItem {
     title: id,
     subtitle: null,
     diff: null,
+    groups: null,
     isLoading: false,
   };
 }

apps/mobile/src/features/review/reviewFileVisibility.test.ts

@@ -18,6 +18,7 @@ function makeFile(id: string): ReviewRenderableFile {
     additions: 0,
     deletions: 0,
     languageHint: null,
+    repoLabel: null,
     additionLines: [],
     deletionLines: [],
     rows: [],

apps/mobile/src/features/review/reviewModel.test.ts

@@ -14,6 +14,7 @@ import {
   getDefaultReviewSectionId,
   getReviewFilePreviewState,
   getReviewSectionIdForCheckpoint,
+  toReviewTurnDiff,
   type ReviewRenderableFile,
 } from "./reviewModel";
 
@@ -41,6 +42,7 @@ function makeRenderableFile(
     additions: 0,
     deletions: 0,
     languageHint: null,
+    repoLabel: null,
     additionLines: [],
     deletionLines: [],
     rows: [],
@@ -88,9 +90,9 @@ describe("buildReviewSectionItems", () => {
     const loadedTurnId = getReviewSectionIdForCheckpoint(checkpoints[0]!);
     const items = buildReviewSectionItems({
       checkpoints,
-      gitSections,
+      gitPreviews: [{ repoRoot: null, sources: gitSections }],
       turnDiffById: {
-        [loadedTurnId]: "diff --git a/loaded.ts b/loaded.ts",
+        [loadedTurnId]: { diff: "diff --git a/loaded.ts b/loaded.ts", groups: null },
       },
       loadingTurnIds: {
         [getReviewSectionIdForCheckpoint(checkpoints[1]!)]: true,
@@ -109,13 +111,84 @@ describe("buildReviewSectionItems", () => {
       isLoading: false,
       diff: expect.stringContaining("loaded.ts"),
     });
+    expect(items[2]).toMatchObject({
+      title: "Dirty worktree",
+      subtitle: "Tracked, staged, and untracked worktree changes",
+      diff: "diff --git a/a.ts b/a.ts",
+      groups: null,
+    });
+    expect(items[3]).toMatchObject({ subtitle: "main ... feature", groups: null });
     expect(getDefaultReviewSectionId(items)).toBe("turn:2");
   });
 
+  it("folds one preview per repo into grouped git sections", () => {
+    const source = (
+      kind: ReviewDiffPreviewSource["kind"],
+      diff: string,
+      baseRef: string | null,
+    ): ReviewDiffPreviewSource => ({
+      id: kind,
+      kind,
+      title: kind === "working-tree" ? "Dirty worktree" : "Against main",
+      baseRef,
+      headRef: kind === "working-tree" ? null : "feature",
+      diff,
+      diffHash: `${kind}:${diff}`,
+      truncated: false,
+    });
+
+    const items = buildReviewSectionItems({
+      checkpoints: [],
+      gitPreviews: [
+        {
+          repoRoot: "/repos/workspace/api",
+          sources: [
+            source("working-tree", "", "HEAD"),
+            source("branch-range", "api-branch", "main"),
+          ],
+        },
+        {
+          repoRoot: "/repos/workspace/web/",
+          sources: [
+            source("working-tree", "web-dirty", "HEAD"),
+            source("branch-range", "web-branch", null),
+          ],
+        },
+      ],
+      turnDiffById: {},
+      loadingTurnIds: {},
+      loadingGitSections: false,
+    });
+
+    expect(items.map((item) => item.id)).toEqual(["git:working-tree", "git:branch-range"]);
+    expect(items[0]).toMatchObject({
+      diff: "\nweb-dirty",
+      groups: [
+        { repoRoot: "/repos/workspace/api", displayName: "api", diff: "" },
+        { repoRoot: "/repos/workspace/web/", displayName: "web", diff: "web-dirty" },
+      ],
+    });
+    expect(items[1]).toMatchObject({
+      subtitle: "2 repositories",
+      diff: "api-branch\nweb-branch",
+    });
+  });
+
+  it("carries turn diff groups only for multi-repo threads", () => {
+    const api = { repoRoot: "/repos/api", displayName: "api", diff: "a" };
+    const web = { repoRoot: "/repos/web", displayName: "web", diff: "b" };
+    expect(toReviewTurnDiff({ diff: "a", groups: [api] })).toEqual({ diff: "a", groups: null });
+    expect(toReviewTurnDiff({ diff: "a" })).toEqual({ diff: "a", groups: null });
+    expect(toReviewTurnDiff({ diff: "a\nb", groups: [api, web] })).toEqual({
+      diff: "a\nb",
+      groups: [api, web],
+    });
+  });
+
   it("shows dirty worktree while git preview is loading", () => {
     const items = buildReviewSectionItems({
       checkpoints: [],
-      gitSections: [],
+      gitPreviews: [],
       turnDiffById: {},
       loadingTurnIds: {},
       loadingGitSections: true,
@@ -165,6 +238,47 @@ describe("buildReviewParsedDiff", () => {
     });
   });
 
+  it("labels files by repo when parsing a grouped diff", () => {
+    const patch = (path: string) =>
+      [
+        `diff --git a/${path} b/${path}`,
+        "index 1111111..2222222 100644",
+        `--- a/${path}`,
+        `+++ b/${path}`,
+        "@@ -1,1 +1,1 @@",
+        "-const before = 1;",
+        "+const after = 2;",
+      ].join("\n");
+    const groups = [
+      { repoRoot: "/repos/api", displayName: "api", diff: patch("src/server.ts") },
+      { repoRoot: "/repos/web", displayName: "web", diff: "" },
+      { repoRoot: "/repos/docs", displayName: "docs", diff: patch("README.md") },
+    ];
+
+    const parsed = buildReviewParsedDiff(
+      groups.map((group) => group.diff).join("\n"),
+      "unit",
+      groups,
+    );
+
+    expect(parsed.kind).toBe("files");
+    if (parsed.kind !== "files") {
+      return;
+    }
+    expect(parsed.files.map((file) => [file.repoLabel, file.path])).toEqual([
+      ["api", "src/server.ts"],
+      ["docs", "README.md"],
+    ]);
+    expect(new Set(parsed.files.map((file) => file.id)).size).toBe(2);
+    expect(parsed.additions).toBe(2);
+    expect(parsed.deletions).toBe(2);
+
+    const single = buildReviewParsedDiff(patch("src/server.ts"), "unit", [groups[0]!]);
+    expect(single.kind === "files" && single.files[0]?.repoLabel).toBe("api");
+    const flat = buildReviewParsedDiff(patch("src/server.ts"), "unit", null);
+    expect(flat.kind === "files" && flat.files[0]?.repoLabel).toBeNull();
+  });
+
   it("builds renderable rows from a unified patch", () => {
     const parsed = buildReviewParsedDiff(
       [