Skip to content

Commit 3b70150

Browse files
committed
fix(web): New Chat targets a reachable copy, keeps worktrees
The New Chat picker collapsed same-repo copies onto the selected chat's environment. Clicking that row while a remote was reconnecting waited forever on t3.json. List every checkout (including same-environment worktrees), skip the file read unless the target is connected, retarget to a reachable sibling when one exists, and toast when the only copy is down. Fixes #12093
1 parent 1de563c commit 3b70150

7 files changed

Lines changed: 679 additions & 80 deletions

File tree

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore"
191191
import {
192192
buildSidebarProjectPickerEntries,
193193
buildSidebarProjectSnapshots,
194+
resolveNewThreadPickerFocusEntry,
194195
} from "../sidebarProjectGrouping";
195196
import type { Project } from "../types";
196197
import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
@@ -933,6 +934,34 @@ function OpenCommandPaletteDialog(props: {
933934
}),
934935
[contextualProjectRef, projectGroups],
935936
);
937+
const isEnvironmentReachable = useCallback(
938+
(environmentId: EnvironmentId) =>
939+
canCreateProjectInEnvironment(
940+
environments.find((environment) => environment.environmentId === environmentId)?.connection
941+
.phase,
942+
),
943+
[environments],
944+
);
945+
const newThreadPickerEntries = useMemo(
946+
() =>
947+
buildSidebarProjectPickerEntries({
948+
groups: projectGroups,
949+
preferredProjectRef: contextualProjectRef,
950+
expandEnvironmentCopies: true,
951+
isEnvironmentReachable,
952+
}),
953+
[contextualProjectRef, isEnvironmentReachable, projectGroups],
954+
);
955+
const newThreadGroupByTargetKey = useMemo(
956+
() =>
957+
new Map(
958+
newThreadPickerEntries.map(({ group, targetProject }) => [
959+
`${targetProject.environmentId}:${targetProject.id}`,
960+
group,
961+
]),
962+
),
963+
[newThreadPickerEntries],
964+
);
936965
const pickerProjects = useMemo(
937966
() =>
938967
projectPickerEntries.map(({ group, targetProject }) => ({
@@ -1260,10 +1289,13 @@ function OpenCommandPaletteDialog(props: {
12601289
() =>
12611290
enumerateCommandPaletteItems(
12621291
buildProjectActionItems({
1263-
projects: pickerProjects,
1292+
projects: newThreadPickerEntries.map(({ group, targetProject }) => ({
1293+
...targetProject,
1294+
displayName: group.displayName,
1295+
})),
12641296
valuePrefix: "new-thread-in",
12651297
searchTerms: (project) => {
1266-
const group = projectGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
1298+
const group = newThreadGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
12671299
const location = projectEnvironmentLocationById.get(project.environmentId);
12681300
return [
12691301
...(group?.memberProjects.flatMap((member) => [member.title, member.workspaceRoot]) ??
@@ -1296,28 +1328,29 @@ function OpenCommandPaletteDialog(props: {
12961328
},
12971329
icon: projectFavicon,
12981330
runProject: async (project) => {
1299-
const group = projectGroupByTargetKey.get(`${project.environmentId}:${project.id}`);
1300-
const contextualRefBelongsToGroup =
1301-
contextualProjectRef !== null &&
1302-
group?.memberProjectRefs.some(
1303-
(projectRef) =>
1304-
projectRef.environmentId === contextualProjectRef.environmentId &&
1305-
projectRef.projectId === contextualProjectRef.projectId,
1306-
);
1307-
await handleNewThread(
1308-
contextualRefBelongsToGroup
1309-
? contextualProjectRef
1310-
: scopeProjectRef(project.environmentId, project.id),
1331+
const environment = environments.find(
1332+
(candidate) => candidate.environmentId === project.environmentId,
13111333
);
1334+
if (!canCreateProjectInEnvironment(environment?.connection.phase)) {
1335+
toastManager.add(
1336+
stackedThreadToast({
1337+
type: "error",
1338+
title: "Environment unavailable",
1339+
description: `${environment?.label ?? "The selected environment"} is not connected.`,
1340+
}),
1341+
);
1342+
return;
1343+
}
1344+
await handleNewThread(scopeProjectRef(project.environmentId, project.id));
13121345
},
13131346
}),
13141347
),
13151348
[
1316-
contextualProjectRef,
1349+
environments,
13171350
handleNewThread,
1318-
pickerProjects,
1351+
newThreadGroupByTargetKey,
1352+
newThreadPickerEntries,
13191353
projectEnvironmentLocationById,
1320-
projectGroupByTargetKey,
13211354
],
13221355
);
13231356

@@ -1705,10 +1738,18 @@ function OpenCommandPaletteDialog(props: {
17051738
setAddProjectCloneFlow(null);
17061739
setViewStack([]);
17071740
setQuery("");
1708-
const currentPrefix =
1741+
const currentProjectRef =
17091742
currentProjectEnvironmentId && currentProjectId
1710-
? `new-thread-in:${currentProjectEnvironmentId}:${currentProjectId}`
1743+
? scopeProjectRef(currentProjectEnvironmentId, currentProjectId)
17111744
: null;
1745+
const focusEntry = resolveNewThreadPickerFocusEntry({
1746+
entries: newThreadPickerEntries,
1747+
currentProjectRef,
1748+
isEnvironmentReachable,
1749+
});
1750+
const currentPrefix = focusEntry
1751+
? `new-thread-in:${focusEntry.targetProject.environmentId}:${focusEntry.targetProject.id}`
1752+
: null;
17121753
const prioritized = currentPrefix
17131754
? [
17141755
...projectThreadItems.filter((item) => item.value === currentPrefix),
@@ -1730,6 +1771,8 @@ function OpenCommandPaletteDialog(props: {
17301771
browseNavigation,
17311772
currentProjectEnvironmentId,
17321773
currentProjectId,
1774+
isEnvironmentReachable,
1775+
newThreadPickerEntries,
17331776
openIntent,
17341777
projectThreadItems,
17351778
pushPaletteView,

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

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
buildSidebarProjectPickerEntries,
1414
buildSidebarProjectSnapshots,
1515
projectGroupsSpanEnvironments,
16+
resolveNewThreadPickerFocusEntry,
1617
} from "./sidebarProjectGrouping";
1718
import { orderItemsByPreferredIds } from "./components/Sidebar.logic";
1819
import { legacyProjectCwdPreferenceKey } from "./uiStateStore";
@@ -457,4 +458,139 @@ describe("environment grouping", () => {
457458

458459
expect(groups.map((group) => group.displayName)).toEqual(["separate", "shared-repo"]);
459460
});
461+
462+
it("expands grouped checkouts into one New Chat row per copy, reachable first", () => {
463+
const primary = makeProject({ repositoryIdentity });
464+
const remote = makeProject({
465+
id: ProjectId.make("project-remote"),
466+
environmentId: remoteEnvironmentId,
467+
repositoryIdentity,
468+
});
469+
const groups = buildSidebarProjectSnapshots({
470+
projects: [primary, remote],
471+
settings: defaultGroupingSettings,
472+
primaryEnvironmentId,
473+
resolveEnvironmentLabel: () => null,
474+
});
475+
476+
const entries = buildSidebarProjectPickerEntries({
477+
groups,
478+
preferredProjectRef: {
479+
environmentId: remoteEnvironmentId,
480+
projectId: remote.id,
481+
},
482+
expandEnvironmentCopies: true,
483+
isEnvironmentReachable: (environmentId) => environmentId === primaryEnvironmentId,
484+
});
485+
486+
expect(entries).toHaveLength(2);
487+
expect(entries.map((entry) => entry.targetProject.environmentId)).toEqual([
488+
primaryEnvironmentId,
489+
remoteEnvironmentId,
490+
]);
491+
expect(entries.every((entry) => entry.isPreferred)).toBe(true);
492+
});
493+
494+
it("focuses a reachable sibling when the selected New Chat copy is down", () => {
495+
const primary = makeProject({ repositoryIdentity });
496+
const remote = makeProject({
497+
id: ProjectId.make("project-remote"),
498+
environmentId: remoteEnvironmentId,
499+
repositoryIdentity,
500+
});
501+
const groups = buildSidebarProjectSnapshots({
502+
projects: [primary, remote],
503+
settings: defaultGroupingSettings,
504+
primaryEnvironmentId,
505+
resolveEnvironmentLabel: () => null,
506+
});
507+
const entries = buildSidebarProjectPickerEntries({
508+
groups,
509+
preferredProjectRef: {
510+
environmentId: remoteEnvironmentId,
511+
projectId: remote.id,
512+
},
513+
expandEnvironmentCopies: true,
514+
isEnvironmentReachable: (environmentId) => environmentId === primaryEnvironmentId,
515+
});
516+
517+
const focus = resolveNewThreadPickerFocusEntry({
518+
entries,
519+
currentProjectRef: {
520+
environmentId: remoteEnvironmentId,
521+
projectId: remote.id,
522+
},
523+
isEnvironmentReachable: (environmentId) => environmentId === primaryEnvironmentId,
524+
});
525+
526+
expect(focus?.targetProject).toMatchObject({
527+
environmentId: primaryEnvironmentId,
528+
id: primary.id,
529+
});
530+
});
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+
});
460596
});

0 commit comments

Comments
 (0)