Phase 3.7: sync main into phase37

.github/workflows/computer-e2e.yml

@@ -29,6 +29,7 @@ on:
       - 'electron.vite.config.ts'
       - 'config/build-plugins/**'
       - 'src/main/daemon/**'
+      - '!src/main/daemon/**/*.test.ts'
       - 'src/main/providers/local-pty-provider.ts'
       - 'src/main/providers/windows-shell-args.ts'
       - 'src/main/providers/windows-shell-preflight-runtime.windows.test.ts'

.github/workflows/e2e.yml

@@ -342,13 +342,23 @@ jobs:
               . != "tests/e2e/terminal-retention-budget.spec.ts" and
               . != "tests/e2e/ssh-startup-exec-readiness.spec.ts" and
               . != "tests/e2e/paired-startup-exec-readiness.spec.ts" and
+              . != "tests/e2e/workspace-layout-oracle-ssh.spec.ts" and
               . != "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts" and
               . != "tests/e2e/ssh-localhost.spec.ts" and
               . != "tests/e2e/terminal-ibus-hangul-native.spec.ts" and
               . != "tests/e2e/orcad-serve-mode-switch.spec.ts" and
+              . != "tests/e2e/workspace-layout-oracle-headless.spec.ts" and
               . != "tests/e2e/ssh-orcad-auto-convert.spec.ts" and
               . != "tests/e2e/windows-missing-appdata-startup.spec.ts" and
-              . != "tests/e2e/ssh-orcad-idle-exit.spec.ts"
+              . != "tests/e2e/ssh-orcad-idle-exit.spec.ts" and
+              . != "tests/e2e/ssh-orcad-browser-capabilities.spec.ts" and
+              . != "tests/e2e/ssh-orcad-browser-service-status.spec.ts" and
+              . != "tests/e2e/ssh-orcad-browser-routing.spec.ts" and
+              . != "tests/e2e/ssh-orcad-editor-ownership.spec.ts" and
+              . != "tests/e2e/ssh-orcad-markdown-conversion.spec.ts" and
+              . != "tests/e2e/ssh-orcad-markdown-link-refresh.spec.ts" and
+              . != "tests/e2e/ssh-orcad-markdown-live-documents.spec.ts" and
+              . != "tests/e2e/ssh-orcad-open-in-owner.spec.ts"
             )' <<<"$TEST_FILES_JSON" > "$RUNNER_TEMP/general-e2e-specs"
           fi
           mapfile -t TEST_FILES < "$RUNNER_TEMP/general-e2e-specs"
@@ -417,7 +427,8 @@ jobs:
       contains(inputs.test_files, 'tests/e2e/ssh-terminal-parking.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/terminal-retention-budget.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-startup-exec-readiness.spec.ts') ||
-      contains(inputs.test_files, 'tests/e2e/paired-startup-exec-readiness.spec.ts')
+      contains(inputs.test_files, 'tests/e2e/paired-startup-exec-readiness.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/workspace-layout-oracle-ssh.spec.ts')
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -520,9 +531,12 @@ jobs:
   orcad-serve-mode-switch:
     name: orca serve Electron/orcad mode switch (D7)
     needs: [build, prepare-native-cache]
-    if: inputs.test_files == '' || contains(inputs.test_files, 'tests/e2e/orcad-serve-mode-switch.spec.ts')
+    if: >-
+      inputs.test_files == '' ||
+      contains(inputs.test_files, 'tests/e2e/orcad-serve-mode-switch.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/workspace-layout-oracle-headless.spec.ts')
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 45
     env:
       ORCA_BACKGROUND_LAUNCH: '1'
     steps:
@@ -549,11 +563,21 @@ jobs:
           pnpm build:orcad
           node config/scripts/build-orcad-template.mjs --targets "$slot"
       - name: Switch serve hosts on one profile
+        if: inputs.test_files == '' || contains(inputs.test_files, 'tests/e2e/orcad-serve-mode-switch.spec.ts')
         env:
           SKIP_BUILD: '1'
           ORCA_E2E_ORCAD_SERVE: '1'
           ORCA_E2E_FORWARD_APP_LOGS: '1'
         run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh pnpm exec playwright test --config tests/playwright.config.ts tests/e2e/orcad-serve-mode-switch.spec.ts --project=electron-headless --workers=1
+      # The layout oracle's headless scenarios run on both serve hosts, so they need this job's orcad.
+      - name: Layout oracle on headless serve (orcad and Electron)
+        if: >-
+          !cancelled() &&
+          (inputs.test_files == '' || contains(inputs.test_files, 'tests/e2e/workspace-layout-oracle-headless.spec.ts'))
+        env:
+          SKIP_BUILD: '1'
+          ORCA_E2E_FORWARD_APP_LOGS: '1'
+        run: xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh pnpm exec playwright test --config tests/playwright.config.ts tests/e2e/workspace-layout-oracle-headless.spec.ts --project=electron-headless --workers=1
       - uses: actions/upload-artifact@v7
         if: failure()
         with:
@@ -568,7 +592,7 @@ jobs:
   orcad-auto-convert-docker:
     name: ssh host auto-converts to managed orcad (Docker)
     needs: [build, prepare-native-cache]
-    if: inputs.test_files == '' || contains(inputs.test_files, 'tests/e2e/ssh-orcad-auto-convert.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-idle-exit.spec.ts')
+    if: inputs.test_files == '' || contains(inputs.test_files, 'tests/e2e/ssh-orcad-auto-convert.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-idle-exit.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-browser-capabilities.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-browser-service-status.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-browser-routing.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-editor-ownership.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-markdown-conversion.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-markdown-link-refresh.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-markdown-live-documents.spec.ts') || contains(inputs.test_files, 'tests/e2e/ssh-orcad-open-in-owner.spec.ts')
     runs-on: ubuntu-latest
     timeout-minutes: 45
     env:
@@ -604,7 +628,7 @@ jobs:
           ORCA_RELAY_PATH: ${{ github.workspace }}/out/relay
         run: |
           export ORCA_E2E_ORCAD_CONVERT_TEMPLATE="$RUNNER_TEMP/orcad-convert-template"
-          xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh pnpm exec playwright test --config tests/playwright.config.ts tests/e2e/ssh-orcad-auto-convert.spec.ts tests/e2e/ssh-orcad-idle-exit.spec.ts --project=electron-headless --workers=1
+          xvfb-run --auto-servernum bash .github/scripts/e2e-with-window-manager.sh pnpm exec playwright test --config tests/playwright.config.ts tests/e2e/ssh-orcad-auto-convert.spec.ts tests/e2e/ssh-orcad-idle-exit.spec.ts tests/e2e/ssh-orcad-browser-capabilities.spec.ts tests/e2e/ssh-orcad-browser-service-status.spec.ts tests/e2e/ssh-orcad-browser-routing.spec.ts tests/e2e/ssh-orcad-editor-ownership.spec.ts tests/e2e/ssh-orcad-markdown-conversion.spec.ts tests/e2e/ssh-orcad-markdown-link-refresh.spec.ts tests/e2e/ssh-orcad-markdown-live-documents.spec.ts tests/e2e/ssh-orcad-open-in-owner.spec.ts --project=electron-headless --workers=1
       - uses: actions/upload-artifact@v7
         if: failure()
         with:

.github/workflows/pi-owner-runtime.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     paths:
       - 'src/main/pi/**'
+      - '!src/main/pi/**/*.test.ts'
       - 'tests/tools/pi-owner-runtime-smoke.mjs'
       - 'tests/tools/omp-completion-runtime-smoke.mjs'
       - '.github/workflows/pi-owner-runtime.yml'

.github/workflows/pr.yml

@@ -432,8 +432,8 @@ jobs:
           PREFLIGHT_PHASE_SELECTED: ${{ needs.code_paths.outputs.typecheck == 'true' }}
           PREFLIGHT_PRIOR_SUCCESS: ${{ job.status == 'success' }}
           ORCA_UNIT_SELECTION_MODE: ${{ vars.ORCA_UNIT_SELECTION_MODE || 'shadow' }}
-          # Set the repository variable to '5' to roll back full PR shards.
-          ORCA_UNIT_FULL_SHARD_COUNT: ${{ vars.ORCA_UNIT_FULL_SHARD_COUNT || '10' }}
+          # Five shards use fewer runner minutes; the repository variable can still request ten.
+          ORCA_UNIT_FULL_SHARD_COUNT: ${{ vars.ORCA_UNIT_FULL_SHARD_COUNT || '5' }}
         run: |
           if [ "$PREFLIGHT_PHASE_SELECTED" != true ] || [ "$PREFLIGHT_PRIOR_SUCCESS" != true ]; then exit 0; fi
           node config/scripts/ci-unit-plan.mjs
@@ -1275,7 +1275,6 @@ jobs:
           src/main/wsl/wsl-runner.test.ts
           src/main/wsl/wsl-guest-environment.test.ts
           src/main/wsl/wsl-executable-path.win32.test.ts
-          src/main/claude-accounts/claude-profile-history-windows.test.ts
           src/main/wsl/wsl-w1-w3-contract.test.ts
           src/shared/source-scan/source-tree-scan.test.ts
           src/main/cli/wsl-cli-powershell-boundary.test.ts
@@ -1296,6 +1295,7 @@ jobs:
           src/relay/windows-port-scan.win32.test.ts
           src/main/ssh/ssh-relay-upload-stage-windows-identity.test.ts
           src/main/ssh/remote-node-runtime-store-windows.test.ts
+          config/scripts/node-pty-windows-pty-teardown-patch.test.mjs
 
       # Why the :parallel variant: identical to build:release except the three
       # electron-vite targets overlap instead of running back to back. The Linux package

.github/workflows/preflight-cli-platforms.yml

@@ -0,0 +1,58 @@
+name: Preflight CLI platforms
+
+on:
+  pull_request:
+    paths:
+      - 'src/main/ipc/preflight*'
+      - 'src/main/ipc/agent-detection-shell-path.ts'
+      - 'src/main/ipc/command-path-resolver*'
+      - 'src/main/preflight/**'
+      - 'src/main/startup/*shell*'
+      - 'src/shared/child-process/**'
+      - '.github/actions/install-node-dependencies/**'
+      - '.github/workflows/preflight-cli-platforms.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: preflight-cli-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  preflight:
+    name: Preflight CLI (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, macos-15, windows-2022]
+    env:
+      ORCA_BACKGROUND_LAUNCH: '1'
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+      - uses: ./.github/actions/install-node-dependencies
+        with:
+          native-runtime: node
+          cache-electron-package: 'true'
+      - name: Check native CLI execution and shell PATH discovery
+        run: >-
+          pnpm exec vitest run --config config/vitest.config.ts --maxWorkers=2
+          src/main/ipc/preflight-command-exec.test.ts
+          src/main/ipc/preflight-host-cli-status.test.ts
+          src/main/ipc/preflight-runnable-local-cli.test.ts
+          src/main/ipc/preflight-agent-detection.test.ts
+          src/main/ipc/preflight-agent-refresh.test.ts
+          src/main/ipc/preflight-wsl-agent-detection.test.ts
+          src/main/ipc/preflight-windows-path-refresh.repro.test.ts
+          src/main/startup/hydrate-shell-path.test.ts
+          src/main/startup/hydrate-shell-path.windows.test.ts
+          src/main/startup/login-shell-environment.test.ts
+          src/main/runtime/rpc/methods/preflight.test.ts
+          src/shared/child-process/process-tree-termination.test.ts
+          src/shared/child-process/run-process.test.ts
+          src/shared/child-process/run-process-termination-failure.test.ts

.github/workflows/win-orcad-serve-switch-e2e.yml

@@ -11,6 +11,7 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'src/main/daemon/**'
+      - '!src/main/daemon/**/*.test.ts'
       - 'src/main/orcad/**'
       - 'src/cli/runtime/**'
       - 'src/shared/orcad-local-serve-selection.ts'

.oxlintrc.json

@@ -140,6 +140,34 @@
     "unicorn/throw-new-error": "error"
   },
   "overrides": [
+    {
+      "files": ["**/*.{js,cjs,mjs,jsx,ts,tsx,mts,cts}"],
+      "excludeFiles": [
+        "**/*.{test,spec}.{js,cjs,mjs,jsx,ts,tsx,mts,cts}",
+        "**/__tests__/**",
+        "src/renderer/src/runtime/web-runtime-browser-creation-placement-test-rig.ts"
+      ],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "@linear/sdk",
+                "allowTypeImports": true,
+                "message": "Value-importing @linear/sdk hoists its ~2.6MB CJS bundle into the eager top-level require block and defeats the lazy loader. Use `import type` plus loadLinearSdk() from src/main/linear/linear-sdk.ts."
+              }
+            ],
+            "patterns": [
+              {
+                "regex": "(?i)(?:^|[/\\\\])(?:web-session-tabs-sync-test-harness|web-runtime-browser-creation-placement-test-rig)(?:\\.[cm]?[jt]sx?)?(?:[?#].*)?$",
+                "message": "This module is unit-test support. Import the production web-session owner instead."
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "files": ["src/renderer/src/**/*.{ts,tsx}"],
       "rules": {

cloud/apps/relay/src/database.ts

@@ -706,7 +706,14 @@ export const POSTGRES_SCHEMA_MIGRATIONS = [
   // Deferrable for the same reason, though SHARE UPDATE EXCLUSIVE blocks only vacuum and DDL: it
   // buys nothing until the drop lands, so a boot that deferred the drop should defer this too.
   `-- schema-deferrable: buys nothing until the drop above lands
-   ALTER TABLE relay_assignment_activity_leases SET (fillfactor = 70)`
+   ALTER TABLE relay_assignment_activity_leases SET (fillfactor = 70)`,
+  // Why: each reservations autovacuum read its ~5.5 GB of indexes in ~3 min, about hourly, evicting
+  // the cache of the Cloud SQL instance shared with auth. 20 ms per 200 cost units spreads a run
+  // over ~15 min. Deferrable: a running vacuum holds the same lock, and nothing at boot needs this.
+  `-- schema-deferrable: a running vacuum holds the lock this needs
+   ALTER TABLE relay_control_connection_reservations SET (autovacuum_vacuum_cost_delay = 20)`,
+  `-- schema-deferrable: a running vacuum holds the lock this needs
+   ALTER TABLE relay_control_connection_reservations SET (autovacuum_vacuum_cost_limit = 200)`
 ]
 
 // The exact statement list a Postgres boot applies, in order, so the lock-target census can read

cloud/apps/relay/src/relay-schema-catalog-precheck-postgres.test.ts

@@ -190,6 +190,47 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     }
   })
 
+  it('throttles the reservations vacuum, deferring it while a vacuum holds the table', async () => {
+    const reservationOptions = async (): Promise<unknown> =>
+      (
+        await pool.query(`SELECT reloptions FROM pg_class WHERE oid = to_regclass($1)`, [
+          `${schema}.${LOCKED_TABLE}`
+        ])
+      ).rows[0]?.reloptions
+    const cold = await openRelayDatabase({ databaseUrl: url, dataDir: '' })
+    opened.push(cold)
+    expect(await reservationOptions()).toEqual([
+      'autovacuum_vacuum_cost_delay=20',
+      'autovacuum_vacuum_cost_limit=200'
+    ])
+    await pool.query(
+      `ALTER TABLE ${schema}.${LOCKED_TABLE}
+         RESET (autovacuum_vacuum_cost_delay, autovacuum_vacuum_cost_limit)`
+    )
+
+    // The lock a running (auto)vacuum holds; the boot must yield to it rather than fail.
+    const holder = new pg.Client({ connectionString: url })
+    await holder.connect()
+    await holder.query('BEGIN')
+    await holder.query(`LOCK TABLE ${LOCKED_TABLE} IN SHARE UPDATE EXCLUSIVE MODE`)
+    try {
+      const behindVacuum = await openRelayDatabase({ databaseUrl: url, dataDir: '' })
+      opened.push(behindVacuum)
+    } finally {
+      await holder.query('ROLLBACK')
+      await holder.end()
+    }
+    expect(await reservationOptions()).toBeNull()
+
+    const next = await openRelayDatabase({ databaseUrl: url, dataDir: '' })
+    opened.push(next)
+    expect(await reservationOptions()).toEqual([
+      'autovacuum_vacuum_cost_delay=20',
+      'autovacuum_vacuum_cost_limit=200'
+    ])
+    await pool.end()
+  })
+
   it('defers the activity-lease migrations and still boots while their table is locked', async () => {
     // The migration boot, reproduced: the index is there, the table is locked by someone else, and
     // all the drop can do is time out. It has to leave the statement for the next boot rather than

cloud/apps/relay/src/relay-schema-lock-targets.test.ts

@@ -134,6 +134,18 @@ const GOLDEN_LOCK_TAKING: SchemaLockTarget[] = [
     table: 'relay_assignment_activity_leases',
     name: 'fillfactor=70',
     skipWhen: 'present'
+  },
+  {
+    kind: 'reloption',
+    table: 'relay_control_connection_reservations',
+    name: 'autovacuum_vacuum_cost_delay=20',
+    skipWhen: 'present'
+  },
+  {
+    kind: 'reloption',
+    table: 'relay_control_connection_reservations',
+    name: 'autovacuum_vacuum_cost_limit=200',
+    skipWhen: 'present'
   }
 ]
 
@@ -240,7 +252,7 @@ describe('relay boot-time lock targets', () => {
     }
   })
 
-  it('marks the out-of-band sweep indexes and the activity-lease migrations deferrable, and nothing else', () => {
+  it('marks the out-of-band sweep indexes, the activity-lease migrations and the reservation vacuum throttle deferrable, and nothing else', () => {
     // The statements a lock timeout must not turn into a crash loop, and the only ones: every
     // other statement still fails the boot loudly, which is what keeps the marker meaningful.
     const deferrable = relayPostgresSchemaStatements().filter(schemaDeferrable)
@@ -250,7 +262,9 @@ describe('relay boot-time lock targets', () => {
       'CREATE INDEX IF NOT EXISTS relay_direct_authorizations_pending_deadline ON relay_direct_authorizations(deadline) WHERE consumed_at IS NULL',
       'CREATE INDEX IF NOT EXISTS relay_rate_windows_started ON relay_rate_windows(window_started_at)',
       'DROP INDEX IF EXISTS relay_assignment_activity_expiry',
-      'ALTER TABLE relay_assignment_activity_leases SET (fillfactor = 70)'
+      'ALTER TABLE relay_assignment_activity_leases SET (fillfactor = 70)',
+      'ALTER TABLE relay_control_connection_reservations SET (autovacuum_vacuum_cost_delay = 20)',
+      'ALTER TABLE relay_control_connection_reservations SET (autovacuum_vacuum_cost_limit = 200)'
     ])
   })