* 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.
143 lines
5.3 KiB
TypeScript
143 lines
5.3 KiB
TypeScript
import { expect, type Page } from "@playwright/test";
|
|
import { buildSeededHost } from "./daemon-registry";
|
|
|
|
const REGISTRY_KEY = "@paseo:daemon-registry";
|
|
const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
|
|
const DISABLE_DEFAULT_SEED_ONCE_KEY = "@paseo:e2e-disable-default-seed-once";
|
|
|
|
// The multi-host UI (the command-center host label, the sidebar host filter) only renders once
|
|
// more than one host exists. The e2e harness runs a single real daemon, so we add an extra registry
|
|
// entry pointing at an unreachable endpoint: it stays offline, which is enough to make the UI treat
|
|
// the view as multi-host without standing up a second daemon.
|
|
//
|
|
// Must run AFTER the first navigation: the auto-seed fixture writes the registry + nonce on load,
|
|
// and reseeds on every navigation. We write the full registry here and set the fixture's
|
|
// disable-once flag, then reload — so the fixture skips its reset and the registry survives. This
|
|
// avoids depending on the (unspecified) ordering of multiple Playwright init scripts. Optionally
|
|
// relabels the seeded primary host so assertions can target a distinctive name.
|
|
export async function addOfflineHostAndReload(
|
|
page: Page,
|
|
input: { serverId: string; label: string; primaryLabel?: string },
|
|
): Promise<void> {
|
|
const offlineHost = buildSeededHost({
|
|
serverId: input.serverId,
|
|
label: input.label,
|
|
endpoint: "127.0.0.1:59999",
|
|
nowIso: new Date().toISOString(),
|
|
});
|
|
|
|
await page.evaluate(
|
|
({ host, keys, primaryLabel }) => {
|
|
const nonce = localStorage.getItem(keys.nonce);
|
|
if (!nonce) {
|
|
throw new Error("Expected the e2e seed nonce before overriding the host registry.");
|
|
}
|
|
const raw = localStorage.getItem(keys.registry);
|
|
const registry: Array<{ serverId: string; label?: string }> = raw ? JSON.parse(raw) : [];
|
|
if (primaryLabel && registry[0]) {
|
|
registry[0].label = primaryLabel;
|
|
}
|
|
if (!registry.some((entry) => entry.serverId === host.serverId)) {
|
|
registry.push(host);
|
|
}
|
|
localStorage.setItem(keys.registry, JSON.stringify(registry));
|
|
localStorage.setItem(keys.disableSeedOnce, nonce);
|
|
},
|
|
{
|
|
host: offlineHost,
|
|
keys: {
|
|
registry: REGISTRY_KEY,
|
|
nonce: SEED_NONCE_KEY,
|
|
disableSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY,
|
|
},
|
|
primaryLabel: input.primaryLabel,
|
|
},
|
|
);
|
|
|
|
await page.reload();
|
|
}
|
|
|
|
export async function addConnectedHostAndReload(
|
|
page: Page,
|
|
input: { serverId: string; label: string; port: number; primaryLabel?: string },
|
|
): Promise<void> {
|
|
await addConnectedHostsAndReload(page, [input], { primaryLabel: input.primaryLabel });
|
|
}
|
|
|
|
export async function addConnectedHostsAndReload(
|
|
page: Page,
|
|
inputs: Array<{ serverId: string; label: string; port: number }>,
|
|
options?: { primaryLabel?: string },
|
|
): Promise<void> {
|
|
const connectedHosts = inputs.map((input) =>
|
|
buildSeededHost({
|
|
serverId: input.serverId,
|
|
label: input.label,
|
|
endpoint: `127.0.0.1:${input.port}`,
|
|
nowIso: new Date().toISOString(),
|
|
}),
|
|
);
|
|
|
|
await page.evaluate(
|
|
({ hosts, keys, primaryLabel }) => {
|
|
const nonce = localStorage.getItem(keys.nonce);
|
|
if (!nonce) {
|
|
throw new Error("Expected the e2e seed nonce before overriding the host registry.");
|
|
}
|
|
const raw = localStorage.getItem(keys.registry);
|
|
const registry: Array<{ serverId: string; label?: string }> = raw ? JSON.parse(raw) : [];
|
|
if (primaryLabel && registry[0]) registry[0].label = primaryLabel;
|
|
for (const host of hosts) {
|
|
if (!registry.some((entry) => entry.serverId === host.serverId)) {
|
|
registry.push(host);
|
|
}
|
|
}
|
|
localStorage.setItem(keys.registry, JSON.stringify(registry));
|
|
localStorage.setItem(keys.disableSeedOnce, nonce);
|
|
},
|
|
{
|
|
hosts: connectedHosts,
|
|
keys: {
|
|
registry: REGISTRY_KEY,
|
|
nonce: SEED_NONCE_KEY,
|
|
disableSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY,
|
|
},
|
|
primaryLabel: options?.primaryLabel,
|
|
},
|
|
);
|
|
|
|
await page.reload();
|
|
}
|
|
|
|
export async function waitForConnectedHost(
|
|
page: Page,
|
|
input: { serverId: string; endpoint: string },
|
|
): Promise<void> {
|
|
await page.getByTestId("sidebar-hosts-trigger").click();
|
|
const host = page.getByTestId(`sidebar-host-row-${input.serverId}`);
|
|
await expect(host).toContainText(input.endpoint, { timeout: 30_000 });
|
|
await page.keyboard.press("Escape");
|
|
await expect(host).not.toBeVisible();
|
|
}
|
|
|
|
export async function openSidebarDisplayPreferences(page: Page): Promise<void> {
|
|
await page.getByTestId("sidebar-display-preferences-menu").click();
|
|
await expect(page.getByTestId("sidebar-display-preferences-content")).toBeVisible({
|
|
timeout: 10_000,
|
|
});
|
|
}
|
|
|
|
// A host's filter row carries a status dot on the left next to its label.
|
|
export async function expectHostFilterRow(page: Page, serverId: string): Promise<void> {
|
|
await expect(page.getByTestId(`sidebar-host-filter-${serverId}`)).toBeVisible();
|
|
await expect(page.getByTestId(`sidebar-host-filter-status-${serverId}`)).toBeVisible();
|
|
}
|
|
|
|
export async function toggleHostFilter(page: Page, serverId: string): Promise<void> {
|
|
await page.getByTestId(`sidebar-host-filter-${serverId}`).click();
|
|
}
|
|
|
|
export async function selectAllHostsFilter(page: Page): Promise<void> {
|
|
await page.getByTestId("sidebar-host-filter-all").click();
|
|
}
|