* 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.
147 lines
5.9 KiB
TypeScript
147 lines
5.9 KiB
TypeScript
import { expect, test, type Page } from "./fixtures";
|
|
import { daemonWsRoutePattern } from "./helpers/daemon-port";
|
|
import { openAgentRoute } from "./helpers/mock-agent";
|
|
import { openGlobalNewWorkspaceComposer, selectNewWorkspaceProject } from "./helpers/new-workspace";
|
|
import { seedWorkspace } from "./helpers/seed-client";
|
|
import { getServerId } from "./helpers/server-id";
|
|
|
|
const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";
|
|
|
|
type WebSocketMessage = string | Buffer;
|
|
|
|
function parseWebSocketJson(message: WebSocketMessage): unknown {
|
|
const rawMessage = typeof message === "string" ? message : message.toString("utf8");
|
|
try {
|
|
return JSON.parse(rawMessage);
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
|
|
const envelope = parseWebSocketJson(message);
|
|
if (!envelope || typeof envelope !== "object") {
|
|
return null;
|
|
}
|
|
const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
|
|
if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
|
|
return null;
|
|
}
|
|
if (typeof maybeEnvelope.message !== "object") {
|
|
return null;
|
|
}
|
|
return maybeEnvelope.message as Record<string, unknown>;
|
|
}
|
|
|
|
// The draft mode control in New Workspace only mutates local form state; it never sends
|
|
// set_agent_mode_request. So the only source of such a request while the New Workspace
|
|
// composer is focused is a *live* agent's mode control. Recording those, keyed by agentId,
|
|
// gives a direct signal that Shift+Tab leaked into a backgrounded agent.
|
|
async function recordSetAgentModeRequests(page: Page): Promise<{
|
|
requestsForAgent(agentId: string): Array<{ agentId: string; modeId: string }>;
|
|
}> {
|
|
const seen: Array<{ agentId: string; modeId: string }> = [];
|
|
await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
|
|
const server = ws.connectToServer();
|
|
ws.onMessage((message) => {
|
|
const sessionMessage = getSessionMessage(message);
|
|
if (sessionMessage?.type === "set_agent_mode_request") {
|
|
const agentId = typeof sessionMessage.agentId === "string" ? sessionMessage.agentId : "";
|
|
const modeId = typeof sessionMessage.modeId === "string" ? sessionMessage.modeId : "";
|
|
seen.push({ agentId, modeId });
|
|
}
|
|
server.send(message);
|
|
});
|
|
server.onMessage((message) => ws.send(message));
|
|
});
|
|
return {
|
|
requestsForAgent: (agentId: string) => seen.filter((request) => request.agentId === agentId),
|
|
};
|
|
}
|
|
|
|
async function seedCodexDefaultPreferences(page: Page, serverId: string): Promise<void> {
|
|
await page.addInitScript(
|
|
({ preferencesKey, serverId: seededServerId }) => {
|
|
localStorage.setItem(
|
|
preferencesKey,
|
|
JSON.stringify({
|
|
serverId: seededServerId,
|
|
provider: "codex",
|
|
providerPreferences: {
|
|
codex: {
|
|
model: "gpt-5.4-mini",
|
|
mode: "auto",
|
|
thinkingByModel: { "gpt-5.4-mini": "low" },
|
|
},
|
|
mock: { model: "ten-second-stream" },
|
|
},
|
|
}),
|
|
);
|
|
},
|
|
{ preferencesKey: CREATE_AGENT_PREFERENCES_KEY, serverId },
|
|
);
|
|
}
|
|
|
|
// Focus the New Workspace composer and cycle the execution mode with the keyboard.
|
|
// Kept out of the test body so the test reads as intent rather than key mechanics.
|
|
async function cycleNewWorkspaceMode(page: Page, presses: number): Promise<void> {
|
|
const composer = page.getByRole("textbox", { name: "Message agent..." });
|
|
await expect(composer).toBeVisible({ timeout: 30_000 });
|
|
await composer.click();
|
|
for (let i = 0; i < presses; i++) {
|
|
await page.keyboard.press("Shift+Tab");
|
|
}
|
|
}
|
|
|
|
test.describe("New Workspace mode cycle safety", () => {
|
|
test.describe.configure({ timeout: 240_000 });
|
|
|
|
// Regression guard for the P1 safety bug: cycling the execution mode with Shift+Tab in
|
|
// the New Workspace composer must never reach a backgrounded, still-mounted agent's mode
|
|
// control and silently change that (possibly running) agent's mode — e.g. into a
|
|
// permissive/bypass mode. See use-keyboard-action-handler.ts.
|
|
test("Shift+Tab in New Workspace never changes a backgrounded agent's mode", async ({ page }) => {
|
|
const serverId = getServerId();
|
|
const seeded = await seedWorkspace({ repoPrefix: "mode-cycle-safety-" });
|
|
await seedCodexDefaultPreferences(page, serverId);
|
|
const modeRequests = await recordSetAgentModeRequests(page);
|
|
|
|
try {
|
|
const agent = await seeded.client.createAgent({
|
|
provider: "codex",
|
|
cwd: seeded.repoPath,
|
|
workspaceId: seeded.workspaceId,
|
|
title: "mode cycle safety e2e",
|
|
modeId: "auto",
|
|
model: "gpt-5.4-mini",
|
|
});
|
|
|
|
// Mount the live agent tab: its mode control registers a mode-cycle keyboard handler.
|
|
await openAgentRoute(page, { workspaceId: seeded.workspaceId, agentId: agent.id });
|
|
await expect(page.getByTestId("mode-control").first()).toContainText("Default permissions", {
|
|
timeout: 30_000,
|
|
});
|
|
|
|
// Move to the New Workspace composer. The agent tab stays mounted in the background,
|
|
// so its handler is still registered when we cycle here.
|
|
await openGlobalNewWorkspaceComposer(page);
|
|
await selectNewWorkspaceProject(page, {
|
|
projectKey: seeded.projectKey,
|
|
projectDisplayName: seeded.projectDisplayName,
|
|
});
|
|
|
|
await cycleNewWorkspaceMode(page, 6);
|
|
|
|
// fetchAgents is a real daemon round-trip; once it resolves, any mode change the
|
|
// presses would have triggered has already landed. Assert the running agent is
|
|
// untouched — both its committed mode and on the wire — with no fixed sleep.
|
|
const agents = await seeded.client.fetchAgents();
|
|
const backgroundAgent = agents.entries.find((entry) => entry.agent.id === agent.id)?.agent;
|
|
expect(backgroundAgent?.currentModeId).toBe("auto");
|
|
expect(modeRequests.requestsForAgent(agent.id)).toEqual([]);
|
|
} finally {
|
|
await seeded.cleanup();
|
|
}
|
|
});
|
|
});
|