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.
2026-07-29 12:01:31 +00:00 · 2026-07-28 18:45:18 +02:00
parent cec40f6616
commit 61409dfe9c
217 changed files with 1355 additions and 1221 deletions
--- a/.github/ci-paths.yml
+++ b/.github/ci-paths.yml
@@ -35,20 +35,15 @@ hub:

 server:
  - "packages/server/**"
-  - "packages/app/e2e/fixtures/recording.*"
+  - "packages/app/e2e/support/fixtures/recording.*"

 desktop:
  - "packages/desktop/**"
-
-desktop_bridge:
-  - "packages/desktop/src/*.{ts,tsx}"
-  - "packages/desktop/src/features/browser-*.{ts,tsx}"
-  - "packages/desktop/src/features/browser-*/**"
-  - "packages/desktop/scripts/browser-*.mjs"
-  - "packages/desktop/*.{json,yml}"
-  - "packages/app/src/**/browser-*.{ts,tsx}"
-  - "packages/app/src/**/browser-*/**"
-  - "packages/app/*.{cjs,js,json,ts}"
+  - "packages/app/src/desktop/**"
+  - "packages/server/src/server/browser-tools/**"
+  - "packages/app/e2e/support/**"
+  - "packages/app/*config.{cjs,js,ts}"
+  - "packages/app/package.json"

 app:
  - "packages/app/**"
@@ -59,21 +54,16 @@ sdk:
  - "packages/highlight/**"
  - "packages/protocol/**"

-playwright:
-  - "packages/app/src/**"
-  - "packages/app/e2e/**"
+browser:
+  - "packages/app/src/!(desktop)/**"
+  - "packages/app/e2e/browser/**"
+  - "packages/app/e2e/support/**"
  - "packages/app/assets/**"
  - "packages/app/public/**"
  - "packages/app/index.ts"
  - "packages/app/*config.{cjs,js,ts}"
  - "packages/app/package.json"

-playwright_desktop:
-  - "packages/app/src/**/*.electron.{ts,tsx}"
-  - "packages/app/e2e/**"
-  - "packages/app/*config.{cjs,js,ts}"
-  - "packages/app/package.json"
-
 relay:
  - "packages/relay/**"

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,11 +30,9 @@ jobs:
      hub: ${{ steps.filter.outputs.hub }}
      server: ${{ steps.filter.outputs.server }}
      desktop: ${{ steps.filter.outputs.desktop }}
-      desktop_bridge: ${{ steps.filter.outputs.desktop_bridge }}
      app: ${{ steps.filter.outputs.app }}
      sdk: ${{ steps.filter.outputs.sdk }}
-      playwright: ${{ steps.filter.outputs.playwright }}
-      playwright_desktop: ${{ steps.filter.outputs.playwright_desktop }}
+      browser: ${{ steps.filter.outputs.browser }}
      relay: ${{ steps.filter.outputs.relay }}
      cli: ${{ steps.filter.outputs.cli }}
    steps:
@@ -188,7 +186,7 @@ jobs:
  desktop-tests-ubuntu:
    name: desktop-tests (ubuntu-latest)
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false' || needs.changes.outputs.desktop_bridge != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false') }}
    runs-on: ubuntu-latest
    timeout-minutes: 30
    permissions:
@@ -208,34 +206,37 @@ jobs:
        run: npm run build:server

      - name: Run desktop tests
-        if: ${{ needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false' }}
        run: npm run test --workspace=@getpaseo/desktop

-      - name: Build app dependencies for desktop E2E
-        if: ${{ runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop_bridge != 'false') }}
-        run: npm run build:app-deps
-
      - name: Install virtual display
-        if: ${{ runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop_bridge != 'false') }}
+        if: ${{ runner.os == 'Linux' }}
        run: sudo apt-get update && sudo apt-get install -y xvfb xauth

-      - name: Run real Electron browser tab bridge E2E
-        if: ${{ runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop_bridge != 'false') }}
-        run: npm run test:e2e:browser-tab-bridge --workspace=@getpaseo/desktop
-        env:
-          PASEO_TAB_BRIDGE_E2E_ARTIFACT_DIR: ${{ runner.temp }}/browser-tab-bridge-e2e
+      - name: Install Playwright browser
+        if: ${{ runner.os == 'Linux' }}
+        run: npx playwright install chromium

-      - name: Upload browser tab bridge diagnostics
+      - name: Run desktop renderer E2E
+        if: ${{ runner.os == 'Linux' }}
+        run: npm run test:e2e:renderer --workspace=@getpaseo/desktop
+
+      - name: Run desktop browser E2E
+        if: ${{ runner.os == 'Linux' }}
+        run: npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop
+        env:
+          PASEO_DESKTOP_BROWSER_E2E_ARTIFACT_DIR: ${{ runner.temp }}/desktop-browser-e2e
+
+      - name: Upload desktop browser diagnostics
        uses: actions/upload-artifact@v4
-        if: ${{ failure() && runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop_bridge != 'false') }}
+        if: ${{ failure() && runner.os == 'Linux' }}
        with:
-          name: browser-tab-bridge-e2e
-          path: ${{ runner.temp }}/browser-tab-bridge-e2e
+          name: desktop-browser-e2e
+          path: ${{ runner.temp }}/desktop-browser-e2e
          if-no-files-found: ignore
          retention-days: 7

      - name: Build and smoke unpacked desktop app
-        if: ${{ runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false') }}
+        if: ${{ runner.os == 'Linux' }}
        run: npm run build:desktop -- --publish never --linux --x64 --dir
        env:
          EP_GH_IGNORE_TIME: true
@@ -244,7 +245,7 @@ jobs:

      - name: Upload packaged smoke diagnostics
        uses: actions/upload-artifact@v4
-        if: ${{ failure() && runner.os == 'Linux' && (needs.changes.outputs.full != 'false' || needs.changes.outputs.desktop != 'false') }}
+        if: ${{ failure() && runner.os == 'Linux' }}
        with:
          name: desktop-packaged-smoke-linux-x64
          path: ${{ runner.temp }}/desktop-smoke
@@ -325,7 +326,7 @@ jobs:
  playwright-1:
    name: playwright (shard 1/4)
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.playwright != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -373,7 +374,7 @@ jobs:
  playwright-2:
    name: playwright (shard 2/4)
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.playwright != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -384,7 +385,7 @@ jobs:
  playwright-3:
    name: playwright (shard 3/4)
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.playwright != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -395,7 +396,7 @@ jobs:
  playwright-4:
    name: playwright (shard 4/4)
    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.playwright != 'false') }}
+    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.browser != 'false') }}
    runs-on: ubuntu-latest
    env:
      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
@@ -403,47 +404,6 @@ jobs:
      PLAYWRIGHT_ARTIFACT: "4"
    steps: *playwright_test_steps

-  playwright-desktop:
-    name: playwright (desktop overlay)
-    needs: changes
-    if: ${{ !cancelled() && (needs.changes.outputs.full != 'false' || needs.changes.outputs.playwright_desktop != 'false') }}
-    runs-on: ubuntu-latest
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: "1"
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "npm"
-
-      - name: Install dependencies with retry
-        run: node scripts/npm-retry.mjs ci
-
-      - name: Install Playwright browsers
-        timeout-minutes: 10
-        run: npx playwright install chromium
-
-      - name: Build app dependencies
-        run: npm run build:app-deps
-
-      - name: Build server stack
-        run: npm run build:server
-
-      - name: Run desktop-overlay Playwright tests
-        run: npm run test:e2e:desktop --workspace=@getpaseo/app
-
-      - name: Upload test artifacts
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: playwright-results-desktop
-          path: |
-            packages/app/test-results/
-            packages/app/playwright-report/
-          retention-days: 7
-
  relay-tests:
    name: relay-tests
    needs: changes
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -189,9 +189,9 @@
        "packages/app/src/components/agent-list.tsx",
        "packages/app/src/components/agent-status-dot.tsx",
        "packages/app/src/components/attachment-lightbox.tsx",
-        "packages/app/src/components/browser-pane.electron.tsx",
-        "packages/app/src/components/browser-pane.tsx",
-        "packages/app/src/components/browser-pane.web.tsx",
+        "packages/app/src/desktop/browser/pane/index.electron.tsx",
+        "packages/app/src/desktop/browser/pane/index.tsx",
+        "packages/app/src/desktop/browser/pane/index.web.tsx",
        "packages/app/src/components/command-center.tsx",
        "packages/app/src/components/context-window-meter.tsx",
        "packages/app/src/components/dictation-controls.tsx",
@@ -280,7 +280,7 @@
      }
    },
    {
-      "files": ["**/e2e/fixtures.ts"],
+      "files": ["**/e2e/**/fixtures.ts"],
      "rules": {
        "no-empty-pattern": "off"
      }
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -148,12 +148,12 @@ The app runs on iOS, Android, web (browser), and web (Electron desktop). Code is
  Import as `@/hooks/use-audio-recorder` — Metro picks the right file automatically.
 - **Use `.electron.ts` / `.electron.tsx` for Electron-only web modules.** Electron is still the Metro `web` platform, but desktop dev/build sets `PASEO_WEB_PLATFORM=electron`, so Metro first looks for `.electron.*` files and falls back to normal `.web.*` files. Use this when the implementation depends on Electron-only behavior such as `webviewTag`, desktop preload APIs, or the Electron bridge. Keep plain browser web in `.web.*`, and keep native fallbacks in the base file or `.native.*`.
  ```
-  components/
-    browser-pane.electron.tsx ← Electron <webview> implementation
-    browser-pane.web.tsx      ← plain web fallback
-    browser-pane.tsx          ← native fallback
+  desktop/browser/pane/
+    index.electron.tsx ← Electron <webview> implementation
+    index.web.tsx      ← plain web fallback
+    index.tsx          ← native fallback
  ```
-  Import as `@/components/browser-pane` — Electron desktop gets the `.electron.tsx` file, browser web gets `.web.tsx`, and native gets the native/base implementation.
+  Import as `@/desktop/browser/pane` — Electron desktop gets the `.electron.tsx` file, browser web gets `.web.tsx`, and native gets the native/base implementation.
 - **NEVER use raw DOM APIs without `isWeb` guard.** DOM APIs crash native. Casting a RN ref to `HTMLElement` is a red flag — ensure the block is web-only.
 - **NEVER use `onPointerEnter`/`onPointerLeave`.** They don't fire on native iOS.
 - **Hover only works on web.** React Native's `onHoverIn`/`onHoverOut` on `Pressable` does NOT fire on native iOS/iPad — the underlying W3C pointer events are behind disabled experimental flags. For hover-to-show UI (kebab menus, action buttons), use `isHovered || isNative || isCompact` so the controls are always visible on native and hover-to-show on web.
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -124,14 +124,14 @@ PASEO_DESKTOP_SMOKE_ARTIFACT_DIR=/tmp/paseo-desktop-smoke \
 npm run build:desktop -- --publish never --linux --x64 --dir
 ```

-### Browser tab bridge regression
+### Desktop browser regression

-The desktop browser tab bridge E2E launches an isolated real daemon, Metro, and Electron app. It forces workspace LRU eviction to reparent the original tab and replace its guest `WebContents`, then makes one MCP call each for tab listing, snapshot, and click against that original browser id. A final MCP wait proves the real target page received the click.
+The desktop browser E2E launches an isolated real daemon, Metro, and Electron app. It forces workspace LRU eviction to reparent the original tab and replace its guest `WebContents`, then makes one MCP call each for tab listing, snapshot, and click against that original browser id. A final MCP wait proves the real target page received the click.

 Run it locally with the same command owned by the Ubuntu `desktop-tests` required check:

 ```bash
-npm run test:e2e:browser-tab-bridge --workspace=@getpaseo/desktop
+npm run test:e2e:browser-tabs --workspace=@getpaseo/desktop
 ```

 ## Test organization
@@ -154,7 +154,7 @@ Vitest picks up tests by suffix. The suffix tells the runner which category it b
 | `*.real.e2e.test.ts`  | E2E that hits a real provider (Claude/Codex/Copilot/OpenCode/Pi) — needs creds in `packages/server/.env.test` | `npm run test:integration:real` / `test:e2e:real`                                    |
 | `*.local.e2e.test.ts` | E2E that needs a local-only resource                                                                          | `npm run test:integration:local` / `test:e2e:local`                                  |

-App-level Playwright browser E2E lives in `packages/app/e2e/*.spec.ts` and runs via `npm run test:e2e --workspace=@getpaseo/app` (separate from Vitest E2E). App Playwright specs that hit real providers use `*.real.spec.ts` and run through `npm run test:e2e:real --workspace=@getpaseo/app`; the default app E2E project ignores that suffix so CI does not need provider credentials.
+Browser Playwright specs live in `packages/app/e2e/browser/`. Desktop Playwright and real-Electron E2E live in `packages/desktop/e2e/`. Harness code shared by both suites lives in `packages/app/e2e/support/`; neither suite may place specs there. App Playwright specs that hit real providers use `*.real.spec.ts` and run through `npm run test:e2e:real --workspace=@getpaseo/app`; the default browser project ignores that suffix so CI does not need provider credentials.

 Live provider smoke tests belong in `*.real.e2e.test.ts`, not `*.test.ts`, even when guarded by environment variables. Default unit suites must use deterministic provider adapters/fakes so missing credits, auth outages, and upstream model drift do not block normal CI.

@@ -185,7 +185,7 @@ PR checks are routed by the behavior each suite proves, using `.github/ci-paths.

 Required matrix legs are declared as statically named jobs. Their shared steps use YAML anchors, while job-level `if` conditions let GitHub report an unaffected leg as genuinely skipped without allocating a runner or losing the exact required-check name.

-The smallest meaningful contract wins over package ownership. Tiny structural invariants such as daemon launch supervision run unconditionally in the always-running routing job instead of maintaining a transitive file list; this check reads source entrypoints and builds no product. Routed integration contracts use stable domain directories or globs. CLI-side Hub changes select one focused test inside the existing required server jobs, while browser-domain changes select the real Electron bridge step inside the required Ubuntu desktop job. Repository scripts and the shared Vitest configuration run every PR contract because they are cross-cutting toolchain inputs.
+The smallest meaningful contract wins over package ownership. Tiny structural invariants such as daemon launch supervision run unconditionally in the always-running routing job instead of maintaining a transitive file list; this check reads source entrypoints and builds no product. Routed integration contracts use stable domain directories. Browser changes select the required Playwright shards; desktop changes select the existing required desktop jobs, with renderer, real-Electron, and packaged-app coverage together in the Ubuntu leg. CLI-side Hub changes select one focused test inside the existing required server jobs. Repository scripts and the shared Vitest configuration run every PR contract because they are cross-cutting toolchain inputs.

 ## Agent authentication in tests

--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,7 @@
        "oxlint": "1.61.0",
        "oxlint-tsgolint": "^0.22.1",
        "patch-package": "^8.0.1",
+        "picomatch": "4.0.5",
        "playwright": "^1.56.1",
        "typescript": "^5.9.3",
        "ws": "^8.20.0"
--- a/package.json
+++ b/package.json
@@ -127,6 +127,7 @@
    "oxlint": "1.61.0",
    "oxlint-tsgolint": "^0.22.1",
    "patch-package": "^8.0.1",
+    "picomatch": "4.0.5",
    "playwright": "^1.56.1",
    "typescript": "^5.9.3",
    "ws": "^8.20.0"
--- a/packages/app/e2e/browser/00-sessions-empty.spec.ts
+++ b/packages/app/e2e/browser/00-sessions-empty.spec.ts
@@ -1,9 +1,9 @@
 // "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";
+import { test } from "../support/fixtures";
+import { connectSeedClient } from "../support/helpers/seed-client";
+import { expectSessionsEmptyState, openSessions } from "../support/helpers/archive-tab";

 test.describe("Sessions screen empty state", () => {
  test.beforeAll(async () => {
--- a/packages/app/e2e/browser/acp-provider-catalog.spec.ts
+++ b/packages/app/e2e/browser/acp-provider-catalog.spec.ts
@@ -1,13 +1,13 @@
-import { test } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
-import { getServerId } from "./helpers/server-id";
+import { test } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
+import { getServerId } from "../support/helpers/server-id";
 import {
  expectProviderInstalledInSettings,
  installAcpCatalogProvider,
  openAddProviderArea,
  openSettingsHost,
  openSettingsHostSection,
-} from "./helpers/settings";
+} from "../support/helpers/settings";

 const ACP_PROVIDER = {
  id: "hermes",
--- a/packages/app/e2e/browser/add-changed-file-to-chat.spec.ts
+++ b/packages/app/e2e/browser/add-changed-file-to-chat.spec.ts
@@ -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();
--- a/packages/app/e2e/browser/add-project-flow.spec.ts
+++ b/packages/app/e2e/browser/add-project-flow.spec.ts
@@ -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, type Page } from "./fixtures";
+import { test, expect, type Page } from "../support/fixtures";
 import {
  addProjectFlow,
  addProjectFlowBack,
@@ -14,14 +14,17 @@ import {
  expectNewWorkspaceForAddedProject,
  openAddProjectFlow,
  waitForConnectedHost,
-} from "./helpers/add-project-flow";
-import { gotoAppShell } from "./helpers/app";
-import { buildSeededHost } from "./helpers/daemon-registry";
-import { addOfflineHostAndReload } 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/add-project-flow";
+import { gotoAppShell } from "../support/helpers/app";
+import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { addOfflineHostAndReload } 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 EXTRA_HOSTS_KEY = "@paseo:e2e-extra-hosts";
 const SECONDARY_HOST_ID = "add-project-flow-secondary";
--- a/packages/app/e2e/browser/add-project-github.real.spec.ts
+++ b/packages/app/e2e/browser/add-project-github.real.spec.ts
@@ -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 });
--- a/packages/app/e2e/browser/agent-message-submission.spec.ts
+++ b/packages/app/e2e/browser/agent-message-submission.spec.ts
@@ -1,7 +1,7 @@
 import type { Locator, Page } from "@playwright/test";
-import { expect, test as baseTest } from "./fixtures";
-import { awaitToolCall, expectAgentIdle } from "./helpers/agent-stream";
-import { gateNextAgentMessage } from "./helpers/agent-message-gate";
+import { expect, test as baseTest } from "../support/fixtures";
+import { awaitToolCall, expectAgentIdle } from "../support/helpers/agent-stream";
+import { gateNextAgentMessage } from "../support/helpers/agent-message-gate";
 import {
  attachImageFromMenu,
  expectComposerDraft,
@@ -11,16 +11,16 @@ import {
  fillComposerDraft,
  sendDraftToQueue,
  startRunningMockAgent,
-} from "./helpers/composer";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { readScrollMetrics } from "./helpers/agent-bottom-anchor";
-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 { readScrollMetrics } from "../support/helpers/agent-bottom-anchor";
+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";

 const IMAGE = {
  name: "message-submission.png",
--- a/packages/app/e2e/browser/agent-stream-ui.spec.ts
+++ b/packages/app/e2e/browser/agent-stream-ui.spec.ts
@@ -1,11 +1,11 @@
-import { test, expect } from "./fixtures";
+import { test, expect } from "../support/fixtures";
 import {
  awaitAssistantMessage,
  expectAgentIdle,
  expectInlineWorkingIndicator,
  expectTurnCopyButton,
  expectScrollFollowsNewContent,
-} from "./helpers/agent-stream";
+} from "../support/helpers/agent-stream";
 import {
  expectScrollStaysFixed,
  clickToolCallBesideScrollToBottomButton,
@@ -13,12 +13,12 @@ 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";
-import { openAgentRoute, seedMockAgentWorkspace } from "./helpers/mock-agent";
+} 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 } from "../support/helpers/mock-agent";

 const SCROLL_AWAY_MIN_SCROLLABLE_DISTANCE = 360;

--- a/packages/app/e2e/browser/agent-timeline-pagination.spec.ts
+++ b/packages/app/e2e/browser/agent-timeline-pagination.spec.ts
@@ -1,4 +1,4 @@
-import { test } from "./fixtures";
+import { test } from "../support/fixtures";
 import {
  expectLoadedTimelineDoesNotScroll,
  expectTimelinePromptNotMounted,
@@ -8,7 +8,7 @@ import {
  openAgentTimeline,
  scrollTimelineUntilOlderHistoryIsReachable,
  seedLongMockAgentTimeline,
-} from "./helpers/timeline-pagination";
+} from "../support/helpers/timeline-pagination";

 test.describe("Agent timeline pagination", () => {
  test("loads older history when the user scrolls to the top of a long agent timeline", async ({
--- a/packages/app/e2e/browser/archive-tab.spec.ts
+++ b/packages/app/e2e/browser/archive-tab.spec.ts
@@ -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>>;
--- a/packages/app/e2e/browser/archived-codex-agent.real.spec.ts
+++ b/packages/app/e2e/browser/archived-codex-agent.real.spec.ts
@@ -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(
--- a/packages/app/e2e/browser/assistant-fork-menu.spec.ts
+++ b/packages/app/e2e/browser/assistant-fork-menu.spec.ts
@@ -1,17 +1,17 @@
-import { expect, test as base, type Page } from "./fixtures";
-import { scrollAgentChatToBottom } from "./helpers/agent-bottom-anchor";
-import { awaitAssistantMessage } from "./helpers/agent-stream";
-import { expectComposerVisible, submitMessage } from "./helpers/composer";
-import { getE2EDaemonPort } from "./helpers/daemon-port";
+import { expect, test as base, type Page } from "../support/fixtures";
+import { scrollAgentChatToBottom } from "../support/helpers/agent-bottom-anchor";
+import { awaitAssistantMessage } from "../support/helpers/agent-stream";
+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>;
--- a/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
+++ b/packages/app/e2e/browser/bottom-sheet-reopen.spec.ts
@@ -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 };

--- a/packages/app/e2e/browser/branch-switcher.spec.ts
+++ b/packages/app/e2e/browser/branch-switcher.spec.ts
@@ -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,
--- a/packages/app/e2e/browser/client-slash-commands.spec.ts
+++ b/packages/app/e2e/browser/client-slash-commands.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/codex-plan-approval.spec.ts
+++ b/packages/app/e2e/browser/codex-plan-approval.spec.ts
@@ -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 ({
--- a/packages/app/e2e/browser/command-center-host.spec.ts
+++ b/packages/app/e2e/browser/command-center-host.spec.ts
@@ -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";
--- a/packages/app/e2e/browser/command-center-workspaces.spec.ts
+++ b/packages/app/e2e/browser/command-center-workspaces.spec.ts
@@ -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";
--- a/packages/app/e2e/browser/commit-diff-panel.spec.ts
+++ b/packages/app/e2e/browser/commit-diff-panel.spec.ts
@@ -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";

--- a/packages/app/e2e/browser/composer-attachments.spec.ts
+++ b/packages/app/e2e/browser/composer-attachments.spec.ts
@@ -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,
--- a/packages/app/e2e/browser/composer-autocomplete.spec.ts
+++ b/packages/app/e2e/browser/composer-autocomplete.spec.ts
@@ -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 = [
  {
--- a/packages/app/e2e/browser/diff-row-alignment.spec.ts
+++ b/packages/app/e2e/browser/diff-row-alignment.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/directory-bootstrap.spec.ts
+++ b/packages/app/e2e/browser/directory-bootstrap.spec.ts
@@ -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 ({
--- a/packages/app/e2e/browser/empty-project-persists.spec.ts
+++ b/packages/app/e2e/browser/empty-project-persists.spec.ts
@@ -1,17 +1,17 @@
 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 { 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 { createTempGitRepo } from "../support/helpers/workspace";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 function workspaceRowTestId(workspaceId: string): string {
  return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
--- a/packages/app/e2e/browser/file-editing.spec.ts
+++ b/packages/app/e2e/browser/file-editing.spec.ts
@@ -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=",
--- a/packages/app/e2e/browser/file-explorer-collapse.spec.ts
+++ b/packages/app/e2e/browser/file-explorer-collapse.spec.ts
@@ -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;

--- a/packages/app/e2e/browser/import-session.opencode.real.spec.ts
+++ b/packages/app/e2e/browser/import-session.opencode.real.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/launcher-tab.spec.ts
+++ b/packages/app/e2e/browser/launcher-tab.spec.ts
@@ -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 ──────────────────────────────────────────────────────────

--- a/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-codex-mode-preferences.spec.ts
@@ -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";

--- a/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-composer-draft.spec.ts
@@ -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.

--- a/packages/app/e2e/browser/new-workspace-entry.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-entry.spec.ts
@@ -1,18 +1,21 @@
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
+import { expect, test } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
 import {
  connectNewWorkspaceDaemonClient,
  expectNewWorkspaceProjectSelected,
  openGlobalNewWorkspaceComposer,
  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 { 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 {
+  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
--- a/packages/app/e2e/browser/new-workspace-isolation-memory.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-isolation-memory.spec.ts
@@ -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
--- a/packages/app/e2e/browser/new-workspace-mode-cycle-safety.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-mode-cycle-safety.spec.ts
@@ -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";

--- a/packages/app/e2e/browser/new-workspace-preselect.spec.ts
+++ b/packages/app/e2e/browser/new-workspace-preselect.spec.ts
@@ -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",
--- a/packages/app/e2e/browser/new-workspace.spec.ts
+++ b/packages/app/e2e/browser/new-workspace.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/out-of-band-command.codex.real.spec.ts
+++ b/packages/app/e2e/browser/out-of-band-command.codex.real.spec.ts
@@ -1,10 +1,10 @@
 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 { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
+import { expect, test } from "../support/fixtures";
+import { submitMessage } from "../support/helpers/composer";
+import { cleanupRewindFlow, launchAgent, type AgentHandle } from "../support/helpers/rewind-flow";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";

 test.describe("Codex out-of-band commands", () => {
  test.setTimeout(300_000);
--- a/packages/app/e2e/browser/pr-pane.spec.ts
+++ b/packages/app/e2e/browser/pr-pane.spec.ts
@@ -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();

--- a/packages/app/e2e/browser/projects-settings.spec.ts
+++ b/packages/app/e2e/browser/projects-settings.spec.ts
@@ -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,
@@ -29,14 +29,14 @@ import {
  removeProjectScript,
  restorePaseoConfig,
  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"];

--- a/packages/app/e2e/browser/provider-removal.spec.ts
+++ b/packages/app/e2e/browser/provider-removal.spec.ts
@@ -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",
--- a/packages/app/e2e/browser/provider-settings-refresh.spec.ts
+++ b/packages/app/e2e/browser/provider-settings-refresh.spec.ts
@@ -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 };

--- a/packages/app/e2e/browser/provider-subagents.real.spec.ts
+++ b/packages/app/e2e/browser/provider-subagents.real.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/provider-usage-settings.spec.ts
+++ b/packages/app/e2e/browser/provider-usage-settings.spec.ts
@@ -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 }) => {
--- a/packages/app/e2e/browser/provider-usage-tooltip.spec.ts
+++ b/packages/app/e2e/browser/provider-usage-tooltip.spec.ts
@@ -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 };

--- a/packages/app/e2e/browser/question-prompt-pagination.spec.ts
+++ b/packages/app/e2e/browser/question-prompt-pagination.spec.ts
@@ -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?";
--- a/packages/app/e2e/browser/rewind-flow.claude.real.spec.ts
+++ b/packages/app/e2e/browser/rewind-flow.claude.real.spec.ts
--- a/packages/app/e2e/browser/rewind-flow.codex.real.spec.ts
+++ b/packages/app/e2e/browser/rewind-flow.codex.real.spec.ts
--- a/packages/app/e2e/browser/rewind-flow.opencode.real.spec.ts
+++ b/packages/app/e2e/browser/rewind-flow.opencode.real.spec.ts
--- a/packages/app/e2e/browser/rewind-flow.pi.real.spec.ts
+++ b/packages/app/e2e/browser/rewind-flow.pi.real.spec.ts
--- a/packages/app/e2e/browser/rewind-flow.shared.ts
+++ b/packages/app/e2e/browser/rewind-flow.shared.ts
@@ -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";

--- a/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts
+++ b/packages/app/e2e/browser/rewind-menu.ui-contract.spec.ts
@@ -1,14 +1,14 @@
 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 { expect, test, type Page } from "../support/fixtures";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
 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`.

--- a/packages/app/e2e/browser/same-directory-workspaces.spec.ts
+++ b/packages/app/e2e/browser/same-directory-workspaces.spec.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:
--- a/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts
+++ b/packages/app/e2e/browser/schedules-edit-model-hydration.spec.ts
@@ -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: {
--- a/packages/app/e2e/browser/schedules-project-target.spec.ts
+++ b/packages/app/e2e/browser/schedules-project-target.spec.ts
@@ -1,17 +1,17 @@
-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 { 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 { 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 };

--- a/packages/app/e2e/browser/settings-host-page.spec.ts
+++ b/packages/app/e2e/browser/settings-host-page.spec.ts
@@ -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 {
  expectHostNoLocalOnlyRows,
  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);
-  });
 });
--- a/packages/app/e2e/browser/settings-i18n.spec.ts
+++ b/packages/app/e2e/browser/settings-i18n.spec.ts
@@ -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);
--- a/packages/app/e2e/browser/settings-navigation.spec.ts
+++ b/packages/app/e2e/browser/settings-navigation.spec.ts
@@ -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,
--- a/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts
+++ b/packages/app/e2e/browser/settings-toggle-tab-regression.spec.ts
@@ -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";
--- a/packages/app/e2e/browser/sidebar-help.spec.ts
+++ b/packages/app/e2e/browser/sidebar-help.spec.ts
@@ -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)(?:[/?#]|$)/;
--- a/packages/app/e2e/browser/sidebar-host-filter-multi.spec.ts
+++ b/packages/app/e2e/browser/sidebar-host-filter-multi.spec.ts
@@ -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";

--- a/packages/app/e2e/browser/sidebar-model-b.spec.ts
+++ b/packages/app/e2e/browser/sidebar-model-b.spec.ts
@@ -1,11 +1,11 @@
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { gotoWorkspace, clickNewTerminal } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { seedMockAgentWorkspace } from "./helpers/mock-agent";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
+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 { 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
--- a/packages/app/e2e/browser/sidebar-reorder.spec.ts
+++ b/packages/app/e2e/browser/sidebar-reorder.spec.ts
@@ -1,9 +1,9 @@
 import type { Locator } from "@playwright/test";
-import { expect, test } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-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 { 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) =>
--- a/packages/app/e2e/browser/sidebar-resize-handle.spec.ts
+++ b/packages/app/e2e/browser/sidebar-resize-handle.spec.ts
@@ -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 } });

--- a/packages/app/e2e/browser/sidebar-workspace-pin-shortcut.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace-pin-shortcut.spec.ts
@@ -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
--- a/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace-rename.spec.ts
@@ -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}`;
--- a/packages/app/e2e/browser/sidebar-workspace.spec.ts
+++ b/packages/app/e2e/browser/sidebar-workspace.spec.ts
@@ -1,17 +1,17 @@
 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 { 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 { escapeRegex } from "../support/helpers/regex";

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

--- a/packages/app/e2e/browser/startup-loading.spec.ts
+++ b/packages/app/e2e/browser/startup-loading.spec.ts
@@ -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();
+  });
+});
--- a/packages/app/e2e/browser/startup-wire-metrics.spec.ts
+++ b/packages/app/e2e/browser/startup-wire-metrics.spec.ts
@@ -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";
--- a/packages/app/e2e/browser/subagent-detach.spec.ts
+++ b/packages/app/e2e/browser/subagent-detach.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/terminal-activity-indicators.spec.ts
+++ b/packages/app/e2e/browser/terminal-activity-indicators.spec.ts
@@ -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";
--- a/packages/app/e2e/browser/terminal-alternate-screen.spec.ts
+++ b/packages/app/e2e/browser/terminal-alternate-screen.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/terminal-keystroke-stress.spec.ts
+++ b/packages/app/e2e/browser/terminal-keystroke-stress.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/terminal-performance.spec.ts
+++ b/packages/app/e2e/browser/terminal-performance.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/terminal-protocol-query.spec.ts
+++ b/packages/app/e2e/browser/terminal-protocol-query.spec.ts
@@ -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);
--- a/packages/app/e2e/browser/terminal-split-resize.spec.ts
+++ b/packages/app/e2e/browser/terminal-split-resize.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/terminal-stuck-size.spec.ts
+++ b/packages/app/e2e/browser/terminal-stuck-size.spec.ts
@@ -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
--- a/packages/app/e2e/browser/tool-call-shimmer.spec.ts
+++ b/packages/app/e2e/browser/tool-call-shimmer.spec.ts
@@ -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;

--- a/packages/app/e2e/browser/user-message-contract.ui-contract.spec.ts
+++ b/packages/app/e2e/browser/user-message-contract.ui-contract.spec.ts
@@ -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 });
--- a/packages/app/e2e/browser/viewed-agent-timelines.spec.ts
+++ b/packages/app/e2e/browser/viewed-agent-timelines.spec.ts
@@ -1,15 +1,15 @@
 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 {
  expectReconnectingToastGone,
  expectReconnectingToastVisible,
-} from "./helpers/workspace-ui";
+} from "../support/helpers/workspace-ui";

 interface ViewedTimelineScenario {
  client: SeedDaemonClient;
--- a/packages/app/e2e/browser/workspace-agent-tab-rename.spec.ts
+++ b/packages/app/e2e/browser/workspace-agent-tab-rename.spec.ts
@@ -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));
--- a/packages/app/e2e/browser/workspace-agent-title-handoff.spec.ts
+++ b/packages/app/e2e/browser/workspace-agent-title-handoff.spec.ts
@@ -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(
--- a/packages/app/e2e/browser/workspace-archive-shortcut.spec.ts
+++ b/packages/app/e2e/browser/workspace-archive-shortcut.spec.ts
@@ -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 }) => {
--- a/packages/app/e2e/browser/workspace-cwd.spec.ts
+++ b/packages/app/e2e/browser/workspace-cwd.spec.ts
@@ -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;
--- a/packages/app/e2e/browser/workspace-focus-mode.spec.ts
+++ b/packages/app/e2e/browser/workspace-focus-mode.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from "./fixtures";
+import { expect, test } from "../support/fixtures";

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

--- a/packages/app/e2e/browser/workspace-lifecycle.spec.ts
+++ b/packages/app/e2e/browser/workspace-lifecycle.spec.ts
@@ -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
--- a/packages/app/e2e/browser/workspace-model-regressions.spec.ts
+++ b/packages/app/e2e/browser/workspace-model-regressions.spec.ts
@@ -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/packages/app/e2e/browser/workspace-model-restart.spec.ts
+++ b/packages/app/e2e/browser/workspace-model-restart.spec.ts
@@ -7,18 +7,21 @@ import path from "node:path";
 import net from "node:net";
 import { test, expect, type Page } from "@playwright/test";
 import { buildHostWorkspaceRoute, decodeWorkspaceIdFromPathSegment } from "@/utils/host-routes";
-import { buildSeededHost } from "./helpers/daemon-registry";
-import { loadDaemonClientConstructor } from "./helpers/daemon-client-loader";
-import { createNodeWebSocketFactory, type NodeWebSocketFactory } from "./helpers/node-ws-factory";
-import { withDisabledE2ESpeechEnv } from "./helpers/speech-env";
+import { buildSeededHost } from "../support/helpers/daemon-registry";
+import { loadDaemonClientConstructor } from "../support/helpers/daemon-client-loader";
+import {
+  createNodeWebSocketFactory,
+  type NodeWebSocketFactory,
+} from "../support/helpers/node-ws-factory";
+import { withDisabledE2ESpeechEnv } from "../support/helpers/speech-env";
 import {
  expectNewWorkspaceProjectSelected,
  openGlobalNewWorkspaceComposer,
  selectNewWorkspaceProject,
  submitNewWorkspaceEmpty,
-} from "./helpers/new-workspace";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
-import { getVisibleWorkspaceAgentTabIds } from "./helpers/workspace-tabs";
+} from "../support/helpers/new-workspace";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import { getVisibleWorkspaceAgentTabIds } from "../support/helpers/workspace-tabs";

 const LEGACY_AGENT_ID = "10000000-0000-4000-8000-000000000001";
 const SERVER_ID = `srv_restart_${randomUUID().replace(/-/g, "").slice(0, 16)}`;
@@ -240,7 +243,7 @@ async function startRestartDaemon(input: {
    return startRestartDaemon(input);
  }

-  const serverDir = path.resolve(__dirname, "../../server");
+  const serverDir = path.resolve(__dirname, "../../../server");
  const tsxBin = execSync("which tsx").toString().trim();
  const child = spawn(tsxBin, ["scripts/supervisor-entrypoint.ts", "--dev"], {
    cwd: serverDir,
@@ -297,7 +300,7 @@ async function connectRestartDaemonClient(port: number): Promise<RestartDaemonCl

 function loadAppVersion(): string {
  const packageJson = JSON.parse(
-    readFileSync(path.resolve(__dirname, "../package.json"), "utf8"),
+    readFileSync(path.resolve(__dirname, "../../package.json"), "utf8"),
  ) as { version?: unknown };
  if (typeof packageJson.version !== "string" || packageJson.version.length === 0) {
    throw new Error("Missing app package version");
--- a/packages/app/e2e/browser/workspace-multiplicity.spec.ts
+++ b/packages/app/e2e/browser/workspace-multiplicity.spec.ts
@@ -1,6 +1,6 @@
-import { test, expect, type Page } from "./fixtures";
-import { gotoAppShell } from "./helpers/app";
-import { gotoWorkspace } from "./helpers/launcher";
+import { test, expect, type Page } from "../support/fixtures";
+import { gotoAppShell } from "../support/helpers/app";
+import { gotoWorkspace } from "../support/helpers/launcher";
 import {
  assertNewWorkspaceSidebarAndHeader,
  connectNewWorkspaceDaemonClient,
@@ -8,11 +8,11 @@ import {
  selectNewWorkspaceProject,
  selectWorkspaceIsolation,
  submitNewWorkspaceEmpty,
-} from "./helpers/new-workspace";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { expectExplorerEntryVisible } from "./helpers/file-explorer";
-import { getServerId } from "./helpers/server-id";
-import { waitForSidebarHydration } from "./helpers/workspace-ui";
+} from "../support/helpers/new-workspace";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { expectExplorerEntryVisible } from "../support/helpers/file-explorer";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForSidebarHydration } from "../support/helpers/workspace-ui";

 // Model B reshape: a workspace is the unit, its isolation (local checkout or
 // worktree) is a CHOICE at creation, and creation NEVER dedupes by
--- a/packages/app/e2e/browser/workspace-navigation-regression.spec.ts
+++ b/packages/app/e2e/browser/workspace-navigation-regression.spec.ts
@@ -3,23 +3,23 @@ import {
  buildHostWorkspaceOpenRoute,
  buildHostWorkspaceRoute,
 } from "@/utils/host-routes";
-import { expect, test, type Page } from "./fixtures";
-import { gotoAppShell, openSettings } from "./helpers/app";
+import { expect, test, type Page } from "../support/fixtures";
+import { gotoAppShell, openSettings } from "../support/helpers/app";
 import {
  createIdleAgent,
  expectWorkspaceTabHidden,
  expectWorkspaceTabVisible,
  openWorkspaceWithAgents,
-} from "./helpers/archive-tab";
-import { expectComposerVisible } from "./helpers/composer";
-import { daemonWsRoutePattern, getE2EDaemonPort } from "./helpers/daemon-port";
-import { seedWorkspace } from "./helpers/seed-client";
+} from "../support/helpers/archive-tab";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { daemonWsRoutePattern } from "../support/helpers/daemon-port";
+import { seedWorkspace } from "../support/helpers/seed-client";
 import {
  getVisibleWorkspaceAgentTabIds,
  expectOnlyWorkspaceAgentTabsVisible,
  waitForWorkspaceTabsVisible,
  expectWorkspaceTabsAbsent,
-} from "./helpers/workspace-tabs";
+} from "../support/helpers/workspace-tabs";
 import {
  expectSidebarWorkspaceSelected,
  expectWorkspaceHeader,
@@ -32,57 +32,14 @@ import {
  waitForSidebarHydration,
  workspaceDeckEntryLocator,
  expectWorkspaceDeckEntryCount,
-} from "./helpers/workspace-ui";
-import { clickSettingsBackToWorkspace } from "./helpers/settings";
-import { getServerId } from "./helpers/server-id";
-import { injectDesktopBridge, waitForDesktopDaemonStartRequest } from "./helpers/desktop-updates";
-import { expectAppRoute } from "./helpers/route-assertions";
-import { installDaemonWebSocketGate } from "./helpers/daemon-websocket-gate";
-import { addOfflineHostAndReload } from "./helpers/hosts";
+} from "../support/helpers/workspace-ui";
+import { clickSettingsBackToWorkspace } from "../support/helpers/settings";
+import { getServerId } from "../support/helpers/server-id";
+import { expectAppRoute } from "../support/helpers/route-assertions";
+import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
+import { addOfflineHostAndReload } from "../support/helpers/hosts";

 const LOADING_WORKSPACE_TEXT_PATTERN = /Loading workspace/i;
-type StartupPresentation = "splash" | "app";
-
-declare global {
-  interface Window {
-    __paseoStartupPresentationTrace?: StartupPresentation[];
-  }
-}
-
-async function observeStartupPresentation(page: Page): Promise<void> {
-  await page.addInitScript(() => {
-    const trace: StartupPresentation[] = [];
-    window.__paseoStartupPresentationTrace = trace;
-
-    document.addEventListener("DOMContentLoaded", () => {
-      const recordPresentation = () => {
-        let presentation: StartupPresentation | null = null;
-        if (document.querySelector('[data-testid="startup-splash"]')) {
-          presentation = "splash";
-        } else if (
-          document.querySelector(
-            '[data-testid="workspace-header-title"], [data-testid="sidebar-settings"]',
-          )
-        ) {
-          presentation = "app";
-        }
-        if (presentation && trace.at(-1) !== presentation) {
-          trace.push(presentation);
-        }
-      };
-      new MutationObserver(recordPresentation).observe(document.documentElement, {
-        childList: true,
-        subtree: true,
-      });
-      recordPresentation();
-    });
-  });
-}
-
-async function getStartupPresentation(page: Page): Promise<StartupPresentation[]> {
-  return page.evaluate(() => window.__paseoStartupPresentationTrace?.slice() ?? []);
-}
-
 async function expectNoLoadingWorkspacePane(
  page: Page,
  input: { label: string; durationMs?: number },
@@ -127,39 +84,6 @@ async function closeFirstVisibleDraftTab(page: Page): Promise<void> {
  await closeButton.first().click();
 }

-async function openWorkspaceThroughApp(
-  page: Page,
-  input: {
-    serverId: string;
-    workspace: Awaited<ReturnType<typeof seedWorkspace>>;
-  },
-): Promise<void> {
-  await gotoAppShell(page);
-  await waitForSidebarHydration(page);
-  await switchWorkspaceViaSidebar({
-    page,
-    serverId: input.serverId,
-    workspaceId: input.workspace.workspaceId,
-  });
-  await waitForWorkspaceTabsVisible(page);
-  await expectWorkspaceLocation(page, input);
-}
-
-async function expectWorkspaceLocation(
-  page: Page,
-  input: {
-    serverId: string;
-    workspace: Awaited<ReturnType<typeof seedWorkspace>>;
-  },
-): Promise<void> {
-  const workspaceRoute = buildHostWorkspaceRoute(input.serverId, input.workspace.workspaceId);
-  await expectAppRoute(page, workspaceRoute, { timeout: 30_000 });
-  await expectWorkspaceHeader(page, {
-    title: input.workspace.workspaceName,
-    subtitle: input.workspace.projectDisplayName,
-  });
-}
-
 test.describe("Workspace navigation regression", () => {
  test.describe.configure({ timeout: 240_000 });

@@ -322,47 +246,6 @@ test.describe("Workspace navigation regression", () => {
    }
  });

-  test("refresh keeps one continuous splash before restoring the workspace route", async ({
-    page,
-  }) => {
-    const serverId = getServerId();
-    const daemonGate = await installDaemonWebSocketGate(page);
-    const workspace = await seedWorkspace({ repoPrefix: "workspace-refresh-route-" });
-
-    try {
-      const agent = await createIdleAgent(workspace.client, {
-        cwd: workspace.repoPath,
-        workspaceId: workspace.workspaceId,
-        title: `workspace-refresh-route-${Date.now()}`,
-      });
-      await injectDesktopBridge(page, {
-        serverId,
-        manageBuiltInDaemon: true,
-        hangDaemonStart: true,
-        desktopSettingsDelayMs: 250,
-        daemonListen: `127.0.0.1:${getE2EDaemonPort()}`,
-      });
-      await openWorkspaceThroughApp(page, { serverId, workspace });
-      await waitForWorkspaceTabsVisible(page);
-      await expectWorkspaceTabVisible(page, agent.id);
-      await expectWorkspaceLocation(page, { serverId, workspace });
-
-      await observeStartupPresentation(page);
-      await daemonGate.drop();
-      await page.reload();
-      await waitForDesktopDaemonStartRequest(page);
-      daemonGate.restore();
-      await waitForSidebarHydration(page);
-
-      await expectWorkspaceLocation(page, { serverId, workspace });
-      await waitForWorkspaceTabsVisible(page);
-      expect(await getStartupPresentation(page)).toEqual(["splash", "app"]);
-    } finally {
-      daemonGate.restore();
-      await workspace.cleanup();
-    }
-  });
-
  test("sidebar navigation and reload keep workspace selection and tabs aligned", async ({
    page,
  }) => {
--- a/packages/app/e2e/browser/workspace-pane-remount.spec.ts
+++ b/packages/app/e2e/browser/workspace-pane-remount.spec.ts
@@ -1,10 +1,10 @@
 import { buildHostAgentDetailRoute } from "@/utils/host-routes";
-import { expect, test } from "./fixtures";
-import { createIdleAgent } from "./helpers/archive-tab";
-import { expectComposerVisible } from "./helpers/composer";
-import { seedWorkspace } from "./helpers/seed-client";
-import { getServerId } from "./helpers/server-id";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import { expect, test } from "../support/fixtures";
+import { createIdleAgent } from "../support/helpers/archive-tab";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { getServerId } from "../support/helpers/server-id";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";

 test.describe("Workspace pane mounting", () => {
  test("opening the first split pane keeps the existing agent composer mounted", async ({
--- a/packages/app/e2e/browser/workspace-pins.spec.ts
+++ b/packages/app/e2e/browser/workspace-pins.spec.ts
@@ -1,9 +1,9 @@
-import { test, expect } from "./fixtures";
-import { gotoWorkspace } from "./helpers/launcher";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
-import { togglePinFromMenu, tabRowPin } from "./helpers/pins";
-import { expectTerminalTabOpen } from "./helpers/workspace-tabs";
-import type { PinnedTabTarget } from "../src/workspace-pins/target";
+import { test, expect } from "../support/fixtures";
+import { gotoWorkspace } from "../support/helpers/launcher";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
+import { togglePinFromMenu, tabRowPin } from "../support/helpers/pins";
+import { expectTerminalTabOpen } from "../support/helpers/workspace-tabs";
+import type { PinnedTabTarget } from "../../src/workspace-pins/target";

 const DRAFT_TARGET: PinnedTabTarget = { kind: "draft" };
 const TERMINAL_TARGET: PinnedTabTarget = { kind: "terminal" };
--- a/packages/app/e2e/browser/workspace-scripts-menu-resize.spec.ts
+++ b/packages/app/e2e/browser/workspace-scripts-menu-resize.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from "./fixtures";
-import { createTempGitRepo } from "./helpers/workspace";
+import { test, expect } from "../support/fixtures";
+import { createTempGitRepo } from "../support/helpers/workspace";
 import {
  connectWorkspaceSetupClient,
  createWorkspaceThroughDaemon,
@@ -7,10 +7,10 @@ import {
  seedProjectForWorkspaceSetup,
  startWorkspaceScriptFromMenu,
  waitForWorkspaceSetupProgress,
-} from "./helpers/workspace-setup";
-import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
-import { getServerId } from "./helpers/server-id";
-import { buildHostWorkspaceRoute } from "../src/utils/host-routes";
+} from "../support/helpers/workspace-setup";
+import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
+import { getServerId } from "../support/helpers/server-id";
+import { buildHostWorkspaceRoute } from "../../src/utils/host-routes";

 test("scripts menu resizes when a service row grows after launch", async ({ page }) => {
  const client = await connectWorkspaceSetupClient();
--- a/packages/app/e2e/browser/workspace-setup-runtime.spec.ts
+++ b/packages/app/e2e/browser/workspace-setup-runtime.spec.ts
@@ -1,8 +1,8 @@
 import { existsSync } from "node:fs";
-import { expect, test } from "./fixtures";
-import { createTempGitRepo } from "./helpers/workspace";
-import { clickNewTerminal } from "./helpers/launcher";
-import { expectTerminalSurfaceVisible } from "./helpers/terminal-perf";
+import { expect, test } from "../support/fixtures";
+import { createTempGitRepo } from "../support/helpers/workspace";
+import { clickNewTerminal } from "../support/helpers/launcher";
+import { expectTerminalSurfaceVisible } from "../support/helpers/terminal-perf";
 import {
  connectWorkspaceSetupClient,
  createWorkspaceThroughDaemon,
@@ -10,7 +10,7 @@ import {
  navigateToWorkspaceViaSidebar,
  openHomeWithProject,
  seedProjectForWorkspaceSetup,
-} from "./helpers/workspace-setup";
+} from "../support/helpers/workspace-setup";

 test.describe("Workspace setup runtime authority", () => {
  test.describe.configure({ retries: 1 });
--- a/packages/app/e2e/browser/workspace-setup-streaming.spec.ts
+++ b/packages/app/e2e/browser/workspace-setup-streaming.spec.ts
@@ -1,15 +1,18 @@
-import { test, expect } from "./fixtures";
-import { createTempGitRepo } from "./helpers/workspace";
+import { test, expect } from "../support/fixtures";
+import { createTempGitRepo } from "../support/helpers/workspace";
 import {
  waitForWorkspaceTabsVisible,
  expectNoTerminalTabs,
  clickFirstTerminalTab,
  expectFirstTerminalTabContains,
-} from "./helpers/workspace-tabs";
-import { clickNewChat } from "./helpers/launcher";
-import { expectComposerVisible } from "./helpers/composer";
-import { openFileExplorer, expectExplorerEntryVisible } from "./helpers/file-explorer";
-import { expectTerminalSurfaceVisible, waitForTerminalAttached } from "./helpers/terminal-perf";
+} from "../support/helpers/workspace-tabs";
+import { clickNewChat } from "../support/helpers/launcher";
+import { expectComposerVisible } from "../support/helpers/composer";
+import { openFileExplorer, expectExplorerEntryVisible } from "../support/helpers/file-explorer";
+import {
+  expectTerminalSurfaceVisible,
+  waitForTerminalAttached,
+} from "../support/helpers/terminal-perf";
 import {
  connectWorkspaceSetupClient,
  createWorkspaceThroughDaemon,
@@ -21,7 +24,7 @@ import {
  closeWorkspaceScriptsMenu,
  seedProjectForWorkspaceSetup,
  waitForWorkspaceSetupProgress,
-} from "./helpers/workspace-setup";
+} from "../support/helpers/workspace-setup";

 interface WorkspaceScriptStarter {
  startWorkspaceScript(
--- a/packages/app/e2e/browser/workspace-terminal-tab-rename.spec.ts
+++ b/packages/app/e2e/browser/workspace-terminal-tab-rename.spec.ts
@@ -1,7 +1,7 @@
-import { test, expect, type Page } from "./fixtures";
-import { clickNewTerminal, gotoWorkspace } from "./helpers/launcher";
-import { renameModalInput, renameModalSubmit } from "./helpers/rename";
-import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
+import { test, expect, type Page } from "../support/fixtures";
+import { clickNewTerminal, gotoWorkspace } from "../support/helpers/launcher";
+import { renameModalInput, renameModalSubmit } from "../support/helpers/rename";
+import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";

 async function fetchTerminalTitle(
  workspace: SeededWorkspace,
--- a/Show More
+++ b/Show More