* 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.
241 lines
7.5 KiB
TypeScript
241 lines
7.5 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import type {
|
|
SidebarProjectEntry,
|
|
SidebarWorkspaceEntry,
|
|
} from "@/hooks/use-sidebar-workspaces-list";
|
|
import {
|
|
buildSidebarProjectRowModel,
|
|
resolveSidebarProjectIconTarget,
|
|
resolveSidebarProjectLocalPath,
|
|
} from "./sidebar-project-row-model";
|
|
|
|
function workspace(overrides: Partial<SidebarWorkspaceEntry> = {}): SidebarWorkspaceEntry {
|
|
return {
|
|
workspaceKey: "srv:ws-root",
|
|
serverId: "srv",
|
|
workspaceId: "ws-root",
|
|
projectKey: "project-1",
|
|
projectName: "paseo",
|
|
workspaceDirectory: "/repo",
|
|
projectKind: "git",
|
|
workspaceKind: "checkout",
|
|
name: "paseo",
|
|
title: null,
|
|
currentBranch: null,
|
|
statusBucket: "done",
|
|
diffStat: null,
|
|
prHint: null,
|
|
archiveHasUncommittedChanges: null,
|
|
archiveUnpushedCommitCount: null,
|
|
scripts: [],
|
|
hasRunningScripts: false,
|
|
statusEnteredAt: null,
|
|
...overrides,
|
|
archivingAt: overrides.archivingAt ?? null,
|
|
};
|
|
}
|
|
|
|
type ProjectOverrides = Omit<Partial<SidebarProjectEntry>, "hosts"> & {
|
|
hosts?: Array<Omit<SidebarProjectEntry["hosts"][number], "projectId"> & { projectId?: string }>;
|
|
};
|
|
|
|
function project(overrides: ProjectOverrides = {}): SidebarProjectEntry {
|
|
const projectKind = overrides.projectKind ?? "git";
|
|
const hosts = Array.from(
|
|
overrides.hosts ?? [
|
|
{ serverId: "srv", iconWorkingDir: "/repo", canCreateWorktree: projectKind === "git" },
|
|
],
|
|
(host) => Object.assign({}, host, { projectId: host.projectId ?? `project-${host.serverId}` }),
|
|
);
|
|
return {
|
|
projectKey: "project-1",
|
|
projectName: "paseo",
|
|
projectKind,
|
|
iconWorkingDir: "/repo",
|
|
workspaces: [workspace()],
|
|
...overrides,
|
|
hosts,
|
|
};
|
|
}
|
|
|
|
describe("buildSidebarProjectRowModel", () => {
|
|
it("renders a non-git single-workspace project as an expandable section", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "directory",
|
|
workspaces: [workspace({ workspaceId: "ws-non-git", workspaceKind: "checkout" })],
|
|
}),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "collapse",
|
|
trailingAction: { kind: "none" },
|
|
});
|
|
});
|
|
|
|
it("renders a single-workspace git project as an expandable section with the new workspace action", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "git",
|
|
workspaces: [workspace({ workspaceId: "ws-main", workspaceKind: "checkout" })],
|
|
}),
|
|
collapsed: true,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "expand",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", projectId: "project-srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("shows the new workspace action for a non-git project when the host supports workspace multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "directory", workspaces: [] }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", true]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", projectId: "project-srv", iconWorkingDir: "/repo" },
|
|
});
|
|
});
|
|
|
|
it("hides the new workspace action for a non-git project when the host lacks workspace multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "directory", workspaces: [] }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", false]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({ kind: "none" });
|
|
});
|
|
|
|
it("still shows the new workspace action for a git project regardless of multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "git" }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", false]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", projectId: "project-srv", iconWorkingDir: "/repo" },
|
|
});
|
|
});
|
|
|
|
it("targets the project host, not route state, for new workspace actions", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
hosts: [
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: false },
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: true },
|
|
],
|
|
}),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toMatchObject({
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "host-b", iconWorkingDir: "/repo/b" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("targets the first multiplicity-capable host for a non-git project", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "directory",
|
|
hosts: [
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: false },
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: false },
|
|
],
|
|
}),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["host-b", true]]),
|
|
});
|
|
|
|
expect(result).toMatchObject({
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "host-b", iconWorkingDir: "/repo/b" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("renders a multi-workspace git project as an expandable section with a new workspace action", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "git",
|
|
workspaces: [
|
|
workspace({ workspaceId: "ws-main", workspaceKind: "checkout" }),
|
|
workspace({ workspaceId: "ws-feature", workspaceKind: "worktree" }),
|
|
],
|
|
}),
|
|
collapsed: true,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "expand",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", projectId: "project-srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("resolves project icons from the project host, not the focused host", () => {
|
|
const iconTarget = resolveSidebarProjectIconTarget(
|
|
project({
|
|
hosts: [
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: true },
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: true },
|
|
],
|
|
}),
|
|
);
|
|
|
|
expect(iconTarget).toEqual({
|
|
serverId: "host-b",
|
|
projectId: "project-host-b",
|
|
iconWorkingDir: "/repo/b",
|
|
});
|
|
});
|
|
|
|
it("resolves desktop file actions from the local project placement", () => {
|
|
const groupedProject = project({
|
|
iconWorkingDir: "/remote/repo",
|
|
hosts: [
|
|
{ serverId: "remote", iconWorkingDir: "/remote/repo", canCreateWorktree: true },
|
|
{ serverId: "local", iconWorkingDir: "/local/repo", canCreateWorktree: true },
|
|
],
|
|
});
|
|
|
|
expect(resolveSidebarProjectLocalPath(groupedProject, "local")).toBe("/local/repo");
|
|
expect(resolveSidebarProjectLocalPath(groupedProject, "missing")).toBe("");
|
|
});
|
|
|
|
it("renders an empty project as an expandable section", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "git", workspaces: [] }),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "collapse",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", projectId: "project-srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
});
|