Skip to content

Commit a6d00ed

Browse files
committed
fix(client): retain scratch filters through config and host changes
1 parent dd3eb10 commit a6d00ed

9 files changed

Lines changed: 170 additions & 17 deletions

File tree

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,13 @@ export function HomeRouteScreen() {
104104
useHomeListOptions(availableEnvironmentIds);
105105
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
106106
const [projectScopeKey, setSelectedProjectKey] = useState<string | null>(null);
107-
const selectedProjectKey = resolveScratchProjectScopeKey(projectScopeKey, projects);
107+
const selectedProjectKey = resolveScratchProjectScopeKey(projectScopeKey, projects, {
108+
sidebarProjectGroupingMode: listOptions.projectGroupingMode,
109+
sidebarProjectGroupingOverrides: {},
110+
});
111+
if (selectedProjectKey !== projectScopeKey) {
112+
setSelectedProjectKey(selectedProjectKey);
113+
}
108114
const projectFilterOptions = useMemo(
109115
() =>
110116
buildHomeProjectScopes({

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,13 @@ function ThreadNavigationSidebarPane(
207207
[threadSearch.matches],
208208
);
209209
const [projectScopeKey, setSelectedProjectKey] = useState<string | null>(null);
210-
const selectedProjectKey = resolveScratchProjectScopeKey(projectScopeKey, projects);
210+
const selectedProjectKey = resolveScratchProjectScopeKey(projectScopeKey, projects, {
211+
sidebarProjectGroupingMode: options.projectGroupingMode,
212+
sidebarProjectGroupingOverrides: {},
213+
});
214+
if (selectedProjectKey !== projectScopeKey) {
215+
setSelectedProjectKey(selectedProjectKey);
216+
}
211217
const projectScopes = useMemo(
212218
() =>
213219
buildHomeProjectScopes({

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ import {
157157
useThreadShells,
158158
} from "../state/entities";
159159
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
160+
import { environmentProjects } from "../state/projects";
160161
import { vcsEnvironment } from "../state/vcs";
161162
import { threadEnvironment } from "../state/threads";
162163
import { useEnvironmentQuery } from "../state/query";
@@ -2578,8 +2579,13 @@ export default function Sidebar() {
25782579
const persistedProjectScopeKey = useUiStateStore((store) => store.sidebarProjectScopeKey);
25792580
const setProjectScopeKey = useUiStateStore((store) => store.setSidebarProjectScopeKey);
25802581
const projectScopeKey = useMemo(
2581-
() => resolveSidebarProjectScopeKey({ groups: projectGroups, key: persistedProjectScopeKey }),
2582-
[persistedProjectScopeKey, projectGroups],
2582+
() =>
2583+
resolveSidebarProjectScopeKey({
2584+
groups: projectGroups,
2585+
key: persistedProjectScopeKey,
2586+
settings: projectGroupingSettings,
2587+
}),
2588+
[persistedProjectScopeKey, projectGroups, projectGroupingSettings],
25832589
);
25842590
// {value, label} items let Base UI drive the combobox selection contract
25852591
// while the popup search filters the same collection.
@@ -2652,13 +2658,12 @@ export default function Sidebar() {
26522658
// Configs identify scratch projects, so both they and live project snapshots
26532659
// must arrive before a persisted scope can be considered missing.
26542660
const allProjectSnapshotsReady = useAllEnvironmentProjectSnapshotsReady();
2655-
const allProjectConfigsReady = environments.every((environment) =>
2656-
serverConfigs.has(environment.environmentId),
2657-
);
2661+
const allProjectConfigsReady = useAtomValue(environmentProjects.projectConfigsReadyAtom);
26582662
useEffect(() => {
26592663
const nextKey = resolveSidebarProjectScopeKey({
26602664
groups: projectGroups,
26612665
key: persistedProjectScopeKey,
2666+
settings: projectGroupingSettings,
26622667
canClearMissingScope: allProjectSnapshotsReady && allProjectConfigsReady,
26632668
});
26642669
if (nextKey !== persistedProjectScopeKey) {
@@ -2669,6 +2674,7 @@ export default function Sidebar() {
26692674
allProjectSnapshotsReady,
26702675
persistedProjectScopeKey,
26712676
projectGroups,
2677+
projectGroupingSettings,
26722678
setProjectScopeKey,
26732679
]);
26742680
// Count-only subscription: the parent needs "are there draft rows" for the

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,44 @@ function makeProject(overrides: Partial<Project> = {}): Project {
5353
}
5454

5555
describe("environment grouping", () => {
56+
it.each(["repository", "repository_path"] as const)(
57+
"migrates a scratch scope selected before config in %s mode",
58+
(mode) => {
59+
const project = makeProject({
60+
workspaceRoot: "/repo/scratch",
61+
repositoryIdentity: { ...repositoryIdentity, rootPath: "/repo" },
62+
});
63+
const settings = { ...defaultGroupingSettings, sidebarProjectGroupingMode: mode };
64+
const key = deriveLogicalProjectKeyFromSettings(project, settings);
65+
const groups = buildSidebarProjectSnapshots({
66+
projects: [{ ...project, isScratch: true }],
67+
settings,
68+
primaryEnvironmentId,
69+
resolveEnvironmentLabel: () => null,
70+
});
71+
expect(
72+
resolveSidebarProjectScopeKey({ groups, key, settings, canClearMissingScope: true }),
73+
).toBe(groups[0]?.projectKey);
74+
},
75+
);
76+
77+
it("prefers an existing ordinary repository scope over a scratch alias", () => {
78+
const scratch = makeProject({ isScratch: true, repositoryIdentity });
79+
const ordinary = makeProject({
80+
id: ProjectId.make("ordinary"),
81+
workspaceRoot: "/ordinary",
82+
repositoryIdentity,
83+
});
84+
const groups = buildSidebarProjectSnapshots({
85+
projects: [scratch, ordinary],
86+
settings: defaultGroupingSettings,
87+
primaryEnvironmentId,
88+
resolveEnvironmentLabel: () => null,
89+
});
90+
const key = deriveLogicalProjectKeyFromSettings(ordinary, defaultGroupingSettings);
91+
expect(resolveSidebarProjectScopeKey({ groups, key, canClearMissingScope: true })).toBe(key);
92+
});
93+
5694
it("keeps both scratch hosts in one filter and migrates a physical scope after config loads", () => {
5795
const projects = [
5896
makeProject({ title: "No project", workspaceRoot: "/local/scratch" }),

‎apps/web/src/sidebarProjectGrouping.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@ export interface SidebarProjectPickerEntry {
5050
export function resolveSidebarProjectScopeKey(input: {
5151
readonly groups: ReadonlyArray<SidebarProjectSnapshot>;
5252
readonly key: string | null;
53+
readonly settings?: ProjectGroupingSettings;
5354
readonly canClearMissingScope?: boolean;
5455
}): string | null {
5556
if (input.key === null) return null;
56-
const group = input.groups.find(
57-
(candidate) =>
58-
candidate.projectKey === input.key ||
59-
(candidate.isScratch &&
60-
resolveScratchProjectScopeKey(input.key, candidate.memberProjects) ===
61-
candidate.projectKey),
62-
);
57+
const group =
58+
input.groups.find((candidate) => candidate.projectKey === input.key) ??
59+
input.groups.find(
60+
(candidate) =>
61+
candidate.isScratch &&
62+
resolveScratchProjectScopeKey(input.key, candidate.memberProjects, input.settings) ===
63+
candidate.projectKey,
64+
);
6365
return group?.projectKey ?? (input.canClearMissingScope ? null : input.key);
6466
}
6567

‎packages/client-runtime/src/state/projectEntities.test.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,38 @@ function makeHarness(withConfig = true) {
5151
snapshotAtom,
5252
...(withConfig ? { serverConfigValueAtom: configAtom } : {}),
5353
});
54-
return { registry: AtomRegistry.make(), projects, configAtom, snapshotAtom };
54+
return { registry: AtomRegistry.make(), projects, configAtom, snapshotAtom, catalogValueAtom };
5555
}
5656

5757
describe("project scratch identity", () => {
58+
it("waits for enabled project configs and ignores a disabled environment with no config", () => {
59+
const { registry, projects, configAtom, catalogValueAtom } = makeHarness();
60+
try {
61+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(false);
62+
registry.set(configAtom(environmentId), { scratchWorkspaceRoot: v2Project.workspaceRoot });
63+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(false);
64+
const catalog = registry.get(catalogValueAtom);
65+
registry.set(catalogValueAtom, {
66+
...catalog,
67+
entries: new Map(
68+
[...catalog.entries].map(([id, entry]) => [
69+
id,
70+
{ ...entry, enabled: id === environmentId },
71+
]),
72+
),
73+
});
74+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(true);
75+
registry.set(catalogValueAtom, catalog);
76+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(false);
77+
registry.set(configAtom(remoteEnvironmentId), {});
78+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(true);
79+
registry.set(catalogValueAtom, { ...catalog, isReady: false });
80+
expect(registry.get(projects.projectConfigsReadyAtom)).toBe(false);
81+
} finally {
82+
registry.dispose();
83+
}
84+
});
85+
5886
it("updates a loaded project when config arrives, preserving unrelated projects and snapshots", () => {
5987
const { registry, projects, configAtom, snapshotAtom } = makeHarness();
6088
try {

‎packages/client-runtime/src/state/projectEntities.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,24 @@ export function createEnvironmentProjectAtoms(input: {
115115
return previousProjects;
116116
}).pipe(Atom.withLabel("environment-project-list"));
117117

118+
const projectConfigsReadyAtom = Atom.make((get) => {
119+
const catalog = get(input.catalogValueAtom);
120+
if (!catalog.isReady) return false;
121+
for (const environmentId of enabledEnvironmentIds(catalog)) {
122+
if (input.serverConfigValueAtom && get(input.serverConfigValueAtom(environmentId)) === null) {
123+
return false;
124+
}
125+
}
126+
return true;
127+
}).pipe(Atom.withLabel("environment-project-configs-ready"));
128+
118129
return {
119130
environmentProjectsAtom,
120131
environmentProjectIndexAtom,
121132
environmentProjectRefsAtom,
122133
projectRefsAtom,
123134
projectsAtom,
135+
projectConfigsReadyAtom,
124136
projectAtom: (ref: ScopedProjectRef) => projectAtomFamily(projectKey(ref)),
125137
};
126138
}

‎packages/client-runtime/src/state/projectGrouping.test.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type { EnvironmentProject } from "./models.ts";
55
import { chooseLoadBalancedEnvironment } from "../load-balancing.ts";
66
import {
77
buildProjectGroups,
8+
deriveLogicalProjectKeyFromSettings,
89
derivePhysicalProjectKey,
910
resolveScratchProjectScopeKey,
1011
type ProjectGroupingSettings,
@@ -118,6 +119,43 @@ function settings(
118119
}
119120

120121
describe("buildProjectGroups", () => {
122+
it.each(["repository", "repository_path", "separate"] as const)(
123+
"migrates a pre-config %s scratch selection and retains it after the original host is removed",
124+
(mode) => {
125+
const local = makeProject("scratch-local", "/local/repo/scratch", {
126+
repositoryIdentity: { ...repositoryIdentity, rootPath: "/local/repo" },
127+
});
128+
const remote = makeProject("scratch-remote", "/remote/scratch", {
129+
environmentId: EnvironmentId.make("remote"),
130+
repositoryIdentity: null,
131+
isScratch: true,
132+
});
133+
const groupingSettings = settings(mode);
134+
const selectedBeforeConfig = deriveLogicalProjectKeyFromSettings(local, groupingSettings);
135+
const loaded = [{ ...local, isScratch: true as const }, remote];
136+
const migrated = resolveScratchProjectScopeKey(
137+
selectedBeforeConfig,
138+
loaded,
139+
groupingSettings,
140+
);
141+
const scratchKey = buildProjectGroups({ projects: loaded, settings: groupingSettings })[0]!
142+
.key;
143+
expect(migrated).toBe(scratchKey);
144+
expect(resolveScratchProjectScopeKey(migrated, [remote], groupingSettings)).toBe(scratchKey);
145+
expect(
146+
buildProjectGroups({ projects: [remote], settings: groupingSettings })[0]
147+
?.memberProjectRefs,
148+
).toEqual([{ environmentId: remote.environmentId, projectId: remote.id }]);
149+
},
150+
);
151+
152+
it("retains a repository filter that still belongs to an ordinary project", () => {
153+
const scratch = makeProject("scratch", "/scratch", { isScratch: true });
154+
const ordinary = makeProject("ordinary", "/ordinary");
155+
const key = deriveLogicalProjectKeyFromSettings(ordinary, settings("repository"));
156+
expect(resolveScratchProjectScopeKey(key, [scratch, ordinary])).toBe(key);
157+
});
158+
121159
it.each(["repository", "repository_path", "separate"] as const)(
122160
"coalesces scratch homes in %s mode without merging ordinary same-title projects",
123161
(mode) => {

‎packages/client-runtime/src/state/projectGrouping.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,28 @@ export function deriveLogicalProjectKeyFromSettings(
164164
export function resolveScratchProjectScopeKey(
165165
key: string | null,
166166
projects: ReadonlyArray<
167-
Pick<EnvironmentProject, "environmentId" | "workspaceRoot" | "isScratch">
167+
Pick<
168+
EnvironmentProject,
169+
"environmentId" | "id" | "workspaceRoot" | "repositoryIdentity" | "isScratch"
170+
>
168171
>,
172+
settings: ProjectGroupingSettings = {
173+
sidebarProjectGroupingMode: "repository",
174+
sidebarProjectGroupingOverrides: {},
175+
},
169176
): string | null {
170177
if (key === null || key === SCRATCH_PROJECT_SCOPE_KEY) return key;
171-
return projects.some((project) => project.isScratch && derivePhysicalProjectKey(project) === key)
178+
if (projects.some((project) => deriveLogicalProjectKeyFromSettings(project, settings) === key)) {
179+
return key;
180+
}
181+
return projects.some((project) => {
182+
if (!project.isScratch) return false;
183+
const mode = resolveProjectGroupingMode(project, settings);
184+
return (
185+
derivePhysicalProjectKey(project) === key ||
186+
(mode !== "separate" && deriveRepositoryScopedKey(project, mode) === key)
187+
);
188+
})
172189
? SCRATCH_PROJECT_SCOPE_KEY
173190
: key;
174191
}

0 commit comments

Comments
 (0)