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:
@@ -1,7 +1,8 @@
|
||||
import { afterEach, describe, expect, it } from "vitest";
|
||||
import type { DaemonClient, FetchAgentsEntry } from "@getpaseo/client/internal/daemon-client";
|
||||
import { useSessionStore, type Agent } from "@/stores/session-store";
|
||||
import { useSessionStore, type Agent, type WorkspaceDescriptor } from "@/stores/session-store";
|
||||
import { deriveWorkspaceAgentVisibility } from "@/workspace-tabs/agent-visibility";
|
||||
import { buildWorkspaceStructureProjects } from "@/projects/workspace-structure";
|
||||
import {
|
||||
applyLegacyDaemonWorkspaceOwnership,
|
||||
backfillLegacyDaemonWorkspaceDirectoryIfEmpty,
|
||||
@@ -10,6 +11,17 @@ import {
|
||||
|
||||
const SERVER_ID = "srv_legacy";
|
||||
|
||||
function legacyProjectFromWorkspace(workspace: WorkspaceDescriptor) {
|
||||
return {
|
||||
projectId: workspace.projectId,
|
||||
projectKey: null,
|
||||
projectDisplayName: workspace.projectDisplayName,
|
||||
projectCustomName: workspace.projectCustomName ?? null,
|
||||
projectRootPath: workspace.projectRootPath,
|
||||
projectKind: workspace.projectKind,
|
||||
};
|
||||
}
|
||||
|
||||
function legacyAgent(input: {
|
||||
id: string;
|
||||
cwd: string;
|
||||
@@ -118,6 +130,38 @@ describe("buildLegacyDaemonWorkspaceSnapshot", () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps matching legacy path projects separate across hosts", () => {
|
||||
const first = buildLegacyDaemonWorkspaceSnapshot({
|
||||
serverId: "host-a",
|
||||
entries: [legacyAgent({ id: "agent-a", cwd: "/repo/app" })],
|
||||
});
|
||||
const second = buildLegacyDaemonWorkspaceSnapshot({
|
||||
serverId: "host-b",
|
||||
entries: [legacyAgent({ id: "agent-b", cwd: "/repo/app" })],
|
||||
});
|
||||
|
||||
const projects = buildWorkspaceStructureProjects({
|
||||
sessions: [
|
||||
{
|
||||
serverId: "host-a",
|
||||
projects: Array.from(first.workspaces.values(), legacyProjectFromWorkspace),
|
||||
workspaces: first.workspaces.values(),
|
||||
},
|
||||
{
|
||||
serverId: "host-b",
|
||||
projects: Array.from(second.workspaces.values(), legacyProjectFromWorkspace),
|
||||
workspaces: second.workspaces.values(),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(projects).toHaveLength(2);
|
||||
expect(projects.map((project) => project.hosts[0]?.serverId).sort()).toEqual([
|
||||
"host-a",
|
||||
"host-b",
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps old-daemon agent updates attached to the path-backed workspace", () => {
|
||||
const snapshot = buildLegacyDaemonWorkspaceSnapshot({
|
||||
serverId: SERVER_ID,
|
||||
@@ -185,7 +229,7 @@ describe("buildLegacyDaemonWorkspaceSnapshot", () => {
|
||||
client,
|
||||
serverId: SERVER_ID,
|
||||
workspaces: new Map(),
|
||||
emptyProjects: new Map(),
|
||||
projects: new Map(),
|
||||
isCancelled: () => cancelled,
|
||||
});
|
||||
|
||||
|
||||
@@ -7,7 +7,12 @@ import {
|
||||
deriveAgentStateBucket,
|
||||
getWorkspaceStateBucketPriority,
|
||||
} from "@getpaseo/protocol/agent-state-bucket";
|
||||
import type { Agent, DaemonServerInfo, WorkspaceDescriptor } from "@/stores/session-store";
|
||||
import type {
|
||||
Agent,
|
||||
DaemonServerInfo,
|
||||
ProjectDescriptor,
|
||||
WorkspaceDescriptor,
|
||||
} from "@/stores/session-store";
|
||||
import { useSessionStore } from "@/stores/session-store";
|
||||
import {
|
||||
buildAgentDirectoryState,
|
||||
@@ -33,7 +38,7 @@ interface LegacyDaemonWorkspaceBackfillInput {
|
||||
client: Pick<DaemonClient, "fetchAgents">;
|
||||
serverId: string;
|
||||
workspaces: ReadonlyMap<unknown, unknown>;
|
||||
emptyProjects: ReadonlyMap<unknown, unknown>;
|
||||
projects: ReadonlyMap<unknown, unknown>;
|
||||
isCancelled?: () => boolean;
|
||||
}
|
||||
|
||||
@@ -97,7 +102,7 @@ export async function fetchLegacyDaemonWorkspaceDirectory(input: {
|
||||
export async function backfillLegacyDaemonWorkspaceDirectoryIfEmpty(
|
||||
input: LegacyDaemonWorkspaceBackfillInput,
|
||||
): Promise<boolean> {
|
||||
if (input.workspaces.size > 0 || input.emptyProjects.size > 0) {
|
||||
if (input.workspaces.size > 0 || input.projects.size > 0) {
|
||||
return false;
|
||||
}
|
||||
const serverInfo = useSessionStore.getState().sessions[input.serverId]?.serverInfo;
|
||||
@@ -205,11 +210,25 @@ export function replaceLegacyDaemonWorkspaceDirectory(input: {
|
||||
const workspaces = buildLegacyWorkspaces(entries);
|
||||
const store = useSessionStore.getState();
|
||||
store.setWorkspaces(input.serverId, workspaces);
|
||||
store.setEmptyProjects(input.serverId, []);
|
||||
store.setProjects(
|
||||
input.serverId,
|
||||
Array.from(workspaces.values(), legacyProjectDescriptorFromWorkspace),
|
||||
);
|
||||
store.setHasHydratedWorkspaces(input.serverId, true);
|
||||
return { agents, workspaces };
|
||||
}
|
||||
|
||||
function legacyProjectDescriptorFromWorkspace(workspace: WorkspaceDescriptor): ProjectDescriptor {
|
||||
return {
|
||||
projectId: workspace.projectId,
|
||||
projectKey: null,
|
||||
projectDisplayName: workspace.projectDisplayName,
|
||||
projectCustomName: workspace.projectCustomName ?? null,
|
||||
projectRootPath: workspace.projectRootPath,
|
||||
projectKind: workspace.projectKind,
|
||||
};
|
||||
}
|
||||
|
||||
function readFetchAgentsHasMore(
|
||||
pageInfo: Awaited<ReturnType<DaemonClient["fetchAgents"]>>["pageInfo"],
|
||||
): boolean {
|
||||
|
||||
Reference in New Issue
Block a user