The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 22:00 UTC
revert(web): restore grouped projects in the new thread selector (#22242)
Theo Browne committed
Oct 20, 2026 at 02:15 UTC
774c6c1953677094662e4ff83590e787aa19dcb2
9 files changed
+43
-234
apps/web/src/components/CommandPalette.logic.test.ts
-25
@@ -348,31 +348,6 @@ function makeThread(overrides: Partial<Thread> = {}): Thread {
348
}
349
350
describe("buildProjectActionItems", () => {
351
- it("shows offline checkout rows but excludes them from keyboard selection", () => {
352
- const local = makeProject();
353
- const remote = makeProject({
354
- id: local.id,
355
- environmentId: EnvironmentId.make("offline"),
356
- });
357
- const items = buildProjectActionItems({
358
- projects: [remote, local].map((project) => ({ ...project, displayName: "shared-repo" })),
359
- valuePrefix: "new-thread-in",
360
- icon: () => null,
361
- runProject: async () => undefined,
362
- disabled: (project) => project.environmentId === remote.environmentId,
363
- });
364
- const groups = [{ value: "projects", label: "Projects", items }];
365
- const { rows, itemValues } = buildCommandPaletteRows(groups);
366
-
367
- expect(rows.filter((row) => row.kind === "item").map((row) => row.item.value)).toEqual([
368
- `new-thread-in:${remote.environmentId}:${remote.id}`,
369
- `new-thread-in:${local.environmentId}:${local.id}`,
370
- ]);
371
- expect(itemValues).toEqual([`new-thread-in:${local.environmentId}:${local.id}`]);
372
- expect(findHighlightedCommandPaletteItem(groups, items[0]!.value)).toBeNull();
373
- expect(findHighlightedCommandPaletteItem(groups, items[1]!.value)).toBe(items[1]);
374
- });
375
-
351
it("shows the grouped display name but keeps the real title for icons", () => {
352
const project = makeProject({ title: "fleet", workspaceRoot: "/Users/theo/Code/p/fleet" });
353
const iconTitles: string[] = [];
apps/web/src/components/CommandPalette.logic.ts
-2
@@ -315,7 +315,6 @@ export function buildProjectActionItems(input: {
315
runProject: (project: CommandPaletteProject) => Promise<void>;
316
searchTerms?: (project: CommandPaletteProject) => ReadonlyArray<string>;
317
renderDescription?: (project: CommandPaletteProject) => ReactNode;
318
- disabled?: (project: CommandPaletteProject) => boolean;
318
shortcutCommand?: KeybindingCommand;
319
}): CommandPaletteActionItem[] {
320
return input.projects.map((project) => ({
@@ -330,7 +329,6 @@ export function buildProjectActionItems(input: {
329
title: project.displayName,
330
description: input.renderDescription?.(project) ?? project.workspaceRoot,
331
icon: input.icon(project),
333
- ...(input.disabled ? { disabled: input.disabled(project) } : {}),
332
...(input.shortcutCommand !== undefined ? { shortcutCommand: input.shortcutCommand } : {}),
333
run: async () => {
334
await input.runProject(project);
apps/web/src/components/CommandPalette.tsx
+28
-41
@@ -25,7 +25,7 @@ import {
25
type AddProjectRemoteSourceReadiness,
26
} from "@t3tools/client-runtime/operations/projects";
27
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
28
-import { connectionStatusText, connectionStatusTitle } from "@t3tools/client-runtime/connection";
28
+import { connectionStatusText } from "@t3tools/client-runtime/connection";
29
import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
30
import { resolveThreadReferenceCopyTarget } from "@t3tools/shared/threadReference";
31
import {
@@ -887,20 +887,6 @@ function OpenCommandPaletteDialog(props: {
887
groups: projectGroups,
888
preferredProjectRef: contextualProjectRef,
889
});
890
- const isEnvironmentReachable = (environmentId: EnvironmentId) =>
891
- environments.some(
892
- (environment) =>
893
- environment.environmentId === environmentId && environment.connection.phase === "connected",
894
- );
895
- const threadPickerProjects = buildSidebarProjectPickerEntries({
896
- groups: projectGroups,
897
- preferredProjectRef: contextualProjectRef,
898
- expandCheckouts: true,
899
- isEnvironmentReachable,
900
- }).map(({ group, targetProject }) => ({
901
- ...targetProject,
902
- displayName: group.displayName,
903
- }));
890
const pickerProjects = projectPickerEntries.map(({ group, targetProject }) => ({
891
...targetProject,
892
displayName: group.displayName,
@@ -1177,16 +1163,18 @@ function OpenCommandPaletteDialog(props: {
1163
isScratchProject(project, scratchWorkspaceRootFor(project.environmentId));
1164
const projectItems = enumerateCommandPaletteItems(
1165
buildProjectActionItems({
1180
- projects: threadPickerProjects.filter((project) => !isScratch(project)),
1166
+ projects: pickerProjects.filter((project) => !isScratch(project)),
1167
valuePrefix: "new-thread-in",
1182
- disabled: (project) => !isEnvironmentReachable(project.environmentId),
1183
- searchTerms: (project) => [
1184
- projectEnvironmentLocationById.get(project.environmentId)?.label ?? "Remote",
1185
- ],
1168
+ searchTerms: (project) => {
1169
+ const group = projectGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
1170
+ const location = projectEnvironmentLocationById.get(project.environmentId);
1171
+ return [
1172
+ ...(group?.memberProjects.flatMap((member) => [member.title, member.workspaceRoot]) ??
1173
+ []),
1174
+ ...(location ? [location.label] : []),
1175
+ ];
1176
+ },
1177
renderDescription: (project) => {
1187
- const environment = environments.find(
1188
- (candidate) => candidate.environmentId === project.environmentId,
1189
- );
1178
const location = projectEnvironmentLocationById.get(project.environmentId) ?? {
1179
kind: "remote",
1180
label: "Remote",
@@ -1206,29 +1194,30 @@ function OpenCommandPaletteDialog(props: {
1194
</span>
1195
<CommandPaletteMetaDot />
1196
<span className="truncate">{project.workspaceRoot}</span>
1209
- {isEnvironmentReachable(project.environmentId) ? null : (
1210
- <>
1211
- <CommandPaletteMetaDot />
1212
- <span className="shrink-0">
1213
- {environment ? connectionStatusTitle(environment.connection) : "Unavailable"}
1214
- </span>
1215
- </>
1216
- )}
1197
</span>
1198
);
1199
},
1200
icon: projectFaviconIcon,
1201
runProject: async (project) => {
1222
- await handleNewThread(scopeProjectRef(project.environmentId, project.id), {
1223
- environmentSelection: "manual",
1224
- });
1202
+ const group = projectGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
1203
+ const contextualRefBelongsToGroup =
1204
+ contextualProjectRef !== null &&
1205
+ group?.memberProjectRefs.some(
1206
+ (projectRef) =>
1207
+ projectRef.environmentId === contextualProjectRef.environmentId &&
1208
+ projectRef.projectId === contextualProjectRef.projectId,
1209
+ );
1210
+ await handleNewThread(
1211
+ contextualRefBelongsToGroup
1212
+ ? contextualProjectRef
1213
+ : scopeProjectRef(project.environmentId, project.id),
1214
+ );
1215
},
1216
}),
1217
);
1218
if (scratchTargetEnvironmentId === null) return projectItems;
1219
1230
- const noProjectIndex =
1231
- threadPickerProjects[0] !== undefined && isScratch(threadPickerProjects[0]) ? 0 : 1;
1220
+ const noProjectIndex = pickerProjects[0] !== undefined && isScratch(pickerProjects[0]) ? 0 : 1;
1221
return [
1222
...projectItems.slice(0, noProjectIndex),
1223
{
@@ -1631,7 +1620,7 @@ function OpenCommandPaletteDialog(props: {
1620
title: "New thread in...",
1621
icon: <SquarePenIcon className={ITEM_ICON_CLASS} />,
1622
addonIcon: <SquarePenIcon className={ADDON_ICON_CLASS} />,
1634
- groups: [{ value: "new-thread-in", label: "Projects", items: projectThreadItems }],
1623
+ groups: [{ value: "projects", label: "Projects", items: projectThreadItems }],
1624
});
1625
}
1626
@@ -1978,7 +1967,7 @@ function OpenCommandPaletteDialog(props: {
1967
case "new-thread-in":
1968
pushPaletteView({
1969
addonIcon: <SquarePenIcon className={ADDON_ICON_CLASS} />,
1981
- groups: [{ value: "new-thread-in", label: "Projects", items: projectThreadItems }],
1970
+ groups: [{ value: "projects", label: "Projects", items: projectThreadItems }],
1971
});
1972
return;
1973
case "change-theme":
@@ -2125,9 +2114,7 @@ function OpenCommandPaletteDialog(props: {
2114
? changeThemeItem.groups
2115
: currentView?.groups[0]?.value === "appearance"
2116
? changeAppearanceItem.groups
2128
- : currentView?.groups[0]?.value === "new-thread-in"
2129
- ? [{ value: "new-thread-in", label: "Projects", items: projectThreadItems }]
2130
- : (currentView?.groups ?? rootGroups);
2117
+ : (currentView?.groups ?? rootGroups);
2118
2119
const filteredGroups = filterCommandPaletteGroups({
2120
activeGroups,
apps/web/src/components/Sidebar.tsx
+3
-5
@@ -130,7 +130,6 @@ import { readLocalApi } from "../localApi";
130
import { useSidebarPendingFileDropStore } from "../sidebarPendingFileDropStore";
131
import { selectProjectGroupingSettings } from "../logicalProject";
132
import {
133
- countSidebarProjectChoices,
133
projectGroupsSpanEnvironments,
134
resolveSidebarProjectScopeKey,
135
getSidebarProjectSettingsKey,
@@ -4531,9 +4530,8 @@ export default function Sidebar() {
4530
updateThreadJumpHintsVisibility(shouldShowJumpHintsNow);
4531
}, [shouldShowJumpHintsNow, updateThreadJumpHintsVisibility]);
4532
4534
- const projectChoiceCount = countSidebarProjectChoices(projectGroups);
4533
const handleNewThreadClick = (event?: ReactMouseEvent) => {
4536
- if (shouldCreateNewThreadInCurrentProject(event?.shiftKey ?? false, projectChoiceCount)) {
4534
+ if (shouldCreateNewThreadInCurrentProject(event?.shiftKey ?? false, projectGroups.length)) {
4535
if (isMobile) setOpenMobile(false);
4536
void startNewThreadFromContext({
4537
activeDraftThread: newThreadContext.activeDraftThread,
@@ -4549,7 +4547,7 @@ export default function Sidebar() {
4547
4548
const newThreadShortcutLabel =
4549
shortcutLabelForCommand(keybindings, "chat.new") ??
4552
- (projectChoiceCount <= 1 ? shortcutLabelForCommand(keybindings, "chat.newLocal") : undefined);
4550
+ (projectGroups.length <= 1 ? shortcutLabelForCommand(keybindings, "chat.newLocal") : undefined);
4551
const newThreadInProjectShortcutLabel = shortcutLabelForCommand(keybindings, "chat.newLocal");
4552
return (
4553
<>
@@ -4691,7 +4689,7 @@ export default function Sidebar() {
4689
newThreadDisabled={projects.length === 0}
4690
newThreadShortcutLabel={newThreadShortcutLabel}
4691
newThreadInProjectShortcutLabel={newThreadInProjectShortcutLabel}
4694
- showNewThreadInProjectHint={projectChoiceCount > 1}
4692
+ showNewThreadInProjectHint={projectGroups.length > 1}
4693
searchInputRef={threadSearchInputRef}
4694
searchQuery={threadSearchQuery}
4695
onSearchQueryChange={(value) => {
apps/web/src/environmentGrouping.test.ts
-52
@@ -12,7 +12,6 @@ import {
12
buildPhysicalToLogicalProjectKeyMap,
13
buildSidebarProjectPickerEntries,
14
buildSidebarProjectSnapshots,
15
- countSidebarProjectChoices,
15
projectGroupsSpanEnvironments,
16
resolveSidebarProjectScopeKey,
17
getSidebarProjectSettingsKey,
@@ -78,10 +77,6 @@ describe("environment grouping", () => {
77
const settingsGroups = buildSidebarProjectSnapshots(input);
78
expect(filters).toHaveLength(1);
79
expect(settingsGroups).toHaveLength(2);
81
- expect([
82
- countSidebarProjectChoices(filters),
83
- countSidebarProjectChoices(settingsGroups),
84
- ]).toEqual([1, 1]);
80
expect(settingsGroups.map((group) => group.memberProjectRefs)).toEqual([
81
[{ environmentId: local.environmentId, projectId: local.id }],
82
[{ environmentId: remote.environmentId, projectId: remote.id }],
@@ -570,53 +565,6 @@ describe("environment grouping", () => {
565
});
566
});
567
573
- it("offers every physical checkout, with reachable choices before an offline preference", () => {
574
- const primary = makeProject({ repositoryIdentity });
575
- const worktree = makeProject({
576
- id: ProjectId.make("local-worktree"),
577
- workspaceRoot: "/tmp/shared-repo-feature",
578
- repositoryIdentity,
579
- });
580
- const remote = makeProject({
581
- id: worktree.id,
582
- environmentId: remoteEnvironmentId,
583
- repositoryIdentity,
584
- });
585
- const groups = buildSidebarProjectSnapshots({
586
- projects: [remote, primary, worktree],
587
- settings: defaultGroupingSettings,
588
- primaryEnvironmentId,
589
- resolveEnvironmentLabel: () => null,
590
- });
591
- expect(countSidebarProjectChoices(groups)).toBe(3);
592
- const pickerInput = {
593
- groups,
594
- expandCheckouts: true,
595
- isEnvironmentReachable: (environmentId: EnvironmentId) =>
596
- environmentId === primaryEnvironmentId,
597
- };
598
-
599
- const connectedPreference = buildSidebarProjectPickerEntries({
600
- ...pickerInput,
601
- preferredProjectRef: { environmentId: primaryEnvironmentId, projectId: worktree.id },
602
- });
603
- expect(connectedPreference.map(({ targetProject }) => targetProject)).toMatchObject([
604
- worktree,
605
- primary,
606
- remote,
607
- ]);
608
-
609
- const offlinePreference = buildSidebarProjectPickerEntries({
610
- ...pickerInput,
611
- preferredProjectRef: { environmentId: remoteEnvironmentId, projectId: remote.id },
612
- });
613
- expect(offlinePreference.map(({ targetProject }) => targetProject)).toMatchObject([
614
- primary,
615
- worktree,
616
- remote,
617
- ]);
618
- });
619
-
568
it("keeps manual project order when building grouped sidebar entries", () => {
569
const primary = makeProject({ repositoryIdentity });
570
const remote = makeProject({
apps/web/src/hooks/useHandleNewThread.test.ts
+3
-49
@@ -103,14 +103,12 @@ vi.mock("@effect/atom-react", () => ({
103
? { newWorktreesStartFromOrigin: !testState.targetSettings.newWorktreesStartFromOrigin }
104
: testServerConfigs(),
105
}));
106
-vi.mock("@t3tools/client-runtime/environment", async (importOriginal) => ({
107
- ...(await importOriginal<typeof import("@t3tools/client-runtime/environment")>()),
106
+vi.mock("@t3tools/client-runtime/environment", () => ({
107
scopedProjectKey: () => "remote-project",
108
scopeProjectRef: (environmentId: string, projectId: string) => ({ environmentId, projectId }),
109
scopeThreadRef: (environmentId: string, threadId: string) => ({ environmentId, threadId }),
110
}));
112
-vi.mock("@t3tools/contracts", async (importOriginal) => ({
113
- ...(await importOriginal<typeof import("@t3tools/contracts")>()),
111
+vi.mock("@t3tools/contracts", () => ({
112
DEFAULT_RUNTIME_MODE: "default",
113
DEFAULT_SERVER_SETTINGS: {},
114
}));
@@ -140,8 +138,7 @@ vi.mock("@tanstack/react-router", () => ({
138
useParams: () => null,
139
useRouter: () => testState.router,
140
}));
143
-vi.mock("react", async (importOriginal) => ({
144
- ...(await importOriginal<typeof import("react")>()),
141
+vi.mock("react", () => ({
142
useCallback: <T>(callback: T) => callback,
143
useMemo: <T>(factory: () => T) => factory(),
144
}));
@@ -202,49 +199,6 @@ vi.mock("../uiStateStore", () => ({
199
vi.mock("./useSettings", () => ({ useClientSettings: () => ({}) }));
200
201
import { useNewThreadHandler } from "./useHandleNewThread";
205
-import { useComposerDraftStore } from "../composerDraftStore";
206
-
207
-it("pins a reused automatic draft to the explicitly selected checkout", async () => {
208
- const { useComposerDraftStore: realDraftStore, DraftId } =
209
- await vi.importActual<typeof import("../composerDraftStore")>("../composerDraftStore");
210
- const { EnvironmentId, ProjectId, ThreadId } =
211
- await vi.importActual<typeof import("@t3tools/contracts")>("@t3tools/contracts");
212
- testState.reset(null);
213
- const draftId = DraftId.make("draft-manual-checkout");
214
- const projectRef = {
215
- environmentId: EnvironmentId.make("environment-ssh"),
216
- projectId: ProjectId.make("project-remote"),
217
- };
218
- const store = realDraftStore.getState();
219
- store.setLogicalProjectDraftThreadId(
220
- "remote-project",
221
- {
222
- environmentId: EnvironmentId.make("environment-primary"),
223
- projectId: ProjectId.make("local"),
224
- },
225
- draftId,
226
- {
227
- threadId: ThreadId.make("thread-manual-checkout"),
228
- environmentSelection: "auto",
229
- loadBalancedEnvironmentId: EnvironmentId.make("environment-primary"),
230
- },
231
- );
232
- const getState = vi.spyOn(useComposerDraftStore, "getState").mockReturnValue(store);
233
- try {
234
- const opened = await useNewThreadHandler()(projectRef, { environmentSelection: "manual" });
235
-
236
- expect(opened?.draftId).toBe(draftId);
237
- expect(store.getDraftSession(draftId)).toMatchObject({
238
- environmentId: projectRef.environmentId,
239
- projectId: projectRef.projectId,
240
- environmentSelection: "manual",
241
- loadBalancedEnvironmentId: null,
242
- });
243
- } finally {
244
- getState.mockRestore();
245
- realDraftStore.setState(store, true);
246
- }
247
-});
202
203
describe.each([
204
["new", null],
apps/web/src/hooks/useHandleNewThread.ts
-9
@@ -74,7 +74,6 @@ export function useNewThreadHandler() {
74
envMode?: DraftThreadEnvMode;
75
startFromOrigin?: boolean;
76
replace?: boolean;
77
- environmentSelection?: "manual";
77
},
78
): Promise<{ draftId: DraftId; threadId: ThreadId } | null> => {
79
const projects = readProjects();
@@ -168,10 +167,6 @@ export function useNewThreadHandler() {
167
const hasWorktreePathOption = options?.worktreePath !== undefined;
168
const hasEnvModeOption = options?.envMode !== undefined;
169
const hasStartFromOriginOption = options?.startFromOrigin !== undefined;
171
- const selectionOptions =
172
- options?.environmentSelection === "manual"
173
- ? { environmentSelection: "manual" as const, loadBalancedEnvironmentId: null }
174
- : {};
170
const storedDraftThread = getDraftSessionByLogicalProjectKey(logicalProjectKey);
171
const storedDraftThreadRef = storedDraftThread
172
? scopeThreadRef(storedDraftThread.environmentId, storedDraftThread.threadId)
@@ -272,7 +267,6 @@ export function useNewThreadHandler() {
267
projectRef,
268
emptyStoredDraftThread.draftId,
269
{
275
- ...selectionOptions,
270
threadId: emptyStoredDraftThread.threadId,
271
...workspaceContext,
272
...(!isDraftAlreadyOpen ? { runtimeMode: defaultRuntimeMode } : {}),
@@ -315,7 +309,6 @@ export function useNewThreadHandler() {
309
setDraftThreadContext(currentRouteTarget.draftId, pickExplicitWorkspaceOptions(options));
310
}
311
setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, currentRouteTarget.draftId, {
318
- ...selectionOptions,
312
threadId: latestActiveDraftThread.threadId,
313
createdAt: latestActiveDraftThread.createdAt,
314
runtimeMode: latestActiveDraftThread.runtimeMode,
@@ -347,7 +340,6 @@ export function useNewThreadHandler() {
340
readThreadShell(scopeThreadRef(racedDraft.environmentId, racedDraft.threadId)) === null
341
) {
342
setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, racedDraft.draftId, {
350
- ...selectionOptions,
343
threadId: racedDraft.threadId,
344
createdAt: racedDraft.createdAt,
345
runtimeMode: racedDraft.runtimeMode,
@@ -362,7 +354,6 @@ export function useNewThreadHandler() {
354
return { draftId: racedDraft.draftId, threadId: racedDraft.threadId };
355
}
356
setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, draftId, {
365
- ...selectionOptions,
357
threadId,
358
createdAt,
359
branch: options?.branch ?? null,
apps/web/src/routes/_chat.tsx
+9
-14
@@ -13,10 +13,7 @@ import { isPreviewAvailableFor } from "../browser/previewRuntime";
13
import { usePrimaryEnvironmentId } from "../state/environments";
14
import { useEnvironmentScope } from "../state/session";
15
import { selectProjectGroupingSettings } from "../logicalProject";
16
-import {
17
- buildSidebarProjectSnapshots,
18
- countSidebarProjectChoices,
19
-} from "../sidebarProjectGrouping";
16
+import { buildSidebarProjectSnapshots } from "../sidebarProjectGrouping";
17
import { dispatchPreviewAction } from "../components/preview/previewActionBus";
18
import { useHandleNewThread } from "../hooks/useHandleNewThread";
19
import { useScratchProject } from "../hooks/useScratchProject";
@@ -49,14 +46,12 @@ function ChatRouteGlobalShortcuts() {
46
const projects = useProjects();
47
const primaryEnvironmentId = usePrimaryEnvironmentId();
48
const { scratchEnvironmentId, startScratchThread } = useScratchProject();
52
- const projectChoiceCount = countSidebarProjectChoices(
53
- buildSidebarProjectSnapshots({
54
- projects,
55
- settings: projectGroupingSettings,
56
- primaryEnvironmentId,
57
- resolveEnvironmentLabel: () => null,
58
- }),
59
- );
49
+ const projectGroupCount = buildSidebarProjectSnapshots({
50
+ projects,
51
+ settings: projectGroupingSettings,
52
+ primaryEnvironmentId,
53
+ resolveEnvironmentLabel: () => null,
54
+ }).length;
55
const terminalOpen = useTerminalUiStateStore((state) =>
56
routeThreadRef
57
? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
@@ -129,7 +124,7 @@ function ChatRouteGlobalShortcuts() {
124
if (command === "chat.new") {
125
event.preventDefault();
126
event.stopPropagation();
132
- if (!legacySidebarEnabled && projectChoiceCount > 1) {
127
+ if (!legacySidebarEnabled && projectGroupCount > 1) {
128
openCommandPalette({ open: "new-thread-in" });
129
return;
130
}
@@ -198,7 +193,7 @@ function ChatRouteGlobalShortcuts() {
193
defaultProjectRef,
194
previewOpen,
195
primaryEnvironmentId,
201
- projectChoiceCount,
196
+ projectGroupCount,
197
routeThreadRef,
198
scratchEnvironmentId,
199
selectedThreadKeysSize,
apps/web/src/sidebarProjectGrouping.ts
-37
@@ -26,18 +26,6 @@ export interface SidebarProjectSnapshot extends Project {
26
remoteEnvironmentLabels: readonly string[];
27
}
28
29
-export function countSidebarProjectChoices(groups: ReadonlyArray<SidebarProjectSnapshot>): number {
30
- let checkoutCount = 0;
31
- let hasScratch = false;
32
- for (const group of groups) {
33
- for (const project of group.memberProjects) {
34
- if (project.isScratch) hasScratch = true;
35
- else checkoutCount += 1;
36
- }
37
- }
38
- return checkoutCount + Number(hasScratch);
39
-}
40
-
29
export function projectGroupsSpanEnvironments(
30
groups: ReadonlyArray<Pick<SidebarProjectSnapshot, "memberProjects">>,
31
): boolean {
@@ -185,33 +173,8 @@ export function buildSidebarProjectSnapshots(input: {
173
export function buildSidebarProjectPickerEntries(input: {
174
groups: ReadonlyArray<SidebarProjectSnapshot>;
175
preferredProjectRef: ScopedProjectRef | null;
188
- expandCheckouts?: boolean;
189
- isEnvironmentReachable?: (environmentId: EnvironmentId) => boolean;
176
}) {
177
const preferredProjectRef = input.preferredProjectRef;
192
- if (input.expandCheckouts) {
193
- // memberProjects already deduplicates physical checkouts. Keep distinct
194
- // worktrees on the same environment as separate choices.
195
- return input.groups
196
- .flatMap((group) =>
197
- group.memberProjects.map((targetProject): SidebarProjectPickerEntry => ({
198
- group,
199
- targetProject,
200
- isPreferred:
201
- preferredProjectRef !== null &&
202
- targetProject.environmentId === preferredProjectRef.environmentId &&
203
- targetProject.id === preferredProjectRef.projectId,
204
- })),
205
- )
206
- .toSorted((left, right) => {
207
- const reachability = input.isEnvironmentReachable;
208
- const reachableDelta = reachability
209
- ? Number(reachability(right.targetProject.environmentId)) -
210
- Number(reachability(left.targetProject.environmentId))
211
- : 0;
212
- return reachableDelta || Number(right.isPreferred) - Number(left.isPreferred);
213
- });
214
- }
178
const entries = input.groups.flatMap((group): SidebarProjectPickerEntry[] => {
179
const isPreferred = preferredProjectRef
180
? group.memberProjectRefs.some(