* 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.
240 lines
9.0 KiB
TypeScript
240 lines
9.0 KiB
TypeScript
import { expect, test } from "./fixtures";
|
|
import { gotoAppShell } from "./helpers/app";
|
|
import {
|
|
addFakeScheduleHostAndReload,
|
|
buildFakeScheduleHostWorkspace,
|
|
FAKE_HOST_MODEL_ID,
|
|
FAKE_HOST_MODEL_LABEL,
|
|
installFakeScheduleHost,
|
|
} from "./helpers/schedule-fake-host";
|
|
import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
|
|
import { expectSettled, expectStableHeight } from "./helpers/settled";
|
|
import { waitForSidebarHydration } from "./helpers/workspace-ui";
|
|
import { buildSchedulesRoute } from "../src/utils/host-routes";
|
|
|
|
interface ScheduleSeedClient {
|
|
scheduleCreate(input: {
|
|
prompt: string;
|
|
name?: string;
|
|
cadence: { type: "cron"; expression: string };
|
|
target: {
|
|
type: "new-agent";
|
|
config: {
|
|
provider: "mock";
|
|
cwd: string;
|
|
model: string;
|
|
modeId: string;
|
|
title: string;
|
|
};
|
|
};
|
|
runOnCreate: boolean;
|
|
}): Promise<{ schedule: { id: string } | null; error: string | null }>;
|
|
scheduleDelete(input: { id: string }): Promise<{ error: string | null }>;
|
|
}
|
|
|
|
async function seedMockSchedule(workspace: SeededWorkspace, name: string): Promise<string> {
|
|
const client = workspace.client as unknown as ScheduleSeedClient;
|
|
const result = await client.scheduleCreate({
|
|
prompt: "Say hello from the scheduled agent.",
|
|
name,
|
|
cadence: { type: "cron", expression: "0 9 * * *" },
|
|
target: {
|
|
type: "new-agent",
|
|
config: {
|
|
provider: "mock",
|
|
cwd: workspace.repoPath,
|
|
model: "ten-second-stream",
|
|
modeId: "load-test",
|
|
title: name,
|
|
},
|
|
},
|
|
runOnCreate: false,
|
|
});
|
|
|
|
if (!result.schedule) {
|
|
throw new Error(result.error ?? "Failed to seed schedule");
|
|
}
|
|
|
|
return result.schedule.id;
|
|
}
|
|
|
|
function ignoreScheduleDeleteError(): void {}
|
|
|
|
async function deleteSeededSchedule(workspace: SeededWorkspace, id: string): Promise<void> {
|
|
await (workspace.client as unknown as ScheduleSeedClient)
|
|
.scheduleDelete({ id })
|
|
.catch(ignoreScheduleDeleteError);
|
|
}
|
|
|
|
type FakeScheduleHostSchedule = NonNullable<
|
|
Parameters<typeof installFakeScheduleHost>[0]["schedules"]
|
|
>[number];
|
|
|
|
function buildFakeHostSchedule(input: {
|
|
id: string;
|
|
name: string;
|
|
cwd: string;
|
|
}): FakeScheduleHostSchedule {
|
|
const now = "2026-07-01T00:00:00.000Z";
|
|
return {
|
|
id: input.id,
|
|
name: input.name,
|
|
prompt: "Run on the secondary host.",
|
|
cadence: { type: "cron", expression: "0 9 * * *" },
|
|
target: {
|
|
type: "new-agent",
|
|
config: {
|
|
provider: "mock",
|
|
cwd: input.cwd,
|
|
model: FAKE_HOST_MODEL_ID,
|
|
modeId: "load-test",
|
|
title: input.name,
|
|
},
|
|
},
|
|
status: "active",
|
|
createdAt: now,
|
|
updatedAt: now,
|
|
nextRunAt: now,
|
|
lastRunAt: null,
|
|
pausedAt: null,
|
|
expiresAt: null,
|
|
maxRuns: null,
|
|
};
|
|
}
|
|
|
|
test.describe("Schedules", () => {
|
|
const cleanupTasks: Array<() => Promise<void>> = [];
|
|
|
|
test.afterEach(async () => {
|
|
for (const cleanup of cleanupTasks.toReversed()) {
|
|
await cleanup();
|
|
}
|
|
cleanupTasks.length = 0;
|
|
});
|
|
|
|
test("edit form hydrates the scheduled model selection", async ({ page }) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "schedule-model-hydration-" });
|
|
cleanupTasks.push(() => workspace.cleanup());
|
|
const scheduleName = `Hydrate model ${Date.now()}`;
|
|
const scheduleId = await seedMockSchedule(workspace, scheduleName);
|
|
cleanupTasks.push(() => deleteSeededSchedule(workspace, scheduleId));
|
|
|
|
await page.goto(buildSchedulesRoute());
|
|
const row = page.getByTestId(`schedule-row-${scheduleId}`);
|
|
await expect(row).toBeVisible({ timeout: 30_000 });
|
|
await expect(row).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
|
|
|
|
await row.click();
|
|
const formSheet = page.getByTestId("schedule-form-sheet");
|
|
await expect(formSheet).toBeVisible({ timeout: 10_000 });
|
|
await expectStableHeight(formSheet);
|
|
const hostTrigger = page.getByTestId("schedule-host-trigger");
|
|
const projectTrigger = page.getByTestId("schedule-project-trigger");
|
|
const modelTrigger = page.getByTestId("schedule-model-trigger");
|
|
const thinkingTrigger = page.getByTestId("schedule-thinking-trigger");
|
|
const modeTrigger = page.getByTestId("schedule-mode-trigger");
|
|
await expect(hostTrigger).toBeVisible({ timeout: 30_000 });
|
|
await expect(hostTrigger).toBeDisabled();
|
|
await expectSettled(hostTrigger);
|
|
await expect(projectTrigger).toContainText(workspace.projectDisplayName, { timeout: 30_000 });
|
|
await expectSettled(projectTrigger);
|
|
await expect(modelTrigger).toContainText("Ten second stream", { timeout: 30_000 });
|
|
await expectSettled(modelTrigger);
|
|
await expect(thinkingTrigger).toHaveCount(0);
|
|
await expect(modeTrigger).toBeVisible({ timeout: 30_000 });
|
|
await expectSettled(modeTrigger);
|
|
await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
|
|
await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
|
|
await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
|
|
await expect(page.getByText(/Times are in/)).toHaveCount(0);
|
|
await expect(formSheet.getByText("Cron", { exact: true })).toHaveCount(0);
|
|
});
|
|
|
|
test("edit form hydrates a non-default host schedule after reload", async ({ page }) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "schedule-host-b-hydration-" });
|
|
cleanupTasks.push(() => workspace.cleanup());
|
|
const fakeHost = await buildFakeScheduleHostWorkspace(workspace);
|
|
const fakePort = String(59_000 + Math.floor(Math.random() * 900));
|
|
const scheduleId = "fake-host-schedule";
|
|
const scheduleName = "Secondary host schedule";
|
|
|
|
await installFakeScheduleHost({
|
|
page,
|
|
port: fakePort,
|
|
serverId: fakeHost.serverId,
|
|
workspace: fakeHost.workspace,
|
|
project: fakeHost,
|
|
schedules: [
|
|
buildFakeHostSchedule({
|
|
id: scheduleId,
|
|
name: scheduleName,
|
|
cwd: String(fakeHost.workspace.workspaceDirectory),
|
|
}),
|
|
],
|
|
});
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await page.goto(buildSchedulesRoute());
|
|
await addFakeScheduleHostAndReload({
|
|
page,
|
|
serverId: fakeHost.serverId,
|
|
label: "Fake host",
|
|
port: fakePort,
|
|
});
|
|
await page.reload();
|
|
|
|
const row = page.getByTestId(`schedule-row-${scheduleId}`);
|
|
await expect(row).toBeVisible({ timeout: 30_000 });
|
|
await row.click();
|
|
|
|
const formSheet = page.getByTestId("schedule-form-sheet");
|
|
await expect(formSheet).toBeVisible({ timeout: 10_000 });
|
|
await expectStableHeight(formSheet);
|
|
const hostTrigger = page.getByTestId("schedule-host-trigger");
|
|
const projectTrigger = page.getByTestId("schedule-project-trigger");
|
|
const modelTrigger = page.getByTestId("schedule-model-trigger");
|
|
const modeTrigger = page.getByTestId("schedule-mode-trigger");
|
|
|
|
await expect(hostTrigger).toContainText("Fake host", { timeout: 30_000 });
|
|
await expect(hostTrigger).toBeDisabled();
|
|
await expectSettled(hostTrigger);
|
|
await expect(projectTrigger).toContainText(fakeHost.projectDisplayName, { timeout: 30_000 });
|
|
await expectSettled(projectTrigger);
|
|
await expect(modelTrigger).toContainText(FAKE_HOST_MODEL_LABEL, { timeout: 30_000 });
|
|
await expectSettled(modelTrigger);
|
|
await expect(modeTrigger).toContainText("Load test", { timeout: 30_000 });
|
|
await expectSettled(modeTrigger);
|
|
await expect(page.getByTestId("cadence-mode")).toHaveCount(0);
|
|
await expect(page.getByTestId("schedule-cadence-preset-trigger")).toContainText("Daily 9:00");
|
|
});
|
|
|
|
test("create opens pristine after closing an edit form", async ({ page }) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "schedule-pristine-create-" });
|
|
cleanupTasks.push(() => workspace.cleanup());
|
|
const scheduleName = `Pristine create ${Date.now()}`;
|
|
const scheduleId = await seedMockSchedule(workspace, scheduleName);
|
|
cleanupTasks.push(() => deleteSeededSchedule(workspace, scheduleId));
|
|
|
|
await page.goto(buildSchedulesRoute());
|
|
const row = page.getByTestId(`schedule-row-${scheduleId}`);
|
|
await expect(row).toBeVisible({ timeout: 30_000 });
|
|
await row.click();
|
|
const formSheet = page.getByTestId("schedule-form-sheet");
|
|
await expect(formSheet).toBeVisible({ timeout: 10_000 });
|
|
await expectStableHeight(formSheet);
|
|
await page.getByRole("button", { name: "Cancel" }).click();
|
|
await expect(formSheet).toHaveCount(0, { timeout: 30_000 });
|
|
|
|
await page.getByTestId("schedules-new").click();
|
|
await expect(formSheet).toBeVisible({ timeout: 10_000 });
|
|
const projectTrigger = page.getByTestId("schedule-project-trigger");
|
|
await expect(projectTrigger).toContainText(/select project/i);
|
|
await expectSettled(projectTrigger);
|
|
await expect(page.getByTestId("schedule-model-trigger")).toHaveCount(0);
|
|
await expect(page.getByTestId("schedule-thinking-trigger")).toHaveCount(0);
|
|
await expect(page.getByTestId("schedule-mode-trigger")).toHaveCount(0);
|
|
await expect(page.getByTestId("cadence-interval-value")).toHaveCount(0);
|
|
});
|
|
});
|