Skip unrelated required checks without losing their names (#2542)

* fix(ci): skip unrelated required checks cleanly Matrix jobs had to start no-op runners to preserve interpolated required-check names. Static named jobs let GitHub report genuine skipped conclusions while keeping those names stable. * fix(ci): gate changes to install patching script * fix(ci): route cross-package test contracts narrowly * fix(ci): keep routed contracts merge-blocking * fix(server): exclude nested test utilities from builds * fix(ci): cover app-owned native and browser domains * refactor(ci): align tests with runtime domains Own browser specs, desktop specs, and Electron-only app code by stable directories so PR routing does not depend on filename conventions. Keep desktop integration coverage inside the required desktop check. * fix(ci): keep routing and desktop suites isolated The routing regression must run before dependency installation, and desktop Vitest must not collect Playwright-owned specs. * fix(ci): isolate desktop e2e runtime * perf(test): isolate Playwright workers * perf(test): parallelize Playwright within specs * fix(test): keep Playwright file scheduling * fix(test): share dynamic Metro fixture * fix(test): preserve own-host restart fixtures * fix(ci): preserve routed contracts after rebase * Stabilize Playwright wheel-scroll assertions
2026-08-02 00:56:05 +08:00
parent 429155b536
commit 5a30affd7f
256 changed files with 2693 additions and 2674 deletions
@@ -1,34 +0,0 @@
-// "00-" prefix is intentional: this file must sort before every other spec.
-// Sessions history is daemon-global — any agent created by a prior spec hides the empty state.
-// If the beforeAll probe below fails, a spec sorted before this file is creating agents.
-import { test } from "./fixtures";
-import { connectSeedClient } from "./helpers/seed-client";
-import { expectSessionsEmptyState, openSessions } from "./helpers/archive-tab";
-
-test.describe("Sessions screen empty state", () => {
-  test.beforeAll(async () => {
-    const client = await connectSeedClient();
-    try {
-      const history = await client.fetchAgentHistory({ page: { limit: 1 } });
-      if (history.entries.length > 0) {
-        throw new Error(
-          `Sessions empty-state precondition failed: daemon already has ${history.entries.length} agent(s). ` +
-            `Either a spec that sorts before 00-sessions-empty.spec.ts created agents, ` +
-            `or the daemon has stale history from a previous run.`,
-        );
-      }
-    } finally {
-      await client.close().catch(() => undefined);
-    }
-  });
-
-  test("shows empty placeholder when there is no session history", async ({
-    page,
-    withWorkspace,
-  }) => {
-    const workspace = await withWorkspace({ prefix: "sessions-empty-" });
-    await workspace.navigateTo();
-    await openSessions(page);
-    await expectSessionsEmptyState(page);
-  });
-});
@@ -1,29 +0,0 @@
-import { test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { getServerId } from "./helpers/server-id";
-import {
-  expectProviderInstalledInSettings,
-  installAcpCatalogProvider,
-  openAddProviderArea,
-  openSettingsHost,
-  openSettingsHostSection,
-} from "./helpers/settings";
-
-const ACP_PROVIDER = {
-  id: "hermes",
-  name: "Hermes",
-};
-
-test.describe("ACP provider catalog", () => {
-  test("adds a catalog provider from settings", async ({ page }) => {
-    await gotoAppShell(page);
-    await openSettings(page);
-    await openSettingsHost(page, getServerId());
-    // Providers moved to their own host section; add-provider lives there now.
-    await openSettingsHostSection(page, getServerId(), "providers");
-    await openAddProviderArea(page);
-
-    await installAcpCatalogProvider(page, ACP_PROVIDER.name);
-    await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);
-  });
-});
@@ -1,101 +0,0 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import {
-  readRails,
-  readSheetHeaderRails,
-  readVerticalGap,
-  waitForSettledPosition,
-} from "./helpers/sheet-layout";
-import {
-  openCompactSkillsIntegrations,
-  openSkillSelection,
-  openSkillsIntegrations,
-  startSkillsSandbox,
-  type SkillsSandbox,
-} from "./helpers/skills-selection";
-
-const COMPACT_VIEWPORT = { width: 390, height: 844 };
-const DESKTOP_VIEWPORT = { width: 1280, height: 900 };
-
-const sandboxes: SkillsSandbox[] = [];
-
-test.afterEach(async () => {
-  for (const sandbox of sandboxes.splice(0)) {
-    await sandbox.cleanup();
-  }
-});
-
-async function openChooseSkillsOnPhone(page: Page): Promise<void> {
-  sandboxes.push(await startSkillsSandbox(page));
-  await gotoAppShell(page);
-  await openCompactSkillsIntegrations(page);
-  await openSkillSelection(page);
-  await waitForSettledPosition(page.getByTestId("skill-selection-sheet"));
-}
-
-async function openChooseSkillsOnDesktop(page: Page): Promise<void> {
-  sandboxes.push(await startSkillsSandbox(page));
-  await gotoAppShell(page);
-  await openSkillsIntegrations(page);
-  await openSkillSelection(page);
-}
-
-function sheetHeaderRails(page: Page) {
-  return readSheetHeaderRails(page, "skill-selection-sheet", "Choose skills");
-}
-
-function allSkillsCard(page: Page) {
-  return page.getByTestId("skill-selection-all-card");
-}
-
-function skillListCard(page: Page) {
-  return page.getByTestId("skill-selection-list-card");
-}
-
-function bundledSkillsLabel(page: Page) {
-  return page.getByText("Bundled skills", { exact: true });
-}
-
-test.describe("Choose skills sheet on a compact form factor", () => {
-  test.use({ viewport: COMPACT_VIEWPORT });
-
-  test("keeps its cards on the sheet header rails", async ({ page }) => {
-    await openChooseSkillsOnPhone(page);
-
-    const header = await sheetHeaderRails(page);
-
-    expect(await readRails(allSkillsCard(page))).toEqual(header);
-    expect(await readRails(skillListCard(page))).toEqual(header);
-  });
-
-  test("gives the Bundled skills label more room above it than below", async ({ page }) => {
-    await openChooseSkillsOnPhone(page);
-
-    expect({
-      aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
-      belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
-    }).toEqual({ aboveLabel: 16, belowLabel: 12 });
-  });
-});
-
-test.describe("Choose skills sheet on a desktop form factor", () => {
-  test.use({ viewport: DESKTOP_VIEWPORT });
-
-  test("keeps its cards on the sheet header rails", async ({ page }) => {
-    await openChooseSkillsOnDesktop(page);
-
-    const header = await sheetHeaderRails(page);
-
-    expect(await readRails(allSkillsCard(page))).toEqual(header);
-    expect(await readRails(skillListCard(page))).toEqual(header);
-  });
-
-  test("gives the Bundled skills label more room above it than below", async ({ page }) => {
-    await openChooseSkillsOnDesktop(page);
-
-    expect({
-      aboveLabel: await readVerticalGap(allSkillsCard(page), bundledSkillsLabel(page)),
-      belowLabel: await readVerticalGap(bundledSkillsLabel(page), skillListCard(page)),
-    }).toEqual({ aboveLabel: 16, belowLabel: 12 });
-  });
-});
@@ -0,0 +1,43 @@
+import { test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  expectProviderInstalledInSettings,
+  installAcpCatalogProvider,
+  openAddProviderArea,
+  openSettingsHost,
+  openSettingsHostSection,
+} from "../support/helpers/settings";
+
+const ACP_PROVIDER = {
+  id: "hermes",
+  name: "Hermes",
+};
+
+interface ProviderCatalogDaemonClient {
+  connect(): Promise<void>;
+  close(): Promise<void>;
+  patchDaemonConfig(config: { removeProviders?: string[] }): Promise<unknown>;
+}
+
+test.describe("ACP provider catalog", () => {
+  test("adds a catalog provider from settings", async ({ page }) => {
+    const client = await connectDaemonClient<ProviderCatalogDaemonClient>({
+      clientIdPrefix: "provider-catalog-e2e",
+    });
+    try {
+      await gotoAppShell(page);
+      await openSettings(page);
+      await openSettingsHost(page, getServerId());
+      await openSettingsHostSection(page, getServerId(), "providers");
+      await openAddProviderArea(page);
+
+      await installAcpCatalogProvider(page, ACP_PROVIDER.name);
+      await expectProviderInstalledInSettings(page, ACP_PROVIDER.name);
+    } finally {
+      await client.patchDaemonConfig({ removeProviders: [ACP_PROVIDER.id] }).catch(() => undefined);
+      await client.close().catch(() => undefined);
+    }
+  });
+});
@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { seedMockAgentWorkspace, openAgentRoute } from "./helpers/mock-agent";
+import { test, expect, type Page } from "../support/fixtures";
+import { seedMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";

 function visibleComposer(page: Page) {
  return page.locator("textarea[data-composer-input]").filter({ visible: true }).first();
@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { mkdtemp, rm, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  addProjectFlow,
  addProjectFlowBack,
@@ -13,17 +13,20 @@ import {
  expectAddProjectPage,
  expectNewWorkspaceForAddedProject,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { gotoAppShell } from "./helpers/app";
+} from "../support/helpers/add-project-flow";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addConnectedHostAndReload,
  addOfflineHostAndReload,
  waitForConnectedHost,
-} from "./helpers/hosts";
-import { type IsolatedHostDaemon, startIsolatedHostDaemon } from "./helpers/isolated-host-daemon";
-import { expectOpenedProject } from "./helpers/project-picker-ui";
-import { connectSeedClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/hosts";
+import {
+  type IsolatedHostDaemon,
+  startIsolatedHostDaemon,
+} from "../support/helpers/isolated-host-daemon";
+import { expectOpenedProject } from "../support/helpers/project-picker-ui";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const SECONDARY_HOST_ID = "add-project-flow-secondary";
 const SECONDARY_HOST_LABEL = "Secondary Host";
@@ -1,7 +1,7 @@
 import { mkdir, mkdtemp, rm, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, test } from "./fixtures";
+import { expect, test } from "../support/fixtures";
 import {
  addProjectFlow,
  addProjectFlowBack,
@@ -10,12 +10,16 @@ import {
  expectAddProjectPage,
  expectNewWorkspaceForAddedProject,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { gotoAppShell } from "./helpers/app";
-import { createTempGithubRepo, hasGithubAuth, type GhRepoFixture } from "./helpers/github-fixtures";
-import { expectOpenedProject } from "./helpers/project-picker-ui";
-import { connectSeedClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/add-project-flow";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  createTempGithubRepo,
+  hasGithubAuth,
+  type GhRepoFixture,
+} from "../support/helpers/github-fixtures";
+import { expectOpenedProject } from "../support/helpers/project-picker-ui";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 test.describe("Add Project GitHub flow", () => {
  test.describe.configure({ timeout: 300_000 });
@@ -1,20 +1,20 @@
 import type { Page } from "@playwright/test";
-import { expect, test as baseTest } from "./fixtures";
-import { expectAgentIdle } from "./helpers/agent-stream";
+import { expect, test as baseTest } from "../support/fixtures";
+import { expectAgentIdle } from "../support/helpers/agent-stream";
 import {
  attachImageFromMenu,
  expectAttachmentPill,
  expectComposerVisible,
  submitMessage,
-} from "./helpers/composer";
-import { clickNewChat, gotoWorkspace } from "./helpers/launcher";
-import { seedWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/composer";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
 import {
  openAgentRoute,
  seedMockAgentWorkspace,
  type MockAgentWorkspace,
-} from "./helpers/mock-agent";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+} from "../support/helpers/mock-agent";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";

 interface FrameRect {
  top: number;
@@ -1,13 +1,13 @@
 import type { Locator } from "@playwright/test";
-import { expect, test, type Page } from "./fixtures";
-import { expectAgentIdle, expectAgentReadyToInterrupt } from "./helpers/agent-stream";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectAgentIdle, expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
 import {
  cancelAgent,
  expectComposerDraft,
  expectComposerVisible,
  submitMessage,
-} from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 async function completeSubmittedTurn(
  page: Page,
@@ -1,5 +1,5 @@
 import type { Locator, Page } from "@playwright/test";
-import { expect, test as baseTest } from "./fixtures";
+import { expect, test as baseTest } from "../support/fixtures";
 import {
  awaitToolCall,
  expectAgentIdle,
@@ -7,8 +7,8 @@ import {
  expectAgentSurfacesIdle,
  expectRunningAgentChrome,
  expectVisibleAgentSurfacesIdle,
-} from "./helpers/agent-stream";
-import { gateNextAgentMessage } from "./helpers/agent-message-gate";
+} from "../support/helpers/agent-stream";
+import { gateNextAgentMessage } from "../support/helpers/agent-message-gate";
 import {
  attachImageFromMenu,
  expectComposerDraft,
@@ -21,26 +21,26 @@ import {
  sendDraftToQueue,
  startRunningMockAgent,
  submitMessage,
-} from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { seedWorkspace } from "./helpers/seed-client";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { getServerId } from "../support/helpers/server-id";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
-import { selectModel } from "./helpers/app";
+import { delayBrowserAgentCreatedStatus } from "../support/helpers/new-workspace";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { selectModel } from "../support/helpers/app";
 import {
  scrollTimelineToNewestLoadedEdge,
  scrollTimelineUntilOlderHistoryIsReachable,
-} from "./helpers/timeline-pagination";
+} from "../support/helpers/timeline-pagination";
 import {
  appendSettledTimelineTurns,
  createSettledMockAgent,
  createSmallAssistantPng,
  emitSettledAssistantImage,
  expectAssistantImageRendered,
-} from "./helpers/assistant-images";
+} from "../support/helpers/assistant-images";

 const IMAGE = {
  name: "message-submission.png",
@@ -1,4 +1,4 @@
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  awaitAssistantMessage,
  expectAgentIdle,
@@ -6,7 +6,7 @@ import {
  expectRunningAgentChrome,
  expectTurnCopyButton,
  expectScrollFollowsNewContent,
-} from "./helpers/agent-stream";
+} from "../support/helpers/agent-stream";
 import {
  expectScrollStaysFixed,
  clickToolCallBesideScrollToBottomButton,
@@ -14,16 +14,16 @@ import {
  scrollAgentChatToBottom,
  scrollChatAwayFromBottom,
  waitForScrollableChat,
-} from "./helpers/agent-bottom-anchor";
-import { delayCreatedAgentInitialTailResponse } from "./helpers/agent-timeline-gate";
-import { selectModel } from "./helpers/app";
-import { clickNewChat } from "./helpers/launcher";
-import { expectComposerVisible, startRunningMockAgent } from "./helpers/composer";
+} from "../support/helpers/agent-bottom-anchor";
+import { delayCreatedAgentInitialTailResponse } from "../support/helpers/agent-timeline-gate";
+import { selectModel } from "../support/helpers/app";
+import { clickNewChat } from "../support/helpers/launcher";
+import { expectComposerVisible, startRunningMockAgent } from "../support/helpers/composer";
 import {
  openAgentRoute,
  seedMockAgentWorkspace,
  seedRunningMockAgentWorkspace,
-} from "./helpers/mock-agent";
+} from "../support/helpers/mock-agent";

 const SCROLL_AWAY_MIN_SCROLLABLE_DISTANCE = 360;

@@ -1,4 +1,4 @@
-import { test as base } from "./fixtures";
+import { test as base } from "../support/fixtures";
 import {
  appendSettledTimelineTurns,
  createNearTenMegabyteAssistantPng,
@@ -13,8 +13,8 @@ import {
  sendFollowUpAndExpectVisibleResponse,
  switchAwayAndBackWithoutImageInstability,
  userPagesUntilAssistantImageRenders,
-} from "./helpers/assistant-images";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/assistant-images";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";

 const test = base.extend<{ imageWorkspace: SeededWorkspace }>({
  imageWorkspace: async ({ page: _page }, provide) => {
@@ -1,4 +1,4 @@
-import { expect, test } from "./fixtures";
+import { expect, test } from "../support/fixtures";
 import {
  expectSameOlderHistoryLoadingOperation,
  expectStableHistoryStartGutter,
@@ -26,7 +26,7 @@ import {
  expectTimelineViewportAnchoredAfterPrepend,
  userNavigatesTimelineToHistoryStartWithKeyboard,
  userScrollsTimelineToHistoryStart,
-} from "./helpers/timeline-pagination";
+} from "../support/helpers/timeline-pagination";

 test.describe("Agent timeline pagination", () => {
  test("keeps a fixed history-start gutter before, during, and after pagination", async ({
@@ -1,5 +1,5 @@
-import { test } from "./fixtures";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+import { test } from "../support/fixtures";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import {
  expectTimelinePresentationUnchanged,
  expectTimelinePromptNotMounted,
@@ -9,14 +9,14 @@ import {
  scrollTimelinePromptIntoView,
  scrollTimelineUntilOlderHistoryIsReachable,
  seedLongMockAgentTimeline,
-} from "./helpers/timeline-pagination";
+} from "../support/helpers/timeline-pagination";
 import {
  commitTimelineTurnsWhileDisconnected,
  disconnectViewedTimeline,
  expectOneTailCheckWithoutCatchUpPages,
  rememberTimelineRequestCounts,
  restoreViewedTimelineWithHeldTail,
-} from "./helpers/timeline-resume";
+} from "../support/helpers/timeline-resume";

 test.describe("Agent timeline resume", () => {
  test("a long disconnected run lands as one latest-tail update", async ({ page }) => {
@@ -1,9 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { expect } from "@playwright/test";
-import { test } from "./fixtures";
-import { getServerId } from "./helpers/server-id";
-import { connectSeedClient } from "./helpers/seed-client";
-import { createTempGitRepo } from "./helpers/workspace";
+import { test } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo } from "../support/helpers/workspace";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 import {
  archiveAgentFromDaemon,
@@ -20,7 +20,7 @@ import {
  primeAdditionalPage,
  resetSeededPageState,
  reloadWorkspace,
-} from "./helpers/archive-tab";
+} from "../support/helpers/archive-tab";

 test.describe("Archive tab reconciliation", () => {
  let client: Awaited<ReturnType<typeof connectSeedClient>>;
@@ -1,18 +1,18 @@
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test, expect } from "./fixtures";
-import { openSessions } from "./helpers/archive-tab";
+import { test, expect } from "../support/fixtures";
+import { openSessions } from "../support/helpers/archive-tab";
 import {
  assertChatTranscript,
  cleanupRewindFlow,
  launchAgent,
  sendMessage,
  type AgentHandle,
-} from "./helpers/rewind-flow";
-import type { SeedDaemonClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/rewind-flow";
+import type { SeedDaemonClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 interface TimelineClient extends SeedDaemonClient {
  fetchAgentTimeline(
@@ -1,5 +1,5 @@
-import { expect, test as base } from "./fixtures";
-import { awaitAssistantMessage } from "./helpers/agent-stream";
+import { expect, test as base } from "../support/fixtures";
+import { awaitAssistantMessage } from "../support/helpers/agent-stream";
 import {
  expectChatHistoryAttachment,
  expectInFlightForkAvailable,
@@ -8,18 +8,18 @@ import {
  forkMostRecentAssistantTurnToNewTab,
  forkMostRecentAssistantTurnToNewWorkspace,
  observeForkAttachment,
-} from "./helpers/assistant-fork";
-import { expectComposerVisible, submitMessage } from "./helpers/composer";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+} from "../support/helpers/assistant-fork";
+import { expectComposerVisible, submitMessage } from "../support/helpers/composer";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  openAgentRoute,
  seedMockAgentWorkspace,
  type MockAgentOptions,
  type MockAgentWorkspace,
-} from "./helpers/mock-agent";
-import { getServerId } from "./helpers/server-id";
-import { seedSavedSettingsHosts } from "./helpers/settings";
-import { submitNewWorkspaceEmpty } from "./helpers/new-workspace";
+} from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
+import { submitNewWorkspaceEmpty } from "../support/helpers/new-workspace";

 const test = base.extend<{
  seedForkWorkspace: (options: MockAgentOptions) => Promise<MockAgentWorkspace>;
@@ -1,15 +1,25 @@
 import { existsSync } from "node:fs";
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { clickSessionRow, expectSessionRowArchived, openSessions } from "./helpers/archive-tab";
-import { cloneGithubRepoDefaultBranchOnly, createTempGithubRepo } from "./helpers/github-fixtures";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  clickSessionRow,
+  expectSessionRowArchived,
+  openSessions,
+} from "../support/helpers/archive-tab";
+import {
+  cloneGithubRepoDefaultBranchOnly,
+  createTempGithubRepo,
+} from "../support/helpers/github-fixtures";
 import {
  archiveWorkspaceFromDaemon,
  connectNewWorkspaceDaemonClient,
-} from "./helpers/new-workspace";
-import { connectSeedClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration, waitForWorkspaceInSidebar } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  waitForSidebarHydration,
+  waitForWorkspaceInSidebar,
+} from "../support/helpers/workspace-ui";

 test.describe("Auto-archive after pull request merge", () => {
  test.describe.configure({ retries: 0, timeout: 180_000 });
@@ -1,6 +1,6 @@
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 const MOBILE_VIEWPORT = { width: 390, height: 844 };

@@ -1,15 +1,18 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  expectNoBranchSwitcherInWorkspaceHeader,
  expectWorkspaceBranch,
  openChangesPanel,
  switchBranchFromChangesPanel,
-} from "./helpers/branch-switcher";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { readWorktreeBranchInfo } from "./helpers/workspace";
-import { switchWorkspaceViaSidebar, waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/branch-switcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { readWorktreeBranchInfo } from "../support/helpers/workspace";
+import {
+  switchWorkspaceViaSidebar,
+  waitForSidebarHydration,
+} from "../support/helpers/workspace-ui";

 async function renameWorkspaceViaSidebar(
  page: Page,
@@ -1,12 +1,12 @@
-import { expect, test, type Page } from "./fixtures";
-import { composerLocator, expectComposerVisible, submitMessage } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { composerLocator, expectComposerVisible, submitMessage } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import {
  expectSessionRowArchived,
  expectWorkspaceTabHidden,
  expectWorkspaceTabVisible,
  openSessions,
-} from "./helpers/archive-tab";
+} from "../support/helpers/archive-tab";

 interface SlashCommandScenario {
  agentId: string;
@@ -1,6 +1,6 @@
-import { expect, test } from "./fixtures";
-import { allowPermission, waitForPermissionPrompt } from "./helpers/permissions";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test } from "../support/fixtures";
+import { allowPermission, waitForPermissionPrompt } from "../support/helpers/permissions";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 test.describe("Codex plan approval", () => {
  test("shows a single actionable plan panel and removes it after implementation starts", async ({
@@ -1,5 +1,5 @@
-import { test } from "./fixtures";
-import { closeCommandCenter, openCommandCenter } from "./helpers/command-center";
+import { test } from "../support/fixtures";
+import { closeCommandCenter, openCommandCenter } from "../support/helpers/command-center";
 import {
  applyCommandCenterAgentControls,
  chooseCommandCenterAgentControl,
@@ -8,11 +8,11 @@ import {
  expectWorkspaceAgentConfiguration,
  submitDraftAgent,
  waitForDraftComposer,
-} from "./helpers/command-center-agent-controls";
-import { clickNewChat, gotoWorkspace } from "./helpers/launcher";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/command-center-agent-controls";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";

@@ -1,13 +1,13 @@
 import { randomUUID } from "node:crypto";
 import { expect } from "@playwright/test";
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { createIdleAgent } from "./helpers/archive-tab";
-import { openCommandCenter } from "./helpers/command-center";
-import { addOfflineHostAndReload } from "./helpers/hosts";
-import { expectAgentTabActive } from "./helpers/launcher";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { createIdleAgent } from "../support/helpers/archive-tab";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { addOfflineHostAndReload } from "../support/helpers/hosts";
+import { expectAgentTabActive } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const PRIMARY_HOST_LABEL = "Primary Host";
 const SECONDARY_HOST_ID = "host-command-center-secondary";
@@ -1,5 +1,5 @@
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  expectCommandCenterToRemainAtTheTop,
  expectPrimaryCommandCenterActions,
@@ -8,8 +8,8 @@ import {
  expectWorkspaceResultsToBeLimitedUntilSearch,
  observeCommandCenterScroll,
  openCommandCenterWithKeyboard,
-} from "./helpers/command-center-scroll";
-import { seedWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/command-center-scroll";
+import { seedWorkspace } from "../support/helpers/seed-client";

 test.use({
  userAgent:
@@ -1,14 +1,14 @@
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { openCommandCenter } from "./helpers/command-center";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { openCommandCenter } from "../support/helpers/command-center";
 import {
  createTerminalFromCommandCenter,
  expectDefaultWorkspaceActions,
  expectWorkspaceActionsAvailableThroughSearch,
  makeWorkspacePrimaryGitActionCommit,
  openWorkspaceFromCommandCenter,
-} from "./helpers/command-center-workspace-actions";
-import { seedWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/command-center-workspace-actions";
+import { seedWorkspace } from "../support/helpers/seed-client";

 test("workspace actions use the Git policy and dispatch through the active workspace", async ({
  page,
@@ -1,13 +1,13 @@
 import { execFileSync } from "node:child_process";
 import { expect } from "@playwright/test";
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { createIdleAgent } from "./helpers/archive-tab";
-import { openCommandCenter } from "./helpers/command-center";
-import { addOfflineHostAndReload } from "./helpers/hosts";
-import { expectAppRoute } from "./helpers/route-assertions";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { createIdleAgent } from "../support/helpers/archive-tab";
+import { openCommandCenter } from "../support/helpers/command-center";
+import { addOfflineHostAndReload } from "../support/helpers/hosts";
+import { expectAppRoute } from "../support/helpers/route-assertions";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";

 const PRIMARY_HOST_LABEL = "Primary Host";
@@ -1,7 +1,7 @@
 import { execFileSync } from "node:child_process";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";

 const COMMIT_SUBJECT = "Show commit timestamps";

@@ -1,7 +1,7 @@
-import { expect, test } from "./fixtures";
-import { clickNewChat } from "./helpers/launcher";
-import { expectComposerVisible } from "./helpers/composer";
-import { expectAgentIdle } from "./helpers/agent-stream";
+import { expect, test } from "../support/fixtures";
+import { clickNewChat } from "../support/helpers/launcher";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { expectAgentIdle } from "../support/helpers/agent-stream";
 import {
  openAttachmentMenu,
  openGithubPickerFromMenu,
@@ -23,13 +23,19 @@ import {
  selectGithubOption,
  expectGithubAttachmentPill,
  openGithubWorkspace,
-} from "./helpers/composer";
-import { delayBrowserAgentCreatedStatus, openNewWorkspaceComposer } from "./helpers/new-workspace";
-import { gotoAppShell } from "./helpers/app";
-import { waitForSidebarHydration, switchWorkspaceViaSidebar } from "./helpers/workspace-ui";
-import { seedWorkspace } from "./helpers/seed-client";
-import { hasGithubAuth, createTempGithubRepo } from "./helpers/github-fixtures";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/composer";
+import {
+  delayBrowserAgentCreatedStatus,
+  openNewWorkspaceComposer,
+} from "../support/helpers/new-workspace";
+import { gotoAppShell } from "../support/helpers/app";
+import {
+  waitForSidebarHydration,
+  switchWorkspaceViaSidebar,
+} from "../support/helpers/workspace-ui";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { hasGithubAuth, createTempGithubRepo } from "../support/helpers/github-fixtures";
+import { getServerId } from "../support/helpers/server-id";

 const MINIMAL_PNG = Buffer.from(
  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
@@ -144,11 +150,6 @@ test.describe("Composer attachments", () => {
    // needed before this can be exercised end-to-end.
  });

-  test.fixme("browser-element attachment pill is created from Electron webview selection", async () => {
-    // The browser-element attachment is only created in browser-pane.electron.tsx via DOM
-    // element selection in the Electron webview. It is not exercisable in headless Chromium E2E.
-  });
-
  test("image lightbox opens on pill click and closes on Escape", async ({
    page,
    withWorkspace,
@@ -1,14 +1,14 @@
-import { expect, test, type Page } from "./fixtures";
-import { composerLocator, expectComposerVisible } from "./helpers/composer";
+import { expect, test, type Page } from "../support/fixtures";
+import { composerLocator, expectComposerVisible } from "../support/helpers/composer";
 import {
  openAgentRoute,
  seedMockAgentWorkspace,
  type MockAgentWorkspace,
-} from "./helpers/mock-agent";
-import { expectWorkspaceTabVisible, openSessions } from "./helpers/archive-tab";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { getServerId } from "./helpers/server-id";
-import { switchWorkspaceViaSidebar } from "./helpers/workspace-ui";
+} from "../support/helpers/mock-agent";
+import { expectWorkspaceTabVisible, openSessions } from "../support/helpers/archive-tab";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { getServerId } from "../support/helpers/server-id";
+import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";

 const TEST_COMMANDS = [
  {
@@ -1,12 +1,12 @@
 import { unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { type Page } from "@playwright/test";
-import { buildHostWorkspaceRoute, buildSettingsSectionRoute } from "../src/utils/host-routes";
-import { test, expect } from "./fixtures";
-import { getServerId } from "./helpers/server-id";
-import { connectSeedClient } from "./helpers/seed-client";
-import { createTempGitRepo } from "./helpers/workspace";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { buildHostWorkspaceRoute, buildSettingsSectionRoute } from "../../src/utils/host-routes";
+import { test, expect } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

 interface DirtyWorkspace {
  id: string;
@@ -1,5 +1,5 @@
-import { test } from "./fixtures";
-import { DirectoryBootstrapScenario } from "./helpers/directory-bootstrap-scenario";
+import { test } from "../support/fixtures";
+import { DirectoryBootstrapScenario } from "../support/helpers/directory-bootstrap-scenario";

 test.describe("Directory bootstrap correctness", () => {
  test("connect, pushed deltas, and reconnect keep directories current without duplicate bootstraps", async ({
@@ -1,18 +1,18 @@
 import path from "node:path";
 import { existsSync } from "node:fs";
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addProjectFlowInput,
  chooseAddProjectMethod,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { expectOpenedProject } from "./helpers/project-picker-ui";
-import { connectSeedClient, seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { createTempGitRepo } from "./helpers/workspace";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/add-project-flow";
+import { expectOpenedProject } from "../support/helpers/project-picker-ui";
+import { connectSeedClient, seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 function workspaceRowTestId(workspaceId: string): string {
  return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
@@ -1,14 +1,18 @@
 import { mkdir, readFile, rename, rm, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { expect, test, type Page } from "./fixtures";
-import { expectFileTabOpen, openFileExplorer, openFileFromExplorer } from "./helpers/file-explorer";
-import type { WithWorkspace } from "./helpers/with-workspace";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  expectFileTabOpen,
+  openFileExplorer,
+  openFileFromExplorer,
+} from "../support/helpers/file-explorer";
+import type { WithWorkspace } from "../support/helpers/with-workspace";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import {
  expectFileCalloutWasRendered,
  expectNoFileCalloutWasRendered,
  recordFileCallouts,
-} from "./helpers/file-callouts";
+} from "../support/helpers/file-callouts";

 function visibleEditor(page: Page) {
  return page.getByTestId("file-source-editor").filter({ visible: true }).locator(".cm-content");
@@ -1,9 +1,13 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { expect, test, type Page } from "./fixtures";
-import { openFileExplorer, openFileFromExplorer, expectFileTabOpen } from "./helpers/file-explorer";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import {
+  openFileExplorer,
+  openFileFromExplorer,
+  expectFileTabOpen,
+} from "../support/helpers/file-explorer";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 const RED_PIXEL = Buffer.from(
  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAusB9Y9ZQmcAAAAASUVORK5CYII=",
@@ -1,4 +1,4 @@
-import { test } from "./fixtures";
+import { test } from "../support/fixtures";
 import {
  collapseFolder,
  expandFolder,
@@ -7,9 +7,9 @@ import {
  expectFileTabOpen,
  openFileExplorer,
  openFileFromExplorer,
-} from "./helpers/file-explorer";
-import { gotoWorkspace } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/file-explorer";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";

 let workspace: SeededWorkspace;

@@ -2,14 +2,14 @@ import { randomUUID } from "node:crypto";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { expect, test, type Page } from "./fixtures";
-import { connectSeedClient, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { expect, test, type Page } from "../support/fixtures";
+import { connectSeedClient, type SeededWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

 const OPENCODE_REAL_MODEL = "openrouter/google/gemini-2.5-flash-lite";
 const OPENCODE_SEED_TIMEOUT_MS = 45_000;
-const PASEO_REPO_PATH = path.resolve(__dirname, "../../..");
+const PASEO_REPO_PATH = path.resolve(__dirname, "../../../..");

 interface OpenCodeSeedResult {
  stdout: string;
@@ -1,4 +1,4 @@
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  gotoWorkspace,
  assertNewChatTileVisible,
@@ -13,10 +13,13 @@ import {
  measureTileTransition,
  sampleTabsDuringTransition,
  terminalSurfaceLocator,
-} from "./helpers/launcher";
-import { expectComposerVisible, composerLocator } from "./helpers/composer";
-import { expectTerminalSurfaceVisible, setupDeterministicPrompt } from "./helpers/terminal-perf";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/launcher";
+import { expectComposerVisible, composerLocator } from "../support/helpers/composer";
+import {
+  expectTerminalSurfaceVisible,
+  setupDeterministicPrompt,
+} from "../support/helpers/terminal-perf";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";

 // ─── Shared state ──────────────────────────────────────────────────────────

@@ -1,17 +1,17 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { openAgentRoute } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { openAgentRoute } from "../support/helpers/mock-agent";
 import {
  openGlobalNewWorkspaceComposer,
  selectNewWorkspaceProject,
  submitNewWorkspacePrompt,
-} from "./helpers/new-workspace";
-import { expectNoTruncation } from "./helpers/no-truncation";
-import { escapeRegex } from "./helpers/regex";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { expectNoTruncation } from "../support/helpers/no-truncation";
+import { escapeRegex } from "../support/helpers/regex";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";

@@ -1,6 +1,6 @@
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  expectNewWorkspaceDraft,
  expectNewWorkspaceProjectSelected,
@@ -9,11 +9,11 @@ import {
  openNewWorkspaceComposer,
  selectNewWorkspaceHost,
  selectNewWorkspaceProject,
-} from "./helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { seedSavedSettingsHosts } from "./helpers/settings";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 const DRAFT = `Please investigate the workspace startup failure.

@@ -1,9 +1,12 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { openNewWorkspaceComposer, selectWorkspaceIsolation } from "./helpers/new-workspace";
-import { seedWorkspace } from "./helpers/seed-client";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import {
+  openNewWorkspaceComposer,
+  selectWorkspaceIsolation,
+} from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 type WebSocketMessage = string | Buffer;

@@ -1,5 +1,5 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  connectNewWorkspaceDaemonClient,
  expectNewWorkspaceControlsEnabled,
@@ -8,14 +8,17 @@ import {
  openMissingProjectNewWorkspaceComposer,
  openNewWorkspaceComposer,
  openNewWorkspaceProjectPickerWithShortcut,
-} from "./helpers/new-workspace";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { seedSavedSettingsHosts } from "./helpers/settings";
-import { getServerId } from "./helpers/server-id";
-import { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { clickArchiveWorkspaceMenuItem, expectWorkspaceAbsentFromSidebar } from "./helpers/sidebar";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
+import { getServerId } from "../support/helpers/server-id";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import {
+  clickArchiveWorkspaceMenuItem,
+  expectWorkspaceAbsentFromSidebar,
+} from "../support/helpers/sidebar";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 // Model B entry points into the New Workspace screen. The surviving entries are
 // the global button (universal) and each project's per-row New workspace icon
@@ -1,17 +1,20 @@
-import { expect, test as base } from "./fixtures";
-import { openProjectDirectoryWithHosts } from "./helpers/project-grouping";
-import { projectPlacementViewKey } from "./helpers/project-view-key";
-import { type IsolatedHostDaemon, startIsolatedHostDaemon } from "./helpers/isolated-host-daemon";
+import { expect, test as base } from "../support/fixtures";
+import { openProjectDirectoryWithHosts } from "../support/helpers/project-grouping";
+import { projectPlacementViewKey } from "../support/helpers/project-view-key";
+import {
+  type IsolatedHostDaemon,
+  startIsolatedHostDaemon,
+} from "../support/helpers/isolated-host-daemon";
 import {
  expectNewWorkspaceProjectSelected,
  openGlobalNewWorkspaceComposer,
  selectNewWorkspaceHost,
  selectNewWorkspaceProject,
-} from "./helpers/new-workspace";
-import { connectSeedClient, type SeedDaemonClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { switchWorkspaceViaSidebar } from "./helpers/workspace-ui";
-import { createTempGitRepo } from "./helpers/workspace";
+} from "../support/helpers/new-workspace";
+import { connectSeedClient, type SeedDaemonClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
+import { createTempGitRepo } from "../support/helpers/workspace";

 const PRIMARY_HOST_LABEL = "Primary host";
 const SECONDARY_HOST_LABEL = "Secondary host";
@@ -1,5 +1,5 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  archiveLocalWorkspaceFromDaemon,
  archiveWorkspaceFromDaemon,
@@ -10,11 +10,11 @@ import {
  openProjectViaDaemon,
  openStartingRefPicker,
  selectBranchInPicker,
-} from "./helpers/new-workspace";
-import { expectNoTruncation } from "./helpers/no-truncation";
-import { createTempGitRepo } from "./helpers/workspace";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { expectNoTruncation } from "../support/helpers/no-truncation";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 // Regression for "the local / worktree selection in the new workspace is not
 // remembered." The isolation choice persists in the create-form preferences
@@ -1,9 +1,12 @@
-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";
+import { expect, test, type Page } from "../support/fixtures";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import {
+  openGlobalNewWorkspaceComposer,
+  selectNewWorkspaceProject,
+} from "../support/helpers/new-workspace";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const CREATE_AGENT_PREFERENCES_KEY = "@paseo:create-agent-preferences";

@@ -1,16 +1,19 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  expectNewWorkspaceProjectSelected,
  openGlobalNewWorkspaceComposer,
-} from "./helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { seedSavedSettingsHosts } from "./helpers/settings";
+} from "../support/helpers/new-workspace";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
 import { LAST_WORKSPACE_SELECTION_STORAGE_KEY } from "@/stores/last-workspace-selection";
 import { buildHostWorkspaceRoute, buildNewWorkspaceRoute } from "@/utils/host-routes";
-import { switchWorkspaceViaSidebar, waitForSidebarHydration } from "./helpers/workspace-ui";
+import {
+  switchWorkspaceViaSidebar,
+  waitForSidebarHydration,
+} from "../support/helpers/workspace-ui";

 const OFFLINE_SERVER_IDS = [
  "srv_e2e_preselect_offline_1",
@@ -1,8 +1,8 @@
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  archiveWorkspaceFromDaemon,
  archiveLocalWorkspaceFromDaemon,
@@ -30,26 +30,26 @@ import {
  selectPickerOptionByKeyboard,
  selectWorkspaceIsolation,
  submitNewWorkspacePrompt,
-} from "./helpers/new-workspace";
-import { createTempGitRepo, readWorktreeBranchInfo } from "./helpers/workspace";
+} from "../support/helpers/new-workspace";
+import { createTempGitRepo, readWorktreeBranchInfo } from "../support/helpers/workspace";
 import {
  createLocalGithubPrFixture,
  cloneGithubRepoDefaultBranchOnly,
  createTempGithubRepo,
  hasGithubAuth,
  type LocalGhPrFixture,
-} from "./helpers/github-fixtures";
-import { getServerId } from "./helpers/server-id";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
-import { chooseAddProjectMethod, expectAddProjectPage } from "./helpers/add-project-flow";
-import { seedSavedSettingsHosts } from "./helpers/settings";
+} from "../support/helpers/github-fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
+import { chooseAddProjectMethod, expectAddProjectPage } from "../support/helpers/add-project-flow";
+import { seedSavedSettingsHosts } from "../support/helpers/settings";
 import {
  expectSidebarWorkspaceSelected,
  expectWorkspaceHeader,
  switchWorkspaceViaSidebar,
  waitForSidebarHydration,
  waitForWorkspaceInSidebar,
-} from "./helpers/workspace-ui";
+} from "../support/helpers/workspace-ui";

 interface WorkspaceStatusGroupEvent {
  rowTestId: string;
@@ -1,9 +1,9 @@
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { expect, test } from "./fixtures";
-import { submitMessage } from "./helpers/composer";
-import { cleanupRewindFlow, launchAgent, type AgentHandle } from "./helpers/rewind-flow";
+import { expect, test } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import { cleanupRewindFlow, launchAgent, type AgentHandle } from "../support/helpers/rewind-flow";

 test.describe("Codex out-of-band commands", () => {
  test.setTimeout(300_000);
@@ -0,0 +1,20 @@
+import { test } from "../support/fixtures";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import {
+  expectRelayConsent,
+  openPairDeviceModal,
+  preparePairingHost,
+} from "../support/helpers/pair-device";
+
+test("opens relay consent in browser web", async ({ page }) => {
+  const daemon = await startIsolatedHostDaemon("pair-device-browser-relay-off", {
+    mutableRelay: { enabled: false },
+  });
+  try {
+    await preparePairingHost(page, daemon);
+    await openPairDeviceModal(page);
+    await expectRelayConsent(page);
+  } finally {
+    await daemon.close();
+  }
+});
@@ -1,18 +1,22 @@
-import { test } from "./fixtures";
+import { test } from "../support/fixtures";
 import {
  openPrPane,
  expectPrPaneTitle,
  expectPrPaneState,
  expectPrPaneCheckSummary,
  expectPrPaneActivityCount,
-} from "./helpers/pr-pane";
-import { gotoWorkspace } from "./helpers/launcher";
-import { hasGithubAuth, createTempGithubRepo, type GhRepoFixture } from "./helpers/github-fixtures";
+} from "../support/helpers/pr-pane";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import {
+  hasGithubAuth,
+  createTempGithubRepo,
+  type GhRepoFixture,
+} from "../support/helpers/github-fixtures";
 import {
  connectWorkspaceSetupClient,
  openProjectViaDaemon,
  type WorkspaceSetupDaemonClient,
-} from "./helpers/workspace-setup";
+} from "../support/helpers/workspace-setup";

 const GITHUB_AUTH = hasGithubAuth();

@@ -1,7 +1,7 @@
 import { chmod, readFile } from "node:fs/promises";
 import path from "node:path";
-import { expect, test as base, type Page } from "./fixtures";
-import { connectSeedClient, seedWorkspace } from "./helpers/seed-client";
+import { expect, test as base, type Page } from "../support/fixtures";
+import { connectSeedClient, seedWorkspace } from "../support/helpers/seed-client";
 import {
  blockPaseoConfigWrites,
  bumpPaseoConfigOnDisk,
@@ -40,14 +40,14 @@ import {
  returnToProjectsList,
  saveProjectEdits,
  unblockPaseoConfigWrites,
-} from "./helpers/project-settings";
-import { gotoAppShell } from "./helpers/app";
+} from "../support/helpers/project-settings";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addProjectFlowInput,
  chooseAddProjectMethod,
  openAddProjectFlow,
-} from "./helpers/add-project-flow";
-import { createTempGitRepo } from "./helpers/workspace";
+} from "../support/helpers/add-project-flow";
+import { createTempGitRepo } from "../support/helpers/workspace";

 const updatedSetup = ["npm install", "npm run build"];

@@ -1,15 +1,15 @@
 import type { Dialog } from "@playwright/test";
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { connectDaemonClient } from "./helpers/daemon-client-loader";
-import { getServerId } from "./helpers/server-id";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { connectDaemonClient } from "../support/helpers/daemon-client-loader";
+import { getServerId } from "../support/helpers/server-id";
 import {
  expectProviderInstalledInSettings,
  installAcpCatalogProvider,
  openAddProviderArea,
  openSettingsHost,
  openSettingsHostSection,
-} from "./helpers/settings";
+} from "../support/helpers/settings";

 const CUSTOM_PROVIDER = {
  id: "junie",
@@ -1,7 +1,7 @@
 import type { Locator } from "@playwright/test";
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 const MOBILE_VIEWPORT = { width: 390, height: 844 };

@@ -1,15 +1,15 @@
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  cleanupRewindFlow,
  launchAgent,
  sendMessage,
  type AgentHandle,
  type RewindFlowProvider,
-} from "./helpers/rewind-flow";
-import { openSubagentsTrack } from "./helpers/subagents";
+} from "../support/helpers/rewind-flow";
+import { openSubagentsTrack } from "../support/helpers/subagents";

 interface ProviderSubagentCase {
  provider: RewindFlowProvider;
@@ -1,8 +1,8 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { installProviderUsageFixture } from "./helpers/provider-usage";
-import { getServerId } from "./helpers/server-id";
-import { openSettingsHostSection } from "./helpers/settings";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { installProviderUsageFixture } from "../support/helpers/provider-usage";
+import { getServerId } from "../support/helpers/server-id";
+import { openSettingsHostSection } from "../support/helpers/settings";

 test.describe("provider usage settings", () => {
  test("renders every provider returned by the daemon usage RPC", async ({ page }) => {
@@ -1,7 +1,7 @@
-import { expect, test, type Page } from "./fixtures";
-import { expectComposerVisible } from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { installProviderUsageFixture } from "./helpers/provider-usage";
+import { expect, test, type Page } from "../support/fixtures";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { installProviderUsageFixture } from "../support/helpers/provider-usage";

 const MOBILE_VIEWPORT = { width: 390, height: 844 };

@@ -1,5 +1,5 @@
-import { test } from "./fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { test } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import {
  chooseQuestionOption,
  continueToNextQuestion,
@@ -14,7 +14,7 @@ import {
  openQuestion,
  submitQuestionAnswers,
  waitForQuestionPrompt,
-} from "./helpers/questions";
+} from "../support/helpers/questions";

 const TOTAL_QUESTIONS = 3;
 const SURFACE_QUESTION = "Which surface should this apply to?";
@@ -1,7 +1,7 @@
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { test } from "./fixtures";
+import { test } from "../support/fixtures";
 import {
  assertChatTranscript,
  assertComposerIdle,
@@ -15,7 +15,7 @@ import {
  type AgentHandle,
  type RewindFlowMode,
  type RewindFlowProvider,
-} from "./helpers/rewind-flow";
+} from "../support/helpers/rewind-flow";

 const FILE_PROMPT = "Use the Write tool to create ./qa.txt with the exact content: PASEO_QA_TOKEN";

@@ -1,15 +1,15 @@
 import type { Locator } from "@playwright/test";
-import { expect, test, type Page } from "./fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
-import { scrollChatAwayFromBottom } from "./helpers/agent-bottom-anchor";
+import { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { scrollChatAwayFromBottom } from "../support/helpers/agent-bottom-anchor";
 import {
  composerLocator,
  expectComposerDraft,
  expectComposerVisible,
  fillComposerDraft,
  submitMessage,
-} from "./helpers/composer";
+} from "../support/helpers/composer";

 // UI plumbing contract against the dev mock provider. Real-provider behavior is tested in `daemon-e2e/*-rewind.real.e2e.test.ts`.

@@ -1,10 +1,10 @@
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { gotoWorkspace, clickNewTerminal } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { expectExplorerEntryVisible } from "./helpers/file-explorer";
-import { expectNoTerminalTabs, clickFirstTerminalTab } from "./helpers/workspace-tabs";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoWorkspace, clickNewTerminal } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { expectExplorerEntryVisible } from "../support/helpers/file-explorer";
+import { expectNoTerminalTabs, clickFirstTerminalTab } from "../support/helpers/workspace-tabs";

 // Model B: two workspaces can back the SAME directory. What follows from that
 // split is the contract these specs pin:
@@ -1,16 +1,16 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/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";
+} from "../support/helpers/schedule-fake-host";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { expectSettled, expectStableHeight } from "../support/helpers/settled";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { buildSchedulesRoute } from "../../src/utils/host-routes";

 interface ScheduleSeedClient {
  scheduleCreate(input: {
@@ -1,18 +1,18 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addFakeScheduleHostAndReload,
  buildFakeScheduleHostWorkspace,
  installFakeScheduleHost,
-} from "./helpers/schedule-fake-host";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { escapeRegex } from "./helpers/regex";
-import { expectNoTruncation } from "./helpers/no-truncation";
-import { expectSettled, expectStableHeight } from "./helpers/settled";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { buildSchedulesRoute } from "../src/utils/host-routes";
+} from "../support/helpers/schedule-fake-host";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { escapeRegex } from "../support/helpers/regex";
+import { expectNoTruncation } from "../support/helpers/no-truncation";
+import { expectSettled, expectStableHeight } from "../support/helpers/settled";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { buildSchedulesRoute } from "../../src/utils/host-routes";

 const MOBILE_SHEET_VIEWPORT = { width: 390, height: 844 };

@@ -0,0 +1,44 @@
+import { randomUUID } from "node:crypto";
+import { metroTest as test } from "../support/fixtures";
+import { expectSessionsEmptyState, openSessions } from "../support/helpers/archive-tab";
+import { gotoAppShell } from "../support/helpers/app";
+import { buildCreateAgentPreferences, buildSeededHost } from "../support/helpers/daemon-registry";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import { seedWorkspace } from "../support/helpers/seed-client";
+
+test("Sessions shows an empty placeholder when the host has no history", async ({ page }) => {
+  const serverId = `srv_sessions_empty_${randomUUID().replaceAll("-", "").slice(0, 12)}`;
+  const daemon = await startIsolatedHostDaemon(serverId);
+  let workspace: Awaited<ReturnType<typeof seedWorkspace>> | null = null;
+
+  try {
+    workspace = await seedWorkspace({
+      repoPrefix: "sessions-empty-",
+      port: daemon.port,
+    });
+    const host = buildSeededHost({
+      serverId,
+      endpoint: `127.0.0.1:${daemon.port}`,
+      nowIso: new Date().toISOString(),
+    });
+    await page.route(/:6767\b/, (route) => route.abort());
+    await page.routeWebSocket(/:6767\b/, async (webSocket) => {
+      await webSocket.close({ code: 1008, reason: "Blocked developer daemon during e2e." });
+    });
+    await page.addInitScript(
+      ({ seededHost, preferences }) => {
+        localStorage.setItem("@paseo:e2e", "1");
+        localStorage.setItem("@paseo:daemon-registry", JSON.stringify([seededHost]));
+        localStorage.setItem("@paseo:create-agent-preferences", JSON.stringify(preferences));
+      },
+      { seededHost: host, preferences: buildCreateAgentPreferences(serverId) },
+    );
+
+    await gotoAppShell(page);
+    await openSessions(page);
+    await expectSessionsEmptyState(page);
+  } finally {
+    await workspace?.cleanup();
+    await daemon.close();
+  }
+});
@@ -1,8 +1,8 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
-import { TEST_HOST_LABEL } from "./helpers/daemon-registry";
-import { getServerId } from "./helpers/server-id";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
+import { TEST_HOST_LABEL } from "../support/helpers/daemon-registry";
+import { getServerId } from "../support/helpers/server-id";
 import {
  expectSettingsHeader,
  openSettingsHost,
@@ -17,9 +17,8 @@ import {
  expectHostNoDaemonLifecycleRow,
  expectRetiredSidebarSectionsAbsent,
  expectHostPageVisible,
-  expectLocalHostEntryFirst,
  seedSavedSettingsHosts,
-} from "./helpers/settings";
+} from "../support/helpers/settings";

 test.describe("Settings host page", () => {
  test("connections section shows the seeded connection endpoint", async ({ page }) => {
@@ -95,24 +94,6 @@ test.describe("Settings host page", () => {
    await expect(updateButton).toBeEnabled();
  });

-  test("a Desktop-managed daemon explains why its update action is disabled", async ({
-    page,
-    desktopManagedOutdatedDaemon,
-  }) => {
-    await seedSavedSettingsHosts(page, [desktopManagedOutdatedDaemon]);
-    await page.reload();
-    await openSettings(page);
-    await openSettingsHost(page, desktopManagedOutdatedDaemon.serverId);
-    await openHostSection(page, desktopManagedOutdatedDaemon.serverId, "host");
-
-    const updateCard = page.getByTestId("host-page-update-card");
-    await expect(updateCard).toBeVisible();
-    await expect(updateCard).toContainText(
-      "This daemon is managed by Paseo Desktop. Update Paseo Desktop on the host.",
-    );
-    await expect(page.getByTestId("host-page-update-button")).toBeDisabled();
-  });
-
  test("clicking the label pencil reveals the inline editor", async ({ page }) => {
    const serverId = getServerId();

@@ -161,46 +142,4 @@ test.describe("Settings host page", () => {
    await expectHostLabelDisplayed(page);
    await expectHostActionCards(page, serverId);
  });
-
-  test("sidebar pins the local daemon host first", async ({ page }) => {
-    const serverId = getServerId();
-
-    // Simulate the Electron desktop bridge so `useIsLocalDaemon` resolves the
-    // seeded host to the local daemon. `manageBuiltInDaemon: false` (returned
-    // from get_desktop_settings) bypasses the desktop bootstrap flow so only
-    // the sidebar's status query runs against the seeded test daemon.
-    await page.addInitScript((localServerId) => {
-      (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
-        platform: "darwin",
-        invoke: async (command: string) => {
-          if (command === "desktop_daemon_status") {
-            return {
-              serverId: localServerId,
-              status: "running",
-              listen: null,
-              hostname: null,
-              pid: null,
-              home: "",
-              version: null,
-              desktopManaged: true,
-              error: null,
-            };
-          }
-          if (command === "get_desktop_settings") {
-            return {
-              releaseChannel: "stable",
-              daemon: { manageBuiltInDaemon: false, keepRunningAfterQuit: true },
-            };
-          }
-          return null;
-        },
-        getPendingOpenProject: async () => null,
-        events: { on: async () => () => undefined },
-      };
-    }, serverId);
-
-    await gotoAppShell(page);
-    await openSettings(page);
-    await expectLocalHostEntryFirst(page, serverId);
-  });
 });
@@ -1,6 +1,6 @@
-import { test, expect } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { openSettingsSection } from "./helpers/settings";
+import { test, expect } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { openSettingsSection } from "../support/helpers/settings";

 test("Settings language selector switches General labels", async ({ page }) => {
  test.setTimeout(120_000);
@@ -1,12 +1,12 @@
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  buildHostWorkspaceRoute,
  buildOpenProjectRoute,
  buildSettingsRoute,
  buildSettingsSectionRoute,
 } from "@/utils/host-routes";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getE2EDaemonPort } from "../support/helpers/daemon-port";
 import {
  closeCompactSettings,
  openSettingsSection,
@@ -39,9 +39,9 @@ import {
  expectSettingsHostPickerLabel,
  openSettingsHostSection,
  removeCurrentHostFromSettings,
-} from "./helpers/settings";
-import { getServerId } from "./helpers/server-id";
-import { expectAppRoute } from "./helpers/route-assertions";
+} from "../support/helpers/settings";
+import { getServerId } from "../support/helpers/server-id";
+import { expectAppRoute } from "../support/helpers/route-assertions";

 async function openWorkspace(
  page: import("@playwright/test").Page,
@@ -1,9 +1,9 @@
 import { buildHostAgentDetailRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";
-import { expect, test } from "./fixtures";
-import { createIdleAgent, openWorkspaceWithAgents } from "./helpers/archive-tab";
-import { waitForTabBar, expectAgentTabActive } from "./helpers/launcher";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { expect, test } from "../support/fixtures";
+import { createIdleAgent, openWorkspaceWithAgents } from "../support/helpers/archive-tab";
+import { waitForTabBar, expectAgentTabActive } from "../support/helpers/launcher";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 async function pressSettingsToggleShortcut(page: import("@playwright/test").Page) {
  const modifier = process.platform === "darwin" ? "Meta" : "Control";
@@ -1,6 +1,6 @@
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { openSettingsSection } from "./helpers/settings";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { openSettingsSection } from "../support/helpers/settings";

 const DISCORD_DESTINATION =
  /^https:\/\/(?:discord\.gg\/jz8T2uahpH|discord\.com\/invite\/jz8T2uahpH)(?:[/?#]|$)/;
@@ -1,15 +1,15 @@
 import { expect } from "@playwright/test";
-import { test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  addOfflineHostAndReload,
  expectHostFilterRow,
  openSidebarDisplayPreferences,
  selectAllHostsFilter,
  toggleHostFilter,
-} from "./helpers/hosts";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+} from "../support/helpers/hosts";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 const SECONDARY_HOST_ID = "host-filter-secondary";

@@ -1,12 +1,12 @@
-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 { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { gotoWorkspace, clickNewTerminal } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { getServerId } from "../support/helpers/server-id";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { getVisibleWorkspaceAgentTabIds } from "../support/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
@@ -1,6 +1,6 @@
 import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test as base } from "./fixtures";
+import { test as base } from "../support/fixtures";
 import {
  beginWorkspaceFromProject,
  createWorkspaceWithoutAgent,
@@ -14,11 +14,14 @@ import {
  openProjectDirectoryWithHosts,
  renameProject,
  selectWorkspaceHost,
-} from "./helpers/project-grouping";
-import { type IsolatedHostDaemon, startIsolatedHostDaemon } from "./helpers/isolated-host-daemon";
-import { connectSeedClient, type SeedDaemonClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { createTempGitRepo } from "./helpers/workspace";
+} from "../support/helpers/project-grouping";
+import {
+  type IsolatedHostDaemon,
+  startIsolatedHostDaemon,
+} from "../support/helpers/isolated-host-daemon";
+import { connectSeedClient, type SeedDaemonClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { createTempGitRepo } from "../support/helpers/workspace";

 const PRIMARY_HOST_LABEL = "Primary Host";
 const SECONDARY_HOST_LABEL = "Secondary Host";
@@ -139,8 +142,14 @@ const test = base.extend<{
    const secondaryRepo = await createTempGitRepo("grouped-legacy-secondary-", {
      originUrl: SHARED_REMOTE_URL,
    });
-    const primaryClient = await connectSeedClient({ port: primaryHost.port });
-    const secondaryClient = await connectSeedClient({ port: secondaryHost.port });
+    const primaryClient = await connectSeedClient({
+      port: primaryHost.port,
+      projectOwnership: "host",
+    });
+    const secondaryClient = await connectSeedClient({
+      port: secondaryHost.port,
+      projectOwnership: "host",
+    });

    try {
      await createProject(primaryClient, {
@@ -1,10 +1,10 @@
 import type { Locator } from "@playwright/test";
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { getServerId } from "./helpers/server-id";
-import { seedWorkspace } from "./helpers/seed-client";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { getServerId } from "../support/helpers/server-id";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 async function rowTestIds(rows: Locator) {
  return rows.evaluateAll((elements) =>
@@ -1,4 +1,4 @@
-import { expect, test, type Page } from "./fixtures";
+import { expect, test, type Page } from "../support/fixtures";

 test.use({ viewport: { width: 1600, height: 900 } });

@@ -1,8 +1,8 @@
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 // The pin shortcut used to be registered by the sidebar row itself, so it silently did nothing
 // whenever the row was unmounted — a collapsed project section being the common case. It now
@@ -1,7 +1,7 @@
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";

 function workspaceRowTestId(workspaceId: string): string {
  return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
@@ -1,18 +1,18 @@
 import path from "node:path";
-import { test, expect } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { test, expect } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  closeMobileAgentSidebar,
  expectMobileAgentSidebarHidden,
  expectMobileAgentSidebarVisible,
  openMobileAgentSidebar,
  pinWorkspaceFromSidebar,
-} from "./helpers/sidebar";
-import { seedWorkspace } from "./helpers/seed-client";
-import { expectWorkspaceHeader } from "./helpers/workspace-ui";
-import { getServerId } from "./helpers/server-id";
-import { projectEquivalenceViewKey } from "./helpers/project-view-key";
-import { escapeRegex } from "./helpers/regex";
+} from "../support/helpers/sidebar";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { expectWorkspaceHeader } from "../support/helpers/workspace-ui";
+import { getServerId } from "../support/helpers/server-id";
+import { projectEquivalenceViewKey } from "../support/helpers/project-view-key";
+import { escapeRegex } from "../support/helpers/regex";

 const GITHUB_REMOTE_URL = "https://github.com/test-owner/test-repo.git";

@@ -0,0 +1,19 @@
+import { test } from "../support/fixtures";
+import { startupScenario } from "../support/helpers/startup-dsl";
+
+test.describe("Startup loading presentation", () => {
+  test("mobile reconnect preserves the saved host shell", async ({ page }) => {
+    const startup = await startupScenario(page)
+      .withMobileViewport()
+      .withSavedHost({
+        serverId: "srv_unreachable_mobile",
+        label: "Dev",
+        endpoint: "127.0.0.1:45678",
+      })
+      .openRoot();
+
+    await startup.expectsSavedHostShell({ serverId: "srv_unreachable_mobile", label: "Dev" });
+    await startup.expectsNoSavedHostErrorStatus();
+    await startup.expectsNoLocalServerStartupCopy();
+  });
+});
@@ -1,8 +1,8 @@
 import { Buffer } from "node:buffer";
 import type { CDPSession, Page, TestInfo } from "@playwright/test";
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 type WireDirection = "sent" | "received";
 type WirePhase = "startup" | "workspace_clicks";
@@ -1,15 +1,15 @@
-import { test } from "./fixtures";
-import { expectWorkspaceTabVisible } from "./helpers/archive-tab";
-import { expectAgentTabActive } from "./helpers/launcher";
-import { openAgentRoute } from "./helpers/mock-agent";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+import { test } from "../support/fixtures";
+import { expectWorkspaceTabVisible } from "../support/helpers/archive-tab";
+import { expectAgentTabActive } from "../support/helpers/launcher";
+import { openAgentRoute } from "../support/helpers/mock-agent";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
  detachSubagentFromTrack,
  expectSubagentRowGone,
  expectSubagentRowVisible,
  openSubagentsTrack,
  seedParentWithSubagent,
-} from "./helpers/subagents";
+} from "../support/helpers/subagents";

 test.describe("Subagent detach", () => {
  let workspace: SeededWorkspace;
@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { test, expect, type Page } from "./fixtures";
-import { TerminalE2EHarness, type TerminalInstance } from "./helpers/terminal-dsl";
+import { test, expect, type Page } from "../support/fixtures";
+import { TerminalE2EHarness, type TerminalInstance } from "../support/helpers/terminal-dsl";

 type HookActivityState = "running" | "idle" | "needs-input";
 type TabStatusBucket = "running" | "needs_input" | "attention" | "none";
@@ -1,15 +1,15 @@
 import type { Page } from "@playwright/test";
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness, withTerminalInApp } from "./helpers/terminal-dsl";
-import { getTabTestIds } from "./helpers/launcher";
+import { test, expect } from "../support/fixtures";
+import { TerminalE2EHarness, withTerminalInApp } from "../support/helpers/terminal-dsl";
+import { getTabTestIds } from "../support/helpers/launcher";
 import {
  installTerminalRenderProbe,
  readTerminalRenderProbe,
  resetTerminalRenderProbe,
  startTerminalFrameSampling,
  summarizeTerminalRenderProbe,
-} from "./helpers/terminal-probes";
-import { getTerminalBufferText, waitForTerminalContent } from "./helpers/terminal-perf";
+} from "../support/helpers/terminal-probes";
+import { getTerminalBufferText, waitForTerminalContent } from "../support/helpers/terminal-perf";

 interface TerminalLayoutMetrics {
  visibleSurfaceCount: number;
@@ -1,14 +1,14 @@
 import { performance } from "node:perf_hooks";
 import type { Page, TestInfo } from "@playwright/test";
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness, type TerminalInstance } from "./helpers/terminal-dsl";
+import { test, expect } from "../support/fixtures";
+import { TerminalE2EHarness, type TerminalInstance } from "../support/helpers/terminal-dsl";
 import {
  installTerminalKeystrokeStressProbe,
  readTerminalKeystrokeStressReport,
  resetTerminalKeystrokeStressProbe,
  type LatencyStats,
-} from "./helpers/terminal-probes";
-import { waitForTerminalContent } from "./helpers/terminal-perf";
+} from "../support/helpers/terminal-probes";
+import { waitForTerminalContent } from "../support/helpers/terminal-perf";

 const INPUT_TEXT = buildStressText(600);
 const BIG_DIFF_BYTES = 256_000;
@@ -1,12 +1,12 @@
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness } from "./helpers/terminal-dsl";
+import { test, expect } from "../support/fixtures";
+import { TerminalE2EHarness } from "../support/helpers/terminal-dsl";
 import {
  waitForTerminalContent,
  measureKeystrokeLatency,
  computePercentile,
  round2,
  type LatencySample,
-} from "./helpers/terminal-perf";
+} from "../support/helpers/terminal-perf";

 const LINE_COUNT = 50_000;
 const THROUGHPUT_BUDGET_MS = 30_000;
@@ -1,8 +1,8 @@
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness } from "./helpers/terminal-dsl";
-import { getTerminalBufferText, waitForTerminalContent } from "./helpers/terminal-perf";
+import { test, expect } from "../support/fixtures";
+import { TerminalE2EHarness } from "../support/helpers/terminal-dsl";
+import { getTerminalBufferText, waitForTerminalContent } from "../support/helpers/terminal-perf";

 const OSC11_CAPTURE_SCRIPT = `
 let captured = Buffer.alloc(0);
@@ -1,7 +1,7 @@
 import type { Page } from "@playwright/test";
-import { test, expect } from "./fixtures";
-import { TerminalE2EHarness, withTerminalInApp } from "./helpers/terminal-dsl";
-import { getTerminalBufferText, waitForTerminalContent } from "./helpers/terminal-perf";
+import { test, expect } from "../support/fixtures";
+import { TerminalE2EHarness, withTerminalInApp } from "../support/helpers/terminal-dsl";
+import { getTerminalBufferText, waitForTerminalContent } from "../support/helpers/terminal-perf";

 interface TerminalSize {
  rows: number | null;
@@ -1,8 +1,8 @@
-import { test, expect, type Page } from "./fixtures";
-import { TerminalE2EHarness } from "./helpers/terminal-dsl";
-import { getTerminalBufferText } from "./helpers/terminal-perf";
-import { buildHostWorkspaceRoute } from "../src/utils/host-routes";
-import { getServerId } from "./helpers/server-id";
+import { test, expect, type Page } from "../support/fixtures";
+import { TerminalE2EHarness } from "../support/helpers/terminal-dsl";
+import { getTerminalBufferText } from "../support/helpers/terminal-perf";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";
+import { getServerId } from "../support/helpers/server-id";

 /**
 * Regression: a terminal created while the window is unfocused must still claim its PTY size
@@ -1,7 +1,7 @@
 import type { Locator, Page } from "@playwright/test";
-import { test, expect } from "./fixtures";
-import { daemonWsRoutePattern } from "./helpers/daemon-port";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { test, expect } from "../support/fixtures";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";

 type WebSocketMessage = string | Buffer;

@@ -1,12 +1,12 @@
-import { expect, test, type Page } from "./fixtures";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+import { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
 import {
  composerLocator,
  expectComposerEditable,
  expectComposerVisible,
  fillComposerDraft,
  submitMessage,
-} from "./helpers/composer";
+} from "../support/helpers/composer";

 async function expectUserMessageCount(page: Page, expected: number): Promise<void> {
  await expect(page.getByTestId("user-message")).toHaveCount(expected, { timeout: 15_000 });
@@ -1,20 +1,20 @@
 import { expect, type Page } from "@playwright/test";
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
-import { test } from "./fixtures";
-import { seedWorkspace, type SeedDaemonClient } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { observeTimelineSubscriptions } from "./helpers/timeline-delivery";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+import { test } from "../support/fixtures";
+import { seedWorkspace, type SeedDaemonClient } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { observeTimelineSubscriptions } from "../support/helpers/timeline-delivery";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 import {
  expectAgentIdle,
  expectInlineWorkingIndicator,
  expectTurnCopyButton,
-} from "./helpers/agent-stream";
+} from "../support/helpers/agent-stream";
 import {
  expectReconnectingToastGone,
  expectReconnectingToastVisible,
-} from "./helpers/workspace-ui";
+} from "../support/helpers/workspace-ui";

 interface ViewedTimelineScenario {
  client: SeedDaemonClient;
@@ -1,11 +1,11 @@
 import { randomUUID } from "node:crypto";
-import { test, expect, type Page } from "./fixtures";
-import { seedWorkspace, type SeedDaemonClient } from "./helpers/seed-client";
-import { createIdleAgent, expectWorkspaceTabVisible } from "./helpers/archive-tab";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { test, expect, type Page } from "../support/fixtures";
+import { seedWorkspace, type SeedDaemonClient } from "../support/helpers/seed-client";
+import { createIdleAgent, expectWorkspaceTabVisible } from "../support/helpers/archive-tab";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
-import { renameModalInput, renameModalSubmit } from "./helpers/rename";
-import { getServerId } from "./helpers/server-id";
+import { renameModalInput, renameModalSubmit } from "../support/helpers/rename";
+import { getServerId } from "../support/helpers/server-id";

 async function openAgentInWorkspace(page: Page, agent: { id: string; workspaceId: string }) {
  await page.goto(buildHostAgentDetailRoute(getServerId(), agent.id, agent.workspaceId));
@@ -1,10 +1,10 @@
-import { test, expect } from "./fixtures";
-import { expectComposerVisible, submitMessage } from "./helpers/composer";
-import { delayCreatedAgentInitialTailResponse } from "./helpers/agent-timeline-gate";
-import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
-import { seedWorkspace, type SeedDaemonClient } from "./helpers/seed-client";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-import { getServerId } from "./helpers/server-id";
+import { test, expect } from "../support/fixtures";
+import { expectComposerVisible, submitMessage } from "../support/helpers/composer";
+import { delayCreatedAgentInitialTailResponse } from "../support/helpers/agent-timeline-gate";
+import { delayBrowserAgentCreatedStatus } from "../support/helpers/new-workspace";
+import { seedWorkspace, type SeedDaemonClient } from "../support/helpers/seed-client";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { getServerId } from "../support/helpers/server-id";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";

 async function waitForCreatedAgentId(
@@ -1,9 +1,12 @@
 import { existsSync } from "node:fs";
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { seedWorkspace } from "./helpers/seed-client";
-import { expectWorkspaceAbsentFromSidebar, selectWorkspaceInSidebar } from "./helpers/sidebar";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import {
+  expectWorkspaceAbsentFromSidebar,
+  selectWorkspaceInSidebar,
+} from "../support/helpers/sidebar";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 test.describe("Workspace archive shortcut", () => {
  test("archives the selected workspace without removing its local checkout", async ({ page }) => {
@@ -1,13 +1,13 @@
-import { expect, test } from "./fixtures";
-import { clickNewChat, clickNewTerminal, gotoWorkspace } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+import { expect, test } from "../support/fixtures";
+import { clickNewChat, clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
  expectTerminalSurfaceVisible,
  focusTerminalSurface,
  typeInTerminal,
  setupDeterministicPrompt,
  waitForTerminalContent,
-} from "./helpers/terminal-perf";
+} from "../support/helpers/terminal-perf";

 interface CreatedAgentCwdAssertion {
  workspaceId: string;
@@ -1,4 +1,4 @@
-import { expect, test, type Page } from "./fixtures";
+import { expect, test, type Page } from "../support/fixtures";

 const modifier = process.platform === "darwin" ? "Meta" : "Control";

@@ -1,9 +1,9 @@
-import { test } from "./fixtures";
+import { test } from "../support/fixtures";
 import {
  createAgentChatFromLauncher,
  createStandaloneTerminalFromLauncher,
  expectTerminalCwd,
-} from "./helpers/workspace-lifecycle";
+} from "../support/helpers/workspace-lifecycle";

 test.describe("Workspace lifecycle", () => {
  // The first test after a spec-file switch can intermittently fail because
@@ -1,7 +1,11 @@
-import { test, expect } from "./fixtures";
-import { expectWorkspaceTabVisible } from "./helpers/archive-tab";
-import { expectComposerEditable, expectComposerVisible, submitMessage } from "./helpers/composer";
-import { clickNewChat, gotoWorkspace } from "./helpers/launcher";
+import { test, expect } from "../support/fixtures";
+import { expectWorkspaceTabVisible } from "../support/helpers/archive-tab";
+import {
+  expectComposerEditable,
+  expectComposerVisible,
+  submitMessage,
+} from "../support/helpers/composer";
+import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
 import {
  assertNewWorkspaceSidebarAndHeader,
  connectNewWorkspaceDaemonClient,
@@ -10,16 +14,16 @@ import {
  selectWorkspaceIsolation,
  submitNewWorkspaceEmpty,
  submitNewWorkspacePrompt,
-} from "./helpers/new-workspace";
-import { getServerId } from "./helpers/server-id";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/new-workspace";
+import { getServerId } from "../support/helpers/server-id";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
 import {
  expectSubagentRowVisible,
  openSubagentsTrack,
  seedParentWithCrossWorkspaceSubagent,
-} from "./helpers/subagents";
-import { expectWorkspaceHeader, waitForSidebarHydration } from "./helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
+} from "../support/helpers/subagents";
+import { expectWorkspaceHeader, waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { getVisibleWorkspaceAgentTabIds } from "../support/helpers/workspace-tabs";

 type NewWorkspaceDaemonClient = Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
 type WorkspaceIndicator = "attention" | "done" | "failed" | "loading" | "needs_input" | "running";
--- a/Show More
+++ b/Show More