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:
@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it } from "vitest";
|
||||
import type { WorkspaceDescriptorPayload } from "@getpaseo/protocol/messages";
|
||||
import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
|
||||
import {
|
||||
normalizeEmptyProjectDescriptor,
|
||||
normalizeProjectDescriptor,
|
||||
normalizeWorkspaceDescriptor,
|
||||
useSessionStore,
|
||||
} from "@/stores/session-store";
|
||||
@@ -96,8 +96,15 @@ function seedSession(): void {
|
||||
SERVER_ID,
|
||||
new Map([["workspace-1", normalizeWorkspaceDescriptor(workspace())]]),
|
||||
);
|
||||
store.setEmptyProjects(SERVER_ID, [
|
||||
normalizeEmptyProjectDescriptor({
|
||||
store.setProjects(SERVER_ID, [
|
||||
normalizeProjectDescriptor({
|
||||
projectId: "project-1",
|
||||
projectKey: "remote:github.com/getpaseo/paseo",
|
||||
projectDisplayName: "Paseo",
|
||||
projectRootPath: "/repo/paseo",
|
||||
projectKind: "git",
|
||||
}),
|
||||
normalizeProjectDescriptor({
|
||||
projectId: "empty-project",
|
||||
projectDisplayName: "Empty project",
|
||||
projectRootPath: "/repo/empty",
|
||||
@@ -162,7 +169,7 @@ describe("ReplicaCache", () => {
|
||||
expect(session?.hasHydratedWorkspaces).toBe(false);
|
||||
expect(Array.from(session?.agents.keys() ?? [])).toEqual(["agent-1"]);
|
||||
expect(Array.from(session?.workspaces.keys() ?? [])).toEqual(["workspace-1"]);
|
||||
expect(Array.from(session?.emptyProjects.keys() ?? [])).toEqual([]);
|
||||
expect(Array.from(session?.projects.keys() ?? [])).toEqual(["project-1"]);
|
||||
expect(session?.agents.get("agent-1")?.updatedAt).toBeInstanceOf(Date);
|
||||
expect(session?.workspaces.get("workspace-1")?.statusEnteredAt).toBeInstanceOf(Date);
|
||||
expect(session?.agentStreamTail.get("agent-1")).toEqual([message("message-1", "Cached")]);
|
||||
@@ -213,7 +220,7 @@ describe("ReplicaCache", () => {
|
||||
const timelines = session?.agentStreamTail;
|
||||
expect(Array.from(session?.agents.keys() ?? [])).toEqual(["agent-2"]);
|
||||
expect(Array.from(session?.workspaces.keys() ?? [])).toEqual(["workspace-2"]);
|
||||
expect(Array.from(session?.emptyProjects.keys() ?? [])).toEqual([]);
|
||||
expect(Array.from(session?.projects.keys() ?? [])).toEqual(["project-2"]);
|
||||
expect(Array.from(timelines?.keys() ?? [])).toEqual(["agent-2"]);
|
||||
expect(timelines?.get("agent-2")).toEqual(secondTimeline.slice(-50));
|
||||
});
|
||||
|
||||
@@ -9,12 +9,13 @@ import {
|
||||
type WorkspaceDescriptorPayload,
|
||||
} from "@getpaseo/protocol/messages";
|
||||
import {
|
||||
normalizeEmptyProjectDescriptor,
|
||||
normalizeProjectDescriptor,
|
||||
normalizeWorkspaceDescriptor,
|
||||
useSessionStore,
|
||||
type Agent,
|
||||
type SessionReplica,
|
||||
type SessionState,
|
||||
type ProjectDescriptor,
|
||||
type WorkspaceDescriptor,
|
||||
} from "@/stores/session-store";
|
||||
import type { StreamItem } from "@/types/stream";
|
||||
@@ -50,6 +51,7 @@ const StoredHostSchema = z.object({
|
||||
serverId: z.string(),
|
||||
agents: z.array(StoredAgentSchema),
|
||||
workspaces: z.array(WorkspaceDescriptorPayloadSchema),
|
||||
projects: z.array(WorkspaceProjectDescriptorPayloadSchema).optional().default([]),
|
||||
emptyProjects: z.array(WorkspaceProjectDescriptorPayloadSchema),
|
||||
timeline: StoredTimelineSchema.nullable(),
|
||||
});
|
||||
@@ -214,18 +216,47 @@ function serializeWorkspace(workspace: WorkspaceDescriptor): WorkspaceDescriptor
|
||||
};
|
||||
}
|
||||
|
||||
function serializeProject(project: ProjectDescriptor) {
|
||||
return {
|
||||
projectId: project.projectId,
|
||||
...(project.projectKey ? { projectKey: project.projectKey } : {}),
|
||||
projectDisplayName: project.projectDisplayName,
|
||||
projectCustomName: project.projectCustomName,
|
||||
projectRootPath: project.projectRootPath,
|
||||
projectKind: project.projectKind,
|
||||
};
|
||||
}
|
||||
|
||||
function deserializeHost(stored: StoredHost): SessionReplica {
|
||||
const agents = stored.agents.map((entry) => deserializeAgent(stored.serverId, entry));
|
||||
const workspaces = stored.workspaces.map(normalizeWorkspaceDescriptor);
|
||||
const emptyProjects = stored.emptyProjects.map(normalizeEmptyProjectDescriptor);
|
||||
const listedProjects = stored.projects.map(normalizeProjectDescriptor);
|
||||
const legacyProjects = [
|
||||
...stored.emptyProjects.map(normalizeProjectDescriptor),
|
||||
...workspaces.map(legacyProjectDescriptorFromWorkspace),
|
||||
];
|
||||
const projects = new Map(
|
||||
[...legacyProjects, ...listedProjects].map((project) => [project.projectId, project]),
|
||||
);
|
||||
return {
|
||||
agents: new Map(agents.map((agent) => [agent.id, agent])),
|
||||
workspaces: new Map(workspaces.map((workspace) => [workspace.id, workspace])),
|
||||
emptyProjects: new Map(emptyProjects.map((project) => [project.projectId, project])),
|
||||
projects,
|
||||
timeline: deserializeTimeline(stored.timeline),
|
||||
};
|
||||
}
|
||||
|
||||
function legacyProjectDescriptorFromWorkspace(workspace: WorkspaceDescriptor): ProjectDescriptor {
|
||||
return {
|
||||
projectId: workspace.projectId,
|
||||
projectKey: null,
|
||||
projectDisplayName: workspace.projectDisplayName,
|
||||
projectCustomName: workspace.projectCustomName ?? null,
|
||||
projectRootPath: workspace.projectRootPath,
|
||||
projectKind: workspace.projectKind,
|
||||
};
|
||||
}
|
||||
|
||||
export class ReplicaCache {
|
||||
private readonly activeServerIds = new Set<string>();
|
||||
private readonly storedHosts = new Map<string, StoredHost>();
|
||||
@@ -384,6 +415,11 @@ export class ReplicaCache {
|
||||
serverId,
|
||||
agents: focusedAgent ? [serializeAgent(focusedAgent)] : [],
|
||||
workspaces: focusedWorkspace ? [serializeWorkspace(focusedWorkspace)] : [],
|
||||
projects: focusedWorkspace
|
||||
? [session.projects.get(focusedWorkspace.projectId)].flatMap((project) =>
|
||||
project ? [serializeProject(project)] : [],
|
||||
)
|
||||
: [],
|
||||
emptyProjects: [],
|
||||
timeline,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user