Files
paseo/packages/app/src/screens/new-workspace-initial-context.test.ts
T
Mohamed BoudraandGitHub 20e46e3e3f 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.
2026-07-29 23:36:31 +02:00

284 lines
9.8 KiB
TypeScript

import { describe, expect, it } from "vitest";
import type { HostProjectListItem } from "@/projects/host-projects";
import type { HostRuntimeConnectionStatus } from "@/runtime/host-runtime";
import {
resolveNewWorkspaceAutomaticServerId,
resolveNewWorkspaceInitialServerId,
} from "./new-workspace-initial-context";
function projectFor(serverId: string, key = "project"): HostProjectListItem {
return {
projectKey: key,
projectName: key,
projectKind: "git",
iconWorkingDir: `/work/${key}`,
hosts: [{ serverId, projectId: key, iconWorkingDir: `/work/${key}`, canCreateWorktree: true }],
workspaceKeys: [],
};
}
function statuses(
entries: Record<string, HostRuntimeConnectionStatus>,
): ReadonlyMap<string, HostRuntimeConnectionStatus> {
return new Map(Object.entries(entries));
}
function multiplicity(entries: Record<string, boolean> = {}): ReadonlyMap<string, boolean> {
return new Map(Object.entries(entries));
}
describe("resolveNewWorkspaceInitialServerId", () => {
it("prefers explicit route host context over online-host fallback", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "online"],
routeServerId: "offline",
lastActiveProject: null,
projects: [projectFor("online")],
hostConnectionStatusByServerId: statuses({ offline: "offline", online: "online" }),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("offline");
});
it("prefers the sole online host over a stale offline project", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "online"],
routeServerId: null,
lastActiveProject: projectFor("offline"),
projects: [projectFor("offline")],
hostConnectionStatusByServerId: statuses({ offline: "offline", online: "online" }),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("online");
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "online"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("online")],
hostConnectionStatusByServerId: statuses({ offline: "offline", online: "online" }),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("online");
});
it("uses the last active project when there is no sole online host", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "other"],
routeServerId: null,
lastActiveProject: projectFor("offline"),
projects: [projectFor("offline")],
hostConnectionStatusByServerId: statuses({ offline: "offline", other: "offline" }),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("offline");
});
it("prefers a connecting project host over a stale offline last active project", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "connecting"],
routeServerId: null,
lastActiveProject: projectFor("offline", "remembered"),
projects: [projectFor("offline", "remembered"), projectFor("connecting", "current")],
hostConnectionStatusByServerId: statuses({
offline: "offline",
connecting: "connecting",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("connecting");
});
it("prefers the online last active project over another hydrated online project", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["host-a", "host-b"],
routeServerId: null,
lastActiveProject: projectFor("host-b", "remembered"),
projects: [projectFor("host-a")],
hostConnectionStatusByServerId: statuses({
"host-a": "online",
"host-b": "online",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("host-b");
});
it("falls back to the only online host even before projects have hydrated", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline-a", "online", "offline-b"],
routeServerId: null,
lastActiveProject: null,
projects: [],
hostConnectionStatusByServerId: statuses({
"offline-a": "offline",
online: "online",
"offline-b": "offline",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("online");
});
it("prefers an online host over the only cached offline project", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "online-a", "online-b"],
routeServerId: null,
lastActiveProject: projectFor("offline"),
projects: [projectFor("offline")],
hostConnectionStatusByServerId: statuses({
offline: "offline",
"online-a": "online",
"online-b": "online",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("online-a");
});
it("prefers the first online project host over an empty online host", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["empty-online", "project-online-a", "project-online-b"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("project-online-a", "a"), projectFor("project-online-b", "b")],
hostConnectionStatusByServerId: statuses({
"empty-online": "online",
"project-online-a": "online",
"project-online-b": "online",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("project-online-a");
});
it("uses the only host with selectable projects even before runtime status is online", () => {
expect(
resolveNewWorkspaceInitialServerId({
allServerIds: ["offline", "connected"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("connected")],
hostConnectionStatusByServerId: statuses({
offline: "offline",
connected: "connecting",
}),
workspaceMultiplicityByServerId: multiplicity(),
}),
).toBe("connected");
});
});
describe("resolveNewWorkspaceAutomaticServerId", () => {
it("keeps a usable automatic host stable when the computed default changes", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["host-a", "host-b"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("host-a"), projectFor("host-b")],
hostConnectionStatusByServerId: statuses({ "host-a": "online", "host-b": "online" }),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "host-a",
nextServerId: "host-b",
}),
).toBe("host-a");
});
it("switches to the remembered online host after it hydrates", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["host-a", "host-b"],
routeServerId: null,
lastActiveProject: projectFor("host-b", "remembered"),
projects: [projectFor("host-a"), projectFor("host-b", "remembered")],
hostConnectionStatusByServerId: statuses({
"host-a": "online",
"host-b": "online",
}),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "host-a",
nextServerId: "host-b",
}),
).toBe("host-b");
});
it("switches from an offline automatic host to the online default", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["offline", "online"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("offline")],
hostConnectionStatusByServerId: statuses({ offline: "offline", online: "online" }),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "offline",
nextServerId: "online",
}),
).toBe("online");
});
it("switches from an offline automatic host to a connecting default with projects", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["offline", "connecting"],
routeServerId: null,
lastActiveProject: projectFor("offline", "remembered"),
projects: [projectFor("offline", "remembered"), projectFor("connecting", "current")],
hostConnectionStatusByServerId: statuses({
offline: "offline",
connecting: "connecting",
}),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "offline",
nextServerId: "connecting",
}),
).toBe("connecting");
});
it("switches to the default when the current automatic host has no selectable projects", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["empty", "with-project"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("with-project")],
hostConnectionStatusByServerId: statuses({
empty: "connecting",
"with-project": "connecting",
}),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "empty",
nextServerId: "with-project",
}),
).toBe("with-project");
});
it("does not switch from an online host to an offline cached project", () => {
expect(
resolveNewWorkspaceAutomaticServerId({
allServerIds: ["online-empty", "offline-project"],
routeServerId: null,
lastActiveProject: null,
projects: [projectFor("offline-project")],
hostConnectionStatusByServerId: statuses({
"online-empty": "online",
"offline-project": "offline",
}),
workspaceMultiplicityByServerId: multiplicity(),
currentServerId: "online-empty",
nextServerId: "offline-project",
}),
).toBe("online-empty");
});
});