Restore project grouping across hosts (#2565)
* fix(projects): restore cross-host grouping Random host-local project IDs replaced the remote-derived value that had also served as grouping identity. Persist a separate opaque group key and let normal boot reconciliation backfill older records without a migration. * fix(projects): keep ambiguous clones separate A shared remote can identify a project across hosts, but it cannot distinguish two independent clones on one host. Treat those keys as ambiguous so host-local project IDs remain separate. * fix(projects): preserve host-local project identity * fix(projects): strengthen grouping identity * test(app): update project host shape contract * fix(projects): preserve selected host identity * fix(projects): close grouped routing gaps * fix(projects): stabilize legacy subproject grouping * fix(projects): preserve selected project identity * fix(projects): isolate legacy host identity * fix(projects): preserve symlinked bootstrap roots * fix(projects): reconcile grouped custom names * fix(projects): stabilize settings and path identity * fix(projects): normalize default remote ports * fix(projects): harden host and remote identity * fix(projects): preserve host-scoped actions * fix(projects): preserve remote path semantics * fix(projects): model SCP remote semantics * fix(projects): keep settings on routed host * fix(projects): preserve SSH URL path semantics * fix(projects): separate identity from presentation * test(projects): use grouped identity in UI specs * fix(projects): harden grouped project routing * test(projects): expect framed settings route * fix(projects): preserve exact placement identity * fix(projects): harden grouping identity and routing * fix(projects): restore project key as grouping identity Random host-local project IDs had replaced the persisted cross-host value carried by projectKey. Keep projectId for routing while reconciliation owns and persists projectKey for grouping. * fix(projects): prevent project key collisions Preserve platform path semantics and generic remote transports in cross-host keys, and compare legacy checkout roots using filesystem equivalence before materializing ownership. * test(projects): assert host-scoped project keys * fix(projects): preserve project key compatibility Resolve legacy workspace project references at the daemon boundary while keeping projectKey as the cross-host identity. Complete generic SSH normalization without collapsing distinct repositories. * fix(projects): harden project reference identity * fix(projects): retain archived reference errors * fix(projects): scope legacy paths to hosts * test(app): model persisted project keys * fix(projects): retain absolute scp users * fix(projects): resolve legacy mutation aliases * fix(projects): preserve conservative identity boundaries * fix(projects): preserve legacy placement identity * test(projects): assert legacy placement identity * test(projects): expect canonical Windows keys * fix(projects): separate bootstrap identity fields * fix(projects): scope legacy paths by host * fix(projects): stabilize opaque project identity * fix(projects): preserve remaining opaque identities * fix(projects): classify forward-slash UNC roots * fix(projects): preserve opaque selection keys * fix(projects): frame host-local project keys * fix(projects): canonicalize framed identities * test(projects): isolate repeated remote fixtures * fix(projects): keep project key as UI identity * fix(projects): reconcile hydrated project references * fix(projects): preserve archived project identity * refactor(projects): group projects from project records, not workspaces Cross-host grouping had been built by hanging a projectKey off every workspace descriptor. That scoped the key to the wrong entity: the app then had to reconstruct project identity per workspace in six modules, which forced projectKey fallbacks into RPC arguments and a server-side resolver that turned grouping keys back into project ids. A workspace has a projectId. The key belongs to the project, and grouping is a display concern, so the daemon now publishes projects over project.list plus the existing project.update channel and the app groups them in one place. Projects are addressed by host-local projectId everywhere, including the settings route. Projects persisted without a key are backfilled by ordinary boot reconciliation, with no migration. Old daemons advertise no projectList capability and simply do not group. * test(projects): seed projects alongside workspaces in fixtures Sidebar fixtures seeded workspaces without their projects, which the daemon cannot produce now that projects arrive on their own channel, so nothing rendered. Adds a seeding helper that supplies both. Also drops the provisioning test for accepting a project key where a project id belongs; that resolver was removed deliberately. * fix(projects): keep derived project identity stable Four gaps left by shrinking the key derivation: Local keys used a bare path resolve, so one directory reached by a different spelling produced a different key and reset grouped identity. Windows CI caught this with the 8.3 and long-name forms of one temp path. Canonicalize through the shared realpath-aware normalization. Subproject display names lost their selected-path input, so every subproject of a monorepo rendered under the same remote-derived name. Reconciliation only ever backfilled a missing key, so a project whose remote changed stayed grouped with hosts on the old remote. Project settings kept a disconnected host selected and rendered a dead end with no way back to an editable host. * fix(projects): read scheme remotes as URLs, not scp form An `ssh://user@host:22/org/repo` remote matched the scp-form pattern first, because `[^@]+` happily eats `ssh://git`, so the port landed in the path and the project keyed as `remote:host/22/org/repo`. Two spellings of one remote therefore never grouped. Try scp form only when there is no scheme, and drop protocol-default ports so an explicitly written `:22` matches the same remote without it.
This commit is contained in:
Mohamed Boudra
@@ -0,0 +1,147 @@
|
||||
import { describe, expect, test } from "vitest";
|
||||
import type { ProjectDescriptor, WorkspaceDescriptor } from "@/stores/session-store";
|
||||
import { buildWorkspaceStructureProjects } from "./workspace-structure";
|
||||
|
||||
function project(input: {
|
||||
id: string;
|
||||
key: string | null;
|
||||
root: string;
|
||||
name?: string;
|
||||
}): ProjectDescriptor {
|
||||
return {
|
||||
projectId: input.id,
|
||||
projectKey: input.key,
|
||||
projectDisplayName: input.name ?? "acme/app",
|
||||
projectCustomName: null,
|
||||
projectRootPath: input.root,
|
||||
projectKind: "git",
|
||||
};
|
||||
}
|
||||
|
||||
function workspace(id: string, projectId: string, root: string): WorkspaceDescriptor {
|
||||
return {
|
||||
id,
|
||||
projectId,
|
||||
projectDisplayName: "acme/app",
|
||||
projectCustomName: null,
|
||||
projectRootPath: root,
|
||||
workspaceDirectory: root,
|
||||
projectKind: "git",
|
||||
workspaceKind: "local_checkout",
|
||||
name: "main",
|
||||
status: "done",
|
||||
statusEnteredAt: null,
|
||||
archivingAt: null,
|
||||
diffStat: null,
|
||||
scripts: [],
|
||||
};
|
||||
}
|
||||
|
||||
describe("buildWorkspaceStructureProjects", () => {
|
||||
test("groups the same project key across hosts and keeps host-local ids", () => {
|
||||
const key = "remote:github.com/acme/app";
|
||||
const result = buildWorkspaceStructureProjects({
|
||||
sessions: [
|
||||
{
|
||||
serverId: "host-a",
|
||||
projects: [project({ id: "prj_a", key, root: "/a/app" })],
|
||||
workspaces: [workspace("ws-a", "prj_a", "/a/app")],
|
||||
},
|
||||
{
|
||||
serverId: "host-b",
|
||||
projects: [project({ id: "prj_b", key, root: "/b/app" })],
|
||||
workspaces: [workspace("ws-b", "prj_b", "/b/app")],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(result).toHaveLength(1);
|
||||
expect(result[0]).toMatchObject({
|
||||
projectKey: key,
|
||||
hosts: [
|
||||
{ serverId: "host-a", projectId: "prj_a" },
|
||||
{ serverId: "host-b", projectId: "prj_b" },
|
||||
],
|
||||
workspaceKeys: ["host-a:ws-a", "host-b:ws-b"],
|
||||
});
|
||||
});
|
||||
|
||||
test("keeps two clones with the same key on one host separate", () => {
|
||||
const key = "remote:github.com/acme/app";
|
||||
const result = buildWorkspaceStructureProjects({
|
||||
sessions: [
|
||||
{
|
||||
serverId: "host-a",
|
||||
projects: [
|
||||
project({ id: "prj_one", key, root: "/repos/one" }),
|
||||
project({ id: "prj_two", key, root: "/repos/two" }),
|
||||
],
|
||||
workspaces: [
|
||||
workspace("ws-one", "prj_one", "/repos/one"),
|
||||
workspace("ws-two", "prj_two", "/repos/two"),
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(result).toHaveLength(2);
|
||||
expect(result.map((item) => item.hosts[0]?.projectId).sort()).toEqual(["prj_one", "prj_two"]);
|
||||
expect(result.map((item) => item.workspaceKeys[0]).sort()).toEqual([
|
||||
"host-a:ws-one",
|
||||
"host-a:ws-two",
|
||||
]);
|
||||
});
|
||||
|
||||
test("does not let project order choose which same-host clone groups with another host", () => {
|
||||
const key = "remote:github.com/acme/app";
|
||||
const hostAProjects = [
|
||||
project({ id: "prj_one", key, root: "/repos/one" }),
|
||||
project({ id: "prj_two", key, root: "/repos/two" }),
|
||||
];
|
||||
const build = (projects: ProjectDescriptor[]) =>
|
||||
buildWorkspaceStructureProjects({
|
||||
sessions: [
|
||||
{ serverId: "host-a", projects, workspaces: [] },
|
||||
{
|
||||
serverId: "host-b",
|
||||
projects: [project({ id: "prj_remote", key, root: "/repos/remote" })],
|
||||
workspaces: [],
|
||||
},
|
||||
],
|
||||
});
|
||||
const identitiesByProjectId = (projects: ReturnType<typeof build>) => {
|
||||
const identities: Record<string, string> = {};
|
||||
for (const group of projects) {
|
||||
for (const host of group.hosts) identities[host.projectId] = group.projectKey;
|
||||
}
|
||||
return identities;
|
||||
};
|
||||
|
||||
const forward = build(hostAProjects);
|
||||
const reversed = build(hostAProjects.toReversed());
|
||||
|
||||
expect(forward).toHaveLength(3);
|
||||
expect(identitiesByProjectId(forward)).toEqual(identitiesByProjectId(reversed));
|
||||
expect(new Set(Object.values(identitiesByProjectId(forward))).size).toBe(3);
|
||||
});
|
||||
|
||||
test("keeps projects without persisted keys scoped to their host", () => {
|
||||
const result = buildWorkspaceStructureProjects({
|
||||
sessions: [
|
||||
{
|
||||
serverId: "host-a",
|
||||
projects: [project({ id: "/workspace/app", key: null, root: "/workspace/app" })],
|
||||
workspaces: [],
|
||||
},
|
||||
{
|
||||
serverId: "host-b",
|
||||
projects: [project({ id: "/workspace/app", key: null, root: "/workspace/app" })],
|
||||
workspaces: [],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(result).toHaveLength(2);
|
||||
expect(new Set(result.map((item) => item.projectKey)).size).toBe(2);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user