* 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.
176 lines
7.8 KiB
TypeScript
176 lines
7.8 KiB
TypeScript
import { test, expect, type Page } from "./fixtures";
|
|
import { gotoAppShell } from "./helpers/app";
|
|
import { gotoWorkspace, clickNewTerminal } from "./helpers/launcher";
|
|
import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
|
|
import { seedMockAgentWorkspace } from "./helpers/mock-agent";
|
|
import { getServerId } from "./helpers/server-id";
|
|
import { waitForSidebarHydration } from "./helpers/workspace-ui";
|
|
import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
|
|
|
|
// Model B sidebar shape: every project — git or non-git, single- or
|
|
// multi-workspace — renders as the same expandable parent, the deepest sidebar
|
|
// level is the workspace row, and tabs/agents/terminals NEVER appear in the
|
|
// sidebar. These specs prove all three invariants end to end.
|
|
|
|
function workspaceRow(page: Page, workspaceId: string) {
|
|
return page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`);
|
|
}
|
|
|
|
function projectRow(page: Page, projectKey: string) {
|
|
return page.getByTestId(`sidebar-project-row-${projectKey}`);
|
|
}
|
|
|
|
function projectNewWorktreeIcon(page: Page, projectKey: string) {
|
|
return page.getByTestId(`sidebar-project-new-worktree-${projectKey}`);
|
|
}
|
|
|
|
async function seedSecondWorkspace(seeded: SeededWorkspace, title: string): Promise<string> {
|
|
const created = await seeded.client.createWorkspace({
|
|
source: { kind: "directory", path: seeded.repoPath, projectId: seeded.projectId },
|
|
title,
|
|
});
|
|
if (!created.workspace) {
|
|
throw new Error(created.error ?? `Failed to create second workspace for ${seeded.projectId}`);
|
|
}
|
|
return created.workspace.id;
|
|
}
|
|
|
|
test.describe("Model B sidebar shape", () => {
|
|
test.describe.configure({ timeout: 180_000 });
|
|
|
|
test("git and non-git projects both render as expandable parents, both show a per-row New workspace icon, and the global button covers both", async ({
|
|
page,
|
|
}) => {
|
|
const gitProject = await seedWorkspace({ repoPrefix: "model-b-git-" });
|
|
const nonGitProject = await seedWorkspace({ repoPrefix: "model-b-nongit-", git: false });
|
|
|
|
try {
|
|
const gitSecondId = await seedSecondWorkspace(gitProject, "Git second");
|
|
const nonGitSecondId = await seedSecondWorkspace(nonGitProject, "Non-git second");
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
|
|
// Both projects are expandable parents — the non-git one is NOT flattened
|
|
// into a bare workspace link.
|
|
await expect(projectRow(page, gitProject.projectKey)).toBeVisible({ timeout: 30_000 });
|
|
await expect(projectRow(page, nonGitProject.projectKey)).toBeVisible({ timeout: 30_000 });
|
|
|
|
// Each parent shows both of its workspace rows underneath.
|
|
await expect(workspaceRow(page, gitProject.workspaceId)).toBeVisible({ timeout: 30_000 });
|
|
await expect(workspaceRow(page, gitSecondId)).toBeVisible({ timeout: 30_000 });
|
|
await expect(workspaceRow(page, nonGitProject.workspaceId)).toBeVisible({ timeout: 30_000 });
|
|
await expect(workspaceRow(page, nonGitSecondId)).toBeVisible({ timeout: 30_000 });
|
|
|
|
// Both projects show a per-row New workspace icon (revealed on hover): the
|
|
// git project can branch off a worktree, and the non-git project can add
|
|
// another workspace because the host supports workspaceMultiplicity.
|
|
await projectRow(page, gitProject.projectKey).hover();
|
|
await expect(projectNewWorktreeIcon(page, gitProject.projectKey)).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
await projectRow(page, nonGitProject.projectKey).hover();
|
|
await expect(projectNewWorktreeIcon(page, nonGitProject.projectKey)).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
|
|
// The global new-workspace button is the universal entry — present for both
|
|
// kinds regardless of their per-row affordance.
|
|
await expect(page.getByTestId("sidebar-global-new-workspace")).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
} finally {
|
|
await gitProject.cleanup();
|
|
await nonGitProject.cleanup();
|
|
}
|
|
});
|
|
|
|
test("no tab, agent, or terminal ever renders as a sidebar row", async ({ page }) => {
|
|
const mock = await seedMockAgentWorkspace({
|
|
repoPrefix: "model-b-leaf-",
|
|
title: "Leaf workspace",
|
|
});
|
|
|
|
try {
|
|
// Open the workspace and materialize both an agent tab and a terminal tab.
|
|
await gotoWorkspace(page, mock.workspaceId);
|
|
const agentTabs = await getVisibleWorkspaceAgentTabIds(page);
|
|
expect(agentTabs).toContain(`workspace-tab-agent_${mock.agentId}`);
|
|
|
|
await clickNewTerminal(page);
|
|
await expect(
|
|
page.locator('[data-testid^="workspace-tab-terminal_"]').filter({ visible: true }).first(),
|
|
).toBeVisible({ timeout: 30_000 });
|
|
|
|
// The deepest level inside the sidebar is the workspace row: no tab,
|
|
// agent, or terminal element appears as a sidebar descendant.
|
|
const sidebar = page.getByTestId("sidebar-sessions").filter({ visible: true }).first();
|
|
await expect(workspaceRow(page, mock.workspaceId).first()).toBeVisible({ timeout: 30_000 });
|
|
await expect(sidebar.locator('[data-testid^="workspace-tab-"]')).toHaveCount(0);
|
|
await expect(sidebar.locator('[data-testid^="sidebar-agent-row-"]')).toHaveCount(0);
|
|
await expect(sidebar.locator('[data-testid^="sidebar-terminal-row-"]')).toHaveCount(0);
|
|
} finally {
|
|
await mock.cleanup();
|
|
}
|
|
});
|
|
|
|
test("status grouping shows only workspace rows and moves a single row when its status changes", async ({
|
|
page,
|
|
}) => {
|
|
const idleProject = await seedWorkspace({ repoPrefix: "model-b-status-idle-" });
|
|
const activeMock = await seedMockAgentWorkspace({
|
|
repoPrefix: "model-b-status-active-",
|
|
title: "Working workspace",
|
|
initialPrompt: "stay busy",
|
|
});
|
|
|
|
try {
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await expect(workspaceRow(page, idleProject.workspaceId)).toBeVisible({ timeout: 30_000 });
|
|
|
|
// Switch to status grouping.
|
|
await page.getByTestId("sidebar-display-preferences-menu").click();
|
|
await page.getByTestId("sidebar-grouping-status").click();
|
|
|
|
const sidebar = page.getByTestId("sidebar-sessions").filter({ visible: true }).first();
|
|
|
|
// The idle workspace lands in the Done bucket; the busy mock-agent workspace
|
|
// lands in the Working bucket. Each workspace is bucketed independently.
|
|
await expect(page.getByTestId("sidebar-status-group-done")).toBeVisible({ timeout: 30_000 });
|
|
await expect(page.getByTestId("sidebar-status-group-running")).toBeVisible({
|
|
timeout: 60_000,
|
|
});
|
|
await expect(workspaceRow(page, idleProject.workspaceId).first()).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
await expect(workspaceRow(page, activeMock.workspaceId).first()).toBeVisible({
|
|
timeout: 60_000,
|
|
});
|
|
|
|
// Only workspace rows are shown — no tab/agent/terminal leaves leak into
|
|
// the status view.
|
|
await expect(sidebar.locator('[data-testid^="workspace-tab-"]')).toHaveCount(0);
|
|
|
|
// The busy workspace is grouped under Working, the idle one under Done:
|
|
// changing one workspace's status moved only that row.
|
|
const workingRows = page.getByTestId("sidebar-status-group-rows-running");
|
|
const doneRows = page.getByTestId("sidebar-status-group-rows-done");
|
|
await expect(
|
|
workingRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${activeMock.workspaceId}`),
|
|
).toBeVisible({ timeout: 60_000 });
|
|
await expect(
|
|
doneRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${idleProject.workspaceId}`),
|
|
).toBeVisible({ timeout: 30_000 });
|
|
// The busy workspace is NOT also sitting in the Done bucket — only its own
|
|
// row moved.
|
|
await expect(
|
|
doneRows.getByTestId(`sidebar-workspace-row-${getServerId()}:${activeMock.workspaceId}`),
|
|
).toHaveCount(0);
|
|
} finally {
|
|
await idleProject.cleanup();
|
|
await activeMock.cleanup();
|
|
}
|
|
});
|
|
});
|