Skip to content

Commit 532dc97

Browse files
committed
fix(web): New Chat keeps same-environment worktrees
expandEnvironmentCopies collapsed picker rows by environmentId, so a logical group with two local worktrees listed only the first checkout. New Chat then omitted the active worktree and created on the wrong one. Keep every distinct memberProjects checkout, sort the preferred member first, and cover two worktrees in one environment.
1 parent a43912c commit 532dc97

2 files changed

Lines changed: 79 additions & 9 deletions

File tree

‎apps/web/src/environmentGrouping.test.ts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,69 @@ describe("environment grouping", () => {
528528
id: primary.id,
529529
});
530530
});
531+
532+
it("keeps two same-environment worktrees as New Chat rows and prefers the active checkout", () => {
533+
const mainWorktree = makeProject({
534+
repositoryIdentity,
535+
workspaceRoot: "/tmp/shared-repo",
536+
});
537+
const featureWorktree = makeProject({
538+
id: ProjectId.make("project-worktree"),
539+
workspaceRoot: "/tmp/shared-repo-feature",
540+
repositoryIdentity,
541+
});
542+
const remote = makeProject({
543+
id: ProjectId.make("project-remote"),
544+
environmentId: remoteEnvironmentId,
545+
workspaceRoot: "/remote/shared-repo",
546+
repositoryIdentity,
547+
});
548+
const groups = buildSidebarProjectSnapshots({
549+
projects: [mainWorktree, featureWorktree, remote],
550+
settings: defaultGroupingSettings,
551+
primaryEnvironmentId,
552+
resolveEnvironmentLabel: () => null,
553+
});
554+
555+
expect(groups).toHaveLength(1);
556+
expect(groups[0]?.memberProjects.map((project) => project.id)).toEqual([
557+
mainWorktree.id,
558+
featureWorktree.id,
559+
remote.id,
560+
]);
561+
562+
const preferredProjectRef = {
563+
environmentId: primaryEnvironmentId,
564+
projectId: featureWorktree.id,
565+
};
566+
const entries = buildSidebarProjectPickerEntries({
567+
groups,
568+
preferredProjectRef,
569+
expandEnvironmentCopies: true,
570+
isEnvironmentReachable: () => true,
571+
});
572+
573+
expect(entries.map((entry) => entry.targetProject.id)).toEqual([
574+
featureWorktree.id,
575+
mainWorktree.id,
576+
remote.id,
577+
]);
578+
expect(entries.map((entry) => entry.targetProject.workspaceRoot)).toEqual([
579+
"/tmp/shared-repo-feature",
580+
"/tmp/shared-repo",
581+
"/remote/shared-repo",
582+
]);
583+
expect(entries.every((entry) => entry.isPreferred)).toBe(true);
584+
585+
const focus = resolveNewThreadPickerFocusEntry({
586+
entries,
587+
currentProjectRef: preferredProjectRef,
588+
isEnvironmentReachable: () => true,
589+
});
590+
expect(focus?.targetProject).toMatchObject({
591+
environmentId: primaryEnvironmentId,
592+
id: featureWorktree.id,
593+
workspaceRoot: "/tmp/shared-repo-feature",
594+
});
595+
});
531596
});

‎apps/web/src/sidebarProjectGrouping.ts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,25 @@ function selectExpandedPickerTargets(
175175
preferredProjectRef: ScopedProjectRef | null,
176176
isEnvironmentReachable: (environmentId: EnvironmentId) => boolean,
177177
): SidebarProjectGroupMember[] {
178-
const copies: SidebarProjectGroupMember[] = [];
179-
const seenEnvironments = new Set<EnvironmentId>();
180-
for (const member of group.memberProjects) {
181-
if (seenEnvironments.has(member.environmentId)) continue;
182-
seenEnvironments.add(member.environmentId);
183-
copies.push(member);
184-
}
185-
186-
return copies.sort((left, right) => {
178+
// memberProjects is already physical-key deduped. Same-environment worktrees
179+
// are distinct checkouts, so New Chat must keep each one instead of collapsing
180+
// by environmentId (that omitted the active worktree and created on the first).
181+
return [...group.memberProjects].sort((left, right) => {
187182
const reachDelta =
188183
Number(isEnvironmentReachable(right.environmentId)) -
189184
Number(isEnvironmentReachable(left.environmentId));
190185
if (reachDelta !== 0) return reachDelta;
191186
if (!preferredProjectRef) return 0;
187+
const preferredMemberDelta =
188+
Number(
189+
right.environmentId === preferredProjectRef.environmentId &&
190+
right.id === preferredProjectRef.projectId,
191+
) -
192+
Number(
193+
left.environmentId === preferredProjectRef.environmentId &&
194+
left.id === preferredProjectRef.projectId,
195+
);
196+
if (preferredMemberDelta !== 0) return preferredMemberDelta;
192197
return (
193198
Number(right.environmentId === preferredProjectRef.environmentId) -
194199
Number(left.environmentId === preferredProjectRef.environmentId)

0 commit comments

Comments
 (0)