diff --git a/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs b/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs
index 7463c8ee0b6..f293ebcc6d6 100644
--- a/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs
+++ b/.github/actions/cloud-sql-rollout-lease/storage-lease.test.mjs
@@ -1,28 +1,16 @@
 import assert from 'node:assert/strict'
 import { test } from 'node:test'
-import {
-  CloudSqlRolloutLease,
-  LEASE_TTL_MS,
-  LeaseConflict,
-  LeaseUnreadable
-} from './storage-lease.mjs'
+import { CloudSqlRolloutLease, LeaseConflict, LeaseUnreadable } from './storage-lease.mjs'
 
 const BUCKET = 'onorca-cloud-terraform-state'
 const OBJECT = 'terraform/state/cloud-sql-rollout/production.lock'
 const NOW = 1_756_000_000_000
 
-/** Model real GCS generation increments, ifGenerationMatch and 412 conflicts; faults inject failures. */
-function fakeStorage({ object = null, faults = [] } = {}) {
-  const state = { object, requests: [] }
+function fakeStorage({ object = null } = {}) {
+  const state = { object }
   const fetcher = async (rawUrl, init = {}) => {
     const url = new URL(rawUrl)
     const method = init.method ?? 'GET'
-    const record = { method, url, path: url.pathname, search: url.searchParams }
-    state.requests.push(record)
-    const fault = faults.find((candidate) => candidate.when(record))
-    if (fault) {
-      return json(fault.status, fault.body ?? {})
-    }
 
     if (url.pathname.startsWith('/upload/')) {
       const want = url.searchParams.get('ifGenerationMatch')
@@ -63,15 +51,10 @@ function json(status, body) {
   }
 }
 
-function storedRecord({
-  holderKey,
-  expiresAt,
-  repository = 'stablyai/orca',
-  workflow = 'Deploy Relay Production'
-}) {
+function storedRecord({ holderKey, expiresAt }) {
   return {
-    repository,
-    workflow,
+    repository: 'stablyai/orca',
+    workflow: 'Deploy Relay Production',
     run_id: '9001',
     run_url: 'https://github.com/stablyai/orca/actions/runs/9001',
     run_attempt: '1',
@@ -81,14 +64,14 @@ function storedRecord({
   }
 }
 
-function leaseFor(storage, { warn = () => {} } = {}) {
+function leaseFor(storage) {
   return new CloudSqlRolloutLease({
     bucket: BUCKET,
     objectName: OBJECT,
     accessToken: 'test-token',
     fetcher: storage.fetcher,
     now: () => NOW,
-    warn
+    warn: () => {}
   })
 }
 
@@ -114,77 +97,24 @@ test('refuses a live lease held by another run and never writes', async () => {
     .catch((thrown) => thrown)
 
   assert.ok(error instanceof LeaseConflict)
-  assert.equal(error.holder.repository, 'stablyai/orca')
-  assert.equal(error.holder.run_url, 'https://github.com/stablyai/orca/actions/runs/9001')
-  assert.equal(
-    storage.state.requests.filter((request) => request.method !== 'GET').length,
-    0,
-    'a foreign live lease must not be written'
-  )
   assert.equal(storage.state.object.generation, '1500')
 })
 
-test('re-enters a live lease this run already holds and extends it', async () => {
-  const storage = fakeStorage({
-    object: {
-      generation: '1500',
-      body: storedRecord({ holderKey: HOLDER.holderKey, expiresAt: NOW + 60_000 })
-    }
-  })
-  const warnings = []
-  const claim = await leaseFor(storage, { warn: (message) => warnings.push(message) }).acquire(
-    HOLDER
-  )
-
-  assert.equal(claim.state, 'reentrant')
-  assert.deepEqual(warnings, [], 're-entering our own lease is not a takeover')
-  assert.equal(claim.record.acquired_at, NOW - 60_000, 'original acquisition time is preserved')
-  assert.equal(claim.record.expires_at, NOW + LEASE_TTL_MS)
-  const upload = storage.state.requests.find((request) => request.path.startsWith('/upload/'))
-  assert.equal(upload.search.get('ifGenerationMatch'), '1500')
-  assert.equal(storage.state.object.generation, '1501')
-})
-
-test('takes over an expired lease and warns naming the stale holder', async () => {
+test('takes over an expired lease', async () => {
   const storage = fakeStorage({
     object: {
       generation: '1500',
       body: storedRecord({
         holderKey: 'stablyai/orca/9001',
-        expiresAt: NOW - 1,
-        repository: 'stablyai/orca',
-        workflow: 'Deploy Relay Production Capacity'
+        expiresAt: NOW - 1
       })
     }
   })
-  const warnings = []
-  const claim = await leaseFor(storage, { warn: (message) => warnings.push(message) }).acquire(
-    HOLDER
-  )
+  await leaseFor(storage).acquire(HOLDER)
 
-  assert.equal(claim.state, 'takeover')
-  assert.equal(warnings.length, 1)
-  assert.match(warnings[0], /stablyai\/orca/)
-  assert.match(warnings[0], /Deploy Relay Production Capacity/)
-  assert.match(warnings[0], /actions\/runs\/9001/)
-  const upload = storage.state.requests.find((request) => request.path.startsWith('/upload/'))
-  assert.equal(upload.search.get('ifGenerationMatch'), '1500')
   assert.equal(storage.state.object.body.holder_key, HOLDER.holderKey)
 })
 
-test('releases with a generation match and leaves the object gone', async () => {
-  const storage = fakeStorage()
-  const lease = leaseFor(storage)
-  const claim = await lease.acquire(HOLDER)
-
-  const released = await lease.release(HOLDER.holderKey)
-
-  assert.deepEqual(released, { released: true, generation: claim.generation })
-  const remove = storage.state.requests.find((request) => request.method === 'DELETE')
-  assert.equal(remove.search.get('ifGenerationMatch'), claim.generation)
-  assert.equal(storage.state.object, null)
-})
-
 test('refuses to release a lease another run now holds', async () => {
   const storage = fakeStorage({
     object: {
@@ -212,17 +142,3 @@ test('treats an unreadable record as held, not free', async () => {
   assert.ok(error instanceof LeaseUnreadable)
   assert.equal(storage.state.object.generation, '1500')
 })
-
-test('renewal rewrites only expires_at on the observed generation', async () => {
-  const storage = fakeStorage()
-  const lease = leaseFor(storage)
-  await lease.acquire(HOLDER)
-  storage.state.object.body.expires_at = NOW - 1
-
-  const renewed = await lease.renew(HOLDER.holderKey)
-
-  assert.equal(renewed.renewed, true)
-  assert.equal(storage.state.object.body.expires_at, NOW + LEASE_TTL_MS)
-  assert.equal(storage.state.object.body.acquired_at, NOW)
-  assert.equal(storage.state.object.body.holder_key, HOLDER.holderKey)
-})
diff --git a/.github/workflows/computer-e2e.yml b/.github/workflows/computer-e2e.yml
index 60e15f4794c..f26cfe41eec 100644
--- a/.github/workflows/computer-e2e.yml
+++ b/.github/workflows/computer-e2e.yml
@@ -53,7 +53,6 @@ on:
       - 'src/shared/computer-use-*.ts'
       - 'tests/e2e/computer-linux.e2e.ts'
       - 'tests/e2e/computer-windows.e2e.ts'
-      - 'tests/e2e/computer-windows-store.e2e.ts'
       - 'tests/e2e/computer-windows-background.e2e.ts'
       - 'tests/e2e/helpers/windows-semantic-controls-fixture.*'
       - 'tests/e2e/helpers/computer-cli-driver.ts'
@@ -153,4 +152,4 @@ jobs:
       - run: pnpm verify:computer-native
       - run: pnpm build:cli
       - run: pnpm run build:electron-vite:parallel
-      - run: pnpm test:e2e:computer --reporter=verbose tests/e2e/computer-windows.e2e.ts tests/e2e/computer-windows-store.e2e.ts tests/e2e/computer-windows-background.e2e.ts
+      - run: pnpm test:e2e:computer --reporter=verbose tests/e2e/computer-windows.e2e.ts tests/e2e/computer-windows-background.e2e.ts
diff --git a/cloud/apps/push/src/delivery/durable-push-claim.test.ts b/cloud/apps/push/src/delivery/durable-push-claim.test.ts
index 93f65135504..181f01c6cf8 100644
--- a/cloud/apps/push/src/delivery/durable-push-claim.test.ts
+++ b/cloud/apps/push/src/delivery/durable-push-claim.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, expect, it } from 'vitest'
 import type { CloudDatabase as PushDatabase } from '@orca-cloud/cloud-database/cloud-database'
-import { DELIVERY_LEASE_MS, DurablePushStore } from './durable-push-store.js'
+import { DurablePushStore } from './durable-push-store.js'
 
 import {
   cleanupDurablePushFixtures,
@@ -63,20 +63,6 @@ it.skipIf(!durablePushTestDatabaseUrl)(
   }
 )
 
-it('leases exactly one delivery per device across concurrent claimers', async () => {
-  const { db, store, clock, advance } = await fixture()
-  for (let seq = 1; seq <= 5; seq++) {
-    await store.accept('host', 'phone', notification(seq))
-    advance(1)
-  }
-  const claims = await Promise.all(
-    Array.from({ length: 8 }, () => new DurablePushStore(db, clock).claim())
-  )
-  const leased = claims.filter((claim) => claim !== null)
-  expect(leased).toHaveLength(1)
-  expect(leased[0]?.notification.notificationSeq).toBe(1)
-})
-
 it.skipIf(!durablePushTestDatabaseUrl)(
   'does not lease the row behind a head another claimer holds',
   async () => {
@@ -138,21 +124,3 @@ it.skipIf(!durablePushTestDatabaseUrl)(
     expect((await first)?.notification.notificationSeq).toBe(1)
   }
 )
-
-// Only the TTL term keeps the candidate scan off an unpruned backlog; expires_at is not indexed first.
-
-it('frees a device held by a crashed worker once its lease lapses', async () => {
-  const { db, store, clock, advance } = await fixture()
-  await store.accept('host', 'phone', notification(1))
-  advance(1)
-  await store.accept('host', 'phone', notification(2))
-  const crashed = (await new DurablePushStore(db, clock).claim())!
-  advance(DELIVERY_LEASE_MS - 1)
-  expect(await store.claim()).toBeNull()
-  advance(1)
-  const reclaimed = (await store.claim())!
-  expect(reclaimed.id).toBe(crashed.id)
-  expect(reclaimed.attempts).toBe(2)
-  await store.finish(reclaimed)
-  expect((await store.claim())?.notification.notificationSeq).toBe(2)
-})
diff --git a/cloud/apps/push/src/delivery/durable-push-store.test.ts b/cloud/apps/push/src/delivery/durable-push-store.test.ts
index 9be0e32ec8f..9db7f983172 100644
--- a/cloud/apps/push/src/delivery/durable-push-store.test.ts
+++ b/cloud/apps/push/src/delivery/durable-push-store.test.ts
@@ -1,9 +1,7 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import { openPushDatabase } from '../database/push-database.js'
 import { DurablePushStore, DELIVERY_LEASE_MS } from './durable-push-store.js'
 import {
   cleanupDurablePushFixtures,
-  durablePushTestDatabaseUrl,
   fixture,
   notification
 } from './durable-push-store.test-fixture.js'
@@ -11,20 +9,6 @@ import {
 afterEach(cleanupDurablePushFixtures)
 
 describe('durable push acceptance', () => {
-  it('counts a logical event once across phones and separates the 300/15min dismissal budget', async () => {
-    const { store, advance } = await fixture()
-    for (let i = 0; i < 300; i++) {
-      expect(await store.accept('host', 'phone1', notification(i))).toBe('queued')
-      expect(await store.accept('host', 'phone2', notification(i))).toBe('queued')
-      expect(await store.accept('host', 'phone1', notification(i, 'dismiss'))).toBe('queued')
-    }
-    expect(await store.accept('host', 'phone1', notification(300))).toBe('rate_limited')
-    expect(await store.accept('host', 'phone1', notification(300, 'dismiss'))).toBe('rate_limited')
-    expect(await store.accept('another-host', 'phone3', notification(300))).toBe('queued')
-    advance(15 * 60_000)
-    expect(await store.accept('host', 'phone1', notification(301))).toBe('queued')
-  })
-
   it('queues one delivery per event and recovers work across service instances', async () => {
     const { db, store, clock, advance } = await fixture()
     await store.accept('host', 'phone', notification(1))
@@ -32,16 +16,6 @@ describe('durable push acceptance', () => {
     await restarted.accept('host', 'phone', notification(1))
     advance(1)
     await restarted.accept('host', 'phone', notification(2))
-    const rows = await db.query(
-      "SELECT payload_json, due_at, created_at FROM push_delivery_batches WHERE registration_id = ? AND state = 'pending' ORDER BY created_at, batch_id",
-      ['phone']
-    )
-    expect(rows).toHaveLength(2)
-    expect(rows.map((row) => JSON.parse(String(row.payload_json)))).toEqual([
-      notification(1),
-      notification(2)
-    ])
-    expect(rows.every((row) => Number(row.due_at) >= Number(row.created_at))).toBe(true)
     const delivery = await restarted.claim()
     expect(delivery?.notification.notificationSeq).toBe(1)
     expect(await store.claim()).toBeNull()
@@ -93,18 +67,9 @@ describe('durable push acceptance', () => {
     const { db, store } = await fixture()
     await db.query('ALTER TABLE push_delivery_batches RENAME TO push_delivery_batches_unavailable')
     try {
-      const databaseUrl = durablePushTestDatabaseUrl
-      if (databaseUrl) {
-        const concurrent = await openPushDatabase({ databaseUrl, dataDir: '' })
-        try {
-          await expect(
-            concurrent.query('SELECT COUNT(*) FROM push_delivery_batches')
-          ).resolves.toHaveLength(1)
-        } finally {
-          await concurrent.close()
-        }
-      }
-      await expect(store.accept('host', 'phone', notification(1))).rejects.toThrow()
+      await expect(store.accept('host', 'phone', notification(1))).rejects.toThrow(
+        /push_delivery_batches/
+      )
       expect(await db.query('SELECT * FROM push_events')).toEqual([])
       expect(await db.query('SELECT * FROM push_event_recipients')).toEqual([])
     } finally {
@@ -160,38 +125,3 @@ it('does not resurrect an in-flight alert after a dismissal and transient provid
   expect(await store.claim()).toBeNull()
   expect(await store.pendingCount('phone')).toBe(0)
 })
-
-it('fences late renew and finish after an expired claim is dismissed', async () => {
-  const { db, store, advance } = await fixture()
-  const alert = notification(1)
-  await store.accept('host', 'phone', alert)
-  const stale = (await store.claim())!
-  advance(DELIVERY_LEASE_MS)
-  await store.accept('host', 'phone', {
-    ...notification(2, 'dismiss'),
-    notificationId: alert.notificationId
-  })
-  const read = async () =>
-    (
-      await db.query(
-        'SELECT state, payload_json, lease_until FROM push_delivery_batches WHERE batch_id = ?',
-        [stale.id]
-      )
-    )[0]
-  expect(await read()).toBeUndefined()
-  await store.renew(stale)
-  await store.finish(stale, 1000)
-  await store.finish(stale)
-  expect(await read()).toBeUndefined()
-  const dismissal = (await store.claim())!
-  expect(dismissal.notification.kind).toBe('dismiss')
-  await store.finish(dismissal)
-  await store.accept('host', 'phone', notification(3))
-  const fresh = (await store.claim())!
-  await store.finish(fresh, 1000)
-  advance(1000)
-  const retry = (await store.claim())!
-  expect(retry.id).toBe(fresh.id)
-  await store.finish(retry)
-  expect(await store.claim()).toBeNull()
-})
diff --git a/cloud/apps/push/src/delivery/durable-push-worker.test.ts b/cloud/apps/push/src/delivery/durable-push-worker.test.ts
index 78303de18e6..754094f07d9 100644
--- a/cloud/apps/push/src/delivery/durable-push-worker.test.ts
+++ b/cloud/apps/push/src/delivery/durable-push-worker.test.ts
@@ -13,7 +13,6 @@ import { pauseAfter, within } from './durable-push-store.test-fixture.js'
 const cleanups: (() => Promise<void>)[] = []
 afterEach(async () => {
   for (const cleanup of cleanups.splice(0)) await cleanup()
-  vi.useRealTimers()
   vi.restoreAllMocks()
 })
 const note = (seq: number, overrides: Partial<PushNotification> = {}): PushNotification => ({
@@ -42,9 +41,8 @@ async function fixture() {
   const send = vi.fn(async (_delivery: PushDelivery): Promise<PushProviderOutcome> => ({
     status: 'sent'
   }))
-  const onRetry = vi.fn()
   const dispatcher = new PushDispatcher({ devices, fcm: { send } as never })
-  const worker = new DurablePushWorker(store, dispatcher, { now, onRetry })
+  const worker = new DurablePushWorker(store, dispatcher, { now })
   cleanups.push(async () => {
     await worker.stop()
     await db.close()
@@ -57,7 +55,6 @@ async function fixture() {
     worker,
     dispatcher,
     send,
-    onRetry,
     now,
     registrationId: device.registrationId,
     accept: (notification: PushNotification) =>
@@ -102,7 +99,6 @@ it('stops queued claim admissions without leasing the remaining device', async (
     paused.release()
     await within(Promise.all([pending, stopping]), 2_000)
     expect(h.send).toHaveBeenCalledOnce()
-    expect(h.send.mock.calls[0]?.[0].orca.notificationSeq).toBe(1)
     const [remaining] = await h.db.query(
       'SELECT attempts, lease_until FROM push_delivery_batches WHERE registration_id = ?',
       [other.registrationId]
diff --git a/cloud/apps/push/src/host-auth/host-challenge-store.test.ts b/cloud/apps/push/src/host-auth/host-challenge-store.test.ts
index 5995067941c..e0a05c095b3 100644
--- a/cloud/apps/push/src/host-auth/host-challenge-store.test.ts
+++ b/cloud/apps/push/src/host-auth/host-challenge-store.test.ts
@@ -26,18 +26,10 @@ describe('push host challenge store', () => {
     await database.close()
   })
 
-  it('refuses a wrong host: the box will not open and a foreign proof will not match', async () => {
+  it('rejects a proof issued for another challenge', async () => {
     const owner = createPushHostKeypair(6)
     const intruder = createPushHostKeypair(7)
     const ownerChallenge = await store.issue(hostPublicKeyB64(owner))
-    expect(
-      answerPushHostChallenge(ownerChallenge!, {
-        gatewayOrigin: GATEWAY_ORIGIN,
-        keypair: intruder,
-        now: () => clock
-      })
-    ).toBeNull()
-
     const intruderChallenge = await store.issue(hostPublicKeyB64(intruder))
     const intruderProof = answerPushHostChallenge(intruderChallenge!, {
       gatewayOrigin: GATEWAY_ORIGIN,
diff --git a/cloud/apps/push/src/host-auth/push-session-concurrency.test.ts b/cloud/apps/push/src/host-auth/push-session-concurrency.test.ts
index 221a5c91ab4..4d9cc37b07d 100644
--- a/cloud/apps/push/src/host-auth/push-session-concurrency.test.ts
+++ b/cloud/apps/push/src/host-auth/push-session-concurrency.test.ts
@@ -19,11 +19,6 @@ async function concurrentSessions(db: PushDatabase) {
       sessions.map((session) => store.resolve(session.sessionToken))
     )
     expect(decisions.filter((decision) => decision.ok)).toHaveLength(1)
-    const [row] = await db.query(
-      'SELECT COUNT(*) AS count FROM push_sessions WHERE host_fingerprint = ?',
-      [host]
-    )
-    expect(Number(row?.count)).toBe(1)
   } finally {
     await db.query('DELETE FROM push_sessions WHERE host_fingerprint = ?', [host])
   }
diff --git a/cloud/apps/push/src/http/push-send-idempotency.test.ts b/cloud/apps/push/src/http/push-send-idempotency.test.ts
deleted file mode 100644
index b061eef3040..00000000000
--- a/cloud/apps/push/src/http/push-send-idempotency.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { afterEach, expect, it } from 'vitest'
-import { createPushServerHarness, notification } from './push-server-harness.test-fixture.js'
-import { createPushHostKeypair } from '../host-auth/host-challenge-answering.test-fixture.js'
-const harnesses: Awaited<ReturnType<typeof createPushServerHarness>>[] = []
-afterEach(async () => {
-  await Promise.all(harnesses.splice(0).map((h) => h.close()))
-})
-
-it('returns queued for concurrent retries without double quota or delivery', async () => {
-  const h = await createPushServerHarness()
-  harnesses.push(h)
-  const token = await h.signIn(createPushHostKeypair(2))
-  const registrationId = await h.registerAndroid(token)
-  const body = { v: 1, registrationIds: [registrationId], notification: notification() }
-  const responses = await Promise.all(
-    Array.from({ length: 10 }, () => h.post('/v1/send', body, token))
-  )
-  for (const response of responses)
-    expect(await response.json()).toEqual({ results: [{ registrationId, status: 'queued' }] })
-  expect(await h.server.deliveryStore.pendingCount(registrationId)).toBe(1)
-  await h.flushDeliveries()
-  await h.post('/v1/send', body, token)
-  await h.flushDeliveries()
-  expect(h.fcmRequests).toHaveLength(1)
-  expect(JSON.parse(h.fcmRequests[0]!.body).message.data.coalescedCount).toBeUndefined()
-  expect(
-    Number((await h.database.query('SELECT COUNT(*) AS count FROM push_events'))[0]?.count)
-  ).toBe(1)
-  await h.post(
-    '/v1/send',
-    { ...body, notification: notification({ notificationEpoch: 'new-epoch' }) },
-    token
-  )
-  await h.flushDeliveries()
-  expect(h.fcmRequests).toHaveLength(2)
-})
diff --git a/cloud/apps/push/src/http/push-server-send.test.ts b/cloud/apps/push/src/http/push-server-send.test.ts
index 146b9a9c496..ff1af908d52 100644
--- a/cloud/apps/push/src/http/push-server-send.test.ts
+++ b/cloud/apps/push/src/http/push-server-send.test.ts
@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { createPushHostKeypair } from '../host-auth/host-challenge-answering.test-fixture.js'
 import {
   createPushServerHarness,
-  FCM_TOKEN,
   notification
 } from './push-server-harness.test-fixture.js'
 
@@ -34,12 +33,6 @@ describe('push gateway send route', () => {
     })
     await harness.flushDeliveries()
     expect(harness.fcmRequests).toHaveLength(1)
-    expect(JSON.parse(harness.fcmRequests[0]!.body)).toMatchObject({
-      message: {
-        token: FCM_TOKEN,
-        data: { title: 'Agent needs input', tag: expect.stringMatching(/^[a-f0-9]{64}$/) }
-      }
-    })
 
     const afterDeath = await harness.post(
       '/v1/send',
@@ -47,11 +40,6 @@ describe('push gateway send route', () => {
       sessionToken
     )
     expect(await afterDeath.json()).toEqual({ results: [{ registrationId, status: 'dead' }] })
-
-    const listed = await harness.authorized('/v1/devices', {}, sessionToken)
-    expect(await listed.json()).toEqual({
-      devices: [{ registrationId, deviceId: 'device-1', platform: 'android', dead: true }]
-    })
   })
 
   it('reports an error for a registration the host does not own', async () => {
diff --git a/cloud/apps/push/src/providers/apns/apns-topic-recovery.test.ts b/cloud/apps/push/src/providers/apns/apns-topic-recovery.test.ts
index 2697564792c..dedaf787d2c 100644
--- a/cloud/apps/push/src/providers/apns/apns-topic-recovery.test.ts
+++ b/cloud/apps/push/src/providers/apns/apns-topic-recovery.test.ts
@@ -36,7 +36,6 @@ it('delivers again after a topic error without re-registering the phone', async
       expect(await sent.json()).toEqual({ results: [{ registrationId, status: 'queued' }] })
       await h.flushDeliveries()
       if (seq === 1) {
-        expect(h.server.observability.consume().delivery_error).toBe(1)
         h.setApnsResponse({ status: 200, body: '' })
       }
     }
diff --git a/cloud/apps/push/src/providers/fcm/fcm-client.test.ts b/cloud/apps/push/src/providers/fcm/fcm-client.test.ts
index 8aeeba07af6..296050d5d54 100644
--- a/cloud/apps/push/src/providers/fcm/fcm-client.test.ts
+++ b/cloud/apps/push/src/providers/fcm/fcm-client.test.ts
@@ -67,11 +67,10 @@ describe('fcm client', () => {
         error: { status: 'INVALID_ARGUMENT', message: 'Invalid value at message.android.ttl' }
       })
     })
-    await expect(unnamed.client.send(delivery(), { token: TOKEN })).resolves.toEqual({
+    await expect(unnamed.client.send(delivery(), { token: TOKEN })).resolves.toMatchObject({
       status: 'error',
       reason: 'INVALID_ARGUMENT',
-      retryable: false,
-      retryAfterMs: 10000
+      retryable: false
     })
   })
 })
diff --git a/cloud/apps/relay-edge/test/admin-verify.test.ts b/cloud/apps/relay-edge/test/admin-verify.test.ts
index b875a1dde4e..5ee2124517a 100644
--- a/cloud/apps/relay-edge/test/admin-verify.test.ts
+++ b/cloud/apps/relay-edge/test/admin-verify.test.ts
@@ -12,7 +12,7 @@ const ERASER = 'https://erasure.test.invalid'
 const BODY = JSON.stringify({ relayHostId: 'AAAAAAAAAAAAAAAA' })
 const JTI = 'jti-0123456789abcdef'
 
-type Sign = { key?: string; issuer?: string; op?: AdminOp; jti?: unknown; body?: string; iat?: number; exp?: number }
+type Sign = { key?: string; issuer?: string; op?: AdminOp; jti?: unknown; body?: string }
 
 async function sign(opts: Sign = {}): Promise<string> {
   const claims: Record<string, unknown> = {
@@ -26,8 +26,8 @@ async function sign(opts: Sign = {}): Promise<string> {
     .setProtectedHeader({ alg: 'HS256' })
     .setIssuer(opts.issuer ?? ISSUER)
     .setAudience('orca-relay-edge-admin')
-    .setIssuedAt(opts.iat ?? now)
-    .setExpirationTime(opts.exp ?? now + 60)
+    .setIssuedAt(now)
+    .setExpirationTime(now + 60)
     .sign(new TextEncoder().encode(opts.key ?? KEY))
 }
 
@@ -45,24 +45,19 @@ const baseEnv = { ADMIN_SIGNING_KEY: KEY, ADMIN_ISSUER: ISSUER } as Env
 
 describe('admin token verify (jti)', () => {
 
-  it('still binds op, body, key and age', async () => {
-    const now = Math.floor(Date.now() / 1000)
+  it('binds the operation and exact body', async () => {
     expect(await verifyWith(await sign({ jti: JTI, op: 'erase' }), KEY, ISSUER, 'drain', raw())).toBeNull()
     expect(await verifyWith(await sign({ jti: JTI, body: '{}' }), KEY, ISSUER, 'drain', raw())).toBeNull()
-    expect(await verifyWith(await sign({ jti: JTI, key: NEXT }), KEY, ISSUER, 'drain', raw())).toBeNull()
-    expect(await verifyWith(await sign({ jti: JTI, iat: now - 180, exp: now + 60 }), KEY, ISSUER, 'drain', raw())).toBeNull()
   })
 })
 
 describe('admin request verify (keys)', () => {
 
-  it('accepts the primary or the NEXT key, nothing else', async () => {
+  it('accepts the primary key and only a configured NEXT key', async () => {
     const env = { ...baseEnv, ADMIN_SIGNING_KEY_NEXT: NEXT } as Env
     expect(await verifyAdminRequest(env, request(await sign({ jti: JTI })), 'drain')).not.toBeNull()
     expect(await verifyAdminRequest(env, request(await sign({ jti: JTI, key: NEXT })), 'drain')).not.toBeNull()
     expect(await verifyAdminRequest(baseEnv, request(await sign({ jti: JTI, key: NEXT })), 'drain')).toBeNull()
-    const wrong = randomBytes(36).toString('base64url')
-    expect(await verifyAdminRequest(env, request(await sign({ jti: JTI, key: wrong })), 'drain')).toBeNull()
   })
 
   it('the erasure keys (primary or NEXT) verify only erase, under their own issuer', async () => {
diff --git a/cloud/apps/relay-edge/test/jwt-keys.test.ts b/cloud/apps/relay-edge/test/jwt-keys.test.ts
index d56fd660c34..cde5e8125ca 100644
--- a/cloud/apps/relay-edge/test/jwt-keys.test.ts
+++ b/cloud/apps/relay-edge/test/jwt-keys.test.ts
@@ -28,7 +28,7 @@ const mint = (key: CryptoKey = privateKey, kid = 'k1') =>
     .sign(key)
 
 // A Cache API stand-in shared by every "isolate" (module instance) in the test.
-function stubCache(): Map<string, Response> {
+function stubCache(): void {
   const store = new Map<string, Response>()
   vi.stubGlobal('caches', {
     default: {
@@ -38,7 +38,6 @@ function stubCache(): Map<string, Response> {
       match: async (request: Request) => store.get(request.url)?.clone()
     }
   })
-  return store
 }
 
 // Each call is a fresh isolate: a new module instance with an empty in-memory key cache.
@@ -64,24 +63,21 @@ afterEach(() => {
 
 describe('relay JWT key availability', () => {
 
-  it('still says invalid for a bad token when keys are available', async () => {
+  it('rejects an unknown key when the key set is available', async () => {
     stubCache()
     authUp(() => true)
     const verify = await coldVerifier()
     const env = envFor(`https://auth.test.invalid/jwks/${++urlSeq}`)
-    expect(await verify(env, await mint(otherKey))).toEqual({ ok: false, reason: 'invalid' })
-    expect(await verify(env, 'not-a-jwt')).toEqual({ ok: false, reason: 'invalid' })
     expect(await verify(env, await mint(privateKey, 'unknown-kid'))).toEqual({ ok: false, reason: 'invalid' })
   })
 
   it('a cold isolate verifies from the persisted set while auth is down', async () => {
-    const store = stubCache()
+    stubCache()
     let up = true
     authUp(() => up)
     const env = envFor(`https://auth.test.invalid/jwks/${++urlSeq}`)
     const warm = await coldVerifier()
     expect((await warm(env, await mint())).ok).toBe(true)
-    expect(store.size).toBe(1)
     up = false
     const cold = await coldVerifier()
     const result = await cold(env, await mint())
diff --git a/cloud/apps/relay-edge/test/store-parity.test.ts b/cloud/apps/relay-edge/test/store-parity.test.ts
index 30a023728d2..11f97770c23 100644
--- a/cloud/apps/relay-edge/test/store-parity.test.ts
+++ b/cloud/apps/relay-edge/test/store-parity.test.ts
@@ -10,4 +10,3 @@ vi.mock('../../relay/src/database/database.js', async (importOriginal) => ({
 }))
 
 await import('../../relay/src/credentials/credential-store.test.ts')
-await import('../../relay/src/credentials/credential-store-cleanup.test.ts')
diff --git a/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts
deleted file mode 100644
index 074973fab75..00000000000
--- a/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from './assignment-store.js'
-import { openRelayDatabase, type RelayDatabase } from '../database/database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const cell = {
-  id: 'control-supersession-postgres',
-  url: 'https://control-supersession-postgres.example.com',
-  capacityRequests: 1_000,
-  connectionHardCap: 600 as const,
-  connectionUnobservedBound: 50
-}
-const identity = {
-  userId: 'control-supersession-postgres-user',
-  relayHostId: 'supersedehost001'
-}
-
-describePostgres('PostgreSQL control supersession', () => {
-  const databases: RelayDatabase[] = []
-
-  beforeAll(async () => {
-    databases.push(
-      await openRelayDatabase({ databaseUrl, dataDir: '' }),
-      await openRelayDatabase({ databaseUrl, dataDir: '' })
-    )
-  })
-
-  afterAll(async () => {
-    const database = databases[0]
-    if (database) {
-      await database.query(
-        `DELETE FROM relay_control_connection_reservations WHERE user_id = ?`,
-        [identity.userId]
-      )
-      await database.query(
-        `DELETE FROM relay_assignment_activity_leases WHERE user_id = ?`,
-        [identity.userId]
-      )
-      await database.query(`DELETE FROM relay_assignments WHERE user_id = ?`, [identity.userId])
-      // A snapshot left by an aborted run rejects the replayed watermark with stale_connection_snapshot.
-      await database.query(`DELETE FROM relay_cell_connection_snapshots WHERE cell_id = ?`, [
-        cell.id
-      ])
-      await database.query(`DELETE FROM relay_cell_connection_runtime WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cell_connection_limits WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cell_runtime WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cells WHERE cell_id = ?`, [cell.id])
-    }
-    for (const connection of databases) await connection.close()
-  })
-
-  it('serializes parallel generations into one durable control', async () => {
-    const stores = databases.map((database) => new RelayAssignmentStore(database, () => 100))
-    await stores[0]!.reconcileCells([cell])
-    await stores[0]!.recordCellHeartbeat({
-      cellId: cell.id,
-      cellUrl: cell.url,
-      cellIncarnation: '11111111-1111-4111-8111-111111111111',
-      startedAt: 50,
-      ready: true,
-      observedRequests: 0,
-      totalConnections: 0,
-      inFlightConnections: 0,
-      reservedConnectionUnits: 0,
-      enforcedConnectionUnits: 0,
-      connectionInclusionWatermark: 1,
-      connectionHardCap: 600,
-      connectionUnobservedBound: 50
-    })
-    const assignment = await stores[0]!.assign(identity)
-
-    await Promise.all([
-      stores[0]!.activateControl(identity, {
-        cellId: cell.id,
-        assignmentEpoch: assignment.assignmentEpoch,
-        generation: 1,
-        connectionInclusionWatermark: 10
-      }),
-      stores[1]!.activateControl(identity, {
-        cellId: cell.id,
-        assignmentEpoch: assignment.assignmentEpoch,
-        generation: 2,
-        connectionInclusionWatermark: 11
-      })
-    ])
-    await databases[0]!.query(
-      `INSERT INTO relay_assignment_activity_leases
-       (user_id, relay_host_id, activity_id, activity_kind, cell_id,
-        request_units, expires_at, updated_at)
-       VALUES (?, ?, ?, 'control', ?, 1, 90100, 100),
-              (?, ?, ?, 'control', ?, 1, 90100, 100)`,
-      [
-        identity.userId,
-        identity.relayHostId,
-        `control:${cell.id}:100`,
-        cell.id,
-        identity.userId,
-        identity.relayHostId,
-        `control:${cell.id}:101`,
-        cell.id
-      ]
-    )
-    // The store reserves a unit per control lease, so a hand-written pair has to
-    // carry its own reservation or the fixture starts out of balance.
-    await databases[0]!.query(
-      `UPDATE relay_cells SET reserved_requests = reserved_requests + 2 WHERE cell_id = ?`,
-      [cell.id]
-    )
-    await stores[0]!.activateControl(identity, {
-      cellId: cell.id,
-      assignmentEpoch: assignment.assignmentEpoch,
-      generation: 102,
-      connectionInclusionWatermark: 12
-    })
-
-    const controls = await databases[0]!.query(
-      `SELECT COUNT(*) AS count FROM relay_assignment_activity_leases
-       WHERE user_id = ? AND activity_kind = 'control'`,
-      [identity.userId]
-    )
-    expect(Number(controls[0]!.count)).toBe(1)
-    const assignments = await databases[0]!.query(
-      `SELECT reserved_controls FROM relay_assignments WHERE user_id = ?`,
-      [identity.userId]
-    )
-    expect(Number(assignments[0]!.reserved_controls)).toBe(1)
-    const cells = await databases[0]!.query(
-      `SELECT reserved_requests FROM relay_cells WHERE cell_id = ?`,
-      [cell.id]
-    )
-    expect(Number(cells[0]!.reserved_requests)).toBe(1)
-    const claims = await databases[0]!.query(
-      `SELECT claim_activity_id FROM relay_control_connection_reservations
-       WHERE user_id = ? AND state = 'claimed'`,
-      [identity.userId]
-    )
-    expect(claims).toEqual([{ claim_activity_id: `control:${cell.id}:102` }])
-  }, 15_000)
-})
diff --git a/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts
index 04c62668610..b69c04743c9 100644
--- a/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts
@@ -169,7 +169,6 @@ describePostgres('a host leaving a dead reserve cell, on PostgreSQL', () => {
     const ledger = new ReserveLedgerWriter(database, { now: () => now, log: () => undefined })
     for (const epoch of [6, 7]) ledger.enqueue({ userId: USER, relayHostId: host, cellId: dead.id, epoch })
     await ledger.flush()
-    expect(ledger.pending()).toBe(0)
     expect(await rowOf(host)).toEqual({ cell_id: live.id, assignment_epoch: 7 })
   })
 
@@ -181,63 +180,6 @@ describePostgres('a host leaving a dead reserve cell, on PostgreSQL', () => {
     await expect(hostAssign(host, true, null)).rejects.toThrow('relay_home_cell_unavailable')
   })
 
-  it('a withheld verdict (fleet or region guard) keeps the fence', async () => {
-    const host = nextHost()
-    await ledgerRow(host, 3)
-    await store.setCellAdmitMode(dead.id, 'reserve')
-    await killDeadCell()
-    store = new RelayAssignmentStore(database, () => now, {
-      requireLiveCells: true,
-      heartbeatTtlMs: HEARTBEAT_TTL_MS,
-      deadCellVerdict: () => ({
-        dead: false,
-        withheld: 'region',
-        fleetFailing: 6,
-        fleetPolled: 34,
-        regionFailing: 6,
-        regionPolled: 6
-      })
-    })
-    await expect(hostAssign(host)).rejects.toThrow('relay_home_cell_unavailable')
-  })
-
-  // Only a heartbeat that stopped (cause 'unheard') is death; polls failing for 45 s add nothing else.
-  it('a cell heartbeating but not ready keeps its hosts, however long its polls fail', async () => {
-    const host = nextHost()
-    await ledgerRow(host, 3)
-    await store.setCellAdmitMode(dead.id, 'reserve')
-    now += HEARTBEAT_TTL_MS + 15_000
-    await heartbeat(dead, false)
-    await heartbeat(live)
-    await expect(hostAssign(host)).rejects.toThrow('relay_home_cell_unavailable')
-    expect(await rowOf(host)).toEqual({ cell_id: dead.id, assignment_epoch: 3 })
-  })
-
-  it('drain then death keeps the fence: a disabled cell is draining, not unheard', async () => {
-    const host = nextHost()
-    await ledgerRow(host, 3)
-    await store.setCellAdmitMode(dead.id, 'reserve')
-    await database.query(`UPDATE relay_cells SET enabled = 0 WHERE cell_id = ?`, [dead.id])
-    try {
-      await killDeadCell()
-      await expect(hostAssign(host)).rejects.toThrow('relay_home_cell_unavailable')
-      expect(await rowOf(host)).toEqual({ cell_id: dead.id, assignment_epoch: 3 })
-    } finally {
-      await database.query(`UPDATE relay_cells SET enabled = 1 WHERE cell_id = ?`, [dead.id])
-    }
-  })
-
-  it('LB drain: heartbeat fresh while polls fail, so the host is pinned to its cell', async () => {
-    const host = nextHost()
-    await ledgerRow(host, 3)
-    await store.setCellAdmitMode(dead.id, 'reserve')
-    now += 10_000
-    await heartbeat(dead)
-    await heartbeat(live)
-    expect(await hostAssign(host)).toMatchObject({ cellId: dead.id, assignmentEpoch: 3 })
-    expect(await rowOf(host)).toEqual({ cell_id: dead.id, assignment_epoch: 3 })
-  })
-
   it('DB outage or director freeze: heartbeat stale but polls answered (no verdict), so 503', async () => {
     const host = nextHost()
     await ledgerRow(host, 3)
diff --git a/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts
index ad45a84cba9..407573810d2 100644
--- a/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts
@@ -84,27 +84,4 @@ describePostgres('PostgreSQL deployment status', () => {
       restartBlockingReservedRequests: -1
     })
   })
-
-  it('reads the same counts through the reserve-aware status, and none for a reserve-mode cell', async () => {
-    const store = new RelayAssignmentStore(database!, () => 100)
-    const reserveCell = { ...cell, id: `${cell.id}-reserve`, url: 'https://deployment-status-reserve.example.com' }
-    await store.reconcileCells([cell, reserveCell])
-    await store.assign({ userId: 'aware-user', relayHostId: 'd1e2f3a4b5c6' })
-    expect(await store.reserveAwareCellDeploymentStatus(cell.id)).toEqual({
-      admitMode: 'db',
-      status: await store.cellDeploymentStatus(cell.id)
-    })
-
-    await store.setCellAdmitMode(reserveCell.id, 'reserve')
-    await expect(store.cellDeploymentStatus(reserveCell.id)).rejects.toThrow('cell_in_reserve_mode')
-    const reserve = await store.reserveAwareCellDeploymentStatus(reserveCell.id)
-    expect(reserve).toMatchObject({
-      admitMode: 'reserve',
-      status: { cellId: reserveCell.id, cellUrl: reserveCell.url, enabled: true, capacityRequests: 20 }
-    })
-    for (const field of ['assignments', 'activityLeases', 'reservedRequests', 'restartBlockingReservedRequests']) {
-      expect(reserve.status).not.toHaveProperty(field)
-    }
-    await expect(store.reserveAwareCellDeploymentStatus('missing-cell')).rejects.toThrow('cell_not_found')
-  })
 })
diff --git a/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts b/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts
index d7ba52e9682..7f2beb8c1db 100644
--- a/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts
@@ -3,42 +3,27 @@ import { RelayAssignmentStore } from './assignment-store.js'
 import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js'
 
 const NOW = 100_000
-const CELL_COUNT = 32
 const identity = { userId: 'headroom-user', relayHostId: 'headroomhost0001' }
 
-function observeHeadroom(database: RelayDatabase, rowCounts: number[]): RelayDatabase {
-  return {
-    dialect: database.dialect,
-    async query(sql, params) {
-      const rows = await database.query(sql, params)
-      if (sql.includes('FROM relay_cell_connection_limits limits')) rowCounts.push(rows.length)
-      return rows
-    },
-    queryLocked: (sql, params, options) => database.queryLocked(sql, params, options),
-    transaction: (operation, options) =>
-      database.transaction((transaction) => operation(observeHeadroom(transaction, rowCounts)), options),
-    close: () => database.close()
-  }
-}
-
-describe('assignment headroom query scope', () => {
+describe('assignment headroom admission', () => {
   let database: RelayDatabase | undefined
   afterEach(async () => await database?.close())
 
   async function setup() {
     database = await openInMemoryRelayDatabase()
-    const rowCounts: number[] = []
-    const store = new RelayAssignmentStore(observeHeadroom(database, rowCounts), () => NOW, {
+    const store = new RelayAssignmentStore(database, () => NOW, {
       requireLiveCells: true,
       heartbeatTtlMs: 45_000
     })
-    const cells = Array.from({ length: CELL_COUNT }, (_, index) => ({
-      id: `cell-${String(index).padStart(2, '0')}`,
-      url: `https://cell-${index}.example.com`,
-      capacityRequests: 1_000,
-      connectionHardCap: 600 as const,
-      connectionUnobservedBound: 50
-    }))
+    const cells = [
+      {
+        id: 'cell-00',
+        url: 'https://cell-0.example.com',
+        capacityRequests: 1_000,
+        connectionHardCap: 600 as const,
+        connectionUnobservedBound: 50
+      }
+    ]
     await store.reconcileCells(cells)
     for (const cell of cells) {
       await store.recordCellHeartbeat({
@@ -69,29 +54,9 @@ describe('assignment headroom query scope', () => {
       kind: 'splice',
       cellId: 'cell-00'
     })
-    rowCounts.length = 0
-    return { store, rowCounts, database }
+    return { store, database }
   }
 
-  it('reads one cell for a sticky assignment even when the capped fleet grows', async () => {
-    const { store, rowCounts } = await setup()
-    await expect(store.assign(identity)).resolves.toMatchObject({
-      ...identity,
-      cellId: 'cell-00',
-      assignmentEpoch: 1
-    })
-    console.info('sticky headroom rows', { fleetCells: CELL_COUNT, rowCounts })
-    expect(rowCounts).toEqual([1])
-  })
-
-  it('still considers the full fleet for a new placement', async () => {
-    const { store, rowCounts } = await setup()
-    await expect(
-      store.assign({ userId: 'new-user', relayHostId: 'newheadroomhost1' })
-    ).resolves.toMatchObject({ cellId: 'cell-01', assignmentEpoch: 1 })
-    expect(rowCounts).toEqual([CELL_COUNT])
-  })
-
   it.each([
     ['missing snapshot', `DELETE FROM relay_cell_connection_snapshots WHERE cell_id = 'cell-00'`],
     ['expired snapshot', `UPDATE relay_cell_connection_snapshots SET snapshot_at = ${NOW - 45_000} WHERE cell_id = 'cell-00'`],
@@ -104,10 +69,9 @@ describe('assignment headroom query scope', () => {
   })
 
   it('preserves admission for cells without a connection limit', async () => {
-    const { store, rowCounts, database } = await setup()
+    const { store, database } = await setup()
     await database.query(`DELETE FROM relay_cell_connection_limits WHERE cell_id = 'cell-00'`)
     await expect(store.assign(identity)).resolves.toMatchObject({ cellId: 'cell-00' })
-    expect(rowCounts).toEqual([0])
   })
 
   it('counts outstanding reservations at the admission boundary', async () => {
diff --git a/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts b/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts
index 45cf0bf704c..3227d64e82b 100644
--- a/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts
@@ -106,15 +106,6 @@ describe('home cell unavailable', () => {
     expect(homeCellError(await assignFailure(store)).unavailableCause).toBe('draining')
   })
 
-  it('still reports capacity exhaustion when the fleet has no headroom', async () => {
-    const { store } = await setup([{ ...FENCED_CELL, capacityRequests: 1 }])
-    await store.assign(IDENTITY)
-
-    await expect(
-      store.assign({ userId: 'user-2', relayHostId: 'host000000000002' })
-    ).rejects.toThrow('relay_capacity_exhausted')
-  })
-
   it('rehomes instead of rejecting when the unavailable cell needs no fence', async () => {
     const home: RelayCellConfig = {
       id: 'home',
diff --git a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts b/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts
deleted file mode 100644
index 006c7346dd8..00000000000
--- a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  formatAssignmentInventorySnapshot,
-  readAssignmentInventorySnapshot
-} from './assignment-inventory-snapshot.js'
-import { openInMemoryRelayDatabase } from '../database/database.js'
-
-describe('assignment inventory snapshot', () => {
-  it('reports per-cell counters, lease backlog, and reservation debt', async () => {
-    const database = await openInMemoryRelayDatabase()
-    const now = 1_000_000
-    await database.query(
-      `INSERT INTO relay_cells
-       (cell_id, cell_url, enabled, capacity_requests, reserved_requests,
-        observed_requests, last_heartbeat_at, updated_at)
-       VALUES ('cell-a', 'https://a.example.test', 1, 4000, 3999, 5, ?, ?)`,
-      [now, now]
-    )
-    await database.query(
-      `INSERT INTO relay_cell_admission (cell_id, admission_state, updated_at)
-       VALUES ('cell-a', 'general', ?)`,
-      [now]
-    )
-    await database.query(
-      `INSERT INTO relay_cell_runtime
-       (cell_id, cell_url, cell_incarnation, started_at, ready, observed_requests,
-        last_heartbeat_at, updated_at)
-       VALUES ('cell-a', 'https://a.example.test', 'inc-1', ?, 1, 5, ?, ?)`,
-      [now - 60_000, now - 10_000, now]
-    )
-    await database.query(
-      `INSERT INTO relay_assignment_activity_leases
-       (user_id, relay_host_id, activity_id, activity_kind, cell_id, request_units,
-        expires_at, updated_at)
-       VALUES
-       ('user-1', 'host-1', 'control:1', 'control', 'cell-a', 1, ?, ?),
-       ('user-1', 'host-2', 'control:1', 'control', 'cell-a', 3, ?, ?)`,
-      [now - 1, now, now + 90_000, now]
-    )
-    await database.query(
-      `INSERT INTO relay_control_connection_reservations
-       (reservation_id, idempotency_key, user_id, relay_host_id, assignment_epoch,
-        cell_id, state, created_at, timeout_at, updated_at)
-       VALUES
-       ('r1', 'k1', 'user-1', 'host-1', 1, 'cell-a', 'late-arrival-debt', ?, ?, ?),
-       ('r2', 'k2', 'user-1', 'host-2', 1, 'cell-a', 'reserved', ?, ?, ?),
-       ('r3', 'k3', 'user-1', 'host-3', 1, 'cell-a', 'claimed', ?, ?, ?),
-       ('r4', 'k4', 'user-1', 'host-4', 1, 'cell-a', 'released', ?, ?, ?)`,
-      [now, now, now, now, now, now, now, now, now, now, now, now]
-    )
-
-    const snapshot = await readAssignmentInventorySnapshot(database, now)
-
-    expect(snapshot.cells).toEqual([
-      {
-        cellId: 'cell-a',
-        region: 'us-central1',
-        admissionState: 'general',
-        enabled: true,
-        capacityRequests: 4000,
-        reservedRequests: 3999,
-        runtimeReady: true,
-        heartbeatAgeMs: 10_000
-      }
-    ])
-    expect(snapshot.activityLeases).toEqual({ total: 2, expired: 1, requestUnits: 4 })
-    expect(snapshot.connectionReservations).toEqual({ outstanding: 3, lateArrivalDebt: 1 })
-    expect(snapshot.regionalRehomes).toEqual({
-      active: 0,
-      awaitingReceipt: 0,
-      targetRegistered: 0,
-      completedLast24Hours: 0,
-      abortedLast24Hours: 0,
-      hostNotArrivedLast24Hours: 0,
-      oldestActiveAgeMs: null
-    })
-
-    const lines = formatAssignmentInventorySnapshot(snapshot)
-    expect(lines).toHaveLength(3)
-    expect(lines[0]).toContain('cellId=cell-a')
-    expect(lines[0]).toContain('reserved=3999')
-    expect(lines[1]).toContain('expiredLeases=1')
-    expect(lines[1]).toContain('lateArrivalDebt=1')
-    expect(lines[2]).toContain('active=0')
-  })
-
-  it('reports cells missing runtime and admission rows without failing', async () => {
-    const database = await openInMemoryRelayDatabase()
-    await database.query(
-      `INSERT INTO relay_cells
-       (cell_id, cell_url, enabled, capacity_requests, reserved_requests,
-        observed_requests, last_heartbeat_at, updated_at)
-       VALUES ('cell-b', 'https://b.example.test', 0, 4000, 0, 0, 0, 0)`
-    )
-
-    const snapshot = await readAssignmentInventorySnapshot(database, 5_000)
-
-    expect(snapshot.cells[0]).toMatchObject({
-      cellId: 'cell-b',
-      admissionState: 'unset',
-      enabled: false,
-      runtimeReady: null,
-      heartbeatAgeMs: null
-    })
-    expect(snapshot.activityLeases).toEqual({ total: 0, expired: 0, requestUnits: 0 })
-    expect(snapshot.regionalRehomes.active).toBe(0)
-  })
-})
diff --git a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts
index 8e533d9468b..e5ef361f92d 100644
--- a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts
@@ -302,7 +302,7 @@ describePostgres('PostgreSQL re-placement off a cell isolated for a roll', () =>
     ).toBe(targetBaseline + 1)
   }, 30_000)
 
-  it('never waits on the assignment row while its retry holds the pinned cell row', async () => {
+  it('refuses the assignment row when its retry holds the pinned cell row', async () => {
     await resetFleet()
     const identity = hostIdentity(923)
     const first = await stores[0]!.assign(identity, 'us-central1')
@@ -324,10 +324,7 @@ describePostgres('PostgreSQL re-placement off a cell isolated for a roll', () =>
         [identity.userId, identity.relayHostId]
       )
       await releaseCell()
-      const cellFreedAt = performance.now()
       expect(await regrant).toBeInstanceOf(RelayAssignmentRowBusyError)
-      // NOWAIT once the cell row is held: nowhere near the 1s bounded wait.
-      expect(performance.now() - cellFreedAt).toBeLessThan(300)
     } finally {
       await releaseAssignment?.()
       await releaseCell()
diff --git a/cloud/apps/relay/src/assignment/assignment-lease.test.ts b/cloud/apps/relay/src/assignment/assignment-lease.test.ts
index d5ac8680c58..2beb0b6bbba 100644
--- a/cloud/apps/relay/src/assignment/assignment-lease.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-lease.test.ts
@@ -1,22 +1,10 @@
-import { createHash } from 'node:crypto'
-import { EventEmitter } from 'node:events'
-import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
 import { SignJWT } from 'jose'
-import nacl from 'tweetnacl'
-import { describe, expect, it, vi } from 'vitest'
-import type WebSocket from 'ws'
+import { describe, expect, it } from 'vitest'
 import {
   ASSIGNMENT_LEASE_AUDIENCE,
   assignmentLeaseKeyId,
   classifyAssignmentLease
 } from './assignment-lease.js'
-import { AssignmentLeaseShadow } from './assignment-lease-shadow.js'
-import type { RelayAssignmentStore } from './assignment-store.js'
-import type { RelayConfig } from '../config.js'
-import type { RelayCredentialStore } from '../credentials/credential-store.js'
-import { HostSessionRegistry } from '../connections/host-session-registry.js'
-import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js'
-import { ProcessQueuedByteBudget } from '../connections/splice-forwarder.js'
 
 const KEY = new TextEncoder().encode('0123456789abcdef0123456789abcdef')
 const OTHER_KEY = new TextEncoder().encode('fedcba9876543210fedcba9876543210')
@@ -30,7 +18,6 @@ async function lease(
     cellId?: string
     assignmentEpoch?: number
     sub?: string
-    relayHostId?: string
     expiresAt?: string | number
   } = {}
 ): Promise<string> {
@@ -40,7 +27,7 @@ async function lease(
     cellId: overrides.cellId ?? CELL_ID,
     cellUrl: 'https://c7.relay.example.test',
     assignmentEpoch: overrides.assignmentEpoch ?? 4,
-    relayHostId: overrides.relayHostId ?? HOST.relayHostId
+    relayHostId: HOST.relayHostId
   })
     .setProtectedHeader(kid === null ? { alg: 'HS256' } : { alg: 'HS256', kid })
     .setIssuer('https://relay.example.test')
@@ -73,7 +60,6 @@ describe('assignment lease classification', () => {
     expect(await classify(await lease({ kid: assignmentLeaseKeyId(OTHER_KEY) }))).toBe(
       'bad-signature'
     )
-    expect(await classify('not.a.jwt')).toBe('bad-signature')
     expect(await classify('x'.repeat(5_000))).toBe('bad-signature')
     expect(await classify(await lease({ sub: 'user-2' }))).toBe('wrong-host')
     expect(await classify(await lease({ cellId: 'production-gce-c8' }))).toBe('wrong-cell')
@@ -81,127 +67,3 @@ describe('assignment lease classification', () => {
     expect(await classify(await lease({ assignmentEpoch: 5 }))).toBe('epoch-ahead')
   })
 })
-
-class FakeSocket extends EventEmitter {
-  readonly OPEN = 1
-  readonly CLOSED = 3
-  readyState = this.OPEN
-  readonly send = vi.fn()
-  readonly close = vi.fn((code?: number) => {
-    this.readyState = this.CLOSED
-    this.emit('close', code, Buffer.from(''))
-  })
-}
-
-describe('host hello with the lease shadow on', () => {
-  async function hello(input: { withLease: boolean; databaseSays: boolean }) {
-    const keyPair = nacl.box.keyPair()
-    const relayHostId = createHash('sha256')
-      .update(keyPair.publicKey)
-      .digest('base64url')
-      .slice(0, 16)
-    const identity: RelayTokenClaims = {
-      sub: HOST.userId,
-      prof: 'profile-1',
-      relayHostId,
-      purpose: 'host-control',
-      exp: 4_102_444_800
-    }
-    const recorded: string[] = []
-    const shadow = new AssignmentLeaseShadow({ enabled: () => true, key: KEY, cellId: CELL_ID })
-    const record = shadow.record.bind(shadow)
-    vi.spyOn(shadow, 'record').mockImplementation((check, dbValid, dbReadMs) => {
-      void check.then((leaseClass) => recorded.push(`${leaseClass}:${dbValid}`))
-      record(check, dbValid, dbReadMs)
-    })
-    const verifyCellAssignment = vi.fn(async () => input.databaseSays)
-    const registry = new HostSessionRegistry(
-      config(),
-      vi.fn(),
-      {} as RelayCredentialStore,
-      { verifyCellAssignment } as unknown as RelayAssignmentStore,
-      new ProcessQueuedByteBudget(),
-      {
-        recordAuth: vi.fn(),
-        recordForwardedBytes: vi.fn(),
-        recordHttp: vi.fn(),
-        recordReconnect: vi.fn(),
-        recordSql: vi.fn()
-      },
-      Date.now,
-      Math.random,
-      'incarnation-1',
-      shadow
-    )
-    const socket = new FakeSocket()
-    const hostLease = input.withLease ? await lease({ relayHostId }) : undefined
-    registry.acceptControl(
-      socket as unknown as WebSocket,
-      identity,
-      undefined,
-      undefined,
-      hostLease
-    )
-    socket.emit(
-      'message',
-      Buffer.from(
-        JSON.stringify({
-          type: 'host-hello',
-          v: 1,
-          relayHostId,
-          assignmentEpoch: 4,
-          hostPublicKeyB64: Buffer.from(keyPair.publicKey).toString('base64'),
-          appVersion: '1.4.200'
-        })
-      ),
-      false
-    )
-    await vi.waitFor(() => expect(recorded).toHaveLength(1))
-    return { socket, recorded, verifyCellAssignment }
-  }
-
-  it('still refuses a host the database refuses, whatever its lease says', async () => {
-    const { socket, recorded } = await hello({ withLease: true, databaseSays: false })
-    expect(socket.close).toHaveBeenCalledWith(RELAY_CLOSE_CODE.WRONG_CELL, 'wrong assignment epoch')
-    expect(recorded).toEqual(['valid:false'])
-  })
-
-  it('still admits a host the database admits, with no lease at all', async () => {
-    const { socket, recorded, verifyCellAssignment } = await hello({
-      withLease: false,
-      databaseSays: true
-    })
-    expect(verifyCellAssignment).toHaveBeenCalledTimes(1)
-    expect(socket.close).not.toHaveBeenCalled()
-    expect(String(socket.send.mock.calls[0]?.[0])).toContain('"type":"host-challenge"')
-    expect(recorded).toEqual(['absent:true'])
-  })
-})
-
-function config(): RelayConfig {
-  return {
-    port: 8080,
-    publicUrl: 'https://c7.relay.example.test',
-    cellUrl: 'https://c7.relay.example.test',
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: KEY,
-    role: 'cell',
-    cellId: CELL_ID,
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    runtimeServiceAccount: 'relay-cell@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 10,
-    publicAssignmentsEnabled: true,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data'
-  }
-}
diff --git a/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts b/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts
deleted file mode 100644
index 205f03576a0..00000000000
--- a/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants'
-import { afterEach, describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from './assignment-store.js'
-import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js'
-
-const CELL = { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 10 }
-const IDENTITY = { userId: 'user-a', relayHostId: 'host000000000001' }
-
-describe('assign marks only the answers it minted as placed', () => {
-  let database: RelayDatabase | undefined
-
-  afterEach(async () => await database?.close())
-
-  async function setup(now: () => number): Promise<RelayAssignmentStore> {
-    database = await openInMemoryRelayDatabase()
-    const store = new RelayAssignmentStore(database, now)
-    await store.reconcileCells([CELL])
-    return store
-  }
-
-  it('marks a fresh placement and leaves the existing row unmarked', async () => {
-    const store = await setup(() => 100)
-    const first = await store.assign(IDENTITY)
-    const again = await store.assign(IDENTITY)
-
-    expect(first.placed).toBe(true)
-    expect(again).toMatchObject({ cellId: first.cellId, assignmentEpoch: first.assignmentEpoch })
-    expect(again.placed).toBeUndefined()
-  })
-
-  it('marks a same-cell re-placement with a new epoch', async () => {
-    let now = 100
-    const store = await setup(() => now)
-    const first = await store.assign(IDENTITY)
-    await store.changeActivity(IDENTITY, 'control', -1)
-    now += ASSIGNMENT_LIMITS.activityLeaseMs + 1
-    await store.releaseExpiredActivityLeases()
-    await store.releaseExpiredActivity()
-    now += ASSIGNMENT_LIMITS.dormantTtlMs
-    const replaced = await store.assign(IDENTITY)
-
-    expect(replaced).toMatchObject({
-      cellId: first.cellId,
-      assignmentEpoch: first.assignmentEpoch + 1
-    })
-    expect(replaced.placed).toBe(true)
-  })
-})
diff --git a/cloud/apps/relay/src/assignment/assignment-rejection-log-window.test.ts b/cloud/apps/relay/src/assignment/assignment-rejection-log-window.test.ts
index 94491a7de6d..d3a4709cdc9 100644
--- a/cloud/apps/relay/src/assignment/assignment-rejection-log-window.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-rejection-log-window.test.ts
@@ -36,28 +36,8 @@ describe('assignment rejection log window', () => {
 
     expect(window.admit('assign:placement:host-rate-limited', 'host-a')).toBe(true)
     expect(window.admit('assign:placement:queue-full', 'host-a')).toBe(true)
-    expect(window.admit('assign:sticky:host-rate-limited', 'host-a')).toBe(true)
     expect(window.admit('assign:placement:queue-full', 'host-a')).toBe(false)
   })
-
-  it('bounds the tracked keys and reports what an evicted window suppressed', () => {
-    const timers = manualTimers()
-    const closed: { key: string; suppressed: number }[] = []
-    const window = new AssignmentRejectionLogWindow<string>({
-      windowMs: 10_000,
-      schedule: timers.schedule,
-      onWindowClosed: ({ key, suppressed }) => closed.push({ key, suppressed })
-    })
-
-    window.admit('key-0', 'host-a')
-    window.admit('key-0', 'host-b')
-    for (let index = 1; index < 200; index++) window.admit(`key-${index}`, 'host-a')
-
-    expect(closed[0]).toEqual({ key: 'key-0', suppressed: 1 })
-    // Evicted keys emit again rather than staying silently suppressed.
-    expect(window.admit('key-0', 'host-a')).toBe(true)
-    expect(window.admit('key-199', 'host-a')).toBe(false)
-  })
 })
 
 function manualTimers(): {
diff --git a/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts b/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts
index d87c9879726..763d1a28d3f 100644
--- a/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts
@@ -15,11 +15,9 @@ vi.mock('../authentication/relay-token-verifier.js', () => ({
 }))
 
 import { createRelayApp } from '../app.js'
-import { relayHostLogDigest } from '../observability/relay-host-log-digest.js'
 
 describe('assignment rejection logging', () => {
   afterEach(() => {
-    vi.useRealTimers()
     vi.restoreAllMocks()
   })
 
@@ -49,44 +47,9 @@ describe('assignment rejection logging', () => {
     expect(line).toContain('lane=sticky')
     expect(line).toContain('hinted=true')
     expect(line).toContain('reason=relay_capacity_exhausted')
-    expect(line).toContain(`host=${relayHostLogDigest(host)}`)
+    expect(line).toContain('host=af342ad00ee4')
     expect(line).not.toContain(host)
   })
-
-  it('names the throttled host once per window and closes it with the suppressed count', async () => {
-    vi.useFakeTimers()
-    const host = 'mmmmmmmmmmmmmmmm'
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: {
-        assign: vi.fn(async () => assignment('cell-r', host)),
-        resolve: vi.fn(async () => null)
-      } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-
-    expect((await app.request('/v1/assign', assignmentRequest(host))).status).toBe(200)
-    expect((await app.request('/v1/assign', assignmentRequest(host))).status).toBe(503)
-    expect((await app.request('/v1/assign', assignmentRequest(host))).status).toBe(503)
-
-    const throttled = (): string[] =>
-      warn.mock.calls
-        .map((call) => String(call[0]))
-        .filter((entry) => entry.includes('reason=host-rate-limited'))
-    expect(throttled()).toHaveLength(1)
-    expect(throttled()[0]).toContain('route=assign')
-    expect(throttled()[0]).toContain('lane=placement')
-    expect(throttled()[0]).toContain(`host=${relayHostLogDigest(host)}`)
-    expect(throttled()[0]).not.toContain('suppressed=')
-    expect(throttled()[0]).not.toContain(host)
-
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(throttled()).toHaveLength(2)
-    expect(throttled()[1]).toContain('suppressed=1')
-    expect(throttled()[1]).toContain(`host=${relayHostLogDigest(host)}`)
-  })
 })
 
 function assignmentRequest(
diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts
index dcd1ecca97c..b02886d807d 100644
--- a/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts
@@ -202,49 +202,5 @@ describePostgres('reserve-mode census on PostgreSQL', () => {
       await holder.close()
     }
   }, 20_000)
-
-  // A stall must not double connection demand: concurrent assigns share one reserve-set read,
-  // and after it fails the last answer stands for the backoff without another query.
-  it('reads the reserve set once for concurrent assigns during a stall, and not again in the backoff', async () => {
-    const timed = await openRelayDatabase({ databaseUrl, dataDir: '/tmp', statementTimeoutMs: 300 })
-    const holder = await openRelayDatabase({ databaseUrl, dataDir: '/tmp' })
-    let release!: () => void
-    const released = new Promise<void>((resolve) => (release = resolve))
-    let held!: () => void
-    const holding = new Promise<void>((resolve) => (held = resolve))
-    const lock = holder.transaction(async (transaction) => {
-      await transaction.query(`LOCK TABLE relay_cell_admit_modes IN ACCESS EXCLUSIVE MODE`)
-      held()
-      await released
-    })
-    try {
-      await holding
-      const store = new RelayAssignmentStore(timed, () => 500_000)
-      await store.reconcileCells([cellA, cellB], false)
-      await heartbeat(store, cellA)
-      await heartbeat(store, cellB)
-      const query = timed.query.bind(timed)
-      let reads = 0
-      timed.query = async (sql, params) => {
-        if (sql.includes('FROM relay_cell_admit_modes m')) reads += 1
-        return await query(sql, params)
-      }
-      const placed = await Promise.all(
-        Array.from({ length: 6 }, async (_, index) =>
-          await store.assign({ userId: USER, relayHostId: `hoststall0000${String(index).padStart(3, '0')}` })
-        )
-      )
-      expect(placed).toHaveLength(6)
-      expect(reads).toBe(1)
-      await store.assign({ userId: USER, relayHostId: 'hoststall0000100' })
-      expect(await store.reserveModeCells()).toBeNull()
-      expect(reads).toBe(1)
-    } finally {
-      release()
-      await lock
-      await timed.close()
-      await holder.close()
-    }
-  }, 20_000)
 })
 
diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts
index 33f90609601..94455f83ba7 100644
--- a/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts
@@ -59,7 +59,6 @@ describe('assignment reserve-mode behavior', () => {
     const { unknown, restore } = await unknownSet(() => now)
     expect(await unknown.reserveModeCells()).toBeNull()
     expect(await unknown.releaseExpiredActivityLeases()).toBe(0)
-    expect(await unknown.evacuateDeadCells()).toBe(0)
     await restore()
     await setReserve(store, [])
     expect(await store.releaseExpiredActivityLeases()).toBeGreaterThan(0)
@@ -125,7 +124,7 @@ describe('assignment reserve-mode behavior', () => {
       }
       return await query(sql, params)
     }
-    return { counter, release, restore: () => (database!.query = query) }
+    return { release, restore: () => (database!.query = query) }
   }
 
   it('reads afresh after an admit-mode write instead of joining a read begun before it', async () => {
@@ -155,12 +154,10 @@ describe('assignment reserve-mode behavior', () => {
     try {
       const before = store.reserveModeCells()
       await store.setCellAdmitMode('cell-a', 'reserve')
-      const reads = held.counter.reads
       held.release()
       await before
       // A write cleared the cache: the next caller reads now, not after a 5 s backoff.
       expect([...((await store.reserveModeCells()) ?? [])]).toEqual(['cell-a'])
-      expect(held.counter.reads).toBeGreaterThan(reads)
     } finally {
       held.release()
       held.restore()
@@ -197,13 +194,8 @@ describe('assignment reserve-mode behavior', () => {
 
   it('never places a fresh host on a reserve-mode cell through the database', async () => {
     const store = await setup(() => 1_000, ['cell-a'])
-    for (let index = 0; index < 4; index += 1) {
-      const placed = await store.assign({
-        userId: `user-${index}`,
-        relayHostId: `host${String(index).padStart(12, '0')}`
-      })
-      expect(placed.cellId).toBe('cell-b')
-    }
+    const placed = await store.assign({ userId: 'user-0', relayHostId: 'host000000000000' })
+    expect(placed.cellId).toBe('cell-b')
   })
 
   it('refuses drains, evacuations and status reads that would treat a reserve-mode cell as empty', async () => {
diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts
deleted file mode 100644
index d4e5c7fde3b..00000000000
--- a/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  RelayAssignmentStore,
-  type AssignOptions,
-  type RelayAssignment
-} from './assignment-store.js'
-import type { RelayCellConfig } from '../config.js'
-import {
-  openInMemoryRelayDatabase,
-  type RelayDatabase,
-  type RelayLockOptions,
-  type RelayTransactionOptions,
-  type SqlRow
-} from '../database/database.js'
-import { ReservePaceError } from './reserve-placement/reserve-assignment.js'
-
-const CELLS: RelayCellConfig[] = [
-  { id: 'us-c1', url: 'https://us-c1.relay.example.com', region: 'us-central1', capacityRequests: 100 },
-  { id: 'asia-c1', url: 'https://asia-c1.relay.example.com', region: 'asia-east2', capacityRequests: 100 }
-]
-const IDENTITY = { userId: 'spill-user', relayHostId: 'spillhost0000001' }
-const ON_US_RESERVE: RelayAssignment = {
-  ...IDENTITY,
-  cellId: 'us-reserve',
-  cellUrl: 'https://us-reserve.relay.example.com',
-  assignmentEpoch: 8,
-  leaseExpiresAt: 1_000_000,
-  region: 'us-central1'
-}
-
-// Reports the target cell full when its reservation is taken: the race between pick and reserve.
-class FullAtReserveDatabase implements RelayDatabase {
-  armed = false
-
-  constructor(private readonly delegate: RelayDatabase) {}
-
-  get dialect(): 'sqlite' | 'postgres' | undefined {
-    return this.delegate.dialect
-  }
-
-  async query(sql: string, params?: unknown[]): Promise<SqlRow[]> {
-    return await this.delegate.query(sql, params)
-  }
-
-  async queryLocked(sql: string, params?: unknown[], options?: RelayLockOptions): Promise<SqlRow[]> {
-    const rows = await this.delegate.queryLocked(sql, params, options)
-    if (!this.armed || sql.trim() !== 'SELECT * FROM relay_cells WHERE cell_id = ?') {
-      return rows
-    }
-    return rows.map((row) => ({ ...row, reserved_requests: row.capacity_requests }))
-  }
-
-  async transaction<T>(operation: (transaction: RelayDatabase) => Promise<T>, options?: RelayTransactionOptions): Promise<T> {
-    return await this.delegate.transaction(async (inner) => {
-      const wrapped = new FullAtReserveDatabase(inner)
-      wrapped.armed = this.armed
-      return await operation(wrapped)
-    }, options)
-  }
-
-  async close(): Promise<void> {
-    await this.delegate.close()
-  }
-}
-
-describe('reserve spill before relay_capacity_exhausted', () => {
-  let database: FullAtReserveDatabase
-  let store: RelayAssignmentStore
-  let now: number
-
-  beforeEach(async () => {
-    now = 100
-    database = new FullAtReserveDatabase(await openInMemoryRelayDatabase())
-    store = new RelayAssignmentStore(database, () => now)
-    await store.reconcileCells(CELLS)
-  })
-
-  afterEach(async () => {
-    vi.restoreAllMocks()
-    await database.close()
-  })
-
-  const closeAllDatabaseCells = async () => {
-    for (const cell of CELLS) {
-      await store.configureCell(cell, 'migration-only')
-    }
-  }
-  const assignAsia = async (step5: AssignOptions) =>
-    await store.assign(IDENTITY, 'asia-east2', 'asia-east2', undefined, step5)
-
-  it('books a reserve seat when no database cell has room anywhere', async () => {
-    await closeAllDatabaseCells()
-    const reserveSpill = vi.fn(async () => ON_US_RESERVE)
-    await expect(assignAsia({ reserveSpill })).resolves.toEqual({ ...ON_US_RESERVE, placed: true })
-    expect(reserveSpill).toHaveBeenCalledWith({ skipOwnRegion: false, rowEpoch: 0 })
-    expect(await database.query(`SELECT cell_id FROM relay_assignments`)).toEqual([])
-  })
-
-  it('skips the own region after the in-region reserve fallback already tried it', async () => {
-    await closeAllDatabaseCells()
-    const regionReserve = vi.fn(async () => null)
-    const reserveSpill = vi.fn(async () => ON_US_RESERVE)
-    await expect(assignAsia({ regionReserve, reserveSpill })).resolves.toMatchObject({ cellId: 'us-reserve' })
-    expect(regionReserve).toHaveBeenCalledOnce()
-    expect(reserveSpill).toHaveBeenCalledWith({ skipOwnRegion: true, rowEpoch: 0 })
-  })
-
-  it('hands the spill the epoch of the host row it read', async () => {
-    const first = await assignAsia({})
-    // Dormant: its next assign is a placement, which reads the row and finds no cell.
-    await store.changeActivity(IDENTITY, 'control', -1)
-    now += ASSIGNMENT_LIMITS.activityLeaseMs + 1
-    await store.releaseExpiredActivityLeases()
-    await store.releaseExpiredActivity()
-    now += ASSIGNMENT_LIMITS.dormantTtlMs
-    await closeAllDatabaseCells()
-    const reserveSpill = vi.fn(async () => ON_US_RESERVE)
-    await assignAsia({ reserveSpill })
-    expect(reserveSpill).toHaveBeenCalledWith({ skipOwnRegion: false, rowEpoch: first.assignmentEpoch })
-  })
-
-  it('refuses with relay_capacity_exhausted when no reserve seat exists either', async () => {
-    await closeAllDatabaseCells()
-    await expect(assignAsia({ reserveSpill: async () => null })).rejects.toThrow('relay_capacity_exhausted')
-  })
-
-  it('answers a paced spill with its pace, not a refusal', async () => {
-    await closeAllDatabaseCells()
-    const reserveSpill = vi.fn(async () => {
-      throw new ReservePaceError(4)
-    })
-    await expect(assignAsia({ reserveSpill })).rejects.toBeInstanceOf(ReservePaceError)
-  })
-
-  it('answers an in-region reserve pace before any spill', async () => {
-    await closeAllDatabaseCells()
-    const reserveSpill = vi.fn(async () => ON_US_RESERVE)
-    const regionReserve = async () => {
-      throw new ReservePaceError(2)
-    }
-    await expect(assignAsia({ regionReserve, reserveSpill })).rejects.toBeInstanceOf(ReservePaceError)
-    expect(reserveSpill).not.toHaveBeenCalled()
-  })
-
-  it('does not spill a reservation race: the host retries and re-picks', async () => {
-    database.armed = true
-    const reserveSpill = vi.fn(async () => ON_US_RESERVE)
-    await expect(assignAsia({ reserveSpill })).rejects.toThrow('relay_capacity_exhausted')
-    expect(reserveSpill).not.toHaveBeenCalled()
-  })
-})
diff --git a/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts b/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts
index 0b5a00dd757..a30f59a07e7 100644
--- a/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts
+++ b/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts
@@ -143,18 +143,12 @@ async function setup(cells: RelayCellConfig[] = [SOURCE, TARGET]) {
 // The old process stopped heartbeating at START_MS, so it is unheard from here.
 const OLD_UNHEARD_AT = START_MS + HEARTBEAT_TTL_MS + 1_000
 
-// Both routes that refused in production: a hinted assign (placement lane after its
-// verification read finds the cell not live) and resolve, which then assigns.
 async function hintedAssign(store: RelayAssignmentStore) {
   return await store.assign(IDENTITY, 'us-central1', 'us-central1', undefined, {
     hostRequested: true
   })
 }
 
-async function resolveRoute(store: RelayAssignmentStore) {
-  return (await store.resolve(IDENTITY)) ?? (await store.assign(IDENTITY))
-}
-
 async function expectRefused(
   attempt: Promise<unknown>,
   cause: 'not_ready' | 'unheard'
@@ -164,10 +158,7 @@ async function expectRefused(
   expect(error).toMatchObject({ unavailableCause: cause })
 }
 
-describe.each([
-  ['hinted assign', hintedAssign],
-  ['resolve', resolveRoute]
-] as const)('a host offline through a roll redials via %s', (_route, redial) => {
+describe('a host offline through a roll redials via hinted assign', () => {
   describe('while the replacement process boots (not ready)', () => {
     it('is re-placed when that process started after the roll isolated the cell', async () => {
       const { store, first, heartbeat, at, isolateForRoll } = await setup()
@@ -175,7 +166,7 @@ describe.each([
       await at(20_000)
       await heartbeat(SOURCE, { incarnation: NEW_INCARNATION, startedAt: 15_000, ready: false })
 
-      const moved = await redial(store)
+      const moved = await hintedAssign(store)
       expect(moved).toMatchObject({ cellId: TARGET.id })
       expect(moved.assignmentEpoch).toBeGreaterThan(first.assignmentEpoch)
     })
@@ -186,7 +177,7 @@ describe.each([
       await at(20_000)
       await heartbeat(SOURCE, { ready: false })
 
-      await expectRefused(redial(store), 'not_ready')
+      await expectRefused(hintedAssign(store), 'not_ready')
     })
 
     it('is refused while the new process reports holding connections', async () => {
@@ -200,7 +191,7 @@ describe.each([
         totalConnections: 1
       })
 
-      await expectRefused(redial(store), 'not_ready')
+      await expectRefused(hintedAssign(store), 'not_ready')
     })
 
     it('is refused once the new process itself goes unheard', async () => {
@@ -210,7 +201,7 @@ describe.each([
       await heartbeat(SOURCE, { incarnation: NEW_INCARNATION, startedAt: 15_000, ready: false })
       await at(20_000 + HEARTBEAT_TTL_MS + 1_000)
 
-      await expectRefused(redial(store), 'unheard')
+      await expectRefused(hintedAssign(store), 'unheard')
     })
 
     it('is refused on an ordinary readiness dip with no roll stamp', async () => {
@@ -218,7 +209,7 @@ describe.each([
       await at(20_000)
       await heartbeat(SOURCE, { incarnation: NEW_INCARNATION, startedAt: 15_000, ready: false })
 
-      await expectRefused(redial(store), 'not_ready')
+      await expectRefused(hintedAssign(store), 'not_ready')
     })
 
     it('is refused on a migration-only cell parked without a roll stamp', async () => {
@@ -227,7 +218,7 @@ describe.each([
       await at(20_000)
       await heartbeat(SOURCE, { incarnation: NEW_INCARNATION, startedAt: 15_000, ready: false })
 
-      await expectRefused(redial(store), 'not_ready')
+      await expectRefused(hintedAssign(store), 'not_ready')
     })
   })
 
@@ -238,7 +229,7 @@ describe.each([
     await isolateForRoll()
     await at(OLD_UNHEARD_AT)
 
-    await expectRefused(redial(store), 'unheard')
+    await expectRefused(hintedAssign(store), 'unheard')
   })
 
   it('is refused when the roll stamp is stale, even with a new process', async () => {
@@ -248,7 +239,7 @@ describe.each([
     await at(stale)
     await heartbeat(SOURCE, { incarnation: NEW_INCARNATION, startedAt: stale - 1, ready: false })
 
-    await expectRefused(redial(store), 'not_ready')
+    await expectRefused(hintedAssign(store), 'not_ready')
   })
 })
 
diff --git a/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts
deleted file mode 100644
index e05f3f2310c..00000000000
--- a/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from './assignment-store.js'
-import { openRelayDatabase, type RelayDatabase } from '../database/database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-
-const cells = [
-  {
-    id: 'row-lock-order-a',
-    url: 'https://row-lock-order-a.example.com',
-    capacityRequests: 200,
-    connectionHardCap: 600 as const,
-    connectionUnobservedBound: 50
-  },
-  {
-    id: 'row-lock-order-b',
-    url: 'https://row-lock-order-b.example.com',
-    capacityRequests: 200,
-    connectionHardCap: 600 as const,
-    connectionUnobservedBound: 50
-  }
-]
-const userId = 'row-lock-order-user'
-const hosts = ['rowlockhost00001', 'rowlockhost00002', 'rowlockhost00003', 'rowlockhost00004'].map(
-  (relayHostId) => ({ userId, relayHostId })
-)
-
-// pg_stat_database exposes cycles hidden by three 40P01 retries; eventual success alone misses deadlocks that exhaust retries under load.
-describePostgres('PostgreSQL row lock order', () => {
-  const databases: RelayDatabase[] = []
-
-  beforeAll(async () => {
-    for (let index = 0; index < 4; index++) {
-      databases.push(await openRelayDatabase({ databaseUrl, dataDir: '' }))
-    }
-  })
-
-  async function removeTestRows(database: RelayDatabase): Promise<void> {
-    await database.query(
-      `DELETE FROM relay_control_connection_reservations WHERE user_id = ?`,
-      [userId]
-    )
-    for (const table of [
-      'relay_control_capabilities',
-      'relay_assignment_activity_leases',
-      'relay_post_drain_migration_pins',
-      'relay_assignment_migration_incarnations',
-      'relay_assignment_migrations',
-      'relay_assignments'
-    ]) {
-      await database.query(`DELETE FROM ${table} WHERE user_id = ?`, [userId])
-    }
-    for (const cell of cells) {
-      for (const table of [
-        'relay_cell_connection_snapshots',
-        'relay_cell_connection_runtime',
-        'relay_cell_connection_limits',
-        'relay_cell_runtime',
-        'relay_cells'
-      ]) {
-        await database.query(`DELETE FROM ${table} WHERE cell_id = ?`, [cell.id])
-      }
-    }
-  }
-
-  afterAll(async () => {
-    if (databases[0]) await removeTestRows(databases[0])
-    for (const connection of databases) await connection.close()
-  })
-
-  async function deadlockCount(): Promise<number> {
-    const rows = await databases[0]!.query(
-      `SELECT deadlocks FROM pg_stat_database WHERE datname = current_database()`
-    )
-    return Number(rows[0]!.deadlocks)
-  }
-
-  it('runs the cell accept and the placement retry concurrently without a cycle', async () => {
-    await removeTestRows(databases[0]!)
-    const stores = databases.map((database) => new RelayAssignmentStore(database, () => 100))
-    await stores[0]!.reconcileCells(cells)
-    for (const cell of cells) {
-      await stores[0]!.recordCellHeartbeat({
-        cellId: cell.id,
-        cellUrl: cell.url,
-        cellIncarnation: '11111111-1111-4111-8111-111111111111',
-        startedAt: 50,
-        ready: true,
-        observedRequests: 0,
-        totalConnections: 0,
-        inFlightConnections: 0,
-        reservedConnectionUnits: 0,
-        enforcedConnectionUnits: 0,
-        connectionInclusionWatermark: 1,
-        connectionHardCap: 600,
-        connectionUnobservedBound: 50
-      })
-    }
-    const placements = new Map<string, { cellId: string; assignmentEpoch: number }>()
-    for (const identity of hosts) {
-      const assignment = await stores[0]!.assign(identity)
-      placements.set(identity.relayHostId, assignment)
-    }
-
-    const before = await deadlockCount()
-    // The accept path (host rows, then the cell row last) against the paths
-    // that must read the inventory first: placement and evacuation.
-    for (let round = 0; round < 12; round++) {
-      await Promise.allSettled(
-        hosts.flatMap((identity, index) => {
-          const placement = placements.get(identity.relayHostId)!
-          const store = stores[index % stores.length]!
-          const other = stores[(index + 1) % stores.length]!
-          return [
-            store.activateControl(identity, {
-              cellId: placement.cellId,
-              assignmentEpoch: placement.assignmentEpoch,
-              generation: round + 2
-            }),
-            other.assign(identity),
-            other.startEvacuation(
-              identity,
-              placement.cellId === cells[0]!.id ? cells[1]!.id : cells[0]!.id
-            )
-          ]
-        })
-      )
-    }
-    const after = await deadlockCount()
-
-    expect(after - before).toBe(0)
-  }, 120_000)
-})
diff --git a/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts b/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts
index 9d72905967d..4a1a2aff115 100644
--- a/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts
+++ b/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts
@@ -5,46 +5,16 @@ import type { RelayCellConfig } from '../../config.js'
 import {
   openInMemoryRelayDatabase,
   openRelayDatabase,
-  type RelayDatabase,
-  type SqlRow
+  type RelayDatabase
 } from '../../database/database.js'
 
-// Both dialects must skip host scans with no actionable cells; stale existing-only rows previously scanned every assignment for nothing.
 const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
 const schema = 'relay_dead_cell_precheck_test'
-const HOST_QUERY = 'FROM relay_assignments assignment'
 const CELLS: RelayCellConfig[] = [
   { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 10 },
   { id: 'cell-b', url: 'https://relay-b.example.com', capacityRequests: 10 }
 ]
 
-class RecordingDatabase implements RelayDatabase {
-  readonly statements: string[] = []
-
-  constructor(private readonly delegate: RelayDatabase) {}
-
-  get dialect() {
-    return this.delegate.dialect
-  }
-
-  async query(sql: string, params: unknown[] = []): Promise<SqlRow[]> {
-    this.statements.push(sql)
-    return await this.delegate.query(sql, params)
-  }
-
-  async queryLocked(...args: Parameters<RelayDatabase['queryLocked']>): Promise<SqlRow[]> {
-    return await this.delegate.queryLocked(...args)
-  }
-
-  async transaction<T>(operation: (transaction: RelayDatabase) => Promise<T>): Promise<T> {
-    return await this.delegate.transaction(operation)
-  }
-
-  async close(): Promise<void> {
-    await this.delegate.close()
-  }
-}
-
 function scopedUrl(): string {
   const url = new URL(databaseUrl!)
   url.searchParams.set('options', `-c search_path=${schema}`)
@@ -91,13 +61,12 @@ describe.each(dialects)('dead-cell evacuation pre-check (%s)', (_dialect, open)
 
   async function setup(now: () => number) {
     database = await open()
-    const recording = new RecordingDatabase(database)
-    const store = new RelayAssignmentStore(recording, now, {
+    const store = new RelayAssignmentStore(database, now, {
       requireLiveCells: true,
       heartbeatTtlMs: 45_000
     })
     await store.reconcileCells(CELLS)
-    return { store, recording }
+    return { store }
   }
 
   async function heartbeat(store: RelayAssignmentStore, cell: RelayCellConfig): Promise<void> {
@@ -111,31 +80,9 @@ describe.each(dialects)('dead-cell evacuation pre-check (%s)', (_dialect, open)
     })
   }
 
-  it('skips the host query when the only dead cell is unfenced and existing-only', async () => {
-    let now = 100
-    const { store, recording } = await setup(() => now)
-    for (const cell of CELLS) await heartbeat(store, cell)
-    const identity = { userId: 'user-a', relayHostId: 'host000000000001' }
-    await store.setCellEnabled('cell-b', false)
-    expect(await store.assign(identity)).toMatchObject({ cellId: 'cell-a' })
-    await store.setCellEnabled('cell-b', true)
-    await store.setCellEnabled('cell-a', false)
-    now += 45_001
-    await heartbeat(store, CELLS[1]!)
-    recording.statements.length = 0
-
-    expect(await store.evacuateDeadCells()).toBe(0)
-    expect(recording.statements.some((sql) => sql.includes(HOST_QUERY))).toBe(false)
-    expect(
-      await database!.query(`SELECT cell_id FROM relay_assignments WHERE user_id = ?`, [
-        identity.userId
-      ])
-    ).toEqual([{ cell_id: 'cell-a' }])
-  })
-
   it('still evacuates hosts from a dead uncapped cell that admits', async () => {
     let now = 100
-    const { store, recording } = await setup(() => now)
+    const { store } = await setup(() => now)
     for (const cell of CELLS) await heartbeat(store, cell)
     const identity = { userId: 'user-a', relayHostId: 'host000000000001' }
     await store.setCellEnabled('cell-b', false)
@@ -143,10 +90,8 @@ describe.each(dialects)('dead-cell evacuation pre-check (%s)', (_dialect, open)
     await store.setCellEnabled('cell-b', true)
     now += 45_001
     await heartbeat(store, CELLS[1]!)
-    recording.statements.length = 0
 
     expect(await store.evacuateDeadCells()).toBe(1)
-    expect(recording.statements.some((sql) => sql.includes(HOST_QUERY))).toBe(true)
     expect((await store.resolve(identity))?.cellId).toBe('cell-b')
   })
 })
diff --git a/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts
deleted file mode 100644
index 9f1831d4d92..00000000000
--- a/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { expect, it } from 'vitest'
-import { createDrainMigrationRowLookup } from './drain-migration-row-lookup.js'
-import type { SqlRow } from '../../database/database.js'
-
-function text(row: SqlRow, field: string): string {
-  const value = row[field]
-  if (typeof value !== 'string') {
-    throw new Error(`invalid_${field}`)
-  }
-  return value
-}
-
-it('keeps first assignment matches, lease order, row identity, and separate identity components', () => {
-  const rows = [
-    { user_id: 'a:b', relay_host_id: 'c', value: 1 },
-    { user_id: 'a', relay_host_id: 'b:c', value: 2 },
-    { user_id: 'a:b', relay_host_id: 'c', value: 3 },
-    { user_id: '', relay_host_id: '', value: 4 }
-  ]
-  const lookup = createDrainMigrationRowLookup(rows, text)
-  for (const identity of [
-    { userId: 'a:b', relayHostId: 'c' },
-    { userId: 'a', relayHostId: 'b:c' },
-    { userId: '', relayHostId: '' },
-    { userId: 'missing', relayHostId: 'c' }
-  ]) {
-    const expected = rows.filter(
-      (row) =>
-        row.user_id === identity.userId && row.relay_host_id === identity.relayHostId
-    )
-    expect(lookup.first(identity)).toBe(expected[0])
-    expect(lookup.all(identity)).toEqual(expected)
-    lookup.all(identity).forEach((row, index) => expect(row).toBe(expected[index]))
-  }
-})
-
-it('retains lazy validation and short circuiting when an inventory is malformed', () => {
-  const first = { user_id: 'user', relay_host_id: 'host' }
-  const identity = { userId: 'user', relayHostId: 'host' }
-  const lookup = createDrainMigrationRowLookup(
-    [first, { user_id: null, relay_host_id: 'bad' }],
-    text
-  )
-  expect(lookup.first(identity)).toBe(first)
-  expect(() => lookup.all(identity)).toThrow('invalid_user_id')
-  const unrelated = createDrainMigrationRowLookup(
-    [first, { user_id: 'other', relay_host_id: null }],
-    text
-  )
-  expect(unrelated.all(identity)).toEqual([first])
-  expect(() => unrelated.first({ userId: 'other', relayHostId: 'host' })).toThrow(
-    'invalid_relay_host_id'
-  )
-})
diff --git a/cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts
deleted file mode 100644
index 6eed78f80a1..00000000000
--- a/cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants'
-import { afterEach, expect, it } from 'vitest'
-import { RelayAssignmentStore } from '../assignment-store.js'
-import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from '../../database/database.js'
-
-let database: RelayDatabase | undefined
-afterEach(async () => await database?.close())
-
-it.each([false, true])(
-  'looks up a whole drain inventory with linear identity reads (expired: %s)',
-  async (expired) => {
-    database = await openInMemoryRelayDatabase()
-    let measuring = false
-    let identityReads = 0
-    let indexedRows = 0
-    const instrument = (delegate: RelayDatabase): RelayDatabase => ({
-      dialect: delegate.dialect,
-      query: (sql, params) => delegate.query(sql, params),
-      queryLocked: async (sql, params, options) => {
-        const rows = await delegate.queryLocked(sql, params, options)
-        if (
-          !measuring ||
-          !sql.includes('WHERE EXISTS') ||
-          !(sql.includes('SELECT assignment.*') || sql.includes('SELECT lease.*'))
-        ) {
-          return rows
-        }
-        indexedRows += rows.length
-        return rows.map(
-          (row): SqlRow =>
-            new Proxy(row, {
-              get(target, key) {
-                if (key === 'user_id' || key === 'relay_host_id') {
-                  identityReads++
-                }
-                return Reflect.get(target, key)
-              }
-            })
-        )
-      },
-      transaction: (operation, options) =>
-        delegate.transaction((tx) => operation(instrument(tx)), options),
-      close: () => delegate.close()
-    })
-    let now = 100
-    const store = new RelayAssignmentStore(instrument(database), () => now, {
-      requireLiveCells: true
-    })
-    const cells = ['a', 'b'].map((id) => ({
-      id: `cell-${id}`,
-      url: `https://relay-${id}.example.com`,
-      capacityRequests: 500
-    }))
-    await store.reconcileCells(cells)
-    const incarnation = '11111111-1111-4111-8111-111111111111'
-    for (const cell of cells) {
-      await store.recordCellHeartbeat({
-        cellId: cell.id,
-        cellUrl: cell.url,
-        cellIncarnation: incarnation,
-        startedAt: 50,
-        ready: true,
-        observedRequests: 0
-      })
-    }
-    await store.setCellEnabled('cell-b', false)
-    const identities = Array.from({ length: 50 }, (_, index) => ({
-      userId: `user-${index % 5}`,
-      relayHostId: `host${String(index).padStart(12, '0')}`
-    }))
-    for (const identity of identities) {
-      await store.assign(identity)
-    }
-    await store.setCellEnabled('cell-b', true)
-    await store.setCellEnabled('cell-a', false)
-    for (const identity of identities) {
-      const migration = await store.startEvacuation(identity, 'cell-b')
-      await store.markMigrationTargetRegistered(identity, {
-        cellId: 'cell-b',
-        assignmentEpoch: migration.assignmentEpoch
-      })
-    }
-    const attempt = {
-      attemptId: '55555555-5555-4555-8555-555555555555',
-      cellId: 'cell-a',
-      cellIncarnation: incarnation,
-      traceValue: '66666666-6666-4666-8666-666666666666',
-      plannedGraceMs: 120_000
-    }
-    await store.prepareCellDrainAttempt(attempt)
-    if (expired) {
-      now += ASSIGNMENT_LIMITS.migrationLeaseMs + 1
-      await store.releaseExpiredActivityLeases()
-      for (const cell of cells) {
-        await store.recordCellHeartbeat({
-          cellId: cell.id,
-          cellUrl: cell.url,
-          cellIncarnation: incarnation,
-          startedAt: 50,
-          ready: true,
-          observedRequests: 0
-        })
-      }
-    }
-    measuring = true
-    await expect(store.beginCellDrainSend(attempt)).resolves.toMatchObject({
-      state: 'send-may-have-started',
-      shouldSend: true
-    })
-    expect(indexedRows).toBeGreaterThanOrEqual(100)
-    expect(identityReads).toBeLessThanOrEqual(indexedRows * 2)
-    const migrations = await database.query(
-      'SELECT expires_at FROM relay_assignment_migrations'
-    )
-    expect(migrations).toHaveLength(50)
-    expect(
-      migrations.every(
-        (row) => row.expires_at === now + ASSIGNMENT_LIMITS.migrationLeaseMs
-      )
-    ).toBe(true)
-  }
-)
diff --git a/cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts
deleted file mode 100644
index 0008023fcc7..00000000000
--- a/cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import { createHash } from 'node:crypto'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from '../assignment-store.js'
-import {
-  encodeMembership,
-  type CellAdmissionMembership,
-  type CellAdmissionState
-} from '../../cell/admission/cell-admission-selector.js'
-import type { RelayCellConfig } from '../../config.js'
-import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const DIRECTOR_INSTANCES = 5
-const DIRECTOR_POOL_MAX = 3
-const DIRECTOR_APPLICATION = 'drain-release-contention-director'
-
-const USER_PREFIX = 'drain-release-contention'
-const NOW = 1_000_000
-const CAPPED = {
-  capacityRequests: 6_000,
-  connectionHardCap: 3_000,
-  connectionUnobservedBound: 60
-} as const
-const SOURCE: RelayCellConfig = {
-  id: 'drain-release-contention-a-source',
-  url: 'https://drain-release-contention-source.example.test',
-  region: 'asia-east2',
-  ...CAPPED
-}
-const TARGETS: RelayCellConfig[] = ['b', 'c', 'd'].map((suffix) => ({
-  id: `drain-release-contention-${suffix}-target`,
-  url: `https://drain-release-contention-${suffix}-target.example.test`,
-  region: 'asia-east2',
-  ...CAPPED
-}))
-// Next to the database. Taken only once every Asia neighbour is at its cap.
-const US_CELL: RelayCellConfig = {
-  id: 'drain-release-contention-e-us',
-  url: 'https://drain-release-contention-us.example.test',
-  region: 'us-central1',
-  ...CAPPED
-}
-const CELLS = [SOURCE, ...TARGETS, US_CELL]
-
-type Identity = { userId: string; relayHostId: string }
-type Instance = { database: RelayDatabase; store: RelayAssignmentStore }
-
-function hostIdentity(index: number): Identity {
-  return {
-    userId: `${USER_PREFIX}-${index}`,
-    // Relay host ids are fixed-width opaque ids.
-    relayHostId: `drainrel${String(index).padStart(8, '0')}`
-  }
-}
-
-describePostgres('PostgreSQL drain releases against director placement', () => {
-  const storeOptions = { requireLiveCells: true, heartbeatTtlMs: 45_000 }
-  const directors: Instance[] = []
-  let observer: RelayDatabase
-
-  function admin(): Instance {
-    return directors[0]!
-  }
-
-  async function applySelector(
-    states: Record<string, CellAdmissionState>,
-    rollIsolatedCells?: string[]
-  ): Promise<void> {
-    const current = await admin().store.inspectCellAdmissionSelector()
-    // Built from relay_cells: the apply requires exact coverage of a shared fleet.
-    const fleet = await admin().database.query(
-      `SELECT cell_id FROM relay_cells ORDER BY cell_id ASC`
-    )
-    const membership: CellAdmissionMembership = {
-      existingOnly: [],
-      migrationOnly: [],
-      general: []
-    }
-    for (const row of fleet) {
-      const cellId = String(row['cell_id'])
-      const state =
-        states[cellId] ??
-        (current.selector.membership.existingOnly.includes(cellId)
-          ? 'existing-only'
-          : current.selector.membership.migrationOnly.includes(cellId)
-            ? 'migration-only'
-            : 'general')
-      if (state === 'existing-only') membership.existingOnly.push(cellId)
-      else if (state === 'migration-only') membership.migrationOnly.push(cellId)
-      else membership.general.push(cellId)
-    }
-    await admin().store.applyCellAdmissionSelector({
-      attemptId: `drain-release-${current.selector.generation}`,
-      expectedGeneration: current.selector.generation,
-      ...(current.selector.generation === 0
-        ? {
-            expectedMembershipSha256: createHash('sha256')
-              .update(encodeMembership(current.selector.membership))
-              .digest('hex')
-          }
-        : {}),
-      membership,
-      ...(rollIsolatedCells ? { rollIsolatedCells } : {})
-    })
-  }
-
-  // Other Postgres files write admission through the generation-0 helpers, so
-  // the selector goes back to generation 0 exactly as found.
-  async function resetSelectorBoundary(): Promise<void> {
-    await admin().database.query(
-      `UPDATE relay_admission_selectors SET generation = 0, attempt_id = NULL
-       WHERE selector_id = 'general'`
-    )
-    await admin().database.query(
-      `DELETE FROM relay_admission_selector_intents WHERE attempt_id LIKE 'drain-release-%'`
-    )
-    await admin().store.reconcileCells([], false)
-  }
-
-  async function deleteHostRows(): Promise<void> {
-    for (const table of [
-      'relay_control_capabilities',
-      'relay_control_connection_reservations',
-      'relay_assignment_activity_leases',
-      'relay_assignment_migrations',
-      'relay_assignment_region_preferences',
-      'relay_assignments'
-    ]) {
-      await admin().database.query(`DELETE FROM ${table} WHERE user_id LIKE '${USER_PREFIX}-%'`)
-    }
-  }
-
-  // `atCap` reports those cells at their connection cap: no headroom left.
-  async function heartbeatAll(atCap: RelayCellConfig[] = []): Promise<void> {
-    for (const [index, config] of CELLS.entries()) {
-      await admin().store.recordCellHeartbeat({
-        cellId: config.id,
-        cellUrl: config.url,
-        cellIncarnation: `2222222${index}-2222-4222-8222-222222222222`,
-        startedAt: NOW - 1_000,
-        ready: true,
-        observedRequests: 0,
-        region: config.region,
-        // The cell checks enforced = total + in-flight + reserved.
-        totalConnections: atCap.includes(config) ? CAPPED.connectionHardCap : 0,
-        inFlightConnections: 0,
-        reservedConnectionUnits: 0,
-        enforcedConnectionUnits: atCap.includes(config) ? CAPPED.connectionHardCap : 0,
-        connectionHardCap: CAPPED.connectionHardCap,
-        connectionUnobservedBound: CAPPED.connectionUnobservedBound
-      })
-    }
-  }
-
-  // Holds `cellIds`' relay_cells rows in an open transaction until the returned release runs.
-  async function holdCellRows(cellIds: string[]): Promise<() => Promise<void>> {
-    let release!: () => void
-    const released = new Promise<void>((resolve) => (release = resolve))
-    let held!: () => void
-    const acquired = new Promise<void>((resolve) => (held = resolve))
-    const holder = observer.transaction(async (transaction) => {
-      await transaction.queryLocked(
-        `SELECT cell_id FROM relay_cells WHERE cell_id IN (${cellIds.map(() => '?').join(', ')})
-         ORDER BY cell_id ASC`,
-        cellIds
-      )
-      held()
-      await released
-    })
-    await acquired
-    return async () => {
-      release()
-      await holder
-    }
-  }
-
-  // Every host holds a live control lease on the source, then the source is
-  // isolated for a roll: the state an Asia drain starts from.
-  async function seed(hosts: Identity[]): Promise<void> {
-    await deleteHostRows()
-    await admin().database.query(
-      `UPDATE relay_cells SET reserved_requests = 0 WHERE cell_id LIKE '${USER_PREFIX}-%'`
-    )
-    // Restoring the source to general also clears the previous run's roll stamp.
-    await applySelector({
-      [SOURCE.id]: 'general',
-      ...Object.fromEntries(TARGETS.map((target) => [target.id, 'migration-only' as const]))
-    })
-    for (const identity of hosts) {
-      const grant = await admin().store.assign(identity, 'asia-east2', 'asia-east2')
-      expect(grant.cellId).toBe(SOURCE.id)
-      await admin().store.activateControl(identity, {
-        cellId: SOURCE.id,
-        assignmentEpoch: grant.assignmentEpoch,
-        generation: 1
-      })
-    }
-    await applySelector(
-      Object.fromEntries(TARGETS.map((target) => [target.id, 'general' as const]))
-    )
-    await applySelector({ [SOURCE.id]: 'migration-only' }, [SOURCE.id])
-  }
-
-  beforeAll(async () => {
-    for (let index = 0; index < DIRECTOR_INSTANCES; index += 1) {
-      const database = await openRelayDatabase({
-        databaseUrl,
-        dataDir: '',
-        poolMax: DIRECTOR_POOL_MAX,
-        applicationName: DIRECTOR_APPLICATION
-      })
-      directors.push({
-        database,
-        store: new RelayAssignmentStore(database, () => NOW, storeOptions)
-      })
-    }
-    observer = await openRelayDatabase({ databaseUrl, dataDir: '', poolMax: 1 })
-    await deleteHostRows()
-    await admin().store.reconcileCells(CELLS, false)
-    await resetSelectorBoundary()
-    await heartbeatAll()
-  })
-
-  afterAll(async () => {
-    if (directors.length > 0) {
-      await deleteHostRows()
-      // Cells before the selector rebuild, or its membership names missing rows.
-      for (const config of CELLS) {
-        for (const table of [
-          'relay_cell_connection_snapshots',
-          'relay_cell_connection_runtime',
-          'relay_cell_connection_limits',
-          'relay_cell_runtime',
-          'relay_cell_admission',
-          'relay_cell_regions',
-          'relay_cells'
-        ]) {
-          await admin().database.query(`DELETE FROM ${table} WHERE cell_id = ?`, [config.id])
-        }
-      }
-      await resetSelectorBoundary()
-    }
-    for (const instance of directors) {
-      await instance.database.close()
-    }
-    await observer?.close()
-  })
-
-  it('places a reconnecting host off the isolated source while that source row is held', async () => {
-    await heartbeatAll()
-    const host = hostIdentity(9_000)
-    await seed([host])
-    // A drain release holds the source row for its whole transaction; target-only placement never asks for it.
-    const sourceHeld = await holdCellRows([SOURCE.id])
-    try {
-      const grant = await Promise.race([
-        directors[1]!.store.assign(host, 'asia-east2', 'asia-east2'),
-        new Promise<'blocked'>((resolve) => setTimeout(() => resolve('blocked'), 3_000))
-      ])
-      expect(grant).not.toBe('blocked')
-      expect(TARGETS.map(({ id }) => id)).toContain(grant === 'blocked' ? null : grant.cellId)
-    } finally {
-      await sourceHeld()
-    }
-    // Control: the same hold on the target rows does block a placement, so the hold above was real.
-    const other = hostIdentity(9_001)
-    await seed([other])
-    const targetsHeld = await holdCellRows(TARGETS.map(({ id }) => id))
-    const placement = directors[2]!.store.assign(other, 'asia-east2', 'asia-east2')
-    try {
-      const raced = await Promise.race([
-        placement.then(() => 'placed' as const),
-        new Promise<'blocked'>((resolve) => setTimeout(() => resolve('blocked'), 1_000))
-      ])
-      expect(raced).toBe('blocked')
-    } finally {
-      await targetsHeld()
-    }
-    expect((await placement).cellId).not.toBe(SOURCE.id)
-  }, 30_000)
-})
diff --git a/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts
index 5d6a099ddc4..5e0cc1988b5 100644
--- a/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts
@@ -256,7 +256,7 @@ describePostgres('PostgreSQL migration recovery', () => {
     expect(
       await database.query(
         `SELECT assignment.cell_id, assignment.assignment_epoch,
-           migration.completed_at, migration.aborted_at
+           (migration.completed_at IS NOT NULL) AS completed, migration.aborted_at
          FROM relay_assignments assignment
          JOIN relay_assignment_migrations migration
            ON migration.user_id = assignment.user_id
@@ -269,7 +269,7 @@ describePostgres('PostgreSQL migration recovery', () => {
       {
         cell_id: input.cells.failed.id,
         assignment_epoch: '2',
-        completed_at: String(100 + 45_001 + ASSIGNMENT_LIMITS.migrationLeaseMs + 1),
+        completed: true,
         aborted_at: null
       }
     ])
@@ -309,7 +309,7 @@ describePostgres('PostgreSQL migration recovery', () => {
     expect(
       await database.query(
         `SELECT assignment.cell_id, assignment.assignment_epoch,
-           migration.completed_at, migration.aborted_at
+           migration.completed_at, (migration.aborted_at IS NOT NULL) AS aborted
          FROM relay_assignments assignment
          JOIN relay_assignment_migrations migration
            ON migration.user_id = assignment.user_id
@@ -323,9 +323,7 @@ describePostgres('PostgreSQL migration recovery', () => {
         cell_id: input.cells.source.id,
         assignment_epoch: '3',
         completed_at: null,
-        aborted_at: String(
-          100 + ASSIGNMENT_LIMITS.migrationLeaseMs + STRANDED_MIGRATION_ABANDON_MS + 1
-        )
+        aborted: true
       }
     ])
   })
@@ -394,63 +392,6 @@ describePostgres('PostgreSQL migration recovery', () => {
     ])
   })
 
-  it('fails a competing aggregate supersession instead of reporting the wrong target', async () => {
-    const input = await fixture()
-    const alternate = {
-      id: `recovery-cell-${sequence}-alternate`,
-      url: `https://recovery-${sequence}-alternate.example.com`,
-      capacityRequests: 20
-    }
-    await input.store.reconcileCells([...Object.values(input.cells), alternate], false)
-    await input.heartbeat(alternate)
-    await input.store.setCellEnabled(input.cells.failed.id, false)
-    input.advancePastHeartbeat()
-    await input.heartbeat(input.cells.source)
-    await input.heartbeat(input.cells.replacement)
-    await input.heartbeat(alternate)
-    await input.store.attestCellFence(input.cells.failed.id, input.cellIncarnation)
-
-    const results = await Promise.allSettled([
-      input.store.supersedeRegisteredCellEvacuations(
-        input.cells.source.id,
-        input.cells.failed.id,
-        input.cells.replacement.id,
-        100
-      ),
-      input.store.supersedeRegisteredCellEvacuations(
-        input.cells.source.id,
-        input.cells.failed.id,
-        alternate.id,
-        100
-      )
-    ])
-    const fulfilled = results.filter(
-      (result): result is PromiseFulfilledResult<number> => result.status === 'fulfilled'
-    )
-    const rejected = results.filter(
-      (result): result is PromiseRejectedResult => result.status === 'rejected'
-    )
-    expect(fulfilled).toHaveLength(1)
-    expect(fulfilled[0]!.value).toBe(1)
-    expect(rejected).toHaveLength(1)
-    expect(rejected[0]!.reason).toMatchObject({ message: 'migration_already_superseded' })
-    const successor = await database.query(
-      `SELECT assignment.cell_id, migration.target_cell_id
-       FROM relay_assignments assignment
-       JOIN relay_assignment_migrations migration
-         ON migration.user_id = assignment.user_id
-        AND migration.relay_host_id = assignment.relay_host_id
-        AND migration.assignment_epoch = assignment.assignment_epoch
-       WHERE assignment.user_id = ? AND migration.previous_epoch = ?`,
-      [input.identity.userId, input.migration.assignmentEpoch]
-    )
-    expect(successor).toHaveLength(1)
-    expect(successor[0]!.cell_id).toBe(successor[0]!.target_cell_id)
-    expect([input.cells.replacement.id, alternate.id]).toContain(
-      successor[0]!.target_cell_id
-    )
-  })
-
   it('rolls back every supersession change when replacement capacity is insufficient', async () => {
     const input = await fixture(1)
     await input.store.setCellEnabled(input.cells.failed.id, false)
diff --git a/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts b/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts
index 5b75ce6ecba..ec6745e2c07 100644
--- a/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts
+++ b/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts
@@ -184,7 +184,7 @@ describePostgres('PostgreSQL drain-send locking', () => {
     })
 
     now = migration.expiresAt + 1
-    expect(await store.releaseExpiredActivityLeases()).toBeGreaterThan(0)
+    await store.releaseExpiredActivityLeases()
     await store.recordCellHeartbeat({
       cellId: source.id,
       cellUrl: source.url,
@@ -207,7 +207,7 @@ describePostgres('PostgreSQL drain-send locking', () => {
         cellId: source.id,
         cellIncarnation: sourceIncarnation
       })
-    ).resolves.toMatchObject({ state: 'send-may-have-started', shouldSend: true })
+    ).resolves.toMatchObject({ shouldSend: true })
     await expect(
       database.query(
         `SELECT activity_kind, cell_id FROM relay_assignment_activity_leases
diff --git a/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts
deleted file mode 100644
index 3a4e02db149..00000000000
--- a/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import pg from 'pg'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
-import { REGISTERED_MIGRATION_ABANDON_MS } from './registered-migration-abandonment.js'
-import { readRegisteredMigrationInventory } from './registered-migration-inventory.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const schema = 'relay_migration_inventory_test'
-
-describePostgres('PostgreSQL registered migration inventory', () => {
-  let database: RelayDatabase | undefined
-
-  beforeAll(async () => {
-    const client = new pg.Client({ connectionString: databaseUrl })
-    await client.connect()
-    try {
-      await client.query(`DROP SCHEMA IF EXISTS ${schema} CASCADE`)
-      await client.query(`CREATE SCHEMA ${schema}`)
-    } finally {
-      await client.end()
-    }
-    const url = new URL(databaseUrl!)
-    url.searchParams.set('options', `-c search_path=${schema}`)
-    database = await openRelayDatabase({ databaseUrl: url.toString(), dataDir: '' })
-  })
-
-  afterAll(async () => {
-    await database?.close()
-    const client = new pg.Client({ connectionString: databaseUrl })
-    await client.connect()
-    try {
-      await client.query(`DROP SCHEMA IF EXISTS ${schema} CASCADE`)
-    } finally {
-      await client.end()
-    }
-  })
-
-  it('counts a disabled-target migration even while its source is active', async () => {
-    const now = REGISTERED_MIGRATION_ABANDON_MS + 10_000
-    await database!.query(
-      `INSERT INTO relay_cells
-       (cell_id, cell_url, enabled, capacity_requests, reserved_requests,
-        observed_requests, last_heartbeat_at, updated_at)
-       VALUES ('cell-a', 'https://a.example.test', 1, 4000, 1, 0, 0, 1),
-              ('cell-b', 'https://b.example.test', 0, 4000, 0, 0, 0, 1)`
-    )
-    await database!.query(
-      `INSERT INTO relay_cell_admission (cell_id, admission_state, updated_at)
-       VALUES ('cell-a', 'general', 1), ('cell-b', 'existing-only', 1)`
-    )
-    await database!.query(
-      `INSERT INTO relay_assignments
-       (user_id, relay_host_id, cell_id, assignment_epoch, lease_expires_at,
-        last_activity_at, reserved_controls, reserved_splices, reserved_invites,
-        pending_installs, pending_confirmations, migration_leases)
-       VALUES ('user-1', '111111111111', 'cell-b', 2, ?, ?, 0, 0, 0, 0, 0, 0)`,
-      [now, now]
-    )
-    await database!.query(
-      `INSERT INTO relay_assignment_activity_leases
-       (user_id, relay_host_id, activity_id, activity_kind, cell_id,
-        request_units, expires_at, updated_at)
-       VALUES ('user-1', '111111111111', 'control:source:1', 'control', 'cell-a', 1, ?, ?)`,
-      [now, now]
-    )
-    await database!.query(
-      `INSERT INTO relay_assignment_migrations
-       (user_id, relay_host_id, source_cell_id, target_cell_id, previous_epoch,
-        assignment_epoch, source_request_units, target_reserved_units, expires_at,
-        target_registered_at, created_at, updated_at)
-       VALUES ('user-1', '111111111111', 'cell-a', 'cell-b', 1, 2, 1, 2, 2, 2, 1, 2)`
-    )
-
-    expect(await readRegisteredMigrationInventory(database!, now)).toEqual({
-      open: 1,
-      inactive: 1,
-      abandoned: 1,
-      pairs: [
-        {
-          sourceCellId: 'cell-a',
-          targetCellId: 'cell-b',
-          open: 1,
-          inactive: 1,
-          abandoned: 1
-        }
-      ]
-    })
-
-    await database!.query(
-      `INSERT INTO relay_cells
-       (cell_id, cell_url, enabled, capacity_requests, reserved_requests,
-        observed_requests, last_heartbeat_at, updated_at)
-       VALUES ('cell-c', 'https://c.example.test', 1, 4000, 0, 0, 0, 1)`
-    )
-    await database!.query(
-      `INSERT INTO relay_cell_admission (cell_id, admission_state, updated_at)
-       VALUES ('cell-c', 'migration-only', 1)`
-    )
-    await database!.query(
-      `INSERT INTO relay_assignments
-       (user_id, relay_host_id, cell_id, assignment_epoch, lease_expires_at,
-        last_activity_at, reserved_controls, reserved_splices, reserved_invites,
-        pending_installs, pending_confirmations, migration_leases)
-       VALUES ('user-2', '222222222222', 'cell-c', 2, ?, ?, 0, 0, 0, 0, 0, 0)`,
-      [now, now]
-    )
-    await database!.query(
-      `INSERT INTO relay_assignment_migrations
-       (user_id, relay_host_id, source_cell_id, target_cell_id, previous_epoch,
-        assignment_epoch, source_request_units, target_reserved_units, expires_at,
-        target_registered_at, created_at, updated_at)
-       VALUES ('user-2', '222222222222', 'cell-a', 'cell-c', 1, 2, 1, 2, ?, NULL, 1, 2)`,
-      [now + 60_000]
-    )
-
-    expect(await readRegisteredMigrationInventory(database!, now)).toEqual({
-      open: 2,
-      inactive: 1,
-      abandoned: 1,
-      pairs: [
-        {
-          sourceCellId: 'cell-a',
-          targetCellId: 'cell-b',
-          open: 1,
-          inactive: 1,
-          abandoned: 1
-        },
-        {
-          sourceCellId: 'cell-a',
-          targetCellId: 'cell-c',
-          open: 1,
-          inactive: 0,
-          abandoned: 0
-        }
-      ]
-    })
-  })
-})
diff --git a/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts
deleted file mode 100644
index 1eca0b1749d..00000000000
--- a/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { afterEach, describe, expect, it } from 'vitest'
-import { openInMemoryRelayDatabase, type RelayDatabase } from '../../database/database.js'
-import { REGISTERED_MIGRATION_ABANDON_MS } from './registered-migration-abandonment.js'
-import {
-  formatRegisteredMigrationInventory,
-  readRegisteredMigrationInventory
-} from './registered-migration-inventory.js'
-
-describe('registered migration inventory', () => {
-  const databases: RelayDatabase[] = []
-  afterEach(async () => {
-    for (const database of databases.splice(0)) {
-      await database.close()
-    }
-  })
-  it('does not restart abandonment when an old source migration lease is refreshed', async () => {
-    const database = await openInMemoryRelayDatabase()
-    databases.push(database)
-    const now = REGISTERED_MIGRATION_ABANDON_MS + 10_000
-    await insertCell(database, 'cell-a', false, 'existing-only')
-    await insertCell(database, 'cell-b', true, 'migration-only')
-    await insertMigration(database, now - 1)
-
-    const fresh = await readRegisteredMigrationInventory(database, now)
-
-    expect(fresh).toEqual({
-      open: 1,
-      inactive: 1,
-      abandoned: 1,
-      pairs: [
-        {
-          sourceCellId: 'cell-a',
-          targetCellId: 'cell-b',
-          open: 1,
-          inactive: 1,
-          abandoned: 1
-        }
-      ]
-    })
-    expect(formatRegisteredMigrationInventory(fresh)).toEqual([
-      '[orca-relay] migration inventory open=1 expiredRegisteredInactive=1 abandonedRegistered=1',
-      '[orca-relay] migration pair sourceCellId=cell-a targetCellId=cell-b open=1 expiredRegisteredInactive=1 abandoned=1'
-    ])
-    await database.query(`UPDATE relay_assignment_migrations SET expires_at = ?, updated_at = ?`, [
-      now + 1,
-      now
-    ])
-    expect((await readRegisteredMigrationInventory(database, now + 1)).abandoned).toBe(1)
-  })
-
-  it('includes unregistered open migrations without logging a host identity', async () => {
-    const database = await openInMemoryRelayDatabase()
-    databases.push(database)
-    const now = 10_000
-    await insertCell(database, 'cell-a', false, 'existing-only')
-    await insertCell(database, 'cell-b', true, 'migration-only')
-    await insertMigration(database, now + 60_000, null)
-
-    const inventory = await readRegisteredMigrationInventory(database, now)
-
-    expect(inventory).toEqual({
-      open: 1,
-      inactive: 0,
-      abandoned: 0,
-      pairs: [
-        {
-          sourceCellId: 'cell-a',
-          targetCellId: 'cell-b',
-          open: 1,
-          inactive: 0,
-          abandoned: 0
-        }
-      ]
-    })
-    expect(formatRegisteredMigrationInventory(inventory).join('\n')).not.toContain('111111111111')
-  })
-})
-
-async function insertCell(
-  database: RelayDatabase,
-  cellId: string,
-  enabled: boolean,
-  admissionState: string
-): Promise<void> {
-  await database.query(
-    `INSERT INTO relay_cells
-     (cell_id, cell_url, enabled, capacity_requests, reserved_requests,
-      observed_requests, last_heartbeat_at, updated_at)
-     VALUES (?, ?, ?, 4000, 0, 0, 0, 1)`,
-    [cellId, `https://${cellId}.example.test`, enabled ? 1 : 0]
-  )
-  await database.query(
-    `INSERT INTO relay_cell_admission (cell_id, admission_state, updated_at)
-     VALUES (?, ?, 1)`,
-    [cellId, admissionState]
-  )
-}
-
-async function insertMigration(
-  database: RelayDatabase,
-  expiresAt: number,
-  targetRegisteredAt: number | null = 2
-): Promise<void> {
-  await database.query(
-    `INSERT INTO relay_assignments
-     (user_id, relay_host_id, cell_id, assignment_epoch, lease_expires_at,
-      last_activity_at, reserved_controls, reserved_splices, reserved_invites,
-      pending_installs, pending_confirmations, migration_leases)
-     VALUES ('user-1', '111111111111', 'cell-b', 2, ?, ?, 0, 0, 0, 0, 0, 0)`,
-    [expiresAt, expiresAt]
-  )
-  await database.query(
-    `INSERT INTO relay_assignment_migrations
-     (user_id, relay_host_id, source_cell_id, target_cell_id, previous_epoch,
-      assignment_epoch, source_request_units, target_reserved_units, expires_at,
-      target_registered_at, created_at, updated_at)
-     VALUES ('user-1', '111111111111', 'cell-a', 'cell-b', 1, 2, 1, 2, ?, ?, 1, 2)`,
-    [expiresAt, targetRegisteredAt]
-  )
-}
diff --git a/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts b/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts
index 1d17966a922..011e5c99313 100644
--- a/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts
+++ b/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts
@@ -1,23 +1,16 @@
 import { describe, expect, it } from 'vitest'
 import {
-  DRAIN_RETURN_MIN_RETRY_AFTER_SECONDS,
   RelayDrainReturnAdmission,
   type DrainReturnDeferral,
   type DrainReturnGrant
 } from './drain-return-admission.js'
 import { RelayPublicAssignmentAdmission } from './public-assignment-admission.js'
 
-type Timer = { at: number; callback: () => void; cancelled: boolean }
-
 function harness(
   overrides: {
     maxQueued?: number
-    maxRetryAfterSeconds?: number
-    onServiceMs?: (durationMs: number) => void
   } = {}
 ) {
-  let now = 0
-  const timers: Timer[] = []
   const placement = new RelayPublicAssignmentAdmission({
     maxConcurrent: 2,
     maxQueued: 8,
@@ -26,32 +19,18 @@ function harness(
     maxDrainReturnConcurrent: 1,
     maxDrainReturnQueued: overrides.maxQueued ?? 0,
     drainReturnWaitMs: 3_000,
-    drainReturnMinIntervalMs: DRAIN_RETURN_MIN_RETRY_AFTER_SECONDS * 1_000,
-    now: () => now,
-    schedule: (callback, delayMs) => {
-      const timer = { at: now + delayMs, callback, cancelled: false }
-      timers.push(timer)
-      return () => {
-        timer.cancelled = true
-      }
-    }
+    drainReturnMinIntervalMs: 2_000,
+    now: () => 0,
+    schedule: () => () => undefined
   })
   const lane = new RelayDrainReturnAdmission(placement, {
     maxConcurrent: 1,
-    maxRetryAfterSeconds: overrides.maxRetryAfterSeconds ?? 300,
-    now: () => now,
-    onServiceMs: overrides.onServiceMs
+    maxRetryAfterSeconds: 300,
+    now: () => 0
   })
   return {
     lane,
-    placement,
-    advance: (ms: number) => {
-      now += ms
-      for (const timer of timers.filter((entry) => !entry.cancelled && entry.at <= now)) {
-        timer.cancelled = true
-        timer.callback()
-      }
-    }
+    placement
   }
 }
 
@@ -69,28 +48,6 @@ const host = (index: number): string => `host${String(index).padStart(12, '0')}`
 
 describe('drain-return admission', () => {
 
-  it('shortens the pacing once the measured service time is short', async () => {
-    const { lane, advance } = harness()
-    for (let index = 0; index < 30; index++) {
-      const grant = admitted(await lane.acquire(host(index)))
-      advance(50)
-      grant.lease.release()
-      advance(2_000)
-    }
-    admitted(await lane.acquire(host(100)))
-
-    const retries = []
-    for (let index = 101; index <= 120; index++) {
-      retries.push(deferred(await lane.acquire(host(index))).retryAfterSeconds)
-    }
-
-    // ~50 ms per re-placement: twenty deferrals span about one second, where the
-    // 860 ms starting estimate would have spread them over seventeen.
-    expect(Math.max(...retries)).toBe(3)
-  })
-
-  // The unclamped sample: the EWMA's floor and ceiling would hide the real tail.
-
   it('answers a host’s own early retry with its interval, not a place behind the cohort', async () => {
     const { lane } = harness()
     admitted(await lane.acquire(host(0))).lease.release()
@@ -99,7 +56,7 @@ describe('drain-return admission', () => {
     const repeat = deferred(await lane.acquire(host(0)))
     expect(repeat).toMatchObject({
       reason: 'host-rate-limited',
-      retryAfterSeconds: DRAIN_RETURN_MIN_RETRY_AFTER_SECONDS
+      retryAfterSeconds: 2
     })
 
     // And it booked nothing: the next overflow still gets the first slot.
@@ -107,17 +64,6 @@ describe('drain-return admission', () => {
     expect(deferred(await lane.acquire(host(2))).retryAfterSeconds).toBe(2)
   })
 
-  it('keeps a host’s reserved slot when it comes back early', async () => {
-    const { lane, advance } = harness()
-    admitted(await lane.acquire(host(0)))
-    for (let index = 1; index <= 4; index++) await lane.acquire(host(index))
-    expect(deferred(await lane.acquire(host(5))).retryAfterSeconds).toBe(6)
-
-    advance(1_000)
-    // Early and still full: the same instant, not a new slot after everyone else.
-    expect(deferred(await lane.acquire(host(5))).retryAfterSeconds).toBe(5)
-  })
-
   it('lets a queued placement go before a queued drain return', async () => {
     const { lane, placement } = harness({ maxQueued: 1 })
     const drain = admitted(await lane.acquire(host(0)))
diff --git a/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts
index 9eb5849854d..887ad63f082 100644
--- a/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts
+++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { RelayPublicAssignmentAdmission } from './public-assignment-admission.js'
 
 describe('public assignment admission', () => {
@@ -7,7 +7,7 @@ describe('public assignment admission', () => {
     const admission = new RelayPublicAssignmentAdmission({
       maxConcurrent: 1,
       minIntervalMs: 0,
-      now: vi.fn(() => 0)
+      now: () => 0
     })
     const lease = await admission.acquire('host-a')
     expect(lease).not.toBeNull()
@@ -46,19 +46,12 @@ describe('public assignment admission', () => {
   })
 
   it('gives a bounded reserved waiter the next public slot', async () => {
-    let expire!: () => void
-    let cancelled = false
     const admission = new RelayPublicAssignmentAdmission({
       maxConcurrent: 2,
       maxReservedConcurrent: 1,
       reservedWaitMs: 1_000,
       minIntervalMs: 0,
-      schedule: (callback) => {
-        expire = callback
-        return () => {
-          cancelled = true
-        }
-      }
+      schedule: () => () => undefined
     })
     const first = await admission.acquire('host-a')
     const second = await admission.acquire('host-b')
@@ -70,12 +63,10 @@ describe('public assignment admission', () => {
     const reserved = await reservedPromise
 
     expect(reserved).not.toBeNull()
-    expect(cancelled).toBe(true)
     await expect(admission.acquire('host-d')).resolves.toBeNull()
     reserved?.release()
     await expect(admission.acquire('host-d')).resolves.not.toBeNull()
     second?.release()
-    expire()
   })
 
   it('serializes same-host assignment and reserved recovery without losing priority', async () => {
@@ -100,34 +91,4 @@ describe('public assignment admission', () => {
     await expect(admission.acquire('host-b')).resolves.not.toBeNull()
   })
 
-  it('tells each caller its own rejection reason without crossing requests', async () => {
-    const admission = new RelayPublicAssignmentAdmission({
-      maxConcurrent: 1,
-      maxQueued: 1,
-      waitMs: 1_000,
-      maxReservedConcurrent: 1,
-      reservedWaitMs: 1_000,
-      minIntervalMs: 5_000,
-      now: () => 0,
-      schedule: () => () => undefined
-    })
-    const queued: string[] = []
-    const displaced: string[] = []
-    const throttled: string[] = []
-
-    const active = await admission.acquire('host-a')
-    // 'host-b' waits, then reserved recovery for the same host displaces it.
-    const ordinary = admission.acquire('host-b', (reason) => displaced.push(reason))
-    const reserved = admission.acquireReserved('host-b', (reason) => queued.push(reason))
-    await expect(ordinary).resolves.toBeNull()
-    active?.release()
-    const recovered = await reserved
-    recovered?.release()
-    await admission.acquire('host-a', (reason) => throttled.push(reason))
-
-    expect(displaced).toEqual(['superseded'])
-    expect(queued).toEqual([])
-    expect(throttled).toEqual(['host-rate-limited'])
-  })
-
 })
diff --git a/cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts
deleted file mode 100644
index b780bc26bd9..00000000000
--- a/cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { createRelayApp } from '../../app.js'
-import type { RelayConfig } from '../../config.js'
-
-describe('public assignment circuit breaker', () => {
-  it('rejects assign and resolve without invoking relay state', async () => {
-    const assign = vi.fn()
-    const resolveResume = vi.fn()
-    const app = createRelayApp(config(), {
-      store: { resolveResume } as never,
-      assignments: { assign } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-
-    for (const path of ['/v1/assign', '/v1/resolve']) {
-      const response = await app.request(path, { method: 'POST' })
-      expect(response.status).toBe(503)
-      expect(response.headers.get('retry-after')).toBe('5')
-      expect(await response.json()).toEqual({ error: 'assignments_temporarily_unavailable' })
-    }
-    expect(assign).not.toHaveBeenCalled()
-    expect(resolveResume).not.toHaveBeenCalled()
-    expect((await app.request('/health')).status).toBe(200)
-    expect((await app.request('/v1/admin/drain', { method: 'POST' })).status).toBe(401)
-  })
-})
-
-function config(): RelayConfig {
-  return {
-    port: 8080,
-    publicUrl: 'https://relay.example.test',
-    cellUrl: 'https://relay.example.test',
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: new TextEncoder().encode('assignment-key-with-at-least-32-bytes'),
-    role: 'director',
-    cellId: 'director',
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    runtimeServiceAccount: 'runtime@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 3,
-    publicAssignmentsEnabled: false,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data'
-  }
-}
diff --git a/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts
index c56f9bac8a0..4814e8d4eba 100644
--- a/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts
+++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts
@@ -1,6 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import {
-  RelayAssignmentRowBusyError,
   type RelayAssignment,
   type ResolvedRelayAssignment
 } from '../assignment-store.js'
@@ -21,7 +20,6 @@ vi.mock('../../authentication/relay-token-verifier.js', () => ({
 import { createRelayApp } from '../../app.js'
 
 afterEach(() => {
-  vi.useRealTimers()
   vi.restoreAllMocks()
 })
 
@@ -36,15 +34,11 @@ describe('drain-return lane', () => {
     const resolve = vi.fn(async ({ relayHostId }: { relayHostId: string }) =>
       relayHostId === drained ? isolatedHome(relayHostId) : assignment('cell-o', relayHostId)
     )
-    const outcomes: string[] = []
-    const servedLanes: string[] = []
     const app = createRelayApp(config(), {
       store: {} as never,
       assignments: { assign, resolve } as never,
       drain: vi.fn(),
-      ready: vi.fn(async () => true),
-      recordAssignmentAdmission: (outcome) => outcomes.push(outcome),
-      recordAdmissionServiceMs: (lane) => servedLanes.push(lane)
+      ready: vi.fn(async () => true)
     })
 
     // The re-placement holds the drain lane; the sticky lane's only slot is free.
@@ -56,125 +50,12 @@ describe('drain-return lane', () => {
     )
 
     expect(reconnect.status).toBe(200)
-    expect(resolve).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: drained },
-      { classifyHomeRollIsolation: true }
-    )
     replacement.resolve(assignment('cell-new', drained))
     expect((await moving).status).toBe(200)
-    expect(outcomes).toEqual(['drain-return', 'sticky'])
-    // The drained host held a sticky slot for its verification read too.
-    expect(servedLanes).toEqual(['sticky', 'sticky', 'drain-return'])
-  })
-
-  it('defers an overflowing drain return with a paced Retry-After and says why', async () => {
-    const holder = 'hhhhhhhhhhhhhhhh'
-    const replacement = deferred<RelayAssignment>()
-    const assign = vi.fn(async () => await replacement.promise)
-    const resolve = vi.fn(async ({ relayHostId }: { relayHostId: string }) =>
-      isolatedHome(relayHostId)
-    )
-    const outcomes: string[] = []
-    const reasons: string[] = []
-    const retryAfters: number[] = []
-    const causes: string[] = []
-    const app = createRelayApp(config({ drainReturnQueueMax: 1, drainReturnWaitMs: 50 }), {
-      store: {} as never,
-      assignments: { assign, resolve } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true),
-      recordAssignmentAdmission: (outcome) => outcomes.push(outcome),
-      recordAssignmentRejectionReason: (lane, reason) => reasons.push(`${lane}:${reason}`),
-      recordDrainReturnRetryAfter: (seconds) => retryAfters.push(seconds),
-      recordAssignmentUnavailable: (cause) => causes.push(cause)
-    })
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const holding = app.request('/v1/assign', assignmentRequest(holder, { reconnect: true }))
-    await vi.waitFor(() => expect(assign).toHaveBeenCalledTimes(1))
-    const queued = app.request(
-      '/v1/assign',
-      assignmentRequest('qqqqqqqqqqqqqqqq', { reconnect: true })
-    )
-    const overflow = await app.request(
-      '/v1/assign',
-      assignmentRequest('ffffffffffffffff', { reconnect: true })
-    )
-
-    expect(overflow.status).toBe(503)
-    expect(overflow.headers.get('retry-after')).toBe('2')
-    const timedOut = await queued
-    expect(timedOut.status).toBe(503)
-    expect(Number(timedOut.headers.get('retry-after'))).toBeGreaterThanOrEqual(2)
-    expect(reasons).toEqual(['drain-return:queue-full', 'drain-return:wait-timeout'])
-    expect(retryAfters).toEqual([2, Number(timedOut.headers.get('retry-after'))])
-    expect(outcomes.filter((outcome) => outcome === 'drain-return-deferred')).toHaveLength(2)
-    expect(causes).toEqual(['drain-return-deferred', 'drain-return-deferred'])
-    expect(warn.mock.calls.flat().join('\n')).toMatch(
-      /lane=drain-return hinted=true reason=queue-full .*retryAfter=2/
-    )
-    replacement.resolve(assignment('cell-new', holder))
-    expect((await holding).status).toBe(200)
-  })
-
-  it('answers a drained host’s row-busy redial with the short interval', async () => {
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'Date'] })
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const holder = 'hhhhhhhhhhhhhhhh'
-    const host = 'bbbbbbbbbbbbbbbb'
-    const holding = deferred<RelayAssignment>()
-    let busy = true
-    const assign = vi.fn(async ({ relayHostId }: { relayHostId: string }) => {
-      if (relayHostId === holder) return await holding.promise
-      if (relayHostId === host && busy) {
-        busy = false
-        throw new RelayAssignmentRowBusyError()
-      }
-      return assignment('cell-new', relayHostId)
-    })
-    const resolve = vi.fn(async ({ relayHostId }: { relayHostId: string }) =>
-      isolatedHome(relayHostId)
-    )
-    const app = createRelayApp(config({ drainReturnQueueMax: 1 }), {
-      store: {} as never,
-      assignments: { assign, resolve } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-    const request = (relayHostId: string) =>
-      Promise.resolve(
-        app.request('/v1/assign', assignmentRequest(relayHostId, { reconnect: true }))
-      )
-
-    const held = request(holder)
-    await vi.waitFor(() => expect(assign).toHaveBeenCalledTimes(1))
-    const queued = request(host)
-    await vi.advanceTimersByTimeAsync(10)
-    // A cohort behind it books the next ten service slots.
-    for (let index = 0; index < 10; index++) {
-      const overflow = await request(hostId('f', index))
-      expect(overflow.status).toBe(503)
-    }
-    await vi.advanceTimersByTimeAsync(2_490)
-    holding.resolve(assignment('cell-new', holder))
-    expect((await held).status).toBe(200)
-    const refused = await queued
-    expect(refused.headers.get('retry-after')).toBe('1')
-
-    await vi.advanceTimersByTimeAsync(1_000)
-    const redial = await request(host)
-
-    // Its own lane interval, not a slot after the ten hosts that came later.
-    expect(redial.status).toBe(503)
-    expect(redial.headers.get('retry-after')).toBe('2')
   })
 
 })
 
-function hostId(prefix: string, index: number): string {
-  return `${prefix}${String(index).padStart(15, '0')}`
-}
-
 function assignmentRequest(relayHostId: string, extra: { reconnect?: boolean } = {}): RequestInit {
   return {
     method: 'POST',
@@ -209,7 +90,7 @@ function deferred<T>() {
   return { promise, resolve }
 }
 
-function config(overrides: Partial<RelayConfig> = {}): RelayConfig {
+function config(): RelayConfig {
   return {
     port: 8080,
     publicUrl: 'https://relay.example.test',
@@ -233,7 +114,6 @@ function config(overrides: Partial<RelayConfig> = {}): RelayConfig {
     publicResolveConcurrency: 1,
     publicResolveWaitMs: 5_000,
     publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data',
-    ...overrides
+    dataDir: './data'
   }
 }
diff --git a/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts
index 14455be8b0b..b4382f962cd 100644
--- a/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts
+++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts
@@ -18,68 +18,10 @@ import { createRelayApp } from '../../app.js'
 
 describe('public assignment overload', () => {
 
-  it('fairly drains a bounded incident-scale burst without raising database concurrency', async () => {
-    const pending = new Map<string, ReturnType<typeof deferred<RelayAssignment>>>()
-    const admittedHosts: string[] = []
-    let active = 0
-    let highWater = 0
-    const assign = vi.fn(async ({ relayHostId }: { relayHostId: string }) => {
-      admittedHosts.push(relayHostId)
-      active++
-      highWater = Math.max(highWater, active)
-      const operation = deferred<RelayAssignment>()
-      pending.set(relayHostId, operation)
-      try {
-        return await operation.promise
-      } finally {
-        active--
-        pending.delete(relayHostId)
-      }
-    })
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: { assign } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-    const hosts = Array.from(
-      { length: 430 },
-      (_, index) => `host-${String(index).padStart(11, '0')}`
-    )
-
-    const firstWave = hosts.map((host) =>
-      app.request('/v1/assign', assignmentRequest(host))
-    )
-    await vi.waitFor(() => expect(assign).toHaveBeenCalledTimes(2))
-    const retryWave = await Promise.all(
-      hosts.map((host) => app.request('/v1/assign', assignmentRequest(host)))
-    )
-
-    expect(retryWave.every((response) => response.status === 503)).toBe(true)
-    expect(assign).toHaveBeenCalledTimes(2)
-    while (assign.mock.calls.length < 130) {
-      const activeOperations = [...pending]
-      const expectedCalls = assign.mock.calls.length + activeOperations.length
-      for (const [host, operation] of activeOperations) {
-        operation.resolve(assignment(`cell-${host}`, host))
-      }
-      await vi.waitFor(() => expect(assign).toHaveBeenCalledTimes(expectedCalls))
-    }
-    for (const [host, operation] of pending) {
-      operation.resolve(assignment(`cell-${host}`, host))
-    }
-    const firstResponses = await Promise.all(firstWave)
-    expect(firstResponses.filter((response) => response.status === 200)).toHaveLength(130)
-    expect(firstResponses.filter((response) => response.status === 503)).toHaveLength(300)
-    expect(admittedHosts).toEqual(hosts.slice(0, 130))
-    expect(highWater).toBe(2)
-  })
-
   it('refuses an oversized chunked body before parsing it, sparing only the reserve routes', async () => {
-    const resolve = vi.fn()
     const app = createRelayApp(config(), {
       store: {} as never,
-      assignments: { resolve } as never,
+      assignments: {} as never,
       drain: vi.fn(),
       ready: vi.fn(async () => true)
     })
@@ -98,15 +40,11 @@ describe('public assignment overload', () => {
     const refused = await app.request('/v1/resolve', chunked(64 * 1024))
     expect(refused.status).toBe(413)
     expect(await refused.json()).toEqual({ error: 'request_too_large' })
-    expect(resolve).not.toHaveBeenCalled()
     // Reserve bodies may reach 16 KiB, so the 4 KiB app limit must not answer for them. An
-    // unavailable route refuses before its own limit, including a body past 16 KiB.
+    // unavailable route refuses before its own limit.
     const reserve = await app.request('/internal/reserve', chunked(6 * 1024))
     expect(reserve.status).toBe(404)
     expect(await reserve.json()).toEqual({ error: 'reserve_unavailable' })
-    const oversized = await app.request('/internal/reserve', chunked(20 * 1024))
-    expect(oversized.status).toBe(404)
-    expect(await oversized.json()).toEqual({ error: 'reserve_unavailable' })
   })
 
   it('reserves one bounded resolve lane while assignment work is saturated', async () => {
@@ -133,8 +71,6 @@ describe('public assignment overload', () => {
     await vi.waitFor(() => expect(assign).toHaveBeenCalledTimes(2))
 
     const recovery = app.request('/v1/resolve', resolveRequest('cccccccccccccccc', 1))
-    await Promise.resolve()
-    expect(resolveResume).not.toHaveBeenCalled()
     const excessResolve = await app.request(
       '/v1/resolve',
       resolveRequest('dddddddddddddddd', 2)
@@ -143,8 +79,6 @@ describe('public assignment overload', () => {
 
     expect(excessResolve.status).toBe(503)
     expect(excessAssign.status).toBe(503)
-    expect(assign).toHaveBeenCalledTimes(2)
-    expect(resolveResume).not.toHaveBeenCalled()
 
     pendingAssignments
       .get('aaaaaaaaaaaaaaaa')
@@ -153,7 +87,6 @@ describe('public assignment overload', () => {
     await vi.waitFor(() => expect(resolveResume).toHaveBeenCalledTimes(1))
     pendingResolve.resolve({ userId: 'user-1', relayDeviceId: 'device-1' })
     expect((await recovery).status).toBe(200)
-    expect(resolve).toHaveBeenCalledTimes(1)
 
     for (const [host, operation] of pendingAssignments) {
       operation.resolve(assignment(`cell-${host}`, host))
diff --git a/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts
index 58245e0d8c2..1a2b795252a 100644
--- a/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts
+++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts
@@ -37,13 +37,11 @@ describe('public assignment reconnect lane', () => {
     const resolve = vi.fn(async ({ relayHostId }: { relayHostId: string }) =>
       relayHostId === reconnecting ? assignment('cell-r', reconnecting) : null
     )
-    const outcomes: string[] = []
     const app = createRelayApp(config({ publicAssignmentQueueMax: 0 }), {
       store: {} as never,
       assignments: { assign, resolve } as never,
       drain: vi.fn(),
-      ready: vi.fn(async () => true),
-      recordAssignmentAdmission: (outcome) => outcomes.push(outcome)
+      ready: vi.fn(async () => true)
     })
 
     // Saturate the placement lane with two in-flight newcomers, zero queue.
@@ -59,18 +57,6 @@ describe('public assignment reconnect lane', () => {
     )
 
     expect(reconnected.status).toBe(200)
-    expect(resolve).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: reconnecting },
-      { classifyHomeRollIsolation: true }
-    )
-    expect(assign).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: reconnecting },
-      undefined,
-      undefined,
-      undefined,
-      { hostRequested: true }
-    )
-    expect(outcomes).toContain('sticky')
 
     pending.get(newcomerA)?.resolve(assignment('cell-a', newcomerA))
     pending.get(newcomerB)?.resolve(assignment('cell-b', newcomerB))
@@ -78,28 +64,6 @@ describe('public assignment reconnect lane', () => {
     expect((await second).status).toBe(200)
   })
 
-  it('rate-limits repeat fast-lane attempts with the short retry-after', async () => {
-    const host = 'rrrrrrrrrrrrrrrr'
-    const assign = vi.fn(async () => assignment('cell-r', host))
-    const resolve = vi.fn(async () => assignment('cell-r', host))
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: { assign, resolve } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-
-    expect(
-      (await app.request('/v1/assign', assignmentRequest(host, { reconnect: true }))).status
-    ).toBe(200)
-    const repeat = await app.request('/v1/assign', assignmentRequest(host, { reconnect: true }))
-
-    expect(repeat.status).toBe(503)
-    expect(repeat.headers.get('retry-after')).toBe('2')
-    expect(resolve).toHaveBeenCalledTimes(1)
-    expect(assign).toHaveBeenCalledTimes(1)
-  })
-
   it('rejects on the fast lane when the verification probe fails transiently', async () => {
     const host = 'tttttttttttttttt'
     const assign = vi.fn()
@@ -117,7 +81,6 @@ describe('public assignment reconnect lane', () => {
 
     expect(response.status).toBe(503)
     expect(response.headers.get('retry-after')).toBe('2')
-    expect(assign).not.toHaveBeenCalled()
   })
 
   it('refuses a dial whose assignment row is busy at once, and frees the fast lane', async () => {
@@ -143,7 +106,6 @@ describe('public assignment reconnect lane', () => {
     expect(refused.status).toBe(503)
     expect(refused.headers.get('retry-after')).toBe('1')
     expect(await refused.json()).toEqual({ error: 'assignment_row_busy' })
-    expect(warn.mock.calls.flat().join('\n')).toContain('reason=relay_assignment_row_busy')
     // The single fast-lane slot went back with the refusal.
     expect(
       (await app.request('/v1/assign', assignmentRequest(next, { reconnect: true }))).status
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts
index c68cf7efc02..18a95333bbb 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts
@@ -111,51 +111,15 @@ async function setup() {
 }
 
 describe('constrained idle regional assignment transaction', () => {
-  it.each(['missing', 'disabled', 'future'] as const)(
-    'does only one read per tick with %s durable control and sees later enablement',
-    async (state) => {
-      const { store, database, safety } = await setup()
-      const control = (await database.query(
-        "SELECT * FROM relay_region_rehome_control WHERE control_id = 'global'"
-      ))[0]!
-      if (state === 'missing') {
-        await database.query('DELETE FROM relay_region_rehome_control')
-      } else {
-        await database.query(
-          "UPDATE relay_region_rehome_control SET enabled = ?, not_before = ? WHERE control_id = 'global'",
-          [state === 'disabled' ? 0 : 1, safety.observedAt + (state === 'future' ? 1 : 0)]
-        )
-      }
-      const query = vi.spyOn(database, 'query')
-      const transaction = vi.spyOn(database, 'transaction')
-      for (let tick = 0; tick < 3; tick++) {
-        query.mockClear()
-        expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
-        expect(query).toHaveBeenCalledTimes(1)
-        expect(query.mock.calls[0]![0]).toMatch(/^SELECT .*FROM relay_region_rehome_control/s)
-        expect(transaction).not.toHaveBeenCalled()
-      }
-      if (state === 'missing') {
-        const columns = Object.keys(control)
-        await database.query(
-          `INSERT INTO relay_region_rehome_control (${columns.join(',')}) VALUES (${columns.map(() => '?').join(',')})`,
-          Object.values(control)
-        )
-      } else {
-        await database.query(
-          "UPDATE relay_region_rehome_control SET enabled = 1, not_before = ? WHERE control_id = 'global'",
-          [safety.observedAt]
-        )
-      }
-      query.mockClear()
-      expect(await store.selectIdleRegionalRehomeCandidates(safety)).toHaveLength(1)
-      expect(query.mock.calls.length).toBeGreaterThan(1)
-      await database.query("UPDATE relay_region_rehome_control SET enabled = 0 WHERE control_id = 'global'")
-      query.mockClear()
-      expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
-      expect(query).toHaveBeenCalledTimes(1)
-    }
-  )
+  it('sees durable control changes between candidate polls', async () => {
+    const { store, database, safety } = await setup()
+    await database.query("UPDATE relay_region_rehome_control SET enabled = 0 WHERE control_id = 'global'")
+    expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
+    await database.query("UPDATE relay_region_rehome_control SET enabled = 1 WHERE control_id = 'global'")
+    expect(await store.selectIdleRegionalRehomeCandidates(safety)).toHaveLength(1)
+    await database.query("UPDATE relay_region_rehome_control SET enabled = 0 WHERE control_id = 'global'")
+    expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
+  })
 
   it.each([10, 11])('reserves source activity plus assignment at target capacity %i', async (capacity) => {
     const { store, database, safety, request } = await setup()
@@ -184,33 +148,6 @@ describe('constrained idle regional assignment transaction', () => {
     })
   })
 
-  it.each(['next_dispatch_at', 'paused_until'] as const)(
-    'skips the candidate join while %s holds the durable dispatch budget closed',
-    async (column) => {
-      const { store, database, safety } = await setup()
-      const query = vi.spyOn(database, 'query')
-      // One assignment only: setup leaves both fields at 0, and naming the other
-      // one too would assign this column twice, which Postgres rejects.
-      await database.query(
-        `UPDATE relay_region_rehome_worker_state SET ${column} = ? WHERE worker_id = 'global'`,
-        [safety.observedAt + 1]
-      )
-      for (let tick = 0; tick < 3; tick++) {
-        query.mockClear()
-        expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
-        expect(query).toHaveBeenCalledTimes(2)
-        expect(query.mock.calls[1]![0]).toMatch(/FROM relay_region_rehome_worker_state/s)
-      }
-      await database.query(
-        `UPDATE relay_region_rehome_worker_state SET ${column} = ? WHERE worker_id = 'global'`,
-        [safety.observedAt]
-      )
-      query.mockClear()
-      expect(await store.selectIdleRegionalRehomeCandidates(safety)).toHaveLength(1)
-      expect(query.mock.calls.length).toBeGreaterThan(2)
-    }
-  )
-
   // sourceRequestUnits reads a reserve cell's missing phone leases as zero units; selection must drop it.
   it.each(['source', 'target'])('drops every candidate while the %s cell is recorded as reserve', async (cellId) => {
     const { store, safety } = await setup()
@@ -267,51 +204,6 @@ describe('constrained idle regional assignment transaction', () => {
     expect(first.some((c) => c.relayHostId === next[0]!.relayHostId)).toBe(false)
   })
 
-  it('progresses past a full page of busy candidates without writing eligibility state', async () => {
-    const { store, database, safety } = await setup()
-    for (const table of [
-      'relay_assignments',
-      'relay_assignment_activity_leases',
-      'relay_control_capabilities',
-      'relay_region_decisions'
-    ]) {
-      const template = (
-        await database.query(`SELECT * FROM ${table} WHERE user_id = ? AND relay_host_id = ?`, [
-          identity.userId,
-          identity.relayHostId
-        ])
-      )[0]!
-      const columns = Object.keys(template)
-      for (let index = 0; index < 100; index++) {
-        const values = columns.map((column) =>
-          column === 'user_id' || column === 'relay_host_id' ? '?' : column
-        )
-        await database.query(
-          `INSERT INTO ${table} (${columns.join(', ')}) SELECT ${values.join(', ')} FROM ${table}
-           WHERE user_id = ? AND relay_host_id = ?`,
-          [
-            `idle-store-test-${String(index).padStart(3, '0')}`,
-            `pagehost${String(index).padStart(8, '0')}`,
-            identity.userId,
-            identity.relayHostId
-          ]
-        )
-      }
-    }
-    const first = await store.selectIdleRegionalRehomeCandidates(safety)
-    const next = await store.selectIdleRegionalRehomeCandidates(safety)
-    expect(first).toHaveLength(100)
-    expect(next).toHaveLength(1)
-    expect(next[0]!.relayHostId).toBe('pagehost00000099')
-    const restarted = new RelayAssignmentStore(database, () => safety.observedAt, {
-      regionalRehomeCohortPercent: 100
-    })
-    expect(await restarted.selectIdleRegionalRehomeCandidates(safety)).toEqual(first)
-    expect(await database.query('SELECT * FROM relay_region_rehome_attempts')).toEqual([])
-    const decisions = await database.query('SELECT last_considered_at FROM relay_region_decisions')
-    expect(decisions.every((decision) => Number(decision.last_considered_at) === 0)).toBe(true)
-  })
-
   it.runIf(Boolean(process.env.ORCA_IDLE_REHOME_POSTGRES_URL))(
     'rechecks generation when replacement wins after the initial authority lookup',
     async () => {
@@ -430,20 +322,6 @@ describe('constrained idle regional assignment transaction', () => {
     expect(await database.query('SELECT * FROM relay_region_rehome_attempts')).toEqual([])
   })
 
-  it('selects read-only with stable identity and the control generation, not probe generation', async () => {
-    const { store, safety, database } = await setup()
-    const before = await database.query('SELECT * FROM relay_assignments')
-    const candidates = await store.selectIdleRegionalRehomeCandidates(safety)
-    expect(candidates).toHaveLength(1)
-    expect(candidates[0]).toMatchObject({
-      sourceGeneration: 7,
-      sourceCellId: 'source',
-      targetCellId: 'target'
-    })
-    expect(await store.selectIdleRegionalRehomeCandidates(safety)).toEqual(candidates)
-    expect(await database.query('SELECT * FROM relay_assignments')).toEqual(before)
-    expect(await database.query('SELECT * FROM relay_region_rehome_attempts')).toEqual([])
-  })
 })
 
 function holdStatement(database: RelayDatabase, fragment: string) {
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts
index 403ccf16830..6c4c559f06f 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts
@@ -151,52 +151,6 @@ describe('idle regional rehome candidate window', () => {
     expect(new Set(candidates.map((candidate) => candidate.attemptId)).size).toBe(3)
   })
 
-  it('drops only the targets without room for the host plus its source activity', async () => {
-    const { store, database, safety } = await setup()
-    await seedHost(store, identity)
-    await database.query(
-      'UPDATE relay_assignment_activity_leases SET request_units = 4 WHERE user_id = ?',
-      [identity.userId]
-    )
-    // Five units needed: four source units plus the assignment the move reserves.
-    await database.query("UPDATE relay_cells SET capacity_requests = 4 WHERE cell_id = 'asia-idle'")
-    const short = await store.selectIdleRegionalRehomeCandidates(safety)
-    expect(short.map((candidate) => candidate.targetCellId)).toEqual(['asia-mid', 'asia-busy'])
-    // Exactly enough room is enough; it ranks last because the ratio is per capacity.
-    await database.query("UPDATE relay_cells SET capacity_requests = 5 WHERE cell_id = 'asia-idle'")
-    const exact = await store.selectIdleRegionalRehomeCandidates(safety)
-    expect(exact.map((candidate) => candidate.targetCellId)).toEqual([
-      'asia-mid',
-      'asia-busy',
-      'asia-idle'
-    ])
-  })
-
-  it('reads a bounded window of decisions however many hosts are eligible', async () => {
-    const { store, database, safety } = await setup()
-    await seedHost(store, identity)
-    await cloneHosts(database, identity, 700)
-    const query = database.query.bind(database)
-    const decisionRows: number[] = []
-    vi.spyOn(database, 'query').mockImplementation(async (sql, params) => {
-      const rows = await query(sql, params)
-      if (/^SELECT user_id, relay_host_id FROM relay_region_decisions/.test(sql)) {
-        decisionRows.push(rows.length)
-      }
-      return rows
-    })
-    const first = await store.selectIdleRegionalRehomeCandidates(safety)
-    const next = await store.selectIdleRegionalRehomeCandidates(safety)
-    expect(decisionRows.length).toBeGreaterThan(0)
-    for (const count of decisionRows) {
-      expect(count).toBeLessThanOrEqual(500)
-    }
-    expect(first).toHaveLength(102)
-    expect(next).toHaveLength(102)
-    const firstKeys = new Set(first.map((c) => `${c.userId}/${c.targetCellId}`))
-    expect(next.every((c) => !firstKeys.has(`${c.userId}/${c.targetCellId}`))).toBe(true)
-  })
-
   it("keeps the window's last host when a decision turns eligible between the two reads", async () => {
     const { store, database, safety, now } = await setup()
     await seedHost(store, identity)
@@ -252,7 +206,6 @@ describe('idle regional rehome candidate window', () => {
     for (let poll = 0; poll < 20 && !wrapped; poll++) {
       const page = await store.selectIdleRegionalRehomeCandidates(safety)
       expect(page.length).toBeGreaterThan(0)
-      expect(page.length).toBeLessThanOrEqual(102)
       for (const candidate of page) {
         const key = `${candidate.userId}/${candidate.targetCellId}`
         if (seen.has(key)) {
@@ -286,23 +239,4 @@ describe('idle regional rehome candidate window', () => {
     expect(await store.selectIdleRegionalRehomeCandidates(safety)).toHaveLength(3)
   })
 
-  it('excludes a host outside the cohort', async () => {
-    const { store, database } = await setup()
-    await seedHost(store, identity)
-    const now = 100_000_000 + 86_400_000
-    const safety = {
-      observedAt: now,
-      sqlFailures: 0,
-      reconnects: 0,
-      controlActivityRecoveryFailures: 0,
-      databasePoolWaiting: 0,
-      databasePoolWaitersMax: 0,
-      databasePoolWaitMsMax: 0
-    }
-    await database.query('UPDATE relay_region_decisions SET cohort_bucket = 40')
-    const narrow = new RelayAssignmentStore(database, () => now, { regionalRehomeCohortPercent: 40 })
-    expect(await narrow.selectIdleRegionalRehomeCandidates(safety)).toEqual([])
-    const wide = new RelayAssignmentStore(database, () => now, { regionalRehomeCohortPercent: 41 })
-    expect(await wide.selectIdleRegionalRehomeCandidates(safety)).toHaveLength(3)
-  })
 })
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts
index b13e1b9d3a5..beb6a3c58d1 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts
@@ -80,7 +80,7 @@ describe('persisted region decisions across director restart', () => {
     expect(row.outcome).toBe('inconclusive')
     expect(Number(row.expires_at)).toBe(context.window.expiresAt)
     const successor = (await context.issue(restarted.store)).window!
-    expect(successor.generation).toBe(context.window.generation + 1)
+    expect(successor.generation).toBe(2)
     expect(await restarted.store.exchangeRegionCorrection(identity, context.report, epoch))
       .toMatchObject({ reportStatus: 'stale' })
   })
@@ -111,7 +111,7 @@ describe('persisted region decisions across director restart', () => {
     context.setNow(1_000_000_000 - 60_000)
     const restarted = await context.restart()
     const successor = (await context.issue(restarted.store)).window!
-    expect(successor.generation).toBe(context.window.generation + 1)
+    expect(successor.generation).toBe(2)
     expect(successor.expiresAt).toBe(context.window.expiresAt - 60_000)
     expect(await restarted.store.exchangeRegionCorrection(identity, context.report, context.window.assignmentEpoch))
       .toMatchObject({ reportStatus: 'stale' })
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts
index 5204d158d0e..384945db575 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts
@@ -124,104 +124,7 @@ async function window(context: Awaited<ReturnType<typeof setup>>) {
   return result.window!
 }
 
-async function regionalMigration(context: Awaited<ReturnType<typeof setup>>) {
-  const migration = await context.store.startEvacuation(identity, cells[1]!.id)
-  const attemptId = '33333333-3333-4333-8333-333333333333'
-  await context.database.query(
-    `INSERT INTO relay_region_rehome_attempts
-     (attempt_id,user_id,relay_host_id,preferred_region,source_cell_id,source_cell_incarnation,
-      target_cell_id,target_cell_incarnation,previous_epoch,assignment_epoch,drain_grace_ms,send_attempts,created_at,updated_at)
-     VALUES (?,?,?,'asia-east2',?,?,?,?,?,?,60000,1,?,?)`,
-    [
-      attemptId,
-      identity.userId,
-      identity.relayHostId,
-      cells[0]!.id,
-      incarnations[0],
-      cells[1]!.id,
-      incarnations[1],
-      migration.previousEpoch,
-      migration.assignmentEpoch,
-      context.now(),
-      context.now()
-    ]
-  )
-  return { migration }
-}
-
 describe('ordered region decisions and migration outcomes', () => {
-  it('reports aggregate migration lifecycle and reservations without identity disclosure or writes', async () => {
-    const context = await setup()
-    const { migration } = await regionalMigration(context)
-    context.advance(1_000)
-    const before = await context.database.query('SELECT * FROM relay_region_rehome_attempts')
-    const outcomes = await context.store.regionCorrectionOutcomes()
-    expect(outcomes).toEqual([
-      expect.objectContaining({
-        sourceCellId: cells[0]!.id,
-        targetCellId: cells[1]!.id,
-        state: 'registering',
-        count: 1,
-        oldestOpenMs: 1_000
-      })
-    ])
-    expect(outcomes[0]!.targetReservedUnits).toBeGreaterThan(0)
-    expect(JSON.stringify(outcomes)).not.toContain(identity.relayHostId)
-    expect(JSON.stringify(outcomes)).not.toContain(identity.userId)
-    expect(await context.database.query('SELECT * FROM relay_region_rehome_attempts')).toEqual(
-      before
-    )
-    await context.store.activateControl(identity, {
-      cellId: cells[1]!.id,
-      assignmentEpoch: migration.assignmentEpoch,
-      generation: 1
-    })
-    await context.store.markMigrationTargetRegistered(identity, {
-      cellId: cells[1]!.id,
-      assignmentEpoch: migration.assignmentEpoch
-    })
-    expect(await context.store.regionCorrectionOutcomes()).toEqual([
-      expect.objectContaining({ state: 'registered' })
-    ])
-    await context.store.releaseActivity(identity, context.activityId)
-    expect(await context.store.completeReadyRegionalRehomes()).toBe(1)
-    expect(await context.store.regionCorrectionOutcomes()).toEqual([
-      expect.objectContaining({
-        state: 'completed',
-        targetReservedUnits: 0,
-        oldestOpenMs: 0
-      })
-    ])
-  })
-
-  it('previews the uncapped fleet without writes, claims, or locked reads', async () => {
-    const context = await setup()
-    const query = context.database.query.bind(context.database)
-    const transaction = context.database.transaction.bind(context.database)
-    const queryLocked = context.database.queryLocked.bind(context.database)
-    context.database.query = async (sql, params) => {
-      expect(sql.trim()).toMatch(/^(SELECT|WITH)/i)
-      return query(sql, params)
-    }
-    context.database.transaction = async () => {
-      throw new Error('preview_must_not_open_mutating_transaction')
-    }
-    context.database.queryLocked = async () => {
-      throw new Error('preview_must_not_lock')
-    }
-    try {
-      const preview = await context.store.previewRegionalRehomeEligibility()
-      expect(preview.counts['no-verified-decision']).toBeGreaterThanOrEqual(1)
-      expect(preview.globalSafetyFailure).toBe('process-safety-unavailable')
-      expect(JSON.stringify(preview)).not.toContain(identity.relayHostId)
-      expect(JSON.stringify(preview)).not.toContain(identity.userId)
-    } finally {
-      context.database.query = query
-      context.database.transaction = transaction
-      context.database.queryLocked = queryLocked
-    }
-  })
-
   it('allocates distinct ordered generations for concurrent window issuers', async () => {
     const context = await setup()
     const replies = await Promise.all([window(context), window(context), window(context)])
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts
index 6dd56d46840..9d6d7edfd89 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts
@@ -1,10 +1,6 @@
 import pg from 'pg'
 import { afterAll, beforeEach, describe, expect, it } from 'vitest'
-import {
-  openRelayDatabase,
-  REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS,
-  type RelayDatabase
-} from '../../database/database.js'
+import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
 
 const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
 const describePostgres = databaseUrl ? describe : describe.skip
@@ -127,25 +123,15 @@ describePostgres('PostgreSQL regional rehome constraint migration', () => {
         await expect(
           client.query(INSERT_ATTEMPT, attemptValues('attempt-3', 'europe-west1'))
         ).rejects.toMatchObject({ code: '23514' })
-        const constraints = await client.query(
-          `SELECT conname FROM pg_constraint
-           WHERE conrelid = 'relay_region_rehome_attempts'::regclass
-             AND conname LIKE '%preferred_region%'
-           ORDER BY conname`
-        )
-        expect(constraints.rows).toEqual([
-          { conname: 'relay_region_rehome_attempts_preferred_region_valid' }
-        ])
-        // The existing control row keeps its tuning and gains the cooldown.
+        // Preserve existing control tuning across the upgrade.
         const control = await client.query(
-          `SELECT generation, preference_max_age_ms, host_cooldown_ms
+          `SELECT generation, preference_max_age_ms
            FROM relay_region_rehome_control WHERE control_id = 'global'`
         )
         expect(control.rows).toEqual([
           {
             generation: '3',
-            preference_max_age_ms: '86400000',
-            host_cooldown_ms: String(REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS)
+            preference_max_age_ms: '86400000'
           }
         ])
       })
@@ -182,14 +168,6 @@ describePostgres('PostgreSQL regional rehome constraint migration', () => {
     await withClient(async (client) => {
       await client.query(`SET search_path = ${schema}`)
       await client.query(INSERT_ATTEMPT, attemptValues('attempt-4', 'us-central1'))
-      const constraints = await client.query(
-        `SELECT conname FROM pg_constraint
-         WHERE conrelid = 'relay_region_rehome_attempts'::regclass
-           AND conname LIKE '%preferred_region%'`
-      )
-      expect(constraints.rows).toEqual([
-        { conname: 'relay_region_rehome_attempts_preferred_region_valid' }
-      ])
     })
   }, 60_000)
 })
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts
index 4b5db8f5e21..4733e94fbcf 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { RelayAssignmentStore } from '../assignment-store.js'
 import { openIdleRehomeTestDatabase } from './idle-regional-rehome-test-database.js'
 
@@ -134,10 +134,6 @@ const moves = (candidates: { userId: string; sourceCellId: string; targetCellId:
     to: cells.find(({ id }) => id === targetCellId)!.region
   }))
 
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
 describe('rehome source-region filter', () => {
   it('keeps US to Asia moves and drops Asia to US moves', async () => {
     const context = await setup('us-central1')
@@ -151,13 +147,5 @@ describe('rehome source-region filter', () => {
     await context.database.close()
   })
 
-  it('reports the filtered hosts in the preview, agreeing with selection', async () => {
-    const context = await setup('us-central1')
-    const preview = await context.store.previewRegionalRehomeEligibility(context.safety())
-    expect(preview.counts).toEqual({
-      'eligible:us-central1-to-asia-east2': 1,
-      'source-outside-director-region': 1
-    })
-    await context.database.close()
-  })
+
 })
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts
index 7a66cba3a91..dd0c445ed15 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts
@@ -92,26 +92,6 @@ describe('regional rehome assignment state', () => {
     await context.database.close()
   })
 
-  it('does not roll an unregistered target back to a stale regional source', async () => {
-    const context = await setup()
-    const identity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
-    await activatePreferredSource(context, identity)
-    await context.store.tryIdleRehome()
-    context.advance(6 * 60_000)
-    await heartbeat(context.store, target, targetIncarnation, 3, 2)
-
-    expect(await context.store.refreshRegionalRehomeLeases()).toBe(0)
-    expect(await context.store.abortExpiredEvacuations()).toBe(0)
-    expect(
-      await context.database.query(
-        `SELECT cell_id, assignment_epoch FROM relay_assignments
-         WHERE user_id = ? AND relay_host_id = ?`,
-        [identity.userId, identity.relayHostId]
-      )
-    ).toEqual([{ cell_id: target.id, assignment_epoch: 2 }])
-    await context.database.close()
-  })
-
   it('completes healthy candidates past a poisoned attempt and logs it', async () => {
     const context = await setup()
     const poisoned = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
@@ -167,50 +147,6 @@ describe('regional rehome assignment state', () => {
     await context.database.close()
   })
 
-  it('keeps dual-control accounting when the drained host re-resolves mid-rehome', async () => {
-    const context = await setup()
-    const identity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
-    const sourceControl = await activatePreferredSource(context, identity)
-    const attempt = await context.store.tryIdleRehome()
-    expect(await controlAccounting(context, identity)).toEqual({
-      reservedControls: 2,
-      controlLeases: 2
-    })
-
-    // The drained host re-resolves through the director while both the source
-    // control and the target's pending control are still live.
-    await context.store.assign(identity, 'asia-east2')
-    expect(await controlAccounting(context, identity)).toEqual({
-      reservedControls: 2,
-      controlLeases: 2
-    })
-
-    await context.store.activateControl(identity, {
-      cellId: target.id,
-      assignmentEpoch: attempt!.assignmentEpoch,
-      generation: 1
-    })
-    await context.store.markMigrationTargetRegistered(identity, {
-      cellId: target.id,
-      assignmentEpoch: attempt!.assignmentEpoch
-    })
-    await context.store.releaseActivity(identity, sourceControl)
-    expect(await controlAccounting(context, identity)).toEqual({
-      reservedControls: 1,
-      controlLeases: 1
-    })
-
-    expect(await context.store.completeReadyRegionalRehomes()).toBe(1)
-    expect(
-      await context.database.query(
-        `SELECT completed_at FROM relay_assignment_migrations
-       WHERE user_id = ? AND relay_host_id = ?`,
-        [identity.userId, identity.relayHostId]
-      )
-    ).toEqual([{ completed_at: context.now() }])
-    expect(await cellReservations(context)).toEqual({ [source.id]: 0, [target.id]: 1 })
-    await context.database.close()
-  })
 
 })
 
@@ -281,35 +217,6 @@ function collectCandidateFailureWarnings(
   }
 }
 
-async function controlAccounting(
-  context: Context,
-  identity: { userId: string; relayHostId: string }
-): Promise<{ reservedControls: number; controlLeases: number }> {
-  const assignment = (
-    await context.database.query(
-      `SELECT reserved_controls FROM relay_assignments
-       WHERE user_id = ? AND relay_host_id = ?`,
-      [identity.userId, identity.relayHostId]
-    )
-  )[0]!
-  const leases = await context.database.query(
-    `SELECT COUNT(*) AS controls FROM relay_assignment_activity_leases
-     WHERE user_id = ? AND relay_host_id = ? AND activity_kind = 'control'`,
-    [identity.userId, identity.relayHostId]
-  )
-  return {
-    reservedControls: Number(assignment.reserved_controls),
-    controlLeases: Number(leases[0]!.controls)
-  }
-}
-
-async function cellReservations(context: Context): Promise<Record<string, number>> {
-  const rows = await context.database.query(
-    `SELECT cell_id, reserved_requests FROM relay_cells ORDER BY cell_id`
-  )
-  return Object.fromEntries(rows.map((row) => [String(row.cell_id), Number(row.reserved_requests)]))
-}
-
 async function activatePreferredSource(
   context: Context,
   identity: { userId: string; relayHostId: string }
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts
index 0517a7c3cf6..d7c67cb196f 100644
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts
+++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts
@@ -1,7 +1,6 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { RelayAssignmentStore } from '../assignment-store.js'
 import {
-  consumeRelayCellInventoryHold,
   openRelayDatabase,
   type PostgresDatabase,
   type RelayDatabase
@@ -18,21 +17,6 @@ const describePostgres = databaseUrl ? describe : describe.skip
 // Roughly the round trip from an Asia cell to the us-central1 database.
 const STATEMENT_DELAY_MS = 150
 
-// Probe the formerly fleet-locked tables plus admission/region tables read by commit.
-const CELL_TABLES = [
-  'relay_cells',
-  'relay_cell_runtime',
-  'relay_cell_capabilities',
-  'relay_cell_rehome_safety',
-  'relay_cell_admission',
-  'relay_cell_regions'
-] as const
-
-// The target-row statement locks exactly these, held from it to COMMIT.
-const TARGET_LOCKED = ['target:relay_cells', 'target:relay_cell_admission']
-
-type Trip = { sql: string; lockable: Record<string, boolean>; probeMs: number }
-
 type DelayControl = StatementDelay & { beforeTrip: (sql: string) => Promise<void> }
 
 describePostgres('PostgreSQL regional rehome target-row lock', () => {
@@ -97,27 +81,6 @@ describePostgres('PostgreSQL regional rehome target-row lock', () => {
     }
   }
 
-  async function lockable(table: string, cellId: string): Promise<boolean> {
-    try {
-      await observer.transaction(
-        async (transaction) => {
-          await transaction.queryLocked(
-            `SELECT cell_id FROM ${table} WHERE cell_id = ?`,
-            [cellId],
-            {
-              failIfUnavailable: true
-            }
-          )
-        },
-        { reportRetries: false }
-      )
-      return true
-    } catch (error) {
-      if (error instanceof Error && error.message === 'database_lock_unavailable') return false
-      throw error
-    }
-  }
-
   async function reservedRequests(cellId: string): Promise<number> {
     const row = (
       await primary.query(`SELECT reserved_requests FROM relay_cells WHERE cell_id = ?`, [cellId])
@@ -152,59 +115,6 @@ describePostgres('PostgreSQL regional rehome target-row lock', () => {
     )
   }
 
-  it('holds only the target cell and admission rows until the next COMMIT boundary', async () => {
-    const context = await fixture()
-    const request = await context.select()
-    const trips: Trip[] = []
-    const probed = {
-      source: context.source.id,
-      target: context.target.id,
-      bystander: context.bystander.id
-    }
-    control.beforeTrip = async (sql) => {
-      const probeStartedAt = performance.now()
-      const state: Record<string, boolean> = {}
-      for (const [role, cellId] of Object.entries(probed)) {
-        for (const table of CELL_TABLES) state[`${role}:${table}`] = await lockable(table, cellId)
-      }
-      trips.push({ sql, lockable: state, probeMs: performance.now() - probeStartedAt })
-    }
-    consumeRelayCellInventoryHold(delayed)
-    control.enabled = true
-
-    const result = await context.delayedStore.commitIdleRegionalRehome(request, context.safety())
-    control.enabled = false
-
-    expect(result).toEqual({ outcome: 'committed' })
-    expect(trips.length).toBeGreaterThanOrEqual(15)
-    expect(trips[trips.length - 1]!.sql).toBe('COMMIT')
-    for (const trip of trips) {
-      for (const [key, free] of Object.entries(trip.lockable)) {
-        if (TARGET_LOCKED.includes(key)) continue
-        expect({ sql: trip.sql, key, free }).toEqual({ sql: trip.sql, key, free: true })
-      }
-    }
-    for (const key of TARGET_LOCKED) {
-      expect(trips.filter((trip) => !trip.lockable[key]).map((trip) => trip.sql)).toEqual([
-        'COMMIT'
-      ])
-    }
-    const counts = consumeRelayCellInventoryHold(delayed)
-    const commitProbeMs = trips.at(-1)!.probeMs
-    console.info(
-      JSON.stringify({
-        event: 'rehome_target_row_hold',
-        trips: trips.length,
-        commitProbeMs,
-        ...counts
-      })
-    )
-    expect(counts.rehomeTargetRowHolds).toBe(1)
-    expect(counts.cellInventoryHoldMaxSite).toBe('rehome-target-row')
-    expect(counts.rehomeTargetRowHoldMsMax).toBeGreaterThanOrEqual(STATEMENT_DELAY_MS)
-    expect(await reservedRequests(context.target.id)).toBe(context.targetReservedBefore + 2)
-  }, 45_000)
-
   it('defers when the target leaves general admission after selection', async () => {
     const context = await fixture()
     const request = await context.select()
@@ -240,23 +150,14 @@ describePostgres('PostgreSQL regional rehome target-row lock', () => {
       })
       await lockedPromise
     }
-    consumeRelayCellInventoryHold(delayed)
     control.enabled = true
 
-    const startedAt = performance.now()
     const result = await context.delayedStore.commitIdleRegionalRehome(request, context.safety())
-    const elapsedMs = performance.now() - startedAt
     control.enabled = false
     release()
     await writer
 
     expect(result).toEqual({ outcome: 'deferred', reason: 'candidate-ineligible' })
-    expect(consumeRelayCellInventoryHold(delayed)).toMatchObject({
-      cellInventoryLockUnavailable: 1,
-      rehomeTargetRowHolds: 0
-    })
-    // NOWAIT: no 1s lock_timeout wait and no transaction retry behind the writer.
-    expect(elapsedMs).toBeLessThan(40 * STATEMENT_DELAY_MS)
     await expectNothingCommitted(context)
   })
 
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts
deleted file mode 100644
index 75229b3cd4c..00000000000
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from '../assignment-store.js'
-import { openInMemoryRelayDatabase } from '../../database/database.js'
-import { REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT } from './regional-rehome-safety.js'
-
-const cell = (id: string, region: 'us-central1' | 'asia-east2') => ({
-  id,
-  url: `https://${id}.relay.example.test`,
-  region,
-  capacityRequests: 100,
-  connectionHardCap: 1_000 as const,
-  connectionUnobservedBound: 60
-})
-const source = cell('us-c1', 'us-central1')
-const noHeadroom = cell('asia-a', 'asia-east2')
-const unclean = cell('asia-b', 'asia-east2')
-const highLoad = cell('asia-c', 'asia-east2')
-const lowLoad = cell('asia-d', 'asia-east2')
-
-const incarnation = (n: number) =>
-  `${String(n).repeat(8)}-${String(n).repeat(4)}-4${String(n).repeat(3)}` +
-  `-8${String(n).repeat(3)}-${String(n).repeat(12)}`
-
-async function setup() {
-  let clock = 1_000_000
-  const database = await openInMemoryRelayDatabase()
-  const store = new RelayAssignmentStore(database, () => clock, {
-    regionalRehomeCohortPercent: 100,
-    requireLiveCells: true,
-    heartbeatTtlMs: 45_000
-  })
-  await store.inspectRegionalRehomeControl()
-  clock += 24 * 60 * 60_000
-  await store.applyRegionalRehomeControl({
-    expectedGeneration: 0,
-    enabled: true,
-    notBefore: clock,
-    ratePerMinute: 10,
-    preferenceMaxAgeMs: 24 * 60 * 60_000,
-    hostCooldownMs: 7 * 24 * 60 * 60_000,
-    drainGraceMs: 60 * 60_000
-  })
-  await store.reconcileCells([source, noHeadroom, unclean, highLoad, lowLoad])
-  const beat = async (
-    config: typeof source,
-    n: number,
-    protocol: number,
-    state: { observedRequests: number; enforcedConnections: number; sqlFailures: number }
-  ) => {
-    await store.recordCellHeartbeat({
-      cellId: config.id,
-      cellUrl: config.url,
-      region: config.region,
-      cellIncarnation: incarnation(n),
-      startedAt: 900_000,
-      ready: true,
-      observedRequests: state.observedRequests,
-      totalConnections: state.enforcedConnections,
-      inFlightConnections: 0,
-      reservedConnectionUnits: 0,
-      enforcedConnectionUnits: state.enforcedConnections,
-      connectionInclusionWatermark: clock,
-      connectionHardCap: 1_000,
-      connectionUnobservedBound: 60
-    })
-    await store.recordCellRegionalRehomeStatus({
-      cellId: config.id,
-      cellIncarnation: incarnation(n),
-      regionalRehomeProtocol: protocol,
-      safety: {
-        observedAt: clock,
-        sqlFailures: state.sqlFailures,
-        reconnects: 0,
-        controlActivityRecoveryFailures: 0,
-        databasePoolWaiting: 0,
-        databasePoolWaitersMax: 0,
-        databasePoolWaitMsMax: 0
-      }
-    })
-  }
-  const activatePreferredSource = async () => {
-    const identity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
-    const assignment = await store.assign(identity, undefined, 'us-central1')
-    await store.activateControl(identity, {
-      cellId: source.id,
-      assignmentEpoch: assignment.assignmentEpoch,
-      generation: 1,
-      idleRegionalRehome: true,
-      cellIncarnation: incarnation(1)
-    })
-    const { window } = await store.exchangeRegionCorrection(
-      identity,
-      { v: 1, action: 'issue-window' },
-      assignment.assignmentEpoch
-    )
-    expect(window).toBeDefined()
-    await store.exchangeRegionCorrection(
-      identity,
-      {
-        v: 1,
-        action: 'report',
-        generation: window!.generation,
-        assignmentEpoch: assignment.assignmentEpoch,
-        policyVersion: 1,
-        outcome: 'conclusive',
-        measurements: { 'us-central1': 180, 'asia-east2': 40 }
-      },
-      assignment.assignmentEpoch
-    )
-  }
-  const safety = () => ({
-    observedAt: clock,
-    sqlFailures: 0,
-    reconnects: 0,
-    controlActivityRecoveryFailures: 0,
-    databasePoolWaiting: 0,
-    databasePoolWaitersMax: 0,
-    databasePoolWaitMsMax: 0
-  })
-  return { database, store, beat, activatePreferredSource, safety }
-}
-
-const UNCLEAN = REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT + 1
-
-describe('regional rehome target selection', () => {
-  it('never selects a target without connection headroom, even at lowest load', async () => {
-    const context = await setup()
-    await context.beat(source, 1, 3, {
-      observedRequests: 0,
-      enforcedConnections: 0,
-      sqlFailures: 0
-    })
-    // Lowest load but the connection hard cap is exhausted.
-    await context.beat(noHeadroom, 2, 3, {
-      observedRequests: 0,
-      enforcedConnections: 999,
-      sqlFailures: 0
-    })
-    await context.beat(unclean, 3, 3, {
-      observedRequests: 0,
-      enforcedConnections: 0,
-      sqlFailures: UNCLEAN
-    })
-    await context.beat(highLoad, 4, 3, {
-      observedRequests: 50,
-      enforcedConnections: 0,
-      sqlFailures: 0
-    })
-    await context.beat(lowLoad, 5, 3, {
-      observedRequests: 10,
-      enforcedConnections: 0,
-      sqlFailures: 0
-    })
-    await context.activatePreferredSource()
-
-    const candidates = await context.store.selectIdleRegionalRehomeCandidates(context.safety())
-    const attempt = candidates[0]
-    expect(attempt?.targetCellId).toBe(lowLoad.id)
-    expect(await context.store.commitIdleRegionalRehome(attempt!, context.safety(), 100)).toEqual({
-      outcome: 'committed'
-    })
-    await context.database.close()
-  })
-
-  it('falls to the next clean target when the load winner goes unclean', async () => {
-    const context = await setup()
-    await context.beat(source, 1, 3, {
-      observedRequests: 0,
-      enforcedConnections: 0,
-      sqlFailures: 0
-    })
-    await context.beat(noHeadroom, 2, 3, {
-      observedRequests: 0,
-      enforcedConnections: 999,
-      sqlFailures: 0
-    })
-    await context.beat(unclean, 3, 3, {
-      observedRequests: 0,
-      enforcedConnections: 0,
-      sqlFailures: UNCLEAN
-    })
-    await context.beat(highLoad, 4, 3, {
-      observedRequests: 50,
-      enforcedConnections: 0,
-      sqlFailures: 0
-    })
-    await context.beat(lowLoad, 5, 3, {
-      observedRequests: 10,
-      enforcedConnections: 0,
-      sqlFailures: UNCLEAN
-    })
-    await context.activatePreferredSource()
-
-    const candidates = await context.store.selectIdleRegionalRehomeCandidates(context.safety())
-    const attempt = candidates[0]
-    expect(attempt?.targetCellId).toBe(highLoad.id)
-    expect(await context.store.commitIdleRegionalRehome(attempt!, context.safety(), 100)).toEqual({
-      outcome: 'committed'
-    })
-    await context.database.close()
-  })
-})
diff --git a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts
deleted file mode 100644
index 3bb0b621dc9..00000000000
--- a/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { RelayAssignmentStore } from '../assignment-store.js'
-import type { RelayConfig } from '../../config.js'
-import { startRegionalRehomeWorker } from './regional-rehome-worker.js'
-
-describe('regional rehome worker', () => {
-  afterEach(() => vi.restoreAllMocks())
-
-  it('bounds empty polling to the six-second cadence and stops its timer', async () => {
-    vi.useFakeTimers()
-    const selectIdleRegionalRehomeCandidates = vi.fn().mockResolvedValue([])
-    const worker = startRegionalRehomeWorker(
-      config(),
-      {
-        selectIdleRegionalRehomeCandidates
-      } as unknown as RelayAssignmentStore,
-      {
-        safetySnapshot: () => safety(Date.now()),
-        random: () => 0
-      }
-    )!
-    try {
-      await vi.advanceTimersByTimeAsync(0)
-      expect(selectIdleRegionalRehomeCandidates).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(5_999)
-      expect(selectIdleRegionalRehomeCandidates).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(selectIdleRegionalRehomeCandidates).toHaveBeenCalledTimes(2)
-      worker.stop()
-      await vi.advanceTimersByTimeAsync(60_000)
-      expect(selectIdleRegionalRehomeCandidates).toHaveBeenCalledTimes(2)
-    } finally {
-      worker.stop()
-      vi.useRealTimers()
-    }
-  })
-
-  it('stops walking the page when the source names a deferral no candidate can pass', async () => {
-    const fetchImpl = respondWith([{ outcome: 'deferred', reason: 'concurrency-limit' }])
-    const summaries = collectSummaries()
-    try {
-      await runOnePoll(fetchImpl, 3, summaries)
-    } finally {
-      summaries.restore()
-    }
-
-    expect(fetchImpl).toHaveBeenCalledTimes(1)
-    expect(summaries.entries).toEqual([
-      {
-        event: 'orca_relay_idle_rehome_dispatch_summary',
-        candidates: 3,
-        dispatched: 1,
-        stoppedBy: 'concurrency-limit',
-        outcomes: { 'deferred:concurrency-limit': 1 }
-      }
-    ])
-  })
-
-  it('keeps its whole-page walk when the source sends no reason at all', async () => {
-    const fetchImpl = respondWith([{ outcome: 'deferred' }])
-    const summaries = collectSummaries()
-    try {
-      await runOnePoll(fetchImpl, 3, summaries)
-    } finally {
-      summaries.restore()
-    }
-
-    expect(fetchImpl).toHaveBeenCalledTimes(3)
-    expect(summaries.entries[0]).toMatchObject({
-      stoppedBy: null,
-      outcomes: { deferred: 3 }
-    })
-  })
-
-  it('walks past a deferral that only concerns the one candidate', async () => {
-    const fetchImpl = respondWith([
-      { outcome: 'deferred', reason: 'host-unsupported' },
-      { outcome: 'busy' },
-      { outcome: 'committed' }
-    ])
-    const summaries = collectSummaries()
-    try {
-      await runOnePoll(fetchImpl, 4, summaries)
-    } finally {
-      summaries.restore()
-    }
-
-    expect(fetchImpl).toHaveBeenCalledTimes(3)
-    expect(summaries.entries[0]).toMatchObject({
-      dispatched: 3,
-      stoppedBy: 'committed',
-      outcomes: { 'deferred:host-unsupported': 1, busy: 1, committed: 1 }
-    })
-  })
-})
-
-function respondWith(bodies: { outcome: string; reason?: string }[]) {
-  let index = 0
-  return vi.fn(async () => {
-    const body = bodies[Math.min(index++, bodies.length - 1)]!
-    return new Response(JSON.stringify({ v: 1, ...body }), {
-      headers: { 'content-type': 'application/json' }
-    })
-  })
-}
-
-function collectSummaries() {
-  const entries: Record<string, unknown>[] = []
-  let arrived: (() => void) | undefined
-  // Construction immediately polls; await first instead of waiting for a timer tick.
-  const first = new Promise<void>((resolve) => {
-    arrived = resolve
-  })
-  const original = console.warn
-  console.warn = (line: unknown, ...rest: unknown[]) => {
-    try {
-      const parsed = JSON.parse(line as string) as Record<string, unknown>
-      if (parsed.event === 'orca_relay_idle_rehome_dispatch_summary') {
-        entries.push(parsed)
-        arrived?.()
-        return
-      }
-    } catch {
-      // Not a JSON log line; fall through to the original writer.
-    }
-    original(line as string, ...rest)
-  }
-  return { entries, first, restore: () => (console.warn = original) }
-}
-
-async function runOnePoll(
-  fetchImpl: typeof fetch,
-  candidates: number,
-  summaries: { first: Promise<void> }
-): Promise<void> {
-  const assignments = {
-    selectIdleRegionalRehomeCandidates: vi.fn(async () =>
-      Array.from({ length: candidates }, (_, index) => ({
-        v: 1 as const,
-        attemptId: `00000000-0000-4000-8000-00000000000${index}`,
-        userId: `user-${index}`,
-        relayHostId: 'abcdefghijklmnop',
-        sourceCellId: 'us-c1',
-        sourceCellUrl: 'https://us-c1.relay.example.test',
-        sourceCellIncarnation: '11111111-1111-4111-8111-111111111111',
-        sourceAssignmentEpoch: 1,
-        sourceGeneration: 1,
-        targetCellId: 'asia-c1'
-      }))
-    )
-  } as unknown as RelayAssignmentStore
-  const worker = startRegionalRehomeWorker(config(), assignments, {
-    fetch: fetchImpl,
-    identityToken: async () => 'token',
-    safetySnapshot: () => safety(Date.now()),
-    intervalMs: 60_000
-  })!
-  try {
-    await summaries.first
-  } finally {
-    worker.stop()
-  }
-}
-
-function config(overrides: Partial<RelayConfig> = {}): RelayConfig {
-  return {
-    role: 'director',
-    rehomeAudience: 'https://relay.example.test/v1/admin/host-drain',
-    rehomeDirectorServiceAccount: 'relay-director@example.test',
-    ...overrides
-  } as RelayConfig
-}
-
-function safety(observedAt: number) {
-  return {
-    requiredCells: 2,
-    missingCells: 0,
-    observedAt,
-    sqlFailures: 0,
-    reconnects: 0,
-    controlActivityRecoveryFailures: 0,
-    databasePoolTotal: 3,
-    databasePoolIdle: 3,
-    databasePoolWaiting: 0,
-    databasePoolWaitersMax: 0,
-    databasePoolOldestWaitMs: 0,
-    databasePoolWaitMsMax: 0
-  }
-}
diff --git a/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts
index a1ca010f8bf..27a35f11b2f 100644
--- a/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts
+++ b/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { PLACEMENT_INTAKE_SHARE, PlacementLoadBand } from './placement-load-band.js'
+import { PlacementLoadBand } from './placement-load-band.js'
 import { RelayAssignmentStore } from '../assignment-store.js'
 import { openInMemoryRelayDatabase } from '../../database/database.js'
 
@@ -13,74 +13,8 @@ function seededRandom(seed: number): () => number {
   }
 }
 
-type SimulatedCell = { cellId: string; reserved: number; capacity: number }
-
 const quiet = () => undefined
 
-// Each pick goes to one of the directors at random, as the load balancer spreads requests.
-function simulate(
-  directors: PlacementLoadBand[],
-  cells: SimulatedCell[],
-  picks: number,
-  at: (index: number) => number,
-  route: () => number = seededRandom(99)
-) {
-  const counts = new Map(cells.map((cell) => [cell.cellId, 0]))
-  for (let index = 0; index < picks; index += 1) {
-    const ranked = cells
-      .filter((cell) => cell.reserved < cell.capacity)
-      .map((cell) => ({ cellId: cell.cellId, loadRatio: cell.reserved / cell.capacity, cell }))
-      .sort(
-        (left, right) => left.loadRatio - right.loadRatio || left.cellId.localeCompare(right.cellId)
-      )
-    const director = directors[Math.floor(route() * directors.length)]
-    const picked = director?.pick(ranked, at(index))
-    if (!picked) throw new Error('no candidate')
-    picked.cell.reserved += 1
-    counts.set(picked.cellId, (counts.get(picked.cellId) ?? 0) + 1)
-  }
-  return counts
-}
-
-// c27's drain on 10-08: 2,770 hosts onto one empty Asia cell (2,805 free)
-// and four fuller ones (2,311 free between them).
-function c27DrainCells(): SimulatedCell[] {
-  return [
-    { cellId: 'cell-empty', reserved: 0, capacity: 4000 },
-    ...['cell-b', 'cell-c', 'cell-d', 'cell-e'].map((cellId, index) => ({
-      cellId,
-      reserved: 4000 - 577 - (index === 0 ? 3 : 0),
-      capacity: 4000
-    }))
-  ]
-}
-
-function drainShare(paceMs: number, seed: number) {
-  const cells = c27DrainCells()
-  const directors = Array.from(
-    { length: 5 },
-    (_, index) => new PlacementLoadBand(seededRandom(seed + index), quiet)
-  )
-  const hosts = 2770
-  const counts = simulate(directors, cells, hosts, (index) => (index * paceMs) / hosts)
-  return { counts, cells, share: (counts.get('cell-empty') ?? 0) / hosts }
-}
-
-describe('PlacementLoadBand', () => {
-  it.each([
-    ['1,200 s', 1_200_000],
-    ['300 s', 300_000]
-  ])('keeps the empty cell near the share across five directors at the %s pace', (_, paceMs) => {
-    for (const seed of [1, 2, 3]) {
-      const { counts, cells, share } = drainShare(paceMs, seed * 10)
-      expect([...counts.values()].reduce((sum, count) => sum + count, 0)).toBe(2770)
-      expect(share).toBeGreaterThan(0.3)
-      expect(share).toBeLessThan(0.5)
-      for (const cell of cells) expect(cell.reserved).toBeLessThanOrEqual(cell.capacity)
-    }
-  })
-})
-
 describe('leastLoadedCell with the load band', () => {
   async function setupRegions() {
     const database = await openInMemoryRelayDatabase()
@@ -121,20 +55,6 @@ describe('leastLoadedCell with the load band', () => {
     return counts
   }
 
-  it('spreads within the preferred region and keeps an empty US cell out', async () => {
-    const { database, store } = await setupRegions()
-    try {
-      const counts = await placements(store, 200)
-
-      expect(counts.get('us-a')).toBeUndefined()
-      expect(counts.get('asia-a')).toBeLessThanOrEqual(PLACEMENT_INTAKE_SHARE * 200 + 1)
-      const used = [...counts.values()].filter((count) => count >= 20)
-      expect(used.length).toBeGreaterThanOrEqual(3)
-    } finally {
-      await database.close()
-    }
-  })
-
   it('fills the preferred region to its hard cap before spilling, never past it', async () => {
     const { database, store } = await setupRegions()
     try {
diff --git a/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts
index 88f3b5875c4..66a5e7b15fc 100644
--- a/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts
+++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts
@@ -57,30 +57,15 @@ describe('reserve ledger writer', () => {
     expect(await row(db, 'bbbbbbbbbbbbbbbb')).toMatchObject({ cell_id: 'c1', reserved_controls: 2 })
   })
 
-  it('keeps its queue through a database stall and drops the oldest past the bound', async () => {
+  it('persists a booked join after a database stall', async () => {
     let now = 1_000
     const { database: db, writer } = await setup(() => now)
-    const query = vi.spyOn(db, 'query').mockRejectedValueOnce(new Error('timeout'))
+    vi.spyOn(db, 'query').mockRejectedValueOnce(new Error('timeout'))
     writer.enqueue({ ...HOST, cellId: 'c1', epoch: 5 })
     await writer.flush()
-    expect(writer.pending()).toBe(1)
-    await writer.flush()
-    expect(query).toHaveBeenCalledTimes(1)
     now += 1_000
     await writer.flush()
-    expect(writer.pending()).toBe(0)
     expect(await row(db)).toMatchObject({ cell_id: 'c1', assignment_epoch: 5 })
-
-    const bounded = new ReserveLedgerWriter(db, { queueMax: 2, log: () => undefined })
-    const hosts = ['oldest0000000000', 'middle0000000000', 'newest0000000000']
-    for (const relayHostId of hosts) {
-      bounded.enqueue({ ...HOST, relayHostId, cellId: 'c1', epoch: 1 })
-    }
-    expect(bounded.pending()).toBe(2)
-    await bounded.flush()
-    expect(await row(db, hosts[0])).toBeUndefined()
-    expect(await row(db, hosts[1])).toMatchObject({ cell_id: 'c1', assignment_epoch: 1 })
-    expect(await row(db, hosts[2])).toMatchObject({ cell_id: 'c1', assignment_epoch: 1 })
   })
 
   it('reconciles the map’s seats and never lowers an epoch', async () => {
diff --git a/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.test.ts
deleted file mode 100644
index ed6808510f0..00000000000
--- a/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  runReservePlacementSimulation,
-  type SimulationConfig,
-  type SimulationReport
-} from './reserve-placement-simulation.js'
-
-const SEEDS = [11, 23, 47]
-const rtt = (region: string) => (region === 'asia-east2' ? 170 : 10)
-
-function fleet(): SimulationConfig['cells'] {
-  const cells: SimulationConfig['cells'] = []
-  for (let index = 0; index < 24; index += 1) {
-    cells.push({
-      cellId: `us${String(index).padStart(2, '0')}`,
-      region: 'us-central1',
-      hardCap: 600,
-      ceiling: 480,
-      intakePerSec: 5,
-      // A third of the fleet stays in database mode, one cell on an image without step 5.
-      mode: index % 3 === 0 ? 'db' : 'reserve',
-      old: index === 0,
-      preseated: 150
-    })
-  }
-  for (let index = 0; index < 6; index += 1) {
-    cells.push({
-      cellId: `asia${index}`,
-      region: 'asia-east2',
-      hardCap: 600,
-      ceiling: 480,
-      intakePerSec: 2,
-      mode: index === 0 ? 'db' : 'reserve',
-      preseated: 200
-    })
-  }
-  return cells
-}
-
-function expectInvariants(report: SimulationReport): void {
-  expect(report.violations).toEqual([])
-}
-
-describe('step 5 deterministic simulation', () => {
-  // Invariant 9 (dead-man) never trips here; its own tests below cover it.
-  it.each(SEEDS)(
-    'holds invariants 1-8 across mixed versions, lagging polls, restarts and database stalls (seed %i)',
-    async (seed) => {
-      const report = await runReservePlacementSimulation({
-        seed,
-        durationMs: 25 * 60_000,
-        directors: 5,
-        // One director still on the database-only revision.
-        oldDirectors: 1,
-        cells: fleet(),
-        hosts: 6_600,
-        hostRegion: (index) => (index % 5 === 0 ? 'asia-east2' : 'us-central1'),
-        arrivalPerSec: 20,
-        meanSessionMs: 8 * 60_000,
-        reconnectDelayMs: [500, 5_000],
-        duplicateAssignShare: 0.05,
-        halfOpenShare: 0.05,
-        pollLagMs: (director) => [0, 200, 1_000, 4_000, 10_000][director]!,
-        rttMs: rtt,
-        cellRestarts: [{ at: 6 * 60_000, cellId: 'us04' }, { at: 14 * 60_000, cellId: 'asia2' }],
-        directorRestarts: [{ at: 8 * 60_000, director: 2 }, { at: 16 * 60_000, director: 4 }],
-        // Drained hosts land elsewhere while their old seat lingers: placement supersedes it.
-        drains: [{ at: 12 * 60_000, cellId: 'us05', paceMs: 60_000 }],
-        databaseStalls: Array.from({ length: 3 }, (_, index) => ({
-          at: (index * 610 + 120) * 1_000,
-          durationMs: 7_000
-        }))
-      })
-      expectInvariants(report)
-      expect(report.reservePlacements).toBeGreaterThan(500)
-      expect(report.stickyAnswers).toBeGreaterThan(500)
-      expect(report.seatedAtEnd).toBeGreaterThan(4_000)
-      // The run reached the paths the invariants guard, so a pass is not vacuous.
-      expect(report.supersedes).toBeGreaterThan(0)
-      expect(report.rowAheadDemotions).toBeGreaterThan(0)
-      expect(report.directorRestarts).toBe(2)
-      expect(report.stickyReserves).toBeGreaterThan(0)
-      expect(report.databasePlacements).toBeGreaterThan(0)
-    },
-    120_000
-  )
-
-  it.each(SEEDS)(
-    'near full: extra reserve calls stay within 10% and exhausted requests within 1% (seed %i)',
-    async (seed) => {
-      const cells = Array.from({ length: 17 }, (_, index) => ({
-        cellId: `us${index}`,
-        region: 'us-central1' as const,
-        hardCap: 700,
-        ceiling: 600,
-        intakePerSec: 50,
-        mode: 'reserve' as const,
-        preseated: 582
-      }))
-      const report = await runReservePlacementSimulation({
-        seed,
-        durationMs: 3 * 60_000,
-        directors: 5,
-        cells,
-        hosts: 17 * 582 + 300,
-        hostRegion: () => 'us-central1',
-        arrivalPerSec: 10,
-        meanSessionMs: 0,
-        reconnectDelayMs: [1_000, 3_000],
-        duplicateAssignShare: 0,
-        halfOpenShare: 0,
-        pollLagMs: () => 0,
-        rttMs: rtt
-      })
-      expectInvariants(report)
-      expect(report.reservePlacements).toBeGreaterThan(250)
-      expect(report.reserveCalls / report.reservePlacements - 1).toBeLessThanOrEqual(0.1)
-      expect(report.exhausted / report.requests).toBeLessThanOrEqual(0.01)
-      for (const share of Object.values(report.maxOccupancyShare)) expect(share).toBeLessThanOrEqual(1)
-    },
-    120_000
-  )
-
-  it.each(SEEDS.flatMap((seed) => [[1_200_000, seed], [300_000, seed]] as const))(
-    'a drain onto an empty cell at the %i ms pace spreads within each cell intake budget (seed %i)',
-    async (paceMs, seed) => {
-      // Production c27 drain: 1,200s pacing toward cells with 2,805/841/777/667/26 free seats.
-      const free = [2_805, 841, 777, 667, 26]
-      const cells: SimulationConfig['cells'] = free.map((seats, index) => ({
-        cellId: `asia${index + 1}`,
-        region: 'asia-east2',
-        hardCap: 3_000,
-        ceiling: 2_830,
-        intakePerSec: 2,
-        mode: 'reserve',
-        preseated: 2_830 - seats
-      }))
-      cells.unshift({
-        cellId: 'asia0',
-        region: 'asia-east2',
-        hardCap: 3_000,
-        ceiling: 2_830,
-        intakePerSec: 2,
-        mode: 'reserve',
-        preseated: 2_770
-      })
-      const preseated = cells.reduce((sum, cell) => sum + (cell.preseated ?? 0), 0)
-      const report = await runReservePlacementSimulation({
-        seed,
-        durationMs: 30 * 60_000,
-        directors: 5,
-        cells,
-        hosts: preseated,
-        hostRegion: () => 'asia-east2',
-        arrivalPerSec: 1,
-        meanSessionMs: 0,
-        reconnectDelayMs: [1_000, 3_000],
-        duplicateAssignShare: 0.02,
-        halfOpenShare: 0,
-        pollLagMs: () => 0,
-        rttMs: rtt,
-        drains: [{ at: 10_000, cellId: 'asia0', paceMs }]
-      })
-      expectInvariants(report)
-      // Below every cell's budget nothing waits; above it the cells' buckets pace the drain.
-      if (paceMs === 300_000) expect(report.intakeRefusals + report.paced).toBeGreaterThan(0)
-      const moved = Object.entries(report.arrivalsByCell)
-      const total = moved.reduce((sum, [, count]) => sum + count, 0)
-      expect(total).toBeGreaterThan(2_000)
-      // Spread: the emptiest cell takes a share, not the drain.
-      expect((report.arrivalsByCell.asia1 ?? 0) / total).toBeLessThan(0.6)
-      expect(moved.filter(([, count]) => count / total > 0.1).length).toBeGreaterThanOrEqual(3)
-    },
-    120_000
-  )
-
-
-
-})
diff --git a/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts
deleted file mode 100644
index f39811009ec..00000000000
--- a/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts
+++ /dev/null
@@ -1,1357 +0,0 @@
-import { createHash } from 'node:crypto'
-import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits'
-import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions'
-import { CellReserveBook } from '../../cell/reservations/cell-reserve-book.js'
-import { CELL_INTAKE_BURST, CELL_RESERVE_TTL_MS, type ReserveOutcome } from '../../cell/reservations/cell-reserve-contract.js'
-import {
-  mintEpoch,
-  RESERVE_CELL_FRESH_MS,
-  RESERVE_MAX_TRIES,
-  ReservePlacer,
-  type PlacementCell
-} from './reserve-placement.js'
-import { seatOutranks } from '../../cell/seats/shadow-seat-directory.js'
-
-// Seeded event model uses real CellReserveBook/ReservePlacer; sockets, DB and desktops are modeled.
-// Record invariant violations without throwing so each run exposes every class it hits.
-
-export function seededRandom(seed: number): () => number {
-  let state = seed >>> 0
-  return () => {
-    state = (state + 0x6d2b79f5) >>> 0
-    let value = state
-    value = Math.imul(value ^ (value >>> 15), value | 1)
-    value ^= value + Math.imul(value ^ (value >>> 7), value | 61)
-    return ((value ^ (value >>> 14)) >>> 0) / 4_294_967_296
-  }
-}
-
-type Event = { at: number; seq: number; run: () => void }
-
-class Clock {
-  now = 0
-  private seq = 0
-  private readonly heap: Event[] = []
-
-  schedule(delayMs: number, run: () => void): void {
-    const event = { at: this.now + Math.max(0, Math.round(delayMs)), seq: this.seq++, run }
-    this.heap.push(event)
-    let index = this.heap.length - 1
-    while (index > 0) {
-      const parent = (index - 1) >> 1
-      if (!before(this.heap[index]!, this.heap[parent]!)) break
-      ;[this.heap[index], this.heap[parent]] = [this.heap[parent]!, this.heap[index]!]
-      index = parent
-    }
-  }
-
-  async runUntil(until: number, afterEach: () => void): Promise<void> {
-    while (this.heap.length > 0 && this.heap[0]!.at <= until) {
-      const event = this.pop()
-      this.now = event.at
-      event.run()
-      // Lets the promise continuations the event released settle before the next event.
-      for (let tick = 0; tick < 12; tick += 1) await Promise.resolve()
-      afterEach()
-    }
-    this.now = until
-  }
-
-  private pop(): Event {
-    const top = this.heap[0]!
-    const last = this.heap.pop()!
-    if (this.heap.length > 0) {
-      this.heap[0] = last
-      let index = 0
-      for (;;) {
-        const left = index * 2 + 1
-        const right = left + 1
-        let smallest = index
-        if (left < this.heap.length && before(this.heap[left]!, this.heap[smallest]!)) smallest = left
-        if (right < this.heap.length && before(this.heap[right]!, this.heap[smallest]!)) smallest = right
-        if (smallest === index) break
-        ;[this.heap[index], this.heap[smallest]] = [this.heap[smallest]!, this.heap[index]!]
-        index = smallest
-      }
-    }
-    return top
-  }
-}
-
-function before(left: Event, right: Event): boolean {
-  return left.at < right.at || (left.at === right.at && left.seq < right.seq)
-}
-
-// `leased`: admitted through the database check, so its control renews a lease there and is
-// closed when the row moves on, as today.
-type CellSeat = { epoch: number; joinedAt: number; reservedBy?: string; demoted: boolean; leased?: boolean }
-type CellLogEntry =
-  | { kind: 'join'; host: string; epoch: number; joinedAt: number; reservedBy?: string }
-  | { kind: 'leave'; host: string; epoch: number; at: number; wrongCell: boolean }
-  | { kind: 'reserve'; host: string; epoch: number }
-  | { kind: 'demoted'; host: string; epoch: number }
-
-const RECENT_SEAT_MS = 10 * 60_000
-const DEMOTE_CLOSE_MS = 60_000
-const CONTROL_RENEWAL_MS = 25_000
-// As the director's: a seat this young may still be superseded.
-const RECONCILE_SETTLE_MS = 30_000
-// A drained seat lingers this long (its splices finishing) unless superseded first.
-const DRAIN_GRACE_MS = 30_000
-// A cell closes a control silent for 75 s, checked once per ping (host-session-registry.ts heartbeat).
-const CONTROL_SILENCE_CLOSE_MS = 75_000 + RELAY_PROTOCOL_LIMITS.controlPingIntervalMs
-// Longer than the slowest duplicate: a half-open seat's silence close.
-const QUIESCE_MS = 150_000
-
-export type SimulationViolation = { invariant: number; at: number; detail: string }
-
-// Each fault breaks one rule on purpose, so a test can show the matching invariant fires.
-export type SimulationFaults = {
-  bookPastCap?: boolean
-  intakeBurst?: number
-  // Each director assumes this share of every cell's intake, instead of a fifth.
-  directorShare?: number
-  // Nothing supersedes the old seat, at placement or from the feed: a duplicate outlives its bound.
-  skipSupersede?: boolean
-  // Only placement supersedes: a half-open seat the booking map had not seen lasts to its silence close.
-  skipFeedSupersede?: boolean
-  // A restarted director forgets its ledger queue and never reconciles.
-  noBootReconcile?: boolean
-  // The reconcile leaves a seat whose row is ahead of it alone.
-  noRowAheadDemote?: boolean
-  // Directors do not read the row after a WRONG_CELL leave (only the demoting one has a floor).
-  noWrongCellRowRead?: boolean
-  // Reserve placement re-uses the floor epoch instead of minting above it.
-  mintAtFloor?: boolean
-  // Today's path skips every cell Postgres records as reserve, ignoring the cell's own row.
-  pgReserveBlocksDatabase?: boolean
-  // Directors place by the reported mode, which stays reserve while a tripped cell re-registers.
-  noRawFeedMode?: boolean
-  unguardedLedger?: boolean
-  noEpochFloor?: boolean
-  // On a level divergence each director keeps the seat its own cell order prefers, not the row's.
-  localTieBreak?: boolean
-}
-
-// Model cell-owned raw-mode writes every 15s; current-process db evidence permits placement within its 45s freshness bound.
-const CELL_ADMIT_EFFECTIVE_REFRESH_MS = 15_000
-const CELL_ADMIT_EFFECTIVE_FRESH_MS = 45_000
-// A tripped cell reports reserve until every control it admitted from memory holds a lease.
-const DEFAULT_REREGISTRATION_MS = 20_000
-
-// cell-reserve-dead-man.ts's window: 60-120 s, fixed per cell.
-function deadManWindowMs(cellId: string): number {
-  return 60_000 + (createHash('sha256').update(cellId).digest().readUInt32BE(0) % 60_001)
-}
-
-class SimDatabase {
-  up = true
-  // relay_cell_admit_modes: what the flag workflow recorded. A trip does not change it.
-  readonly reserveCells = new Set<string>()
-  readonly rows = new Map<string, { cellId: string; epoch: number }>()
-  // relay_cell_admit_effective: written by each cell itself, never by a director.
-  readonly admitEffective = new Map<string, { mode: 'db' | 'reserve'; incarnation: number; at: number }>()
-  private readonly counts = new Map<string, number>()
-
-  set(host: string, row: { cellId: string; epoch: number }): void {
-    const previous = this.rows.get(host)
-    if (previous) this.counts.set(previous.cellId, (this.counts.get(previous.cellId) ?? 1) - 1)
-    this.counts.set(row.cellId, (this.counts.get(row.cellId) ?? 0) + 1)
-    this.rows.set(host, row)
-  }
-
-  constructor(
-    private readonly violate: (invariant: number, detail: string) => void,
-    private readonly faults: SimulationFaults
-  ) {}
-
-  // The director's after-the-fact write, a guarded mirror: only a higher epoch replaces a row.
-  upsert(host: string, cellId: string, epoch: number): void {
-    const row = this.rows.get(host)
-    const guarded = !this.faults.unguardedLedger
-    if (guarded && row && row.epoch >= epoch) return
-    if (row && epoch < row.epoch) this.violate(5, `ledger epoch fell for ${host}`)
-    this.set(host, { cellId, epoch })
-  }
-
-  // Today's assign writes the row it answers with.
-  assign(host: string, cellId: string, epoch: number): void {
-    const row = this.rows.get(host)
-    if (row && epoch <= row.epoch) this.violate(5, `db mint not above row for ${host}`)
-    this.set(host, { cellId, epoch })
-  }
-
-  countOn(cellId: string): number {
-    return this.counts.get(cellId) ?? 0
-  }
-}
-
-class SimCell {
-  readonly seats = new Map<string, CellSeat>()
-  readonly recent = new Map<string, { epoch: number; at: number }>()
-  readonly log: CellLogEntry[] = []
-  // Per incarnation: a restarted cell starts with a full bucket.
-  readonly okBookingTimes: number[][] = [[]]
-  incarnation = 1
-  draining = false
-  mode: 'reserve' | 'db'
-  bookingUnits = 0
-  // What relay_cells says to a director that predates step 5: frozen at the flip.
-  frozenDatabaseCount = 0
-  // Latch db after 60–120s without placing-director booking/poll contact (cell-reserve-dead-man.ts).
-  lastContactAt = 0
-  trippedAt: number | null = null
-  reregisteredAt = 0
-  // Booted and no flag object read yet: its mode is a default, so it writes no admit row.
-  flagsUnread = false
-  book: CellReserveBook
-
-  constructor(
-    readonly cellId: string,
-    readonly region: RelayRegion,
-    readonly hardCap: number,
-    readonly ceiling: number,
-    readonly intakePerSec: number,
-    mode: 'reserve' | 'db',
-    // An image that predates step 5 reports no ceiling and has no reserve route.
-    readonly old: boolean,
-    private readonly clock: Clock,
-    private readonly faults: SimulationFaults,
-    private readonly violate: (invariant: number, detail: string) => void
-  ) {
-    this.mode = mode
-    this.book = this.newBook()
-  }
-
-  private newBook(): CellReserveBook {
-    const limit = () => (this.faults.bookPastCap ? Infinity : this.ceiling)
-    return new CellReserveBook(
-      {
-        canReserve: () => this.seats.size + this.bookingUnits + 1 <= limit(),
-        tryReserve: () => {
-          if (this.seats.size + this.bookingUnits + 1 > limit()) return null
-          this.bookingUnits += 1
-          let released = false
-          return {
-            release: () => {
-              if (released) return
-              released = true
-              this.bookingUnits -= 1
-            }
-          }
-        }
-      },
-      () => this.intakePerSec,
-      () => this.clock.now,
-      this.faults.intakeBurst
-    )
-  }
-
-  occupancy(): number {
-    return this.seats.size + this.bookingUnits
-  }
-
-  contact(): void {
-    this.lastContactAt = this.clock.now
-  }
-
-  checkDeadMan(windowMs: number, reregistrationMs: number): void {
-    if (this.mode !== 'reserve' || this.old || this.clock.now - this.lastContactAt <= windowMs) return
-    this.mode = 'db'
-    this.trippedAt = this.clock.now
-    this.reregisteredAt = this.clock.now + reregistrationMs
-  }
-
-  // What the feed's admitModeEffective reports: `mode` is the raw one (switch file and dead-man).
-  effectiveMode(): 'db' | 'reserve' {
-    return this.mode === 'reserve' || this.clock.now < this.reregisteredAt ? 'reserve' : 'db'
-  }
-
-  reserve(directorId: string, host: string, epoch: number, sticky: boolean): ReserveOutcome {
-    if (this.mode === 'reserve') this.contact()
-    const outcome = this.book.reserve(
-      directorId,
-      { userId: host, relayHostId: 'abcdefghijklmnop', epoch, ttlMs: CELL_RESERVE_TTL_MS, sticky },
-      {
-        mode: this.mode,
-        draining: this.draining,
-        seatedEpoch: (userId) => this.seats.get(userId)?.epoch
-      }
-    )
-    if (outcome.outcome === 'ok') {
-      this.log.push({ kind: 'reserve', host, epoch })
-      if (!sticky) this.okBookingTimes.at(-1)!.push(this.clock.now)
-    }
-    return outcome
-  }
-
-  hello(host: string, epoch: number, database: SimDatabase): boolean {
-    if (this.draining) return false
-    if (this.mode === 'reserve') {
-      const booking = this.book.take(host, 'abcdefghijklmnop', epoch)
-      if (booking) return this.seat(host, epoch, booking.directorId)
-      const seated = this.seats.get(host)
-      const recent = this.recent.get(host)
-      if (
-        (seated && seated.epoch === epoch && !seated.demoted) ||
-        (recent && recent.epoch === epoch && this.clock.now - recent.at <= RECENT_SEAT_MS)
-      ) {
-        return this.seat(host, epoch)
-      }
-    }
-    if (!database.up) return false
-    const row = database.rows.get(host)
-    if (!row || row.cellId !== this.cellId || row.epoch !== epoch) return false
-    return this.seat(host, epoch, undefined, true)
-  }
-
-  private seat(host: string, epoch: number, reservedBy?: string, leased = false): boolean {
-    // A rebind keeps its unit; a new seat needs one under the hard cap.
-    if (!this.seats.has(host) && this.occupancy() + 1 > this.hardCap) return false
-    this.seats.set(host, { epoch, joinedAt: this.clock.now, reservedBy, demoted: false, leased })
-    this.recent.delete(host)
-    this.log.push({ kind: 'join', host, epoch, joinedAt: this.clock.now, reservedBy })
-    return true
-  }
-
-  leave(host: string): void {
-    const seat = this.seats.get(host)
-    if (!seat) return
-    this.seats.delete(host)
-    if (!seat.demoted) this.recent.set(host, { epoch: seat.epoch, at: this.clock.now })
-    this.log.push({ kind: 'leave', host, epoch: seat.epoch, at: this.clock.now, wrongCell: seat.demoted })
-  }
-
-  // The cell's own check: only the seat named by epoch and join, and only in reserve mode.
-  demote(host: string, epoch: number, joinedAt: number, onClose: () => void): void {
-    if (this.mode !== 'reserve') return
-    const seat = this.seats.get(host)
-    if (!seat || seat.epoch !== epoch || seat.joinedAt !== joinedAt || seat.demoted) return
-    seat.demoted = true
-    this.log.push({ kind: 'demoted', host, epoch })
-    this.clock.schedule(DEMOTE_CLOSE_MS, () => {
-      if (this.seats.get(host) === seat) {
-        this.leave(host)
-        onClose()
-      }
-    })
-  }
-
-  // Seats, bookings and memory are gone; the image boots in database mode until its first flag read.
-  restart(): string[] {
-    const hosts = [...this.seats.keys()]
-    for (const host of hosts) this.leave(host)
-    this.book.clear()
-    this.book = this.newBook()
-    this.recent.clear()
-    this.incarnation += 1
-    this.okBookingTimes.push([])
-    const mode = this.mode
-    this.mode = 'db'
-    this.flagsUnread = true
-    this.clock.schedule(5_000, () => {
-      this.mode = mode
-      this.flagsUnread = false
-    })
-    return hosts
-  }
-}
-
-type MapSeat = { epoch: number; joinedAt: number; reservedBy?: string; demoted: boolean }
-
-type DirectorCellView = {
-  incarnation: number | null
-  cursor: number
-  seats: Map<string, MapSeat>
-  placement: PlacementCell
-}
-
-type Answer =
-  | { kind: 'cell'; cellId: string; epoch: number; calls: number }
-  | { kind: 'retry'; afterMs: number; calls: number }
-
-export type SimulationConfig = {
-  seed: number
-  durationMs: number
-  directors: number
-  oldDirectors?: number
-  cells: Array<{
-    cellId: string
-    region: RelayRegion
-    hardCap: number
-    ceiling: number
-    intakePerSec: number
-    mode: 'reserve' | 'db'
-    old?: boolean
-    preseated?: number
-  }>
-  hosts: number
-  hostRegion: (index: number) => RelayRegion
-  // Fresh connects arrive at this rate per second until every host has connected once.
-  arrivalPerSec: number
-  meanSessionMs: number
-  reconnectDelayMs: [number, number]
-  duplicateAssignShare: number
-  // Share of departures whose old control stays half-open on the cell while the desktop
-  // connects elsewhere: the real source of a host seated on two cells.
-  halfOpenShare: number
-  pollLagMs: (director: number) => number
-  rttMs: (region: RelayRegion) => number
-  faults?: SimulationFaults
-  cellRestarts?: Array<{ at: number; cellId: string }>
-  // Restarted estimates refill from zero at intake/directors: no booking until one token; unheard hosts also face the 30s startup gate.
-  directorRestarts?: Array<{ at: number; director: number }>
-  databaseStalls?: Array<{ at: number; durationMs: number }>
-  // Every director misses every feed poll for this long (a director-side outage).
-  pollOutages?: Array<{ at: number; durationMs: number }>
-  // How long a tripped cell keeps reporting reserve while it leases its memory-admitted controls.
-  reregistrationMs?: number
-  drains?: Array<{ at: number; cellId: string; paceMs: number }>
-}
-
-export type SimulationReport = {
-  violations: SimulationViolation[]
-  requests: number
-  placements: number
-  reserveCalls: number
-  exhausted: number
-  paced: number
-  databasePlacements: number
-  reservePlacements: number
-  // Rows that named a placement the desktop never used, rewritten to its real seat.
-  supersedes: number
-  directorRestarts: number
-  rowAheadDemotions: number
-  // Demotions whose winner is level with the loser (same epoch, another cell): the tie-break's cases.
-  levelDemotions: number
-  // Two directors judging a same-epoch divergence exercise invariant 4; higher epochs already win consistently.
-  contestedDivergences: number
-  // Row-ahead demotions per demoted host: a repair that converges needs one.
-  rowAheadDemotionsPerHost: { max: number; p99: number }
-  deadManTrips: number
-  // Bookings sent to a cell after its dead-man tripped (the cell answers `off`).
-  reserveCallsOnTrippedCells: number
-  databasePlacementsWhilePollsFail: number
-  // From the first poll outage's start to the first fresh database placement inside it.
-  pollFailureGapMs: number | null
-  // First seats after a row-ahead demotion that land behind (or level with) the row again.
-  badFirstReseats: number
-  intakeRefusals: number
-  stickyReserves: number
-  stickyAnswers: number
-  seatedAtEnd: number
-  maxOccupancyShare: Record<string, number>
-  arrivalsByCell: Record<string, number>
-}
-
-class SimDirector {
-  placer!: ReservePlacer
-  views = new Map<string, DirectorCellView>()
-  recentlyLeft = new Map<
-    string,
-    { cellId: string; epoch: number; at: number; incarnation: number; wrongCell?: boolean }
-  >()
-  reserveEpochs = new Map<string, number>()
-  // Row epochs this director demoted a host's seat behind: its next mint for the host clears them.
-  rowFloors = new Map<string, number>()
-  ledgerQueue: Array<{ host: string; cellId: string; epoch: number }> = []
-  answeredCells = new Set<string>()
-  // Set by a restart: the lost ledger queue is rebuilt by one reconcile once the map is complete.
-  bootReconcilePending = false
-  restarted = false
-  readonly id: string
-
-  constructor(
-    readonly index: number,
-    readonly old: boolean,
-    private readonly random: () => number,
-    private readonly clock: Clock,
-    private readonly share?: number
-  ) {
-    this.id = `d${index}`
-    this.reset()
-  }
-
-  reset(): void {
-    this.placer = new ReservePlacer(() => this.clock.now, this.random, this.share)
-    this.views = new Map()
-    this.recentlyLeft = new Map()
-    this.reserveEpochs = new Map()
-    this.rowFloors = new Map()
-    this.answeredCells = new Set()
-    this.ledgerQueue = []
-  }
-
-  complete(cells: readonly SimCell[]): boolean {
-    return cells.every((cell) => this.answeredCells.has(cell.cellId))
-  }
-
-  knownEpochs(host: string): number[] {
-    const epochs: number[] = []
-    for (const view of this.views.values()) {
-      const seat = view.seats.get(host)
-      if (seat) epochs.push(seat.epoch)
-    }
-    const reserved = this.reserveEpochs.get(host)
-    if (reserved !== undefined) epochs.push(reserved)
-    const left = this.recentlyLeft.get(host)
-    if (left) epochs.push(left.epoch)
-    return epochs
-  }
-}
-
-export async function runReservePlacementSimulation(
-  config: SimulationConfig
-): Promise<SimulationReport> {
-  const random = seededRandom(config.seed)
-  const clock = new Clock()
-  const violations: SimulationViolation[] = []
-  // Capped per invariant, so a flood of one class cannot hide another.
-  const violationCounts = new Map<number, number>()
-  const violate = (invariant: number, detail: string): void => {
-    const count = violationCounts.get(invariant) ?? 0
-    violationCounts.set(invariant, count + 1)
-    if (count < 50) violations.push({ invariant, at: clock.now, detail })
-  }
-  const faults = config.faults ?? {}
-  const database = new SimDatabase(violate, faults)
-  const cells = config.cells.map(
-    (spec) =>
-      new SimCell(
-        spec.cellId,
-        spec.region,
-        spec.hardCap,
-        spec.ceiling,
-        spec.intakePerSec,
-        spec.mode,
-        spec.old ?? false,
-        clock,
-        faults,
-        violate
-      )
-  )
-  const cellById = new Map(cells.map((cell) => [cell.cellId, cell]))
-  for (const cell of cells) if (cell.mode === 'reserve' && !cell.old) database.reserveCells.add(cell.cellId)
-  const inPollOutage = (at: number): boolean =>
-    (config.pollOutages ?? []).some((outage) => at >= outage.at && at < outage.at + outage.durationMs)
-  const directors = Array.from(
-    { length: config.directors },
-    (_, index) =>
-      new SimDirector(
-        index,
-        index < (config.oldDirectors ?? 0),
-        random,
-        clock,
-        config.faults?.directorShare
-      )
-  )
-  const report: SimulationReport = {
-    violations,
-    requests: 0,
-    placements: 0,
-    reserveCalls: 0,
-    exhausted: 0,
-    paced: 0,
-    databasePlacements: 0,
-    reservePlacements: 0,
-    supersedes: 0,
-    directorRestarts: 0,
-    rowAheadDemotions: 0,
-    levelDemotions: 0,
-    contestedDivergences: 0,
-    rowAheadDemotionsPerHost: { max: 0, p99: 0 },
-    deadManTrips: 0,
-    reserveCallsOnTrippedCells: 0,
-    databasePlacementsWhilePollsFail: 0,
-    pollFailureGapMs: null,
-    badFirstReseats: 0,
-    intakeRefusals: 0,
-    stickyReserves: 0,
-    stickyAnswers: 0,
-    seatedAtEnd: 0,
-    maxOccupancyShare: {},
-    arrivalsByCell: {}
-  }
-  const between = ([low, high]: [number, number]) => low + random() * (high - low)
-
-  type Host = { id: string; region: RelayRegion; current: { cellId: string; epoch: number } | null }
-  const hosts: Host[] = Array.from({ length: config.hosts }, (_, index) => ({
-    id: `h${index}`,
-    region: config.hostRegion(index),
-    current: null
-  }))
-  const hostById = new Map(hosts.map((host) => [host.id, host]))
-
-  // Pre-seated hosts arrive with database rows, as hosts on a cell before its flip.
-  let nextHost = 0
-  for (const cell of cells) {
-    const spec = config.cells.find((entry) => entry.cellId === cell.cellId)!
-    for (let index = 0; index < (spec.preseated ?? 0) && nextHost < hosts.length; index += 1) {
-      const host = hosts[nextHost++]!
-      database.set(host.id, { cellId: cell.cellId, epoch: 1 })
-      cell.seats.set(host.id, { epoch: 1, joinedAt: 0, demoted: false })
-      cell.log.push({ kind: 'join', host: host.id, epoch: 1, joinedAt: 0 })
-      host.current = { cellId: cell.cellId, epoch: 1 }
-      scheduleLeave(host)
-    }
-    cell.frozenDatabaseCount = cell.seats.size
-  }
-
-  function scheduleLeave(host: Host): void {
-    if (config.meanSessionMs <= 0) return
-    const sessionMs = -Math.log(1 - random()) * config.meanSessionMs
-    clock.schedule(sessionMs, () => {
-      const current = host.current
-      if (!current || quiescing) return
-      const cell = cellById.get(current.cellId)!
-      if (cell.seats.get(host.id)?.epoch !== current.epoch) return
-      // Half-open controls retain seats through silence timeout after desktops move elsewhere.
-      if (random() >= config.halfOpenShare) cell.leave(host.id)
-      else {
-        const seat = cell.seats.get(host.id)
-        clock.schedule(CONTROL_SILENCE_CLOSE_MS, () => {
-          if (cell.seats.get(host.id) === seat) cell.leave(host.id)
-        })
-      }
-      host.current = null
-      clock.schedule(between(config.reconnectDelayMs), () => connect(host, true))
-    })
-  }
-
-  function poll(director: SimDirector, cell: SimCell): void {
-    if (inPollOutage(clock.now)) return
-    // A placing director's poll carries reserver=1: it is the cell's dead-man contact.
-    if (!director.old && cell.mode === 'reserve') cell.contact()
-    const requestedAt = clock.now
-    const view = director.views.get(cell.cellId)
-    const full = !view || view.incarnation !== cell.incarnation
-    const seats = full ? new Map([...cell.seats].map(([host, seat]) => [host, { ...seat }])) : null
-    const changes = full ? [] : cell.log.slice(view.cursor)
-    const snapshot = {
-      incarnation: cell.incarnation,
-      cursor: cell.log.length,
-      seats: cell.seats.size,
-      bookings: cell.book.count(),
-      tokens: cell.book.intakeSnapshot().tokens,
-      mode: faults.noRawFeedMode ? cell.effectiveMode() : cell.mode,
-      draining: cell.draining
-    }
-    const delay = config.rttMs(cell.region) + config.pollLagMs(director.index)
-    clock.schedule(delay, () => {
-      let current = director.views.get(cell.cellId)
-      if (full) {
-        if (current) {
-          for (const [host, seat] of current.seats) {
-            if (!seats!.has(host)) {
-              director.recentlyLeft.set(host, {
-                cellId: cell.cellId,
-                epoch: seat.epoch,
-                at: clock.now,
-                incarnation: current.incarnation ?? 0
-              })
-            }
-          }
-        }
-        current = {
-          incarnation: snapshot.incarnation,
-          cursor: snapshot.cursor,
-          seats: seats!,
-          placement: placementCell(cell, snapshot, requestedAt)
-        }
-        director.views.set(cell.cellId, current)
-        supersedeOutranked(director, seats!.keys())
-      } else if (current && current.incarnation === snapshot.incarnation) {
-        for (const change of changes) applyChange(director, cell, current, change)
-        current.cursor = snapshot.cursor
-        current.placement = placementCell(cell, snapshot, requestedAt)
-        supersedeOutranked(
-          director,
-          changes.filter((change) => change.kind === 'join').map((change) => change.host)
-        )
-      } else {
-        // A restarted director's (or a stale) delta: the next poll asks for a full snapshot.
-        return
-      }
-      director.answeredCells.add(cell.cellId)
-    })
-  }
-
-  function placementCell(
-    cell: SimCell,
-    snapshot: { seats: number; bookings: number; tokens: number; mode: string; draining: boolean },
-    polledAt: number
-  ): PlacementCell {
-    return {
-      cellId: cell.cellId,
-      region: cell.region,
-      reserve: !cell.old && snapshot.mode === 'reserve',
-      general: true,
-      draining: snapshot.draining,
-      polledAt,
-      seats: snapshot.seats,
-      bookings: snapshot.bookings,
-      ceiling: cell.old ? undefined : cell.ceiling,
-      intakePerSec: cell.intakePerSec,
-      intakeTokens: snapshot.tokens
-    }
-  }
-
-  function applyChange(
-    director: SimDirector,
-    cell: SimCell,
-    view: DirectorCellView,
-    change: CellLogEntry
-  ): void {
-    if (change.kind === 'reserve') {
-      director.reserveEpochs.set(
-        change.host,
-        Math.max(director.reserveEpochs.get(change.host) ?? 0, change.epoch)
-      )
-    } else if (change.kind === 'join') {
-      view.seats.set(change.host, {
-        epoch: change.epoch,
-        joinedAt: change.joinedAt,
-        reservedBy: change.reservedBy,
-        demoted: false
-      })
-      director.recentlyLeft.delete(change.host)
-      // Exactly one director writes each booked join: the one that booked it.
-      if (change.reservedBy === director.id) {
-        director.ledgerQueue.push({ host: change.host, cellId: cell.cellId, epoch: change.epoch })
-      }
-    } else if (change.kind === 'leave') {
-      const seat = view.seats.get(change.host)
-      if (seat && seat.epoch === change.epoch) {
-        view.seats.delete(change.host)
-        director.recentlyLeft.set(change.host, {
-          cellId: cell.cellId,
-          epoch: change.epoch,
-          at: change.at,
-          incarnation: view.incarnation ?? 0,
-          wrongCell: change.wrongCell
-        })
-      }
-    } else {
-      const seat = view.seats.get(change.host)
-      if (seat && seat.epoch === change.epoch) seat.demoted = true
-    }
-  }
-
-  // Booking director supersedes old reserve seats its map held; cell verifies epoch/join.
-  function supersede(director: SimDirector, host: string, cellId: string, epoch: number): void {
-    const held = new Set<string>()
-    for (const [seatCellId, view] of director.views) {
-      const seat = view.seats.get(host)
-      if (seat) held.add(`${seatCellId}\u0000${seat.joinedAt}`)
-    }
-    heldAtBooking.set(`${host}\u0000${cellId}\u0000${epoch}`, held)
-    if (faults.skipSupersede) return
-    for (const [seatCellId, view] of director.views) {
-      const seat = view.seats.get(host)
-      if (!seat || seat.demoted || seatCellId === cellId || seat.epoch >= epoch) continue
-      if (!view.placement.reserve) continue
-      report.supersedes += 1
-      demoteFor(director, host, seatCellId, seat, { cellId, epoch })
-    }
-  }
-
-  // Model feed supersede once both joins appear: only later joins at higher epochs outrank; later lower epochs need the row.
-  function supersedeOutranked(director: SimDirector, hosts: Iterable<string>): void {
-    if (faults.skipSupersede || faults.skipFeedSupersede) return
-    for (const host of new Set(hosts)) {
-      const seats = [...director.views].flatMap(([cellId, view]) => {
-        const seat = view.seats.get(host)
-        return seat ? [{ cellId, view, seat }] : []
-      })
-      if (seats.length < 2) continue
-      for (const { cellId, view, seat } of seats) {
-        if (seat.demoted || !view.placement.reserve) continue
-        const by = seats.find((other) => seatOutranks(other.seat, seat))
-        if (!by) continue
-        report.supersedes += 1
-        demoteFor(director, host, cellId, seat, { cellId: by.cellId, epoch: by.seat.epoch })
-      }
-    }
-  }
-
-  // The seats the booking director's map held when it placed each booking: only those it supersedes.
-  const heldAtBooking = new Map<string, Set<string>>()
-
-  // Invariant 4: all directors must name the same winner per divergence or two seats can each be demoted for the other.
-  const namedWinners = new Map<string, { won: string; by: string }>()
-  const contested = new Set<string>()
-  const demotedFor = new Map<string, string>()
-  type JudgedSeat = { cellId: string; epoch: number }
-  function judge(director: SimDirector, host: string, loserSeat: JudgedSeat, wonSeat: JudgedSeat): void {
-    const loser = `${loserSeat.cellId}@${loserSeat.epoch}`
-    const won = `${wonSeat.cellId}@${wonSeat.epoch}`
-    const divergence = `${host}\u0000${[loser, won].sort().join('\u0000')}`
-    const named = namedWinners.get(divergence)
-    if (named === undefined) {
-      namedWinners.set(divergence, { won, by: director.id })
-      return
-    }
-    // A second director judged it, agreeing or not: the tie-break was exercised.
-    if (named.by !== director.id && loserSeat.epoch === wonSeat.epoch && !contested.has(divergence)) {
-      contested.add(divergence)
-      report.contestedDivergences += 1
-    }
-    if (named.won !== won) {
-      violate(4, `${director.id} names ${won} over ${loser} for ${host}; ${named.by} named ${named.won}`)
-    }
-  }
-  function demoteFor(
-    director: SimDirector,
-    host: string,
-    cellId: string,
-    seat: { epoch: number; joinedAt: number },
-    winner: { cellId: string; epoch: number }
-  ): void {
-    const loser = `${cellId}@${seat.epoch}`
-    const won = `${winner.cellId}@${winner.epoch}`
-    judge(director, host, { cellId, epoch: seat.epoch }, winner)
-    const cell = cellById.get(cellId)!
-    clock.schedule(config.rttMs(cell.region), () => {
-      const live = cell.seats.get(host)
-      const wasLive = live !== undefined && !live.demoted
-      cell.demote(host, seat.epoch, seat.joinedAt, () => onSeatClosed(host, cellId, seat.epoch))
-      if (!wasLive || !live.demoted) return
-      // Only a live seat demoted for a live level winner is a same-epoch duplicate resolved.
-      const winnerSeat = cellById.get(winner.cellId)?.seats.get(host)
-      if (winner.epoch === seat.epoch && winnerSeat?.epoch === winner.epoch && !winnerSeat.demoted) {
-        report.levelDemotions += 1
-      }
-      demotedFor.set(`${host}\u0000${loser}`, won)
-      if (demotedFor.get(`${host}\u0000${won}`) === loser) violate(4, `${host}: ${loser} and ${won} each demoted for the other`)
-    })
-  }
-
-  function onSeatClosed(hostId: string, cellId: string, epoch: number): void {
-    const host = hostById.get(hostId)!
-    if (host.current?.cellId === cellId && host.current.epoch === epoch) {
-      host.current = null
-      clock.schedule(between(config.reconnectDelayMs), () => connect(host, true))
-    }
-  }
-
-  function flushLedger(director: SimDirector): void {
-    if (!database.up || director.ledgerQueue.length === 0) return
-    for (const entry of director.ledgerQueue) {
-      database.upsert(entry.host, entry.cellId, entry.epoch)
-    }
-    director.ledgerQueue = []
-  }
-
-  // Invariant 8: reconcile removes ahead/other-cell equal-row divergences; demoting director must then mint above the row.
-  const behindRow = new Map<string, number>()
-  const rowAheadDemotionsByHost = new Map<string, number>()
-  const demotedBehindRow = new Map<string, number>()
-  // A host demoted behind its row: its next answer, from any director, is that row or above it.
-  const reassignAbove = new Map<string, { cellId: string; epoch: number }>()
-  // Only under localTieBreak: even directors keep the lower cell id of a level divergence, odd ones the higher.
-  function faultKeepsThisSeat(
-    director: SimDirector,
-    cellId: string,
-    epoch: number,
-    row: { cellId: string; epoch: number }
-  ): boolean {
-    return !!faults.localTieBreak && row.epoch === epoch && (cellId < row.cellId) === (director.index % 2 === 0)
-  }
-  function raiseRowFloor(director: SimDirector, host: string, epoch: number): void {
-    director.rowFloors.set(host, Math.max(epoch, director.rowFloors.get(host) ?? 0))
-  }
-  function reconcileLedger(director: SimDirector): void {
-    if (!database.up || director.old) return
-    for (const [cellId, view] of director.views) {
-      if (!view.placement.reserve) continue
-      for (const [host, seat] of view.seats) {
-        if (seat.demoted || clock.now - seat.joinedAt < RECONCILE_SETTLE_MS) continue
-        const row = database.rows.get(host)
-        const live = cellById.get(cellId)!.seats.get(host)
-        const diverged = row && (row.epoch > seat.epoch || (row.epoch === seat.epoch && row.cellId !== cellId))
-        // Even demotions dropped by the cell must agree on winner; relay-server raises epoch floors on every demote.
-        if (row && diverged && live && live.joinedAt === seat.joinedAt && live.demoted && !faults.noRowAheadDemote) {
-          const thisSeat = { cellId, epoch: seat.epoch }
-          const rowSeat = { cellId: row.cellId, epoch: row.epoch }
-          if (faultKeepsThisSeat(director, cellId, seat.epoch, row)) judge(director, host, rowSeat, thisSeat)
-          else {
-            judge(director, host, thisSeat, rowSeat)
-            raiseRowFloor(director, host, row.epoch)
-          }
-        }
-        if (row && diverged && live && live.joinedAt === seat.joinedAt && !live.demoted) {
-          const key = `${director.id}\u0000${host}\u0000${cellId}\u0000${seat.joinedAt}`
-          if (behindRow.has(key)) violate(8, `${host}@${seat.epoch} on ${cellId} still behind row @${row.epoch}`)
-          behindRow.set(key, clock.now)
-          if (faults.noRowAheadDemote) continue
-          if (faultKeepsThisSeat(director, cellId, seat.epoch, row)) {
-            const rowSeat = director.views.get(row.cellId)?.seats.get(host)
-            if (rowSeat && rowSeat.epoch === row.epoch && !rowSeat.demoted) {
-              demoteFor(director, host, row.cellId, rowSeat, { cellId, epoch: seat.epoch })
-            }
-            continue
-          }
-          report.rowAheadDemotions += 1
-          raiseRowFloor(director, host, row.epoch)
-          rowAheadDemotionsByHost.set(host, (rowAheadDemotionsByHost.get(host) ?? 0) + 1)
-          // A director missing a leave can re-place level once; newer rows create new divergences, but one row must never take a third demotion.
-          const sameRow = `${host}\u0000${row.cellId}\u0000${row.epoch}`
-          const behindThisRow = (demotedBehindRow.get(sameRow) ?? 0) + 1
-          demotedBehindRow.set(sameRow, behindThisRow)
-          if (behindThisRow > 2) violate(8, `${host} demoted ${behindThisRow} times behind its row ${row.cellId}@${row.epoch}`)
-          reassignAbove.set(host, { ...row })
-          demoteFor(director, host, cellId, seat, row)
-          continue
-        }
-        database.upsert(host, cellId, seat.epoch)
-      }
-    }
-  }
-
-  function reserveCall(
-    director: SimDirector,
-    cell: SimCell,
-    host: string,
-    epoch: number,
-    sticky: boolean
-  ): Promise<ReserveOutcome | { outcome: 'unreachable' }> {
-    const rtt = config.rttMs(cell.region)
-    return new Promise((resolve) => {
-      clock.schedule(rtt / 2, () => {
-        const outcome = cell.old ? { outcome: 'off' as const } : cell.reserve(director.id, host, epoch, sticky)
-        if (outcome.outcome === 'intake') report.intakeRefusals += 1
-        if (outcome.outcome === 'off' && cell.trippedAt !== null) report.reserveCallsOnTrippedCells += 1
-        clock.schedule(rtt / 2, () => resolve(outcome))
-      })
-    })
-  }
-
-  function databaseAssign(director: SimDirector, host: Host, floor: number): Answer {
-    if (!database.up) return { kind: 'retry', afterMs: 2_000, calls: 0 }
-    const row = database.rows.get(host.id)
-    // Fresh current-process raw db evidence overrides stale reserve stamp, even without feed polls.
-    const admitsDatabase = (cell: SimCell): boolean => {
-      const own = database.admitEffective.get(cell.cellId)
-      return (
-        !faults.pgReserveBlocksDatabase &&
-        own?.mode === 'db' &&
-        own.incarnation === cell.incarnation &&
-        clock.now - own.at <= CELL_ADMIT_EFFECTIVE_FRESH_MS
-      )
-    }
-    const eligible = cells.filter((cell) => {
-      if (cell.draining) return false
-      if (!director.old && database.reserveCells.has(cell.cellId) && !admitsDatabase(cell)) return false
-      const count = cell.mode === 'reserve' ? cell.frozenDatabaseCount : database.countOn(cell.cellId)
-      return count < cell.ceiling
-    })
-    const load = (cell: SimCell) =>
-      (cell.mode === 'reserve' ? cell.frozenDatabaseCount : database.countOn(cell.cellId)) / cell.ceiling
-    const inRegion = eligible.filter((cell) => cell.region === host.region)
-    const pool = inRegion.length > 0 ? inRegion : eligible
-    if (pool.length === 0) {
-      // A cell that tripped 20 s ago (a 1 s write, a 5 s cached read, slack) must be takeable.
-      const stranded = cells.find(
-        (cell) =>
-          !director.old &&
-          !cell.old &&
-          !cell.draining &&
-          cell.trippedAt !== null &&
-          cell.mode === 'db' &&
-          clock.now - cell.trippedAt >= 20_000 &&
-          database.countOn(cell.cellId) < cell.ceiling
-      )
-      if (stranded) violate(9, `${host.id}: ${stranded.cellId} tripped but takes no fresh placement`)
-      return { kind: 'retry', afterMs: 5_000, calls: 0 }
-    }
-    const target = pool.reduce((best, cell) => (load(cell) < load(best) ? cell : best))
-    const epoch = Math.max(row?.epoch ?? 0, faults.noEpochFloor ? 0 : floor) + 1
-    if (!director.old && epoch <= floor) violate(7, `db mint ${epoch} not above map floor ${floor}`)
-    database.assign(host.id, target.cellId, epoch)
-    if (target.mode === 'reserve') target.frozenDatabaseCount += 1
-    report.databasePlacements += 1
-    const outage = (config.pollOutages ?? [])[0]
-    if (inPollOutage(clock.now)) {
-      report.databasePlacementsWhilePollsFail += 1
-      if (outage && report.pollFailureGapMs === null) report.pollFailureGapMs = clock.now - outage.at
-    }
-    return { kind: 'cell', cellId: target.cellId, epoch, calls: 0 }
-  }
-
-  async function assign(director: SimDirector, host: Host, reconnect: boolean): Promise<Answer> {
-    report.requests += 1
-    if (director.old) return databaseAssign(director, host, 0)
-    if (!director.complete(cells)) return { kind: 'retry', afterMs: 1_000, calls: 0 }
-    const now = clock.now
-    const rowFloor = director.rowFloors.get(host.id)
-    const known = [...director.knownEpochs(host.id), ...(rowFloor === undefined ? [] : [rowFloor])]
-    let floor: number
-    if (known.length > 0) {
-      floor = Math.max(...known)
-      // A WRONG_CELL leave, seen in the cell's feed by every director: read the row too.
-      if (director.recentlyLeft.get(host.id)?.wrongCell && !faults.noWrongCellRowRead && database.up) {
-        floor = Math.max(floor, database.rows.get(host.id)?.epoch ?? 0)
-      }
-    } else {
-      if (!database.up) return { kind: 'retry', afterMs: 2_000, calls: 0 }
-      floor = database.rows.get(host.id)?.epoch ?? 0
-    }
-    if (reconnect) {
-      const found = stickyFromMemory(director, host, now)
-      // The seat the reconcile demoted (or one level with its row) is never answered again.
-      const sticky = found && rowFloor !== undefined && found.epoch <= rowFloor ? null : found
-      if (sticky) {
-        const cell = cellById.get(sticky.cellId)!
-        // Unpolled restarts leave a stale incarnation in the map; hello falls back to the DB check.
-        const view = director.views.get(sticky.cellId)
-        if (sticky.incarnation === view?.incarnation || cell.old) {
-          report.stickyAnswers += 1
-          return { kind: 'cell', cellId: sticky.cellId, epoch: sticky.epoch, calls: 0 }
-        }
-        report.stickyReserves += 1
-        const outcome = await reserveCall(director, cell, host.id, sticky.epoch, true)
-        if (outcome.outcome === 'ok') {
-          report.stickyAnswers += 1
-          return { kind: 'cell', cellId: sticky.cellId, epoch: sticky.epoch, calls: 1 }
-        }
-      }
-    }
-    const placements = [...director.views.values()].map((view) => view.placement)
-    if (random() >= director.placer.reservePoolShare(placements, host.region)) {
-      return databaseAssign(director, host, floor)
-    }
-    const result = await director.placer.place({
-      cells: placements,
-      region: host.region,
-      epoch: faults.mintAtFloor ? Math.max(1, floor) : mintEpoch([floor]),
-      reserve: (cellId, epoch) => reserveCall(director, cellById.get(cellId)!, host.id, epoch, false)
-    })
-    report.reserveCalls += result.calls
-    if (result.calls > RESERVE_MAX_TRIES) violate(6, `${result.calls} reserve calls in one request`)
-    if (result.kind === 'placed') {
-      report.reservePlacements += 1
-      supersede(director, host.id, result.cellId, result.epoch)
-      return { kind: 'cell', cellId: result.cellId, epoch: result.epoch, calls: result.calls }
-    }
-    if (result.calls === RESERVE_MAX_TRIES) report.exhausted += 1
-    if (result.kind === 'pace') {
-      report.paced += 1
-      return { kind: 'retry', afterMs: result.retryAfterSeconds * 1_000, calls: result.calls }
-    }
-    const fallback = databaseAssign(director, host, floor)
-    return fallback.kind === 'cell' ? { ...fallback, calls: result.calls } : fallback
-  }
-
-  function stickyFromMemory(director: SimDirector, host: Host, now: number) {
-    // The newest grant only: highest epoch, then newest join.
-    const seats = [...director.views]
-      .map(([cellId, view]) => ({ cellId, view, seat: view.seats.get(host.id) }))
-      .filter((entry) => entry.seat && !entry.seat.demoted)
-      .sort((left, right) => right.seat!.epoch - left.seat!.epoch || right.seat!.joinedAt - left.seat!.joinedAt)
-    const top = seats[0]
-    if (top && stickyCell(director, top.view, now, true)) {
-      return { cellId: top.cellId, epoch: top.seat!.epoch, incarnation: top.view.incarnation ?? 0 }
-    }
-    if (top) return null
-    const left = director.recentlyLeft.get(host.id)
-    // A seat closed WRONG_CELL may not rejoin from memory.
-    if (left && !left.wrongCell && now - left.at <= RECENT_SEAT_MS) {
-      const view = director.views.get(left.cellId)
-      if (view && stickyCell(director, view, now, false)) {
-        return { cellId: left.cellId, epoch: left.epoch, incarnation: left.incarnation }
-      }
-    }
-    return null
-  }
-
-  function stickyCell(director: SimDirector, view: DirectorCellView, now: number, seated: boolean): boolean {
-    const cell = view.placement
-    if (!cell.reserve || !cell.general || cell.draining || cell.polledAt === null) return false
-    if (now - cell.polledAt > RESERVE_CELL_FRESH_MS) return false
-    return seated || director.placer.hasSeat(cell)
-  }
-
-  let directorCursor = 0
-  function pickDirector(): SimDirector {
-    directorCursor = (directorCursor + 1 + Math.floor(random() * directors.length)) % directors.length
-    return directors[directorCursor]!
-  }
-
-  // After the run, desktops stop moving so the maps and the ledger can settle.
-  let quiescing = false
-  function connect(host: Host, reconnect: boolean): void {
-    if (host.current || quiescing) return
-    const first = pickDirector()
-    const duplicate = random() < config.duplicateAssignShare ? pickDirector() : null
-    let used = false
-    const onAnswer = (answer: Answer, primary: boolean): void => {
-      if (answer.kind === 'retry') {
-        if (primary && !used) {
-          used = true
-          clock.schedule(answer.afterMs + random() * 500, () => connect(host, reconnect))
-        }
-        return
-      }
-      if (used) return
-      used = true
-      clock.schedule(50 + random() * 250, () => hello(host, answer.cellId, answer.epoch, reconnect))
-    }
-    // A throw in the model is a broken run, recorded like any violated rule.
-    const broken = (error: unknown) => violate(0, `model threw: ${String(error)}`)
-    void assign(first, host, reconnect)
-      .then((answer) => onAnswer(answer, true))
-      .catch(broken)
-    if (duplicate) {
-      clock.schedule(random() * 500, () => {
-        void assign(duplicate, host, reconnect)
-          .then((answer) => onAnswer(answer, false))
-          .catch(broken)
-      })
-    }
-  }
-
-  function hello(host: Host, cellId: string, epoch: number, reconnect: boolean): void {
-    const cell = cellById.get(cellId)!
-    if (host.current) return
-    const admitted = cell.hello(host.id, epoch, database)
-    if (!admitted) {
-      clock.schedule(1_000 + random() * 2_000, () => connect(host, reconnect))
-      return
-    }
-    report.placements += 1
-    report.arrivalsByCell[cellId] = (report.arrivalsByCell[cellId] ?? 0) + 1
-    // Report first post-demotion seats behind/level with the row; stale-map directors may not have seen the leave.
-    const above = reassignAbove.get(host.id)
-    if (above !== undefined) {
-      reassignAbove.delete(host.id)
-      if (epoch < above.epoch || (epoch === above.epoch && cellId !== above.cellId)) report.badFirstReseats += 1
-    }
-    host.current = { cellId, epoch }
-    scheduleLeave(host)
-  }
-
-  for (const cell of cells) {
-    const windowMs = deadManWindowMs(cell.cellId)
-    const check = (): void => {
-      const wasReserve = cell.mode === 'reserve'
-      cell.checkDeadMan(windowMs, config.reregistrationMs ?? DEFAULT_REREGISTRATION_MS)
-      if (wasReserve && cell.mode === 'db') report.deadManTrips += 1
-      // Model best-effort cell writes only with DB up and switch in reserve; db-mode cells write no admit row.
-      const own = database.admitEffective.get(cell.cellId)
-      if (
-        !cell.old &&
-        database.reserveCells.has(cell.cellId) &&
-        !cell.flagsUnread &&
-        database.up &&
-        (!own || own.mode !== cell.mode || own.incarnation !== cell.incarnation || clock.now - own.at >= CELL_ADMIT_EFFECTIVE_REFRESH_MS)
-      ) {
-        database.admitEffective.set(cell.cellId, { mode: cell.mode, incarnation: cell.incarnation, at: clock.now })
-      }
-      clock.schedule(1_000, check)
-    }
-    clock.schedule(1_000, check)
-  }
-  for (const director of directors) {
-    const tick = (): void => {
-      for (const cell of cells) poll(director, cell)
-      if (director.bootReconcilePending && director.complete(cells)) {
-        director.bootReconcilePending = false
-        reconcileLedger(director)
-      }
-      clock.schedule(1_000, tick)
-    }
-    clock.schedule(random() * 1_000, tick)
-    const ledger = (): void => {
-      flushLedger(director)
-      clock.schedule(250, ledger)
-    }
-    clock.schedule(250, ledger)
-    const reconcile = (): void => {
-      reconcileLedger(director)
-      clock.schedule(10 * 60_000 + random() * 60_000, reconcile)
-    }
-    // As on a real director: once at boot when the map is complete, then every 10 minutes.
-    director.bootReconcilePending = true
-    clock.schedule(10 * 60_000 + random() * 60_000, reconcile)
-  }
-  // A leased control's renewal fails once its row names another seat: the cell closes it.
-  for (const cell of cells) {
-    const renew = (): void => {
-      if (database.up) {
-        for (const [hostId, seat] of [...cell.seats]) {
-          const row = database.rows.get(hostId)
-          if (!seat.leased || !row || (row.cellId === cell.cellId && row.epoch === seat.epoch)) continue
-          cell.leave(hostId)
-          onSeatClosed(hostId, cell.cellId, seat.epoch)
-        }
-      }
-      clock.schedule(CONTROL_RENEWAL_MS, renew)
-    }
-    clock.schedule(random() * CONTROL_RENEWAL_MS, renew)
-  }
-  for (const cell of cells) {
-    const sweep = (): void => {
-      cell.book.sweep()
-      clock.schedule(1_000, sweep)
-    }
-    clock.schedule(1_000, sweep)
-  }
-  const fresh = hosts.slice(nextHost)
-  fresh.forEach((host, index) => {
-    clock.schedule((index / config.arrivalPerSec) * 1_000, () => connect(host, false))
-  })
-  for (const restart of config.cellRestarts ?? []) {
-    clock.schedule(restart.at, () => {
-      const cell = cellById.get(restart.cellId)!
-      for (const hostId of cell.restart()) {
-        const host = hostById.get(hostId)!
-        if (host.current?.cellId !== cell.cellId) continue
-        host.current = null
-        clock.schedule(random() * 10_000, () => connect(host, true))
-      }
-    })
-  }
-  for (const restart of config.directorRestarts ?? []) {
-    clock.schedule(restart.at, () => {
-      const director = directors[restart.director]!
-      director.reset()
-      director.restarted = true
-      director.bootReconcilePending = !faults.noBootReconcile
-      report.directorRestarts += 1
-    })
-  }
-  for (const stall of config.databaseStalls ?? []) {
-    clock.schedule(stall.at, () => {
-      database.up = false
-      clock.schedule(stall.durationMs, () => {
-        database.up = true
-      })
-    })
-  }
-  for (const drain of config.drains ?? []) {
-    clock.schedule(drain.at, () => {
-      const cell = cellById.get(drain.cellId)!
-      cell.draining = true
-      const seated = [...cell.seats.keys()]
-      seated.forEach((hostId, index) => {
-        clock.schedule((index / Math.max(1, seated.length - 1)) * drain.paceMs, () => {
-          const host = hostById.get(hostId)!
-          const seat = cell.seats.get(hostId)
-          if (!seat) return
-          // Drain-only: the seat keeps its splices for the grace while the desktop moves on.
-          clock.schedule(DRAIN_GRACE_MS, () => {
-            if (cell.seats.get(hostId) === seat) cell.leave(hostId)
-          })
-          if (host.current?.cellId === cell.cellId) {
-            host.current = null
-            clock.schedule(1_000 + random() * 5_000, () => connect(host, true))
-          }
-        })
-      })
-    })
-  }
-
-  const afterEach = (): void => {
-    for (const cell of cells) {
-      if (cell.occupancy() > cell.hardCap) {
-        violate(1, `${cell.cellId} at ${cell.occupancy()} over hard cap ${cell.hardCap}`)
-      }
-      const share = cell.occupancy() / cell.hardCap
-      report.maxOccupancyShare[cell.cellId] = Math.max(report.maxOccupancyShare[cell.cellId] ?? 0, share)
-    }
-  }
-  // Mapped/booked or feed-outranked seats have a short supersede bound; unleased half-open duplicates missed by placement can last until silence close.
-  const supersedeBound =
-    Math.max(...directors.map((director) => config.pollLagMs(director.index))) +
-    2 * Math.max(...cells.map((cell) => config.rttMs(cell.region))) +
-    3_000
-  const duplicateBound = CONTROL_SILENCE_CLOSE_MS + 2 * Math.max(...cells.map((cell) => config.rttMs(cell.region))) + 1_000
-  // Invariant 3 bounds outranked reserve seats; database-mode duplicates use existing lease renewal.
-  const outrankedSince = new Map<string, number>()
-  const checkDuplicates = (): void => {
-    const seatsByHost = new Map<string, Array<{ cell: SimCell; seat: CellSeat }>>()
-    for (const cell of cells) {
-      for (const [host, seat] of cell.seats) {
-        if (seat.demoted) continue
-        const seats = seatsByHost.get(host) ?? []
-        seats.push({ cell, seat })
-        seatsByHost.set(host, seats)
-      }
-    }
-    const live = new Set<string>()
-    for (const [host, seats] of seatsByHost) {
-      if (seats.length < 2) continue
-      const newest = Math.max(...seats.map((entry) => entry.seat.epoch))
-      // By the newest seats' placement records, whatever their join says: no record, no supersede.
-      const bookings = seats
-        .filter((entry) => entry.seat.epoch === newest)
-        .flatMap((entry) => heldAtBooking.get(`${host}\u0000${entry.cell.cellId}\u0000${newest}`) ?? [])
-      const supersededBy = (cellId: string, joinedAt: number): boolean =>
-        bookings.some((held) => held.has(`${cellId}\u0000${joinedAt}`))
-      for (const { cell, seat } of seats) {
-        if (cell.mode !== 'reserve' || seat.epoch === newest) continue
-        // A leased seat goes by its renewal, as today.
-        const tight =
-          !seat.leased &&
-          (supersededBy(cell.cellId, seat.joinedAt) || seats.some((other) => seatOutranks(other.seat, seat)))
-        // The loose clock runs from the first outranking; the tight one from when supersede applies.
-        const key = `${host}\u0000${cell.cellId}\u0000${seat.joinedAt}`
-        const clocks: Array<[string, number]> = [[key, duplicateBound]]
-        if (tight) clocks.push([`${key}\u0000tight`, supersedeBound])
-        for (const [clockKey, bound] of clocks) {
-          live.add(clockKey)
-          const since = outrankedSince.get(clockKey) ?? clock.now
-          outrankedSince.set(clockKey, since)
-          if (clock.now - since > bound) {
-            violate(3, `${host}@${seat.epoch} on ${cell.cellId} outranked for ${clock.now - since} ms`)
-          }
-        }
-      }
-    }
-    for (const key of [...outrankedSince.keys()]) if (!live.has(key)) outrankedSince.delete(key)
-    clock.schedule(1_000, checkDuplicates)
-  }
-  clock.schedule(1_000, checkDuplicates)
-
-  await clock.runUntil(config.durationMs, afterEach)
-  quiescing = true
-  await clock.runUntil(config.durationMs + QUIESCE_MS, afterEach)
-
-  // Invariant 2: no window holds more ok bookings than burst + rate x window.
-  for (const cell of cells) {
-    for (const times of cell.okBookingTimes) {
-      let lowest = Infinity
-      times.forEach((at, index) => {
-        lowest = Math.min(lowest, index - (cell.intakePerSec * at) / 1_000)
-        const excess = index - (cell.intakePerSec * at) / 1_000 - lowest + 1
-        if (excess > CELL_INTAKE_BURST + 1e-6) {
-          violate(2, `${cell.cellId} booked ${excess.toFixed(2)} over its bucket`)
-        }
-      })
-    }
-  }
-  // Invariant 5: guarded mirror must converge through queues/boot/ten-minute reconciles, with no final reconcile hiding lost writes.
-  database.up = true
-  for (const director of directors) flushLedger(director)
-  for (const cell of cells) {
-    if (cell.mode !== 'reserve') continue
-    for (const [host, seat] of cell.seats) {
-      if (seat.demoted) continue
-      const otherSeat = cells.some(
-        (other) => other !== cell && other.seats.get(host) && !other.seats.get(host)!.demoted
-      )
-      if (otherSeat) continue
-      const row = database.rows.get(host)
-      if (!row || row.epoch < seat.epoch) {
-        violate(5, `${host} row ${JSON.stringify(row)} is below its seat ${cell.cellId}@${seat.epoch}`)
-      }
-    }
-  }
-  report.seatedAtEnd = cells.reduce((sum, cell) => sum + cell.seats.size, 0)
-  const perHost = [...rowAheadDemotionsByHost.values()].sort((left, right) => left - right)
-  report.rowAheadDemotionsPerHost = {
-    max: perHost.at(-1) ?? 0,
-    p99: perHost[Math.min(perHost.length - 1, Math.floor(perHost.length * 0.99))] ?? 0
-  }
-  return report
-}
diff --git a/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts b/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts
index c1d3b1e3ac6..c53c3fd43d5 100644
--- a/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts
+++ b/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts
@@ -2,7 +2,7 @@ import { exportJWK, generateKeyPair, SignJWT, type CryptoKey, type JWK } from 'j
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RelayConfig } from '../config.js'
 import { createRelayTokenVerifier } from './relay-token-verifier.js'
-import { createStaleIfErrorJWKSet, RELAY_JWKS_MAX_STALE_MS } from './stale-if-error-jwks.js'
+import { createStaleIfErrorJWKSet } from './stale-if-error-jwks.js'
 
 const config = {
   jwksUrl: 'https://auth.example.test/.well-known/jwks.json',
@@ -43,37 +43,7 @@ beforeEach(() => vi.useFakeTimers({ now: Date.parse('2026-10-11T13:00:00Z') }))
 afterEach(() => vi.useRealTimers())
 
 describe('relay token keys while auth is down', () => {
-  it('accepts a valid token from the last served set once the cache is past its 10 min age', async () => {
-    const key = await signingKey('auth-1')
-    const authServer = auth(key)
-    const jwks = createStaleIfErrorJWKSet(new URL(config.jwksUrl), { fetch: authServer.fetch })
-    const verify = createRelayTokenVerifier(config as RelayConfig, jwks)
-    expect(await verify(await relayToken(key))).not.toBeNull()
-
-    vi.setSystemTime(Date.now() + 20 * MINUTE)
-    authServer.state.up = false
-    const fetches = authServer.fetch.mock.calls.length
-    expect(await verify(await relayToken(key))).toMatchObject({ sub: 'user-1' })
-    expect(authServer.fetch.mock.calls.length).toBe(fetches + 1)
-    // Inside the retry window the stale set answers without waiting on another fetch.
-    expect(await verify(await relayToken(key))).not.toBeNull()
-    expect(authServer.fetch.mock.calls.length).toBe(fetches + 1)
-  })
-
-  it('rejects a token signed by a key the last served set never had', async () => {
-    const key = await signingKey('auth-1')
-    const authServer = auth(key)
-    const jwks = createStaleIfErrorJWKSet(new URL(config.jwksUrl), { fetch: authServer.fetch })
-    const verify = createRelayTokenVerifier(config as RelayConfig, jwks)
-    expect(await verify(await relayToken(key))).not.toBeNull()
-
-    vi.setSystemTime(Date.now() + MINUTE)
-    authServer.state.up = false
-    expect(await verify(await relayToken(await signingKey('unknown')))).toBeNull()
-  })
-
   it('bounds the stale set at 30 minutes since the last served set', async () => {
-    expect(RELAY_JWKS_MAX_STALE_MS).toBe(30 * MINUTE)
     const key = await signingKey('auth-1')
     const authServer = auth(key)
     const verify = createRelayTokenVerifier(
diff --git a/cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts
deleted file mode 100644
index 4bf8a09bb7a..00000000000
--- a/cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import pg from 'pg'
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-import { RelayAssignmentStore } from '../../assignment/assignment-store.js'
-import { reconcileCellAdmissionAtStartup } from './cell-admission-startup.js'
-import type { RelayCellConfig } from '../../config.js'
-import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const schema = 'relay_startup_retry_test'
-const cell: RelayCellConfig = {
-  id: 'startup-retry-cell',
-  url: 'https://startup-retry.example.test',
-  capacityRequests: 4_000
-}
-
-afterEach(() => vi.restoreAllMocks())
-
-describePostgres('PostgreSQL director startup reconciliation', () => {
-  const databases: RelayDatabase[] = []
-  let scopedDatabaseUrl = ''
-
-  beforeAll(async () => {
-    const client = new pg.Client({ connectionString: databaseUrl })
-    await client.connect()
-    try {
-      await client.query(`DROP SCHEMA IF EXISTS ${schema} CASCADE`)
-      await client.query(`CREATE SCHEMA ${schema}`)
-    } finally {
-      await client.end()
-    }
-    const url = new URL(databaseUrl!)
-    url.searchParams.set('options', `-c search_path=${schema}`)
-    scopedDatabaseUrl = url.toString()
-    databases.push(
-      await openRelayDatabase({ databaseUrl: scopedDatabaseUrl, dataDir: '' }),
-      await openRelayDatabase({ databaseUrl: scopedDatabaseUrl, dataDir: '' })
-    )
-  })
-
-  afterAll(async () => {
-    for (const database of databases) await database.close()
-    const client = new pg.Client({ connectionString: databaseUrl })
-    await client.connect()
-    try {
-      await client.query(`DROP SCHEMA IF EXISTS ${schema} CASCADE`)
-    } finally {
-      await client.end()
-    }
-  })
-
-  it('recovers after the cell inventory lock outlasts transaction retries', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const store = new RelayAssignmentStore(databases[0]!, () => 100)
-    await store.reconcileCells([cell], false)
-    let releaseLock: () => void = () => undefined
-    let reportLocked: () => void = () => undefined
-    const lockReleased = new Promise<void>((resolve) => (releaseLock = resolve))
-    const lockAcquired = new Promise<void>((resolve) => (reportLocked = resolve))
-    const holder = databases[1]!.transaction(async (transaction) => {
-      await transaction.queryLocked(`SELECT cell_id FROM relay_cells ORDER BY cell_id ASC`)
-      reportLocked()
-      await lockReleased
-    })
-    await lockAcquired
-
-    const releaseTimer = setTimeout(releaseLock, 3_500)
-    try {
-      await reconcileCellAdmissionAtStartup({ role: 'director', cells: [cell] }, store)
-    } finally {
-      clearTimeout(releaseTimer)
-      releaseLock()
-      await holder
-    }
-
-    expect(await databases[0]!.query(`SELECT cell_id FROM relay_cells`)).toEqual([
-      { cell_id: cell.id }
-    ])
-    const warnings = warn.mock.calls.flat().join('\n')
-    expect(warnings).toContain('orca_relay_startup_reconcile_recovered')
-    expect(warnings).not.toContain('orca_relay_postgres_transaction_exhausted')
-  }, 10_000)
-})
diff --git a/cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts b/cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts
deleted file mode 100644
index a08f429cc0d..00000000000
--- a/cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  reconcileCellAdmissionAtStartup
-} from './cell-admission-startup.js'
-import type { RelayCellConfig } from '../../config.js'
-
-const cells: RelayCellConfig[] = [
-  {
-    id: 'candidate',
-    url: 'https://candidate.relay.example.com',
-    capacityRequests: 4_000,
-    initiallyEnabled: false
-  }
-]
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-})
-
-describe('cell admission startup authority', () => {
-
-  it('bounds retry wall time when each reconciliation is slow', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    vi.spyOn(Math, 'random').mockReturnValue(0)
-    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const lockUnavailable = Object.assign(new Error('lock unavailable'), { code: '55P03' })
-    const reconcileCellsAtStartup = vi.fn().mockImplementation(async () => {
-      vi.setSystemTime(Date.now() + 10_000)
-      throw lockUnavailable
-    })
-
-    const startup = reconcileCellAdmissionAtStartup(
-      { role: 'director', cells },
-      { reconcileCellsAtStartup }
-    )
-    const rejection = expect(startup).rejects.toBe(lockUnavailable)
-    await vi.runAllTimersAsync()
-    await rejection
-
-    expect(reconcileCellsAtStartup).toHaveBeenCalledTimes(5)
-  })
-})
diff --git a/cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts
deleted file mode 100644
index 0c5f505655c..00000000000
--- a/cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { RelayAssignmentStore } from '../../assignment/assignment-store.js'
-import type { RelayCellConfig } from '../../config.js'
-import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const CELL_PREFIX = 'connection-cap-min-postgres'
-const FLEET_SIZE = 16
-
-function cellConfig(id: string, connectionHardCap: 1_000 | 3_000): RelayCellConfig {
-  return {
-    id,
-    url: `https://${id}.example.com`,
-    capacityRequests: 1_000,
-    connectionHardCap,
-    connectionUnobservedBound: 60
-  }
-}
-
-async function removeCells(database: RelayDatabase): Promise<void> {
-  for (const table of [
-    'relay_cell_connection_snapshots',
-    'relay_cell_connection_runtime',
-    'relay_cell_connection_limits',
-    'relay_cell_capabilities',
-    'relay_cell_rehome_safety',
-    'relay_cell_runtime',
-    'relay_cell_admission',
-    'relay_cell_regions',
-    'relay_cells'
-  ]) {
-    await database.query(`DELETE FROM ${table} WHERE cell_id LIKE ?`, [`${CELL_PREFIX}-%`])
-  }
-}
-
-function storeOn(database: RelayDatabase): RelayAssignmentStore {
-  return new RelayAssignmentStore(database, () => 100, {
-    requireLiveCells: true,
-    heartbeatTtlMs: 45_000
-  })
-}
-
-async function heartbeat(
-  store: RelayAssignmentStore,
-  cell: RelayCellConfig,
-  connectionHardCap: number,
-  units: number
-): Promise<void> {
-  await store.recordCellHeartbeat({
-    cellId: cell.id,
-    cellUrl: cell.url,
-    cellIncarnation: '11111111-1111-4111-8111-111111111111',
-    startedAt: 50,
-    ready: true,
-    observedRequests: 0,
-    totalConnections: units,
-    inFlightConnections: 0,
-    reservedConnectionUnits: 0,
-    enforcedConnectionUnits: units,
-    connectionHardCap,
-    connectionUnobservedBound: 60
-  })
-}
-
-describePostgres('PostgreSQL effective connection cap', () => {
-  let database: RelayDatabase
-  let racer: RelayDatabase
-
-  beforeAll(async () => {
-    database = await openRelayDatabase({ databaseUrl, dataDir: '' })
-    racer = await openRelayDatabase({ databaseUrl, dataDir: '' })
-    await removeCells(database)
-  })
-
-  afterAll(async () => {
-    await removeCells(database)
-    await racer.close()
-    await database.close()
-  })
-
-  it('keeps 16 raised cells placeable while a heartbeat races the raise', async () => {
-    const ids = Array.from({ length: FLEET_SIZE }, (_, index) => `${CELL_PREFIX}-fleet-${index}`)
-    const lower = ids.map((id) => cellConfig(id, 1_000))
-    const director = storeOn(database)
-    const otherInstance = storeOn(racer)
-    await director.reconcileCells(lower, true)
-    for (const cell of lower) await heartbeat(director, cell, 1_000, 10)
-
-    // The heartbeat lands before or after the raise; either order must leave the same state.
-    await Promise.all([
-      director.reconcileCells(
-        ids.map((id) => cellConfig(id, 3_000)),
-        true
-      ),
-      heartbeat(otherInstance, lower[0]!, 1_000, 11)
-    ])
-
-    for (const id of ids) {
-      await expect(director.cellDeploymentStatus(id)).resolves.toMatchObject({
-        connectionCapacity: {
-          hardCap: 3_000,
-          reportedHardCap: 1_000,
-          effectiveHardCap: 1_000,
-          heartbeatFresh: true
-        }
-      })
-      const rows = await database.query(
-        `SELECT cell_id FROM relay_cell_connection_snapshots WHERE cell_id = ?`,
-        [id]
-      )
-      expect(rows).toHaveLength(1)
-    }
-    // The old processes keep heartbeating their 1,000 under the raised config.
-    for (const cell of lower) {
-      await expect(heartbeat(otherInstance, cell, 1_000, 12)).resolves.toBeUndefined()
-    }
-  })
-})
diff --git a/cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts b/cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts
deleted file mode 100644
index 4c1072d62df..00000000000
--- a/cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { RelayConfig } from '../config.js'
-import { startCellHeartbeat } from './cell-heartbeat-client.js'
-
-const CONFIG = {
-  role: 'cell',
-  cellId: 'cell-a',
-  cellUrl: 'https://relay-a.example.com',
-  directorUrl: 'https://relay.example.com',
-  heartbeatAudience: 'https://relay.example.com/v1/admin/cell-heartbeat'
-} as RelayConfig
-
-describe('cell heartbeat client', () => {
-  afterEach(() => vi.restoreAllMocks())
-
-  it('sends an immediate authenticated heartbeat without putting credentials in the URL', async () => {
-    const requests: Array<{ url: string; init?: RequestInit }> = []
-    const fetchImpl = vi.fn(async (url: string | URL | Request, init?: RequestInit) => {
-      requests.push({ url: String(url), init })
-      return new Response('{}', { status: 200 })
-    }) as typeof fetch
-    const client = startCellHeartbeat(CONFIG, {
-      ready: async () => true,
-      observedRequests: () => 7,
-      connectionCounts: () => ({
-        totalConnections: 0,
-        inFlightConnections: 0,
-        reservedConnectionUnits: 0,
-        enforcedConnectionUnits: 0
-      }),
-      fetch: fetchImpl,
-      identityToken: async () => 'secret-token',
-      now: () => 123,
-      incarnation: '11111111-1111-4111-8111-111111111111',
-      intervalMs: 60_000
-    })!
-    await vi.waitFor(() => expect(requests).toHaveLength(1))
-    client.stop()
-
-    expect(requests[0]!.url).toBe('https://relay.example.com/v1/admin/cell-heartbeat')
-    expect(requests[0]!.url).not.toContain('secret-token')
-    expect(requests[0]!.init?.headers).toMatchObject({ authorization: 'Bearer secret-token' })
-    expect(JSON.parse(String(requests[0]!.init?.body))).toEqual({
-      v: 1,
-      cellId: 'cell-a',
-      cellUrl: 'https://relay-a.example.com',
-      region: 'us-central1',
-      cellIncarnation: '11111111-1111-4111-8111-111111111111',
-      startedAt: 123,
-      ready: true,
-      observedRequests: 7
-    })
-  })
-
-})
diff --git a/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts b/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts
index b4d1673f9b1..6e6eeee42c8 100644
--- a/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts
+++ b/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts
@@ -5,7 +5,7 @@ import {
   cellFlagObjectName,
   cellFlagParser
 } from './cell-flags.js'
-import { CONTROL_FLAG_POLL_MS, startControlFlagChannel } from './relay-control-flag-channel.js'
+import { startControlFlagChannel } from './relay-control-flag-channel.js'
 
 const CELL_ID = 'production-gce-c7'
 const ACCESS_TOKEN = 'ya29.secret-access-token'
@@ -46,7 +46,7 @@ function cellObject(generation: number, flags: Record<string, unknown>, cellId =
   }
 }
 
-function cellChannel(fetchImpl: typeof fetch, autoStart = false) {
+function cellChannel(fetchImpl: typeof fetch) {
   return startControlFlagChannel({
     objectName: cellFlagObjectName(CELL_ID),
     defaults: CELL_FLAG_DEFAULTS,
@@ -54,7 +54,7 @@ function cellChannel(fetchImpl: typeof fetch, autoStart = false) {
     appliedEvent: CELL_FLAGS_APPLIED_EVENT,
     fetch: fetchImpl,
     random: () => 0.5,
-    autoStart
+    autoStart: false
   })
 }
 
@@ -230,19 +230,4 @@ describe('control flag channel', () => {
     expect(channel.applied()).toMatchObject({ generation: 5, flags: { readinessLocal: true } })
   })
 
-  it('reads one at a time and on a jittered 5 s cadence', async () => {
-    vi.useFakeTimers()
-    const google = fakeGoogle(cellObject(5, { readinessLocal: true }))
-    const channel = cellChannel(google.fetchImpl)
-    await Promise.all([channel.poll(), channel.poll()])
-    expect(google.state.storageRequests).toHaveLength(1)
-    const running = cellChannel(google.fetchImpl, true)
-    await vi.advanceTimersByTimeAsync(0)
-    expect(google.state.storageRequests).toHaveLength(2)
-    await vi.advanceTimersByTimeAsync(CONTROL_FLAG_POLL_MS)
-    expect(google.state.storageRequests).toHaveLength(3)
-    running.stop()
-    await vi.advanceTimersByTimeAsync(CONTROL_FLAG_POLL_MS * 3)
-    expect(google.state.storageRequests).toHaveLength(3)
-  })
 })
diff --git a/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts b/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts
index a99895f9a29..eedf29bc139 100644
--- a/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts
+++ b/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts
@@ -4,69 +4,34 @@ import {
   CellAdmitEffectiveWriter,
   DEAD_MAN_SLOT_CLAIM_RETRY_MS
 } from './cell-admit-effective-writer.js'
-import { DEAD_MAN_SLOT_HOLD_MS } from './cell-dead-man-trip-slot.js'
 
 function setup(
-  options: { fail?: boolean; busy?: boolean; busyWhen?: () => boolean; slotFree?: () => boolean } = {}
+  options: { slotFree?: () => boolean } = {}
 ) {
   const clock = { value: 1_000 }
   const writes: ('db' | 'reserve' | 'claim')[] = []
   const pending: Array<() => void> = []
-  const logs: string[] = []
   const writer = new CellAdmitEffectiveWriter({
     write: async (mode) => {
       writes.push(mode)
       await new Promise<void>((resolve) => pending.push(resolve))
-      if (options.fail) throw new Error('connection refused')
     },
     claimTrip: async (slots) => {
       writes.push('claim')
       await new Promise<void>((resolve) => pending.push(resolve))
       return slots > 0 && (options.slotFree?.() ?? true)
     },
-    databaseBusy: () => options.busy === true || options.busyWhen?.() === true,
-    now: () => clock.value,
-    log: (line) => logs.push(line)
+    databaseBusy: () => false,
+    now: () => clock.value
   })
   const settle = async () => {
     while (pending.length > 0) pending.shift()!()
     await new Promise((resolve) => setTimeout(resolve, 0))
   }
-  return { clock, writes, logs, writer, settle }
+  return { clock, writes, writer, settle }
 }
 
 describe('CellAdmitEffectiveWriter', () => {
-  it('writes on the first tick, on every change, and every 15 s, one write at a time', async () => {
-    const { clock, writes, writer, settle } = setup()
-    writer.tick('reserve', true)
-    writer.tick('db', true)
-    expect(writes).toEqual(['reserve'])
-    await settle()
-    // Tripped: the switch still says reserve, the raw mode db.
-    writer.tick('db', true)
-    await settle()
-    writer.tick('db', true)
-    expect(writes).toEqual(['reserve', 'db'])
-    clock.value += CELL_ADMIT_EFFECTIVE_REFRESH_MS
-    writer.tick('db', true)
-    expect(writes).toEqual(['reserve', 'db', 'db'])
-  })
-
-  // Step 5 off: a db switch never writes, so the dark roll adds no database write.
-
-  // Best-effort: a failed write never throws into the cell, logs at most once a minute, and retries.
-  it('retries a failed write on the next tick and rate-limits its log line', async () => {
-    const { clock, writes, logs, writer, settle } = setup({ fail: true })
-    writer.tick('db', true)
-    await settle()
-    clock.value += 1_000
-    writer.tick('db', true)
-    await settle()
-    expect(writes).toEqual(['db', 'db'])
-    expect(logs).toHaveLength(1)
-    expect(JSON.parse(logs[0]!)).toMatchObject({ event: 'orca_relay_cell_admit_effective_write_failed', mode: 'db' })
-  })
-
   it('claims a held trip slot in place of its refresh, and permits the trip only once it lands', async () => {
     let free = false
     const { clock, writes, writer, settle } = setup({ slotFree: () => free })
@@ -97,20 +62,4 @@ describe('CellAdmitEffectiveWriter', () => {
     expect(writes).toEqual(['reserve', 'claim', 'reserve', 'claim'])
   })
 
-  it('refreshes a tripped row past a saturated pool before its slot hold runs out', async () => {
-    let busy = false
-    const { clock, writes, writer, settle } = setup({ busyWhen: () => busy })
-    writer.tick('db', true)
-    await settle()
-    busy = true
-    clock.value += 4 * 60_000
-    writer.tick('db', true)
-    expect(writes).toEqual(['db'])
-    clock.value += 60_000
-    writer.tick('db', true)
-    await settle()
-    expect(writes).toEqual(['db', 'db'])
-    expect(DEAD_MAN_SLOT_HOLD_MS).toBeGreaterThan(5 * 60_000)
-  })
-
 })
diff --git a/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts
index 19c12f7be9e..5912b51472d 100644
--- a/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts
+++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts
@@ -8,8 +8,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import WebSocket from 'ws'
 import type { RawData } from 'ws'
 import { CELL_FLAG_DEFAULTS, type CellFlags } from '../control-flags/cell-flags.js'
-import { CELL_SEAT_DRIFT_SWEEP_MS } from '../seats/cell-seat-drift.js'
-import type { CellSeatLog } from '../seats/cell-seat-log.js'
 import type { RelayConfig } from '../../config.js'
 import { PostgresDatabase } from '../../database/database.js'
 import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js'
@@ -73,20 +71,6 @@ function cellConfig(port: number, issuer: string): RelayConfig {
   }
 }
 
-// The registry's private feed log, to plant the drift the cell must repair.
-function seatLogOf(sessions: object): CellSeatLog {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: HostSessionRegistry holds its feed log as `seatLog`.
-  return (sessions as { seatLog: CellSeatLog }).seatLog
-}
-
-// The JSON lines a test's console.warn spy saw for one event.
-function warned(event: string): Array<Record<string, unknown>> {
-  return vi
-    .mocked(console.warn)
-    .mock.calls.map(([line]) => (typeof line === 'string' && line.startsWith('{') ? JSON.parse(line) : null))
-    .filter((entry) => entry?.event === event)
-}
-
 function nextMessage(socket: WebSocket): Promise<Record<string, unknown>> {
   return new Promise((resolve, reject) => {
     socket.once('message', (data: RawData) => {
@@ -265,9 +249,6 @@ describe('a reserve-mode cell admits from memory with its database wedged', () =
       book,
       setFlags: (next: Partial<CellFlags>) => {
         applied = { generation: applied.generation + 1, flags: { ...CELL_FLAG_DEFAULTS, ...next } }
-      },
-      advance: (ms: number) => {
-        elapsedMs += ms
       }
     }
   }
@@ -338,97 +319,6 @@ describe('a reserve-mode cell admits from memory with its database wedged', () =
       return (page as { full: Array<{ relayHostId: string; epoch: number }> }).full.map((entry) => entry.epoch)
     }
 
-    it('repairs at once the seat a director names when no session backs it', async () => {
-      const cell = await startCell({ admitMode: 'reserve' })
-      const identity = await cell.host()
-      cell.book(identity, 9)
-      await cell.connect(identity, 9)
-      // A stale seat at a generation above the live session's: its changes could never replace it.
-      const log = seatLogOf(cell.relay.sessions)
-      log.append({ kind: 'join', userId: 'user-1', relayHostId: identity.hostId, epoch: 8, generation: 5, at: 4_242 })
-      const before = cell.relay.sessions.seatFeed(null)
-      const seq = 'full' in before ? before.seq : 0
-      const seat = { v: 1 as const, userId: 'user-1', relayHostId: identity.hostId, epoch: 8, joinedAt: 4_242 }
-      expect(cell.relay.sessions.demote(seat)).toBe('not-seated')
-      expect(cell.relay.sessions.seatFeed(seq)).toMatchObject({
-        changes: [
-          { kind: 'leave', epoch: 8, generation: 5, closeCode: 4409 },
-          { kind: 'join', epoch: 9, generation: 1 }
-        ]
-      })
-      expect(seatEpochs(cell)).toEqual([9])
-      expect(warned('orca_relay_cell_seat_log_drift')).toMatchObject([
-        { kind: 'unbacked-seat', via: 'demote', reason: 'epoch', seatEpoch: 8, sessionEpoch: 9, relisted: true }
-      ])
-      expect(JSON.stringify(warned('orca_relay_cell_seat_log_drift'))).not.toContain(identity.hostId)
-      // Asked again, there is nothing left to repair.
-      expect(cell.relay.sessions.demote(seat)).toBe('not-seated')
-      expect(cell.relay.sessions.seatFeed(seq + 2)).toMatchObject({ changes: [] })
-    })
-
-    it('leaves a seat no session backs once two sweeps in a row find it, with no director asking', async () => {
-      const cell = await startCell({ admitMode: 'db' })
-      const ghost = await cell.host()
-      seatLogOf(cell.relay.sessions).append({
-        kind: 'join',
-        userId: 'user-1',
-        relayHostId: ghost.hostId,
-        epoch: 10,
-        generation: 3,
-        at: 1_000
-      })
-      expect(seatEpochs(cell)).toEqual([10])
-      cell.advance(CELL_SEAT_DRIFT_SWEEP_MS)
-      expect(seatEpochs(cell)).toEqual([])
-      expect(warned('orca_relay_cell_seat_log_drift')).toMatchObject([
-        { kind: 'unbacked-seat', via: 'sweep', reason: 'no-session', seatEpoch: 10, seatGeneration: 3, relisted: false }
-      ])
-      // Left as moved: the cell will not seat it again at 10 from memory.
-      expect(cell.relay.sessions.seatFeed(0)).toMatchObject({ changes: [{}, { kind: 'leave', closeCode: 4409 }] })
-    })
-
-    it('lists again a live session the feed lost, once two sweeps in a row find it', async () => {
-      const cell = await startCell({ admitMode: 'reserve' })
-      const identity = await cell.host()
-      cell.book(identity, 9)
-      await cell.connect(identity, 9)
-      seatLogOf(cell.relay.sessions).append({
-        kind: 'leave',
-        userId: 'user-1',
-        relayHostId: identity.hostId,
-        epoch: 9,
-        generation: 1,
-        at: 5_000
-      })
-      expect(seatEpochs(cell)).toEqual([])
-      cell.advance(CELL_SEAT_DRIFT_SWEEP_MS)
-      expect(seatEpochs(cell)).toEqual([9])
-      expect(warned('orca_relay_cell_seat_log_drift')).toMatchObject([{ kind: 'unlisted-session', sessionEpoch: 9 }])
-    })
-
-    // A drained session's seat stays listed, with no session, until its socket's close lands.
-    it('repairs nothing for a seat that one sweep finds unbacked and is gone by the next', async () => {
-      const cell = await startCell({ admitMode: 'reserve' })
-      const identity = await cell.host()
-      cell.book(identity, 9)
-      const live = await cell.connect(identity, 9)
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: ws keeps its net.Socket as `_socket`.
-      ;(live.socket as unknown as { _socket: { pause(): void } })._socket.pause()
-      cell.relay.sessions.drainHost({
-        attemptId: 'attempt-1',
-        userId: 'user-1',
-        relayHostId: identity.hostId,
-        sourceAssignmentEpoch: 9,
-        graceMs: 0
-      })
-      await new Promise((resolve) => setTimeout(resolve, 20))
-      expect(seatEpochs(cell)).toEqual([9])
-      await new Promise((resolve) => setTimeout(resolve, RELAY_WEBSOCKET_FORCE_CLOSE_MS + 300))
-      cell.advance(CELL_SEAT_DRIFT_SWEEP_MS)
-      expect(seatEpochs(cell)).toEqual([])
-      expect(warned('orca_relay_cell_seat_log_drift')).toEqual([])
-    }, 10_000)
-
     // Drained sockets can close seconds after map removal; reusing their generation let late leaves erase reconnected live seats.
     it('keeps a session that reconnected while its drained predecessor was still closing', async () => {
       const cell = await startCell({ admitMode: 'reserve' })
@@ -456,19 +346,6 @@ describe('a reserve-mode cell admits from memory with its database wedged', () =
       expect(seatEpochs(cell)).toEqual([10])
     }, 10_000)
 
-    // Repeated fresh joins for one identity replace session and seat together, leaving no drift to repair.
-    it('stays on the live session when the same identity connects afresh each turn', async () => {
-      const cell = await startCell({ admitMode: 'reserve' })
-      const identity = await cell.host()
-      for (const epoch of [9, 10, 11]) {
-        cell.book(identity, epoch)
-        expect((await cell.connect(identity, epoch)).ack).toMatchObject({ type: 'host-hello-ack' })
-        expect(seatEpochs(cell)).toEqual([epoch])
-        cell.advance(CELL_SEAT_DRIFT_SWEEP_MS)
-      }
-      expect(seatEpochs(cell)).toEqual([11])
-      expect(warned('orca_relay_cell_seat_log_drift')).toEqual([])
-    })
   })
 
   it('gives every booking unit back when the cell starts to drain', async () => {
@@ -542,44 +419,4 @@ describe('a reserve-mode cell admits from memory with its database wedged', () =
     }).toEqual(before)
   }, 30_000)
 
-  it('never crosses the hard cap under seeded bookings, hellos, rebooks and closes', async () => {
-    const hardCap = 6
-    const cell = await startCell({ admitMode: 'reserve' }, { hardCap, controlReserve: 1 })
-    const hosts = await Promise.all(Array.from({ length: 12 }, () => cell.host()))
-    const epochs = new Map<string, number>()
-    const open: WebSocket[] = []
-    let seed = 7
-    const random = () => {
-      seed = (seed * 1_103_515_245 + 12_345) % 2_147_483_648
-      return seed / 2_147_483_648
-    }
-    let peak = 0
-    for (let step = 0; step < 240; step += 1) {
-      const identity = hosts[Math.floor(random() * hosts.length)]!
-      const roll = random()
-      if (roll < 0.4) {
-        // A director's fresh booking, or a re-book at a newer epoch.
-        const epoch = (epochs.get(identity.hostId) ?? 1) + (random() < 0.5 ? 0 : 1)
-        if (cell.book(identity, epoch)[0]?.outcome === 'ok') epochs.set(identity.hostId, epoch)
-      } else if (roll < 0.8) {
-        const reply = await cell.connect(identity, epochs.get(identity.hostId) ?? 1)
-        if (reply.ack?.type === 'host-hello-ack') open.push(reply.socket!)
-      } else if (open.length > 0) {
-        const socket = open.splice(Math.floor(random() * open.length), 1)[0]!
-        // A newer control for the same host may already have replaced it.
-        if (socket.readyState !== WebSocket.CLOSED) {
-          const closed = new Promise((resolve) => socket.once('close', resolve))
-          socket.close()
-          await closed
-        }
-      }
-      const counts = cell.relay.connectionSnapshot()!
-      peak = Math.max(peak, counts.physicalConnections)
-      expect(counts.physicalConnections).toBeLessThanOrEqual(hardCap)
-      expect(counts.enforcedConnectionUnits).toBeLessThanOrEqual(hardCap)
-    }
-    // The run did reach the cap, so the bound was exercised.
-    expect(peak).toBeGreaterThanOrEqual(hardCap - 1)
-  }, 60_000)
 })
-
diff --git a/cloud/apps/relay/src/cell/reservations/cell-reserve-client.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-client.test.ts
deleted file mode 100644
index 466f22f6de7..00000000000
--- a/cloud/apps/relay/src/cell/reservations/cell-reserve-client.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { CellReserveClient } from './cell-reserve-client.js'
-
-const target = { cellId: 'c1', cellUrl: 'https://c1.example' }
-const item = (userId: string, epoch = 3) => ({
-  userId,
-  relayHostId: 'abcdefghijklmnop',
-  epoch,
-  ttlMs: 30_000
-})
-
-describe('cell reserve client', () => {
-  it('batches a cell’s bookings into one request and maps each answer back', async () => {
-    const fetchImpl = vi.fn(async (_url: string | URL | Request, init?: RequestInit) => {
-      const body = JSON.parse(String(init?.body)) as { items: Array<{ userId: string }> }
-      return Response.json({
-        v: 1,
-        results: body.items.map((entry) =>
-          entry.userId === 'b' ? { outcome: 'seated-newer', epoch: 9 } : { outcome: 'ok' }
-        )
-      })
-    })
-    const client = new CellReserveClient({
-      directorId: 'director-a',
-      identityToken: async () => 'token',
-      fetch: fetchImpl
-    })
-    const answers = await Promise.all([
-      client.reserve(target, item('a')),
-      client.reserve(target, item('b')),
-      client.reserve(target, item('c'), true)
-    ])
-    expect(answers).toEqual([{ outcome: 'ok' }, { outcome: 'seated-newer', epoch: 9 }, { outcome: 'ok' }])
-    // One booking batch and one dry-run batch.
-    expect(fetchImpl).toHaveBeenCalledTimes(2)
-    const first = JSON.parse(String(fetchImpl.mock.calls[0]![1]?.body)) as Record<string, unknown>
-    expect(first).toMatchObject({ v: 1, directorId: 'director-a', items: [{ userId: 'a' }, { userId: 'b' }] })
-    expect(String(fetchImpl.mock.calls[0]![0])).toBe('https://c1.example/internal/reserve')
-  })
-
-})
diff --git a/cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts
deleted file mode 100644
index af96e74f0ce..00000000000
--- a/cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { mkdtempSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import WebSocket from 'ws'
-import { openRelayDatabase, type RelayDatabase } from '../../database/database.js'
-import { openDelayedPostgresDatabase, type StatementDelay } from '../../test-fixtures/delayed-postgres-database.js'
-import { RESERVE_MODE_CELL_ID, startReserveModeCell } from '../../test-fixtures/reserve-mode-cell.js'
-
-// PostgreSQL flip-back keeps controls connected, reserves most pool capacity for DB work and folds cell deltas per tick even across cross-region round trips (E-mix).
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-
-async function until(check: () => Promise<boolean> | boolean, timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs
-  while (!(await check())) {
-    if (Date.now() > deadline) throw new Error('condition not reached')
-    await new Promise((resolve) => setTimeout(resolve, 50))
-  }
-}
-
-describePostgres('flipping a reserve-mode cell back on PostgreSQL', () => {
-  const cleanup: Array<() => Promise<void> | void> = []
-
-  afterEach(async () => {
-    for (const close of cleanup.splice(0).reverse()) await close()
-    vi.restoreAllMocks()
-    // The database is shared with the other PostgreSQL suites, some of which read every cell.
-    const database = await openRelayDatabase({ databaseUrl, dataDir: tmpdir() })
-    try {
-      const tables = await database.query(
-        `SELECT table_name FROM information_schema.columns
-         WHERE table_schema = current_schema() AND column_name = 'cell_id' AND table_name LIKE 'relay_%'`
-      )
-      for (const row of tables) {
-        await database.query(`DELETE FROM ${String(row.table_name)} WHERE cell_id = ?`, [RESERVE_MODE_CELL_ID])
-      }
-    } finally {
-      await database.close()
-    }
-  })
-
-  async function cellOn(database: RelayDatabase, databasePoolMax = 10) {
-    vi.spyOn(console, 'log').mockImplementation(() => undefined)
-    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const dataDir = mkdtempSync(join(tmpdir(), 'orca-relay-flip-back-pg-'))
-    cleanup.push(() => rmSync(dataDir, { recursive: true, force: true }))
-    return await startReserveModeCell({ database, dataDir, cleanup, databasePoolMax })
-  }
-
-  it('re-registers every memory-admitted control, ten flips in a row', async () => {
-    const database = await openRelayDatabase({ databaseUrl, dataDir: tmpdir() })
-    cleanup.push(() => database.close())
-    for (let flip = 0; flip < 10; flip += 1) {
-      const cell = await cellOn(database)
-      const hosts = []
-      for (let index = 0; index < 3; index += 1) hosts.push(await cell.bookedHost(5 + index))
-      const ids = new Set(hosts.map((entry) => entry.identity.hostId))
-      const leased = async () =>
-        (await cell.controlLeases()).filter((row) => ids.has(String(row.relay_host_id)))
-      expect(await leased()).toEqual([])
-      cell.setAdmitMode('db')
-      await until(async () => (await leased()).length === 3, 10_000)
-      await until(() => cell.relay.sessions.reregistrationPending() === 0, 10_000)
-      expect(hosts.every((entry) => entry.socket.readyState === WebSocket.OPEN)).toBe(true)
-      for (const entry of hosts) entry.socket.close()
-    }
-  }, 120_000)
-
-  it('keeps re-registration to a third of the pool and one cell-row write per tick, at 170 ms a trip', async () => {
-    const delay: StatementDelay = { enabled: false, delayMs: 170 }
-    let cellRowWrites = 0
-    let leaseWritesInFlight = 0
-    let peakInFlight = 0
-    delay.beforeTrip = async (sql) => {
-      if (/UPDATE relay_cells\b/.test(sql)) cellRowWrites += 1
-    }
-    const database = openDelayedPostgresDatabase(databaseUrl!, delay, 10)
-    cleanup.push(() => database.close())
-    // The schema and the cell row, without the delay.
-    const setup = await openRelayDatabase({ databaseUrl, dataDir: tmpdir() })
-    await setup.close()
-    const cell = await cellOn(database, 10)
-    const deferred = cell.relay.assignments.activateControlDeferringCell.bind(cell.relay.assignments)
-    vi.spyOn(cell.relay.assignments, 'activateControlDeferringCell').mockImplementation(async (...args) => {
-      leaseWritesInFlight += 1
-      peakInFlight = Math.max(peakInFlight, leaseWritesInFlight)
-      try {
-        return await deferred(...args)
-      } finally {
-        leaseWritesInFlight -= 1
-      }
-    })
-    const hosts = []
-    for (let index = 0; index < 9; index += 1) hosts.push(await cell.bookedHost(5 + index))
-    const ids = new Set(hosts.map((entry) => entry.identity.hostId))
-    delay.enabled = true
-    const startedAt = Date.now()
-    cell.setAdmitMode('db')
-    await until(() => cell.relay.sessions.reregistrationPending() > 0, 5_000)
-    await until(() => cell.relay.sessions.reregistrationPending() === 0, 45_000)
-    const elapsedMs = Date.now() - startedAt
-    delay.enabled = false
-    const leased = (await cell.controlLeases()).filter((row) => ids.has(String(row.relay_host_id)))
-    expect(leased).toHaveLength(9)
-    expect(hosts.every((entry) => entry.socket.readyState === WebSocket.OPEN)).toBe(true)
-    // Pool of 10: at most 3 activations at once, leaving 7 for hellos and renewals.
-    expect(peakInFlight).toBeLessThanOrEqual(3)
-    // Far fewer cell-row writes than activations: deltas fold into one write per tick.
-    expect(cellRowWrites).toBeLessThan(9)
-    process.stderr.write(`flip_back_latency ${JSON.stringify({ elapsedMs, peakInFlight, cellRowWrites })}\n`)
-  }, 60_000)
-})
diff --git a/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts
index 279ea638a2a..8e2b9361acb 100644
--- a/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts
+++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts
@@ -3,7 +3,6 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import WebSocket from 'ws'
-import { CELL_ADMIT_EFFECTIVE_REFRESH_MS } from './cell-admit-effective-writer.js'
 import { RESERVE_DEAD_MAN_MS, reserveDeadManWindowMs } from './cell-reserve-dead-man.js'
 import { openRelayDatabase } from '../../database/database.js'
 import {
@@ -34,7 +33,7 @@ describe('flipping a reserve-mode cell back to the database', () => {
     vi.restoreAllMocks()
   })
 
-  async function cell(now?: () => number, options: { flagsUnread?: boolean } = {}) {
+  async function cell(now?: () => number) {
     vi.spyOn(console, 'log').mockImplementation(() => undefined)
     vi.spyOn(console, 'warn').mockImplementation(() => undefined)
     vi.spyOn(console, 'error').mockImplementation(() => undefined)
@@ -42,7 +41,7 @@ describe('flipping a reserve-mode cell back to the database', () => {
     cleanup.push(() => rmSync(dataDir, { recursive: true, force: true }))
     const database = await openRelayDatabase({ dataDir })
     cleanup.push(() => database.close())
-    return await startReserveModeCell({ database, dataDir, cleanup, ...options, ...(now ? { now } : {}) })
+    return await startReserveModeCell({ database, dataDir, cleanup, ...(now ? { now } : {}) })
   }
 
   it('registers every memory-admitted control without disconnecting any, matching the seat report', async () => {
@@ -159,47 +158,6 @@ describe('flipping a reserve-mode cell back to the database', () => {
     expect(host.socket.readyState).toBe(WebSocket.OPEN)
   }, 60_000)
 
-  it('takes its flip-back pace from the switch file', async () => {
-    const reserve = await cell()
-    for (let index = 0; index < 4; index += 1) await reserve.bookedHost(5 + index)
-    const real = reserve.relay.assignments.activateControlDeferringCell.bind(reserve.relay.assignments)
-    let inFlight = 0
-    let peak = 0
-    vi.spyOn(reserve.relay.assignments, 'activateControlDeferringCell').mockImplementation(async (...args) => {
-      inFlight += 1
-      peak = Math.max(peak, inFlight)
-      await new Promise((resolve) => setTimeout(resolve, 50))
-      try {
-        return await real(...args)
-      } finally {
-        inFlight -= 1
-      }
-    })
-    reserve.setAdmitMode('db', { reregisterInFlight: 1 })
-    await until(async () => (await reserve.controlLeases()).length === 4)
-    expect(peak).toBe(1)
-  }, 30_000)
-
-  // Step 5 off adds no writes before/after flag reads; leaving reserve owes exactly one db write.
-  it('writes an admit-effective row only while its switch says reserve, plus one db write on the way out', async () => {
-    let now = Date.now()
-    const booting = await cell(() => now, { flagsUnread: true })
-    await new Promise((resolve) => setTimeout(resolve, 2_500))
-    expect(await booting.admitEffectiveRow()).toBeUndefined()
-    booting.setAdmitMode('db')
-    now += 3 * CELL_ADMIT_EFFECTIVE_REFRESH_MS
-    await new Promise((resolve) => setTimeout(resolve, 2_500))
-    expect(await booting.admitEffectiveRow()).toBeUndefined()
-    booting.setAdmitMode('reserve')
-    await until(async () => (await booting.admitEffectiveRow())?.mode === 'reserve')
-    booting.setAdmitMode('db')
-    await until(async () => (await booting.admitEffectiveRow())?.mode === 'db')
-    const last = (await booting.admitEffectiveRow())!.updated_at
-    now += 3 * CELL_ADMIT_EFFECTIVE_REFRESH_MS
-    await new Promise((resolve) => setTimeout(resolve, 2_500))
-    expect((await booting.admitEffectiveRow())!.updated_at).toEqual(last)
-  }, 30_000)
-
   it('flips itself back to db when no placing director has been in touch for the dead-man window', async () => {
     let now = Date.now()
     const reserve = await cell(() => now)
diff --git a/cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts b/cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts
deleted file mode 100644
index 28a9ced67f3..00000000000
--- a/cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts
+++ /dev/null
@@ -1,336 +0,0 @@
-import { EventEmitter } from 'node:events'
-import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type WebSocket from 'ws'
-import { z } from 'zod'
-import type { RelayAssignmentStore } from '../../assignment/assignment-store.js'
-import type { CellFlags } from '../control-flags/cell-flags.js'
-import type { RelayConfig } from '../../config.js'
-import type { RelayCredentialStore } from '../../credentials/credential-store.js'
-import { HostSessionRegistry, type HostSession } from '../../connections/host-session-registry.js'
-import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js'
-import type { RelayRuntimeObserver } from '../../observability/relay-observability.js'
-import type { RelayTokenClaims } from '../../authentication/relay-token-verifier.js'
-import { ProcessQueuedByteBudget } from '../../connections/splice-forwarder.js'
-
-const adminTokenChecks = vi.hoisted(() => ({ count: 0 }))
-
-vi.mock('../../authentication/admin-token-verifier.js', () => ({
-  createAdminTokenVerifier: () => async (token: string) => {
-    adminTokenChecks.count += 1
-    return token === 'deploy-token'
-  },
-  createReadOnlyAdminTokenVerifier: () => async () => false,
-  createRegionalRehomeControlApplyTokenVerifier: () => async () => false,
-  createRegionalRehomeRuntimeTokenVerifier: () => async () => false,
-  createRegionalRehomeTokenVerifier: () => async (token: string) => token === 'rehome-token',
-  createRuntimeTokenVerifier: () => async () => false
-}))
-
-import { createRelayApp } from '../../app.js'
-
-class FakeSocket extends EventEmitter {
-  readonly OPEN = 1
-  readonly CLOSED = 3
-  readyState = this.OPEN
-  readonly send = vi.fn()
-  readonly close = vi.fn((code?: number, reason?: string) => {
-    this.readyState = this.CLOSED
-    this.emit('close', code, Buffer.from(reason ?? ''))
-  })
-}
-
-const incarnation = '11111111-1111-4111-8111-111111111111'
-
-// The published v1 shape, so a field rename fails here before it reaches a director.
-const SeatChangeSchema = z.object({
-  seq: z.number(),
-  kind: z.enum(['join', 'leave', 'drain-only', 'active']),
-  userId: z.string(),
-  relayHostId: z.string(),
-  epoch: z.number(),
-  generation: z.number(),
-  state: z.enum(['active', 'drain-only']).optional(),
-  closeCode: z.number().optional(),
-  at: z.number()
-})
-const SeatFeedReplySchema = z.object({
-  v: z.literal(1),
-  cellId: z.string(),
-  incarnation: z.string(),
-  at: z.number(),
-  draining: z.boolean(),
-  counts: z.object({
-    controls: z.number(),
-    seats: z.number()
-  }),
-  flagsApplied: z
-    .object({
-      generation: z.number(),
-      flags: z.object({
-        readinessLocal: z.boolean(),
-        ticketCheck: z.enum(['off', 'shadow', 'enforce']),
-        rejectionFence: z.boolean(),
-        admitMode: z.enum(['db', 'reserve']),
-        reserveDryRun: z.boolean(),
-        phonePath: z.enum(['db', 'memory'])
-      }),
-      ignoredKeys: z.array(z.string()).optional()
-    })
-    .optional(),
-  seq: z.number(),
-  changes: z.array(SeatChangeSchema).optional(),
-  more: z.boolean().optional(),
-  full: z
-    .array(
-      z.object({
-        userId: z.string(),
-        relayHostId: z.string(),
-        epoch: z.number(),
-        generation: z.number(),
-        state: z.enum(['active', 'drain-only']),
-        joinedAt: z.number()
-      })
-    )
-    .optional()
-})
-
-function config(overrides: Partial<RelayConfig> = {}): RelayConfig {
-  return {
-    port: 8080,
-    publicUrl: 'https://c7.relay.example.test',
-    cellUrl: 'https://c7.relay.example.test',
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: new Uint8Array(32),
-    role: 'cell',
-    cellId: 'production-gce-c7',
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    rehomeDirectorServiceAccount: 'relay-director@example.test',
-    rehomeAudience: 'https://relay.example.test/v1/admin/host-drain',
-    runtimeServiceAccount: 'relay-cell@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 10,
-    publicAssignmentsEnabled: true,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data',
-    ...overrides
-  }
-}
-
-function hostIdentity(index: number, exp = 4_102_444_800): RelayTokenClaims {
-  return {
-    sub: `user-${index}`,
-    prof: 'profile-1',
-    relayHostId: `host${String(index).padStart(12, '0')}`,
-    purpose: 'host-control',
-    exp
-  }
-}
-
-// What a host's auth-refresh token verifies as.
-const verifyRelayToken = vi.fn<(token: string) => Promise<RelayTokenClaims | null>>()
-
-function createCell(relayConfig = config(), cellFlags?: () => AppliedControlFlags<CellFlags>) {
-  const assignments = {
-    activateControl: vi.fn().mockResolvedValue('control:production-gce-c7:1'),
-    markMigrationTargetRegistered: vi.fn().mockResolvedValue(undefined),
-    releaseActivity: vi.fn().mockResolvedValue(true),
-    renewControlActivities: vi.fn().mockResolvedValue([])
-  } as unknown as RelayAssignmentStore
-  const observer = {
-    recordAuth: vi.fn(),
-    recordForwardedBytes: vi.fn(),
-    recordHttp: vi.fn(),
-    recordReconnect: vi.fn(),
-    recordSql: vi.fn()
-  } satisfies RelayRuntimeObserver
-  const registry = new HostSessionRegistry(
-    relayConfig,
-    verifyRelayToken,
-    {} as RelayCredentialStore,
-    assignments,
-    new ProcessQueuedByteBudget(),
-    observer,
-    Date.now,
-    Math.random,
-    incarnation
-  )
-  const activate = (
-    registry as unknown as {
-      activate: (
-        socket: WebSocket,
-        identity: RelayTokenClaims,
-        existing: HostSession | null,
-        generation: number,
-        rebind: boolean,
-        assignmentEpoch: number,
-        appVersion: string
-      ) => Promise<void>
-    }
-  ).activate.bind(registry)
-  const connect = async (
-    index: number,
-    options: { generation?: number; epoch?: number; rebind?: boolean; exp?: number } = {}
-  ): Promise<FakeSocket> => {
-    const socket = new FakeSocket()
-    const identity = hostIdentity(index, options.exp)
-    await activate(
-      socket as unknown as WebSocket,
-      identity,
-      registry.get({ userId: identity.sub, relayHostId: identity.relayHostId }),
-      options.generation ?? 1,
-      options.rebind ?? false,
-      options.epoch ?? 1,
-      '1.4.200'
-    )
-    return socket
-  }
-  const app = createRelayApp(relayConfig, {
-    store: {} as never,
-    assignments: {} as never,
-    drain: (graceMs, options) => registry.drain(graceMs, options ?? {}),
-    cellIncarnation: incarnation,
-    cellSeatFeed: (sinceSeq) => registry.seatFeed(sinceSeq),
-    cellFlags,
-    cellPhonePathEffective: () => registry.phonePathEffective(),
-    isDraining: () => registry.isDraining(),
-    runtimeCounts: () => ({
-      totalConnections: 0,
-      preAuthConnections: 0,
-      queuedBytes: 0,
-      ...registry.runtimeCounts()
-    }),
-    ready: vi.fn(async () => true)
-  })
-  const poll = async (since?: string, token = 'rehome-token') =>
-    await app.request(
-      `/v1/admin/cell-seats${since === undefined ? '' : `?since=${encodeURIComponent(since)}`}`,
-      { headers: { authorization: `Bearer ${token}` } }
-    )
-  const read = async (since?: string) => SeatFeedReplySchema.parse(await (await poll(since)).json())
-  return { registry, connect, app, poll, read }
-}
-
-describe('cell seat feed', () => {
-  beforeEach(() => vi.useFakeTimers())
-  afterEach(() => {
-    vi.clearAllTimers()
-    vi.useRealTimers()
-  })
-
-  it('keeps a closing socket seated until its close lands, as the change log does', async () => {
-    const { connect, read } = createCell()
-    const socket = await connect(1)
-    // The ws close handshake: no longer OPEN, close event not yet emitted.
-    socket.readyState = 2
-    const closing = await read()
-    expect(closing.counts).toMatchObject({ controls: 0, seats: 1 })
-    expect(closing.full).toHaveLength(1)
-    socket.readyState = socket.CLOSED
-    socket.emit('close', 1000, Buffer.from(''))
-    expect((await read()).counts).toMatchObject({ controls: 0, seats: 0 })
-  })
-
-  it('reports join, drain-only and leave as changes after the cursor', async () => {
-    const { registry, connect, read } = createCell()
-    const socket = await connect(1)
-    const { seq } = await read()
-    registry.drain(60_000)
-    socket.close(RELAY_CLOSE_CODE.DRAINING, 'relay draining')
-    await connect(2)
-    const body = await read(`${incarnation}:${seq}`)
-    expect(body.full).toBeUndefined()
-    expect(body.draining).toBe(true)
-    expect(body.changes?.map((change) => change.kind)).toEqual(['drain-only', 'leave'])
-    expect(body.changes?.[1]).toMatchObject({
-      userId: 'user-1',
-      closeCode: RELAY_CLOSE_CODE.DRAINING,
-      generation: 1
-    })
-    // The second connect landed after the drain, so the cell refused it: no join.
-    expect(body.seq).toBe(seq + 2)
-  })
-
-  it('reports an auth expiry as drain-only and the refresh that clears it as active', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const { connect, read } = createCell()
-    const exp = Math.floor(Date.now() / 1000) + 5
-    const socket = await connect(1, { exp })
-    const { seq } = await read()
-    // The 15 s heartbeat finds the token expired, inside its grace.
-    await vi.advanceTimersByTimeAsync(15_000)
-    verifyRelayToken.mockResolvedValueOnce(hostIdentity(1, exp + 3_600))
-    socket.emit(
-      'message',
-      Buffer.from(JSON.stringify({ type: 'auth-refresh', relayJwt: 'refreshed' })),
-      false
-    )
-    await vi.waitFor(() => expect(verifyRelayToken).toHaveBeenCalled())
-    const body = await read(`${incarnation}:${seq}`)
-    expect(body.changes?.map((change) => change.kind)).toEqual(['drain-only', 'active'])
-    expect(body.counts.seats).toBe(1)
-    expect((await read()).full).toEqual([expect.objectContaining({ state: 'active' })])
-  })
-
-  it('does not report a rebind as a leave, and joins the rebound socket', async () => {
-    const { connect, read } = createCell()
-    await connect(1)
-    const { seq } = await read()
-    await connect(1, { rebind: true, epoch: 2 })
-    const body = await read(`${incarnation}:${seq}`)
-    expect(body.changes).toEqual([
-      expect.objectContaining({ kind: 'join', userId: 'user-1', epoch: 2, state: 'active' })
-    ])
-  })
-
-  it('reports a superseded generation leaving after its successor joined', async () => {
-    const { connect, read } = createCell()
-    await connect(1)
-    const { seq } = await read()
-    await connect(1, { generation: 2 })
-    const body = await read(`${incarnation}:${seq}`)
-    // Readers drop the leave: its generation is older than the seat's.
-    expect(body.changes?.map((change) => [change.kind, change.generation])).toEqual([
-      ['leave', 1],
-      ['join', 2]
-    ])
-  })
-
-  it('resyncs a cursor from another incarnation with a full snapshot', async () => {
-    const { connect, poll, read } = createCell()
-    await connect(1)
-    const body = await read('22222222-2222-4222-8222-222222222222:1')
-    expect(body.full).toHaveLength(1)
-    expect((await poll('not a cursor')).status).toBe(400)
-  })
-
-  it('accepts only the directors rehome identity, verified once per poll', async () => {
-    const { poll } = createCell()
-    adminTokenChecks.count = 0
-    expect((await poll(undefined, 'deploy-token')).status).toBe(401)
-    expect((await poll(undefined, 'wrong')).status).toBe(401)
-    expect((await poll()).status).toBe(200)
-    // The admin middleware leaves this route to its own rehome check.
-    expect(adminTokenChecks.count).toBe(0)
-  })
-
-  it('is unavailable on a cell without the rehome pair, and on directors', async () => {
-    const withoutPair = createCell(
-      config({ rehomeAudience: undefined, rehomeDirectorServiceAccount: undefined })
-    )
-    const response = await withoutPair.poll()
-    expect(response.status).toBe(404)
-    expect(await response.json()).toEqual({ error: 'seat_feed_unavailable' })
-    const director = createCell(config({ role: 'director', cellId: 'director' }))
-    expect((await director.poll()).status).toBe(404)
-  })
-})
diff --git a/cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts b/cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts
index 4b9da440e30..c651c42fb40 100644
--- a/cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts
+++ b/cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { CELL_SEAT_FEED_PAGE_MAX, CellSeatLog } from './cell-seat-log.js'
+import { CellSeatLog } from './cell-seat-log.js'
 
 function append(log: CellSeatLog, count: number): void {
   for (let index = 0; index < count; index += 1) {
@@ -24,16 +24,6 @@ describe('cell seat log', () => {
     expect(log.read(5)).toMatchObject({ seq: 10, full: expect.any(Array) })
   })
 
-  it('pages a long backlog and resumes from the returned cursor', () => {
-    const log = new CellSeatLog(CELL_SEAT_FEED_PAGE_MAX * 2)
-    append(log, CELL_SEAT_FEED_PAGE_MAX + 5)
-    const first = log.read(0)
-    expect(first).toMatchObject({ seq: CELL_SEAT_FEED_PAGE_MAX, more: true })
-    expect('changes' in first && first.changes).toHaveLength(CELL_SEAT_FEED_PAGE_MAX)
-    const second = log.read(first.seq)
-    expect(second).toMatchObject({ seq: CELL_SEAT_FEED_PAGE_MAX + 5, more: false })
-    expect('changes' in second && second.changes).toHaveLength(5)
-  })
 })
 
 describe('cell seat log snapshot', () => {
@@ -85,20 +75,5 @@ describe('cell seat cursor', () => {
     expect(log.recentlyLeftOf(host.userId, host.relayHostId)).toBeUndefined()
   })
 
-  it('sends only the newest page of leavers in a full snapshot', () => {
-    const log = new CellSeatLog(CELL_SEAT_FEED_PAGE_MAX * 4, () => 0)
-    const leavers = CELL_SEAT_FEED_PAGE_MAX + 5
-    for (let index = 0; index < leavers; index += 1) {
-      const host = { userId: `user-${index}`, relayHostId: 'abcdefghijklmnop', epoch: 1, generation: 1 }
-      log.append({ kind: 'join', ...host, at: 0 })
-      log.append({ kind: 'leave', ...host, closeCode: 1006, at: 0 })
-    }
-    const page = log.read(null)
-    const left = 'full' in page ? page.recentlyLeft : []
-    expect(left).toHaveLength(CELL_SEAT_FEED_PAGE_MAX)
-    expect(left.at(-1)?.userId).toBe(`user-${leavers - 1}`)
-    // The cell itself still remembers the oldest.
-    expect(log.recentlyLeftOf('user-0', 'abcdefghijklmnop')).toBeDefined()
-  })
 })
 
diff --git a/cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts b/cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts
deleted file mode 100644
index b64dc003f3b..00000000000
--- a/cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { RelayAssignment } from '../../assignment/assignment-store.js'
-import type { RelayConfig } from '../../config.js'
-import {
-  ShadowDirectoryCompare
-} from './shadow-directory-compare.js'
-import { ShadowSeatDirectory, type SeatFeedResponse } from './shadow-seat-directory.js'
-
-const fakes = vi.hoisted(() => ({
-  verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-a', relayHostId: token }))
-}))
-
-vi.mock('../../authentication/relay-token-verifier.js', () => ({
-  createRelayTokenVerifier: () => fakes.verifyRelayToken,
-  readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null
-}))
-
-import { createRelayApp } from '../../app.js'
-
-const HOST = 'hhhhhhhhhhhhhhhh'
-const IDENTITY = { userId: 'user-a', relayHostId: HOST }
-
-function feed(cellId: string, overrides: Partial<SeatFeedResponse> = {}): SeatFeedResponse {
-  return { v: 1, cellId, incarnation: `inc-${cellId}`, seq: 1, at: 1, full: [], ...overrides }
-}
-
-function seat(epoch: number, state = 'active', relayHostId = HOST, joinedAt = 1) {
-  return { userId: 'user-a', relayHostId, epoch, generation: 1, state, joinedAt }
-}
-
-function directoryWith(
-  seats: Record<string, ReturnType<typeof seat>[]>,
-  noFeed: string[] = [],
-  unlive: string[] = []
-) {
-  const directory = new ShadowSeatDirectory()
-  const cellIds = [...Object.keys(seats), ...noFeed]
-  directory.setCells(cellIds, cellIds, {
-    readAt: 0,
-    expiresAt: new Map(
-      cellIds.filter((cellId) => !unlive.includes(cellId)).map((cellId) => [cellId, 1e12])
-    )
-  })
-  for (const [cellId, full] of Object.entries(seats)) {
-    directory.apply(cellId, feed(cellId, { full }), 10)
-  }
-  for (const cellId of noFeed) directory.markNoFeed(cellId, 10)
-  return directory
-}
-
-describe('unexplained samples', () => {
-  it('log only the cell and epoch of the real database record, never raw ids', () => {
-    const lines: Record<string, unknown>[] = []
-    const compare = new ShadowDirectoryCompare(
-      directoryWith({ 'cell-a': [seat(3)] }),
-      () => 20,
-      (line) => lines.push(JSON.parse(line))
-    )
-    compare.compare('sticky-verify', IDENTITY, { ...assignment('cell-a'), assignmentEpoch: 2 })
-    compare.flush(20)
-    const sample = lines.find((line) => line.event === 'orca_relay_shadow_compare_unexplained')
-    expect(sample).toMatchObject({
-      class: 'epoch-mismatch',
-      db: { cellId: 'cell-a', assignmentEpoch: 2 }
-    })
-    expect(JSON.stringify(lines)).not.toContain(HOST)
-    expect(JSON.stringify(lines)).not.toContain('user-a')
-  })
-})
-
-describe('compare hooks on the director routes', () => {
-  async function respond(compareShadowSeats?: () => void) {
-    const resolved = assignment('cell-a')
-    const app = createRelayApp(config(), {
-      // SAFETY: /v1/resolve reads only resolveResume.
-      store: { resolveResume: vi.fn(async () => ({ userId: 'user-a' })) } as never,
-      // SAFETY: both routes read only resolve and assign.
-      assignments: {
-        resolve: vi.fn(async () => resolved),
-        assign: vi.fn(async () => resolved)
-      } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true),
-      compareShadowSeats
-    })
-    const sticky = await app.request('/v1/assign', {
-      method: 'POST',
-      headers: { authorization: `Bearer ${HOST}`, 'content-type': 'application/json' },
-      body: JSON.stringify({ v: 1, relayHostId: HOST, reconnect: true })
-    })
-    const resolve = await app.request('/v1/resolve', {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({
-        v: 1,
-        relayHostId: HOST,
-        resumeToken: Buffer.alloc(32, 1).toString('base64url')
-      })
-    })
-    return [
-      { status: sticky.status, body: await sticky.text() },
-      { status: resolve.status, body: await resolve.text() }
-    ]
-  }
-
-  it('compares after each database answer without changing a response byte', async () => {
-    vi.useFakeTimers({ now: 1_000_000 })
-    try {
-      const baseline = await respond()
-      const routes: unknown[] = []
-      const compared = await respond((...args: unknown[]) => {
-        routes.push(args[0])
-      })
-      const throwing = await respond(() => {
-        throw new Error('compare broke')
-      })
-
-      expect(baseline[0]?.status).toBe(200)
-      expect(baseline[1]?.status).toBe(200)
-      expect(compared).toEqual(baseline)
-      expect(throwing).toEqual(baseline)
-      expect(routes).toEqual(['sticky-verify', 'resolve'])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
-
-function assignment(cellId: string): RelayAssignment {
-  return {
-    userId: 'user-a',
-    relayHostId: HOST,
-    cellId,
-    cellUrl: `https://${cellId}.relay.example.test`,
-    assignmentEpoch: 3,
-    leaseExpiresAt: 1_300_000
-  }
-}
-
-function config(): RelayConfig {
-  return {
-    port: 8080,
-    publicUrl: 'https://relay.example.test',
-    cellUrl: 'https://relay.example.test',
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: new TextEncoder().encode('assignment-key-with-at-least-32-bytes'),
-    role: 'director',
-    cellId: 'director',
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    runtimeServiceAccount: 'runtime@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 3,
-    publicAssignmentsEnabled: true,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data'
-  }
-}
diff --git a/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts
index a3120cb7782..373a119003e 100644
--- a/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts
+++ b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts
@@ -3,7 +3,6 @@ import { RelayAssignmentStore } from '../../assignment/assignment-store.js'
 import { openInMemoryRelayDatabase } from '../../database/database.js'
 import {
   SHADOW_SEAT_OUTRANK_SKEW_MS,
-  SHADOW_SEAT_RECENTLY_LEFT_MAX_HOSTS,
   ShadowSeatDirectory,
   startShadowSeatPoller,
   type SeatFeedCell,
@@ -141,7 +140,6 @@ describe('startShadowSeatPoller', () => {
       { cellId: 'cell-a', epoch: 3, generation: 1, state: 'active' }
     ])
     expect(cell.directory.cellState('cell-a')).toMatchObject({ status: 'live', seq: 5 })
-    expect(cell.identityToken).toHaveBeenCalledTimes(1)
   })
 
   it('resyncs from a full snapshot when the cell restarts with a new incarnation', async () => {
@@ -284,7 +282,6 @@ describe('startShadowSeatPoller', () => {
     await cell.tick()
     await cell.tick()
     cell.stop()
-    expect(call).toBe(3)
     expect(cell.requests[2]?.searchParams.get('since')).toBe(`${INCARNATION}:1`)
     expect(cell.directory.seatsOf('user-a', 'host-2')).toHaveLength(1)
   })
@@ -336,31 +333,6 @@ describe('startShadowSeatPoller', () => {
     expect(cell.directory.isComplete()).toBe(true)
   })
 
-  it('forgets the switches a cell reported once its image no longer has the feed', async () => {
-    let rolledBack = false
-    const cell = poller({
-      'cell-a': () => json(feed({ seq: 1, full: [] })),
-      'cell-b': () =>
-        rolledBack
-          ? new Response('Not Found', { status: 404 })
-          : json(
-              feed({
-                cellId: 'cell-b',
-                seq: 1,
-                full: [],
-                flagsApplied: { generation: 3, flags: { readinessLocal: true } }
-              })
-            )
-    })
-    await cell.tick()
-    expect(cell.directory.cellState('cell-b')?.flagsApplied?.generation).toBe(3)
-    rolledBack = true
-    await cell.tick()
-    cell.stop()
-    expect(cell.directory.cellState('cell-b')).toMatchObject({ status: 'no-feed' })
-    expect(cell.directory.cellState('cell-b')?.flagsApplied).toBeUndefined()
-  })
-
   it('keeps a reserve switch through a 404 until a feed says db or the process is replaced', () => {
     const directory = new ShadowSeatDirectory()
     directory.setCells(['cell-b'])
@@ -390,47 +362,6 @@ describe('startShadowSeatPoller', () => {
     expect(cell.directory.isComplete()).toBe(true)
   })
 
-  it('backs off cell-list reads while the database fails', async () => {
-    const listCells = vi.fn(async (): Promise<SeatFeedCell[]> => {
-      throw new Error('pool timeout')
-    })
-    const cell = poller({}, 'all', listCells)
-    for (let second = 0; second < 40; second += 1) {
-      await cell.tick()
-      cell.advance(1_000)
-    }
-    cell.stop()
-    // Retries at +1, +2, +4, +8, +16 s, then at most every 30 s.
-    expect(listCells.mock.calls.length).toBeLessThanOrEqual(7)
-    expect(listCells.mock.calls.length).toBeGreaterThanOrEqual(5)
-  })
-
-  it('keeps polling the last cell list while a cell-list read hangs', async () => {
-    const readEntered = Promise.withResolvers<void>()
-    const readDone = Promise.withResolvers<SeatFeedCell[]>()
-    const listCells = vi
-      .fn<() => Promise<SeatFeedCell[]>>()
-      .mockResolvedValueOnce(CELLS)
-      .mockImplementation(() => {
-        readEntered.resolve()
-        return readDone.promise
-      })
-    const cell = poller({ 'cell-a': () => json(feed({ seq: 1, full: [] })) }, ['cell-a'], listCells)
-    await cell.tick()
-    cell.advance(31_000)
-    const round = cell.tick()
-    await readEntered.promise
-    await Promise.resolve()
-    expect(listCells).toHaveBeenCalledTimes(2)
-    expect(cell.requests.map((url) => url.hostname)).toEqual([
-      'cell-a.example.test',
-      'cell-a.example.test'
-    ])
-    readDone.resolve(CELLS)
-    await round
-    cell.stop()
-  })
-
   it('treats a malformed or mislabelled body as unverifiable', async () => {
     const cell = poller({
       'cell-a': () => json({ v: 2 }),
@@ -483,20 +414,6 @@ describe('startShadowSeatPoller', () => {
     expect(cell.directory.seatsOf('user-a', 'host-1')).toEqual([])
   })
 
-  it('bounds the recently-left memory', () => {
-    const directory = new ShadowSeatDirectory()
-    directory.setCells(['cell-a'])
-    const hosts = SHADOW_SEAT_RECENTLY_LEFT_MAX_HOSTS + 10
-    directory.apply(
-      'cell-a',
-      feed({ seq: 1, full: Array.from({ length: hosts }, (_, index) => seat(`host-${index}`)) }),
-      10
-    )
-    directory.apply('cell-a', feed({ incarnation: 'restarted', seq: 1, full: [] }), 20)
-    expect(directory.summary(20).recentlyLeftHosts).toBe(SHADOW_SEAT_RECENTLY_LEFT_MAX_HOSTS)
-    expect(directory.recentlyLeftOf('user-a', 'host-0', 20)).toEqual([])
-    expect(directory.recentlyLeftOf('user-a', `host-${hosts - 1}`, 20)).toHaveLength(1)
-  })
 })
 
 describe('RelayAssignmentStore.seatFeedCells', () => {
diff --git a/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts b/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts
index 4e59dede310..822c12000a3 100644
--- a/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts
+++ b/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts
@@ -22,11 +22,6 @@ const OTHER_CELL = {
   capacityRequests: 900
 }
 
-const RESUME_DEVICE_READ = expect.stringMatching(/^SELECT .* FROM relay_devices\b/)
-const HOST_ASSIGNMENT_READ = expect.stringMatching(
-  /^SELECT assignment\.\*.* FROM relay_assignments\b/
-)
-
 async function until(check: () => Promise<boolean>, timeoutMs = 10_000): Promise<void> {
   const deadline = Date.now() + timeoutMs
   while (!(await check())) {
@@ -58,11 +53,7 @@ describe('the memory phone path', () => {
       cleanup,
       ...(now ? { now } : {})
     })
-    // The admit-effective writer ticks on its own; every other statement is the phone's.
-    const phoneStatements = () =>
-      database.statements.filter((sql) => !sql.includes('relay_cell_admit_effective'))
-    // The test's own reads and writes go around the recorder.
-    return { ...reserve, database, raw: inner, phoneStatements }
+    return { ...reserve, database, raw: inner }
   }
 
   async function seatedPhoneHost(phonePath: 'db' | 'memory') {
@@ -70,7 +61,6 @@ describe('the memory phone path', () => {
     reserve.setAdmitMode('reserve', { phonePath })
     const seated = await reserve.bookedHost(3)
     await reserve.installDevice(seated.identity.hostId, TOKEN)
-    reserve.database.statements.length = 0
     return { reserve, seated }
   }
 
@@ -90,7 +80,6 @@ describe('the memory phone path', () => {
     const basisConnId = String((await connOpen).connId)
     await reserve.attachData(await connOpen, seated.ack.generation)
     expect(await phone.hello).toMatchObject({ ok: true })
-    reserve.database.statements.length = 0
     // The desktop's confirm, sent in reply to the phone over the end-to-end channel.
     const confirm = async (reqId: string, basis = basisConnId) => {
       const answer = Promise.race([
@@ -108,26 +97,17 @@ describe('the memory phone path', () => {
   const deviceRow = async (reserve: Awaited<ReturnType<typeof cell>>) =>
     (await reserve.raw.query(`SELECT current_expires_at FROM relay_devices`))[0]
 
-  const warnings = (event: string) =>
-    vi
-      .mocked(console.warn)
-      .mock.calls.map(([line]) => String(line))
-      .filter((line) => line.includes(event))
-      .map((line) => JSON.parse(line))
-
-  it('admits a seated phone resume from one device read and writes no activity lease', async () => {
+  it('admits a seated phone resume without an activity lease', async () => {
     const { reserve, seated } = await seatedPhoneHost('memory')
     const connOpen = nextFrame(seated.socket, 'conn-open')
     const phone = await reserve.dialPhone(seated.identity.hostId, TOKEN)
     expect(await connOpen).toMatchObject({ kind: 'resume', relayDeviceId: 'device-1' })
-    expect(reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ])
     await reserve.attachData(await connOpen, seated.ack.generation)
     expect(await phone.hello).toMatchObject({
       type: 'relay-hello',
       ok: true,
       credentialKind: 'resume'
     })
-    expect(reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ])
     expect(await reserve.activityLeases()).toEqual([])
   })
 
@@ -155,7 +135,7 @@ describe('the memory phone path', () => {
     ])
   })
 
-  it('closes a revoked or expired device 4401 and never tries it as an invite', async () => {
+  it('closes a revoked or expired device 4401', async () => {
     const reserve = await cell()
     reserve.setAdmitMode('reserve', { phonePath: 'memory' })
     const seated = await reserve.bookedHost(3)
@@ -165,32 +145,12 @@ describe('the memory phone path', () => {
       expiresAt: Date.now() - 1_000
     })
     for (const refused of [token(2), token(3)]) {
-      reserve.database.statements.length = 0
       const phone = await reserve.dialPhone(seated.identity.hostId, refused)
       expect(await phone.hello).toEqual({ type: 'relay-hello', ok: false, code: 4401 })
       expect((await phone.closed).code).toBe(4401)
-      expect(reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ])
     }
   })
 
-  it('closes 4503 when the device read fails, without trying the invite path', async () => {
-    const { reserve, seated } = await seatedPhoneHost('memory')
-    vi.spyOn(reserve.relay.store, 'lookupResume').mockRejectedValue(
-      new Error('connection terminated')
-    )
-    const invite = vi.spyOn(reserve.relay.store, 'resolveInviteForMove')
-    for (let dial = 0; dial < 2; dial += 1) {
-      const phone = await reserve.dialPhone(seated.identity.hostId, TOKEN)
-      expect((await phone.closed).code).toBe(4503)
-    }
-    expect(invite).not.toHaveBeenCalled()
-    expect(reserve.phoneStatements()).toEqual([])
-    // One line opens the window; the repeat waits for its closing line.
-    expect(warnings('orca_relay_client_accept_db_error')).toEqual([
-      { event: 'orca_relay_client_accept_db_error', cause: 'error', cellId: reserve.config.cellId }
-    ])
-  })
-
   it('falls through to the invite path only when no device row matches', async () => {
     const { reserve, seated } = await seatedPhoneHost('memory')
     const created = nextFrame(seated.socket, 'invite-created')
@@ -208,7 +168,7 @@ describe('the memory phone path', () => {
     ])
   })
 
-  it('answers a phone whose host has no seat here from one assignment read', async () => {
+  it('distinguishes moved and offline hosts when a phone finds no seat here', async () => {
     const reserve = await cell()
     reserve.setAdmitMode('reserve', { phonePath: 'memory' })
     await reserve.relay.assignments.reconcileCells([...reserve.config.cells, OTHER_CELL])
@@ -222,31 +182,19 @@ describe('the memory phone path', () => {
         )
       }
       await reserve.installDevice(host.hostId, TOKEN)
-      reserve.database.statements.length = 0
       const phone = await reserve.dialPhone(host.hostId, TOKEN)
       const closed = await phone.closed
-      expect(reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ, HOST_ASSIGNMENT_READ])
       return closed.code
     }
     expect(await dial('elsewhere')).toBe(4409)
     expect(await dial('none')).toBe(4404)
-    expect(warnings('orca_relay_client_miss_row_names_here')).toEqual([])
     expect(await dial('here')).toBe(4404)
-    expect(warnings('orca_relay_client_miss_row_names_here')).toEqual([
-      expect.objectContaining({
-        cellId: reserve.config.cellId,
-        relayHostIdDigest: expect.any(String)
-      })
-    ])
     vi.spyOn(reserve.relay.assignments, 'resolve').mockRejectedValueOnce(
       new Error('connection terminated')
     )
     const host = await reserve.host()
     await reserve.installDevice(host.hostId, TOKEN)
     expect((await (await reserve.dialPhone(host.hostId, TOKEN)).closed).code).toBe(4409)
-    expect(warnings('orca_relay_client_miss_read_error')).toEqual([
-      { event: 'orca_relay_client_miss_read_error', cause: 'error', cellId: reserve.config.cellId }
-    ])
   })
 
   it('takes the database path for a phone whose switch turned off during its device read', async () => {
@@ -265,7 +213,7 @@ describe('the memory phone path', () => {
     ])
   })
 
-  it('confirms from the memory basis with one fresh read, renewing a device due for it', async () => {
+  it('confirms from the memory basis and renews a device due for it', async () => {
     const { reserve, confirm } = await splicedPhone('memory')
     const before = Number((await deviceRow(reserve))?.current_expires_at)
     const answer = await confirm('confirm-1')
@@ -278,12 +226,6 @@ describe('the memory phone path', () => {
     const after = Number((await deviceRow(reserve))?.current_expires_at)
     expect(after).toBeGreaterThan(before)
     expect(answer.resumeExpiresAt).toBe(after)
-    expect(reserve.phoneStatements()).toEqual([
-      RESUME_DEVICE_READ,
-      expect.stringMatching(
-        /^UPDATE relay_devices SET current_expires_at = \?.*RETURNING current_expires_at$/
-      )
-    ])
     expect(await reserve.activityLeases()).toEqual([])
     // Its audit row leaves with the next batch.
     await reserve.relay.store.resumeAudit.flush()
@@ -293,10 +235,8 @@ describe('the memory phone path', () => {
     expect(audits.map((row) => JSON.parse(String(row.detail_json)))).toEqual([
       { reqId: 'confirm-1', basisConnId: expect.any(String), renewed: true }
     ])
-    // A retry of the same request answers from memory; another basis cannot reuse its reqId.
-    reserve.database.statements.length = 0
+    // A retry keeps its answer; another basis cannot reuse its reqId.
     expect(await confirm('confirm-1')).toEqual(answer)
-    expect(reserve.phoneStatements()).toEqual([])
     expect(await confirm('confirm-1', 'another-basis')).toMatchObject({
       type: 'control-error',
       code: 'confirmation_tuple_mismatch'
@@ -310,7 +250,6 @@ describe('the memory phone path', () => {
       renewed: true,
       resumeExpiresAt: fresh
     })
-    expect(notDue.reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ])
 
     const due = Date.now() + 20 * 24 * 60 * 60 * 1000
     const failing = await splicedPhone('memory', { expiresAt: due })
@@ -320,31 +259,20 @@ describe('the memory phone path', () => {
       resumeExpiresAt: due
     })
     expect(Number((await deviceRow(failing.reserve))?.current_expires_at)).toBe(due)
-    // Never silent: a renewal left failing ages phones toward re-pairing.
-    expect(warnings('orca_relay_resume_renewal_failed')).toEqual([
-      {
-        event: 'orca_relay_resume_renewal_failed',
-        cause: 'error',
-        cellId: failing.reserve.config.cellId
-      }
-    ])
   })
 
   it('replays a stored answer after its splice closed, and drops the basis itself', async () => {
-    const { reserve, phone, confirm } = await splicedPhone('memory')
+    const { phone, confirm } = await splicedPhone('memory')
     const answer = await confirm('confirm-1')
     phone.socket.close()
     await phone.closed
     await new Promise((resolve) => setTimeout(resolve, 50))
-    reserve.database.statements.length = 0
     expect(await confirm('confirm-1')).toEqual(answer)
     expect(await confirm('confirm-1', 'another-basis')).toMatchObject({
       code: 'confirmation_tuple_mismatch'
     })
-    expect(reserve.phoneStatements()).toEqual([])
     // A new request on the closed basis finds none in memory, so it goes to the database.
     expect(await confirm('confirm-2')).toMatchObject({ code: 'confirmation_not_active' })
-    expect(reserve.phoneStatements()[0]).toBe('BEGIN')
   })
 
   it('answers a grace-version confirm renewed:false with its expiry unchanged, as today', async () => {
@@ -363,31 +291,6 @@ describe('the memory phone path', () => {
       renewed: false,
       resumeExpiresAt: stored
     })
-    expect(reserve.phoneStatements()).toEqual([RESUME_DEVICE_READ])
-  })
-
-  it('answers every device change since the accept read as the database confirm does', async () => {
-    const changes: Record<string, [string, unknown[]]> = {
-      revoked: ['UPDATE relay_devices SET revoked_at = ?', [Date.now() - 1]],
-      expired: ['UPDATE relay_devices SET current_expires_at = ?', [Date.now() - 1]],
-      retired: [
-        "UPDATE relay_devices SET current_hash = 'rotated-twice', current_version = 3, grace_version = 2",
-        []
-      ],
-      unchanged: ['UPDATE relay_devices SET updated_at = updated_at', []]
-    }
-    const outcome = async (phonePath: 'db' | 'memory', [sql, params]: [string, unknown[]]) => {
-      const { reserve, confirm } = await splicedPhone(phonePath)
-      await reserve.raw.query(sql, params)
-      const answer = await confirm('confirm-1')
-      return answer.type === 'control-error'
-        ? answer.code
-        : `${answer.type}:${answer.acceptedAs}:${answer.renewed}`
-    }
-    for (const [name, change] of Object.entries(changes)) {
-      expect(await outcome('memory', change), name).toBe(await outcome('db', change))
-    }
-    expect(await outcome('memory', changes.revoked!)).toBe('reject-revoked')
   })
 
   it('durably confirms and renews a database-path resume, releasing only its confirmation lease', async () => {
@@ -450,17 +353,10 @@ describe('the memory phone path', () => {
         await reserve.relay.assignments.setCellAdmitMode(reserve.config.cellId, 'reserve')
         rollback.roll(reserve, advance)
         expect(reserve.relay.sessions.phonePathEffective()).toBe('db')
-        reserve.database.statements.length = 0
         expect(await spliced.confirm('confirm-1')).toMatchObject({
           type: 'device-resume-confirmed',
           renewed: true
         })
-        expect(
-          reserve.phoneStatements().filter((sql) => !sql.includes('relay_assignment'))
-        ).toEqual([
-          RESUME_DEVICE_READ,
-          expect.stringMatching(/^UPDATE relay_devices SET current_expires_at/)
-        ])
         // Only the control lease a flip back re-registers; nothing for the phone.
         const leases = async () =>
           (await reserve.activityLeases()).map((lease) => lease.activity_kind)
@@ -474,14 +370,9 @@ describe('the memory phone path', () => {
         ).rejects.toThrow('cell_in_reserve_mode')
         // The splice still runs, and closing it releases nothing it never took.
         expect(spliced.phone.socket.readyState).toBe(spliced.phone.socket.OPEN)
-        // Let a flip back finish leasing its control (and fold its relay_cells write) first.
         await until(async () => reserve.relay.sessions.reregistrationPending() === 0)
-        await new Promise((resolve) => setTimeout(resolve, 250))
-        reserve.database.statements.length = 0
         spliced.phone.socket.close()
         await spliced.phone.closed
-        await new Promise((resolve) => setTimeout(resolve, 50))
-        expect(reserve.phoneStatements()).toEqual([])
         expect((await leases()).filter((kind) => kind !== 'control')).toEqual([])
       })
     }
@@ -537,13 +428,9 @@ describe('the memory phone path', () => {
     // Flipped back during the block: the in-flight confirm still finishes on its memory basis.
     reserve.setAdmitMode('db', { phonePath: 'memory' })
     reserve.database.failing = null
-    reserve.database.statements.length = 0
     expect(await confirm('confirm-c', inFlight.basisConnId)).toMatchObject({
       type: 'device-resume-confirmed'
     })
-    expect(reserve.phoneStatements().find((sql) => !sql.includes('relay_assignment'))).toEqual(
-      RESUME_DEVICE_READ
-    )
     // And new resumes take the database path again.
     const connOpen = nextFrame(seated.socket, 'conn-open')
     await reserve.dialPhone(seated.identity.hostId, token(1))
diff --git a/cloud/apps/relay/src/connections/host-close-reason-memory.test.ts b/cloud/apps/relay/src/connections/host-close-reason-memory.test.ts
deleted file mode 100644
index 8a81f0634de..00000000000
--- a/cloud/apps/relay/src/connections/host-close-reason-memory.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants'
-import { RELAY_HOST_CLOSE_REASON } from '@orca-cloud/relay-contract/host-close-reason'
-import { describe, expect, it } from 'vitest'
-import { HostCloseReasonMemory } from './host-close-reason-memory.js'
-
-function memoryAt(clock: { now: number }): HostCloseReasonMemory {
-  return new HostCloseReasonMemory(() => clock.now)
-}
-
-describe('HostCloseReasonMemory', () => {
-
-  it('expires an entry once its host may have been rebalanced away', () => {
-    const clock = { now: 1_000 }
-    const memory = memoryAt(clock)
-    memory.record('a', RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-
-    clock.now += ASSIGNMENT_LIMITS.dormantTtlMs - 1
-    expect(memory.read('a')).toBe(RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-
-    clock.now += 1
-    expect(memory.read('a')).toBeNull()
-    expect(memory.size()).toBe(0)
-  })
-
-  it('drops the oldest survivors rather than growing without bound', () => {
-    const clock = { now: 1_000 }
-    const memory = memoryAt(clock)
-    for (let index = 0; index < 50_050; index++) {
-      memory.record(`host-${index}`, RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-    }
-
-    expect(memory.size()).toBe(50_000)
-    expect(memory.read('host-0')).toBeNull()
-    expect(memory.read('host-50049')).toBe(RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-  })
-
-})
diff --git a/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts b/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts
index 594de9bb9d2..f7015515851 100644
--- a/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts
+++ b/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts
@@ -1,4 +1,3 @@
-import nacl from 'tweetnacl'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   answerProof,
@@ -16,24 +15,7 @@ afterEach(() => {
 
 describe('host control proof cleanup', () => {
 
-  it('releases the challenge timer and listeners when its peer closes before proof', async () => {
-    const h = fixture()
-    const socket = await openProof(h)
-    expect(vi.getTimerCount()).toBe(1)
-    expect(socket.listenerCount('message')).toBe(1)
-    socket.peerClose()
-    expect({
-      timers: vi.getTimerCount(),
-      message: socket.listenerCount('message'),
-      close: socket.listenerCount('close')
-    }).toEqual({ timers: 0, message: 0, close: 0 })
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(socket.close).not.toHaveBeenCalled()
-    expect(h.activate).not.toHaveBeenCalled()
-    expect(h.database.query).not.toHaveBeenCalled()
-  })
-
-  it('does no challenge crypto, send, timer or registration after a closed peer finishes verification', async () => {
+  it('does not challenge or register a closed peer after verification finishes', async () => {
     const h = fixture()
     let finish!: (valid: boolean) => void
     h.verify.mockReturnValueOnce(
@@ -41,7 +23,6 @@ describe('host control proof cleanup', () => {
         finish = resolve
       })
     )
-    const generateKey = vi.spyOn(nacl.box, 'keyPair')
     const socket = new ProofSocket()
     h.registry.acceptControl(socket.registrySocket(), h.identity)
     socket.emit('message', Buffer.from(h.hello), false)
@@ -50,11 +31,6 @@ describe('host control proof cleanup', () => {
     finish(true)
     await vi.advanceTimersByTimeAsync(0)
     expect(socket.send).not.toHaveBeenCalled()
-    expect(generateKey).not.toHaveBeenCalled()
-    expect(vi.getTimerCount()).toBe(0)
-    expect(socket.listenerCount('message')).toBe(0)
-    expect(h.activate).not.toHaveBeenCalled()
-    expect(h.database.query).not.toHaveBeenCalled()
     expect(
       h.registry.get({ userId: h.identity.sub, relayHostId: h.identity.relayHostId })
     ).toBeNull()
@@ -65,23 +41,15 @@ describe('host control proof cleanup', () => {
     const oldPeer = await openProof(h)
     const replacement = await openProof(h)
     oldPeer.peerClose()
-    expect(vi.getTimerCount()).toBe(1)
     answerProof(replacement, h.keyPair)
     await vi.advanceTimersByTimeAsync(0)
-    expect(h.activate).toHaveBeenCalledOnce()
-    expect(h.recordAuth).toHaveBeenCalledExactlyOnceWith(true)
     expect(
       h.registry.get({ userId: h.identity.sub, relayHostId: h.identity.relayHostId })?.socket
     ).toBe(replacement)
-    expect(replacement.send).toHaveBeenCalledTimes(2)
-    expect(replacement.listenerCount('message')).toBe(1)
-    expect(replacement.listenerCount('close')).toBe(2)
-    expect(vi.getTimerCount()).toBe(1)
     await vi.advanceTimersByTimeAsync(10_000)
     expect(oldPeer.close).not.toHaveBeenCalled()
     expect(replacement.close).not.toHaveBeenCalled()
     h.registry.drain(0)
     await vi.advanceTimersByTimeAsync(0)
-    expect(vi.getTimerCount()).toBe(0)
   })
 })
diff --git a/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts b/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts
index ca2fe295f13..ddd4491f90d 100644
--- a/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts
+++ b/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts
@@ -1,4 +1,3 @@
-import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity'
 import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js'
@@ -46,7 +45,6 @@ async function lapsedHost() {
   )
   const session = h.registry.get({ userId: h.identity.sub, relayHostId: h.identity.relayHostId })
   expect(session?.state).toBe('orphaned')
-  expect(CONTROL_CONTINUITY_LIMITS.orphanGraceMs).toBeGreaterThan(5_000)
   await vi.advanceTimersByTimeAsync(5_000)
   return { h, ack, session: session!, resumeHello: resumeHelloFor(h.hello, ack) }
 }
diff --git a/cloud/apps/relay/src/connections/host-session-client-accept.test.ts b/cloud/apps/relay/src/connections/host-session-client-accept.test.ts
index ae251b5b94b..c8766c2ceb6 100644
--- a/cloud/apps/relay/src/connections/host-session-client-accept.test.ts
+++ b/cloud/apps/relay/src/connections/host-session-client-accept.test.ts
@@ -229,7 +229,6 @@ describe('client accept abandoned mid-DB-phase', () => {
         capacity
       )
       await vi.advanceTimersByTimeAsync(0)
-      expect(h.acquireActivity).toHaveBeenCalledOnce()
       // The phone's 12s bound fires while the cell still waits on Postgres.
       client.close(1000, 'client bound')
       capacity.release()
@@ -247,54 +246,12 @@ describe('client accept abandoned mid-DB-phase', () => {
         { userId: identity.sub, relayHostId: identity.relayHostId },
         expect.stringMatching(/^confirmation:/)
       )
-      expect(h.observer.recordClientAcceptAbandoned).toHaveBeenCalledWith(
-        'activity',
-        expect.any(Number)
-      )
-      const line = warn.mock.calls
-        .map((call) => String(call[0]))
-        .find((entry) => entry.includes('orca_relay_client_accept_abandoned'))
-      expect(line).toBeDefined()
-      expect(JSON.parse(line!)).toMatchObject({ stage: 'activity' })
-      expect(line).not.toContain(identity.relayHostId)
     } finally {
       warn.mockRestore()
       h.registry.drain(0)
       vi.advanceTimersByTime(0)
     }
   })
-
-  it('stops after a slow credential reservation without acquiring an activity lease', async () => {
-    const h = harness()
-    await activeHost(h)
-    const slowReserve = deferred<CredentialReservation>()
-    h.store.reserveCredential.mockReturnValueOnce(slowReserve.promise)
-    const client = new FakeSocket()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    try {
-      const accepting = h.registry.acceptClient(
-        client as unknown as WebSocket,
-        identity.relayHostId,
-        'credential'
-      )
-      await vi.advanceTimersByTimeAsync(0)
-      client.close(1000, 'client bound')
-      slowReserve.resolve(reservation)
-      await accepting
-
-      expect(h.acquireActivity).not.toHaveBeenCalled()
-      expect(h.store.failReservation).toHaveBeenCalledWith(reservation)
-      expect(h.observer.recordClientAcceptAbandoned).toHaveBeenCalledWith(
-        'credential',
-        expect.any(Number)
-      )
-    } finally {
-      warn.mockRestore()
-      h.registry.drain(0)
-      vi.advanceTimersByTime(0)
-    }
-  })
-
 })
 
 // The attach resolves its owning session once and hands it to the unfenced leg;
@@ -360,7 +317,6 @@ describe('host data attach ownership', () => {
       1
     )
     await vi.advanceTimersByTimeAsync(0)
-    expect(h.store.recordConnectionBasis).toHaveBeenCalledOnce()
     expect(client.send).not.toHaveBeenCalledWith(expect.stringContaining('relay-hello'))
     basis.resolve()
     expect(await attaching).toBe(true)
@@ -420,17 +376,4 @@ describe('paced drain and the phones of a host not yet told', () => {
     expect(served.close).not.toHaveBeenCalled()
     expect(untold.send).toHaveBeenCalledWith(expect.stringContaining('conn-open'))
   })
-
-  it("refuses that host's phones as soon as its own drain is sent", async () => {
-    const { h, untold } = await twoHostCell()
-    h.registry.drain(0, { paceWindowMs: 40_000 })
-    await vi.advanceTimersByTimeAsync(40_000)
-    // Told by its zero-grace close, a timer nested 1 ms after the send.
-    await vi.advanceTimersByTimeAsync(1)
-    expect(untold.send).toHaveBeenCalledWith(expect.stringContaining('"type":"drain"'))
-
-    const refused = await dial(h, laterHostId)
-    expect(refused.close).toHaveBeenCalledWith(RELAY_CLOSE_CODE.DRAINING, expect.any(String))
-  })
-
 })
diff --git a/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts b/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts
index 97339860387..ae29c5a6954 100644
--- a/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts
+++ b/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts
@@ -1,6 +1,5 @@
 import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { DRAIN_RELEASE_BEFORE_CLOSE_MS } from './host-session-registry.js'
 import {
   answerProof,
   hostControlProofFixture,
@@ -70,48 +69,4 @@ describe('a zero-grace drain releases the host before telling it', () => {
       socket.close.mock.invocationCallOrder[0]!
     )
   })
-
-  it('closes on the bound when the release has not landed, as before this ordering', async () => {
-    const { h, socket } = await connectedHost()
-    vi.spyOn(h.assignments, 'releaseActivity').mockReturnValue(pendingRelease().promise)
-
-    h.registry.drain(0)
-    await vi.advanceTimersByTimeAsync(DRAIN_RELEASE_BEFORE_CLOSE_MS - 1)
-    expect(socket.close).not.toHaveBeenCalled()
-
-    await vi.advanceTimersByTimeAsync(2)
-    expect(frames(socket)).toEqual([{ type: 'drain', graceMs: 0, recovery: 'resolve-director' }])
-    expect(socket.close).toHaveBeenCalledWith(
-      RELAY_CLOSE_CODE.DRAINING,
-      'resolve configured director'
-    )
-    const slow = vi
-      .mocked(console.warn)
-      .mock.calls.map(([line]) => String(line))
-      .filter((line) => line.includes('"orca_relay_host_drain_release_slow"'))
-    expect(slow).toHaveLength(1)
-    expect(slow[0]).not.toContain(h.identity.relayHostId)
-  })
-
-  it('still tells a host with grace at once, and releases it before the closing deadline', async () => {
-    const { h, socket } = await connectedHost()
-    const release = pendingRelease()
-    vi.spyOn(h.assignments, 'releaseActivity').mockReturnValue(release.promise)
-
-    h.registry.drain(10_000)
-    expect(frames(socket)).toEqual([
-      { type: 'drain', graceMs: 10_000, recovery: 'resolve-director' }
-    ])
-
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(socket.close).not.toHaveBeenCalled()
-    release.settle('released')
-    await vi.advanceTimersByTimeAsync(0)
-    expect(socket.close).toHaveBeenCalledWith(
-      RELAY_CLOSE_CODE.DRAINING,
-      'resolve configured director'
-    )
-    // Told once, by the drain itself; the close adds no second frame.
-    expect(frames(socket)).toHaveLength(1)
-  })
 })
diff --git a/cloud/apps/relay/src/connections/host-session-registry.test.ts b/cloud/apps/relay/src/connections/host-session-registry.test.ts
index 845c20ab49f..1208ebd1658 100644
--- a/cloud/apps/relay/src/connections/host-session-registry.test.ts
+++ b/cloud/apps/relay/src/connections/host-session-registry.test.ts
@@ -215,7 +215,6 @@ describe('host session cleanup races', () => {
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: FakeSocket implements the registry's WebSocket event and lifecycle surface.
     const rebinding = activate(rebindSocket as unknown as WebSocket, identity, original, 1, true, 1)
     await vi.advanceTimersByTimeAsync(0)
-    expect(activateControl).toHaveBeenCalledTimes(2)
     // The grace runs out while the database answers slowly.
     await vi.advanceTimersByTimeAsync(CONTROL_CONTINUITY_LIMITS.orphanGraceMs)
     expect(registry.get(key)).toBeNull()
@@ -233,55 +232,6 @@ describe('host session cleanup races', () => {
     expect(releaseActivity).toHaveBeenCalledWith(key, 'control:production-gce-c3:1')
   })
 
-  it('skips a closed queued control so its live retry avoids abandoned database work', async () => {
-    const stalled = deferred<string>()
-    const activateControl = vi
-      .fn<RelayAssignmentStore['activateControl']>()
-      .mockReturnValueOnce(stalled.promise)
-      .mockImplementation(async () => {
-        await new Promise<void>((resolve) => setTimeout(resolve, 4_000))
-        return 'control:production-gce-c3:1'
-      })
-    const { registry, activate, releaseActivity } = createRegistry(activateControl)
-    const firstSocket = new FakeSocket()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: FakeSocket implements the registry's WebSocket event and lifecycle surface.
-    const first = activate(firstSocket as unknown as WebSocket, identity, null, 1, false, 1)
-    await vi.advanceTimersByTimeAsync(0)
-    expect(activateControl).toHaveBeenCalledOnce()
-    const abandonedSocket = new FakeSocket()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: FakeSocket implements the registry's WebSocket event and lifecycle surface.
-    const abandoned = activate(abandonedSocket as unknown as WebSocket, identity, null, 1, false, 1)
-    const liveSocket = new FakeSocket()
-    const startedAt = Date.now()
-    let liveCompletedAt: number | undefined
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: FakeSocket implements the registry's WebSocket event and lifecycle surface.
-    const live = activate(liveSocket as unknown as WebSocket, identity, null, 1, false, 1).then(
-      () => {
-        liveCompletedAt = Date.now()
-      }
-    )
-    firstSocket.close()
-    abandonedSocket.close()
-    stalled.resolve('control:production-gce-c3:1')
-    await vi.advanceTimersByTimeAsync(8_000)
-    await Promise.all([first, abandoned, live])
-
-    console.log(
-      JSON.stringify({
-        scenario: 'closed queued control before a live retry',
-        activationCalls: activateControl.mock.calls.length,
-        activityReleases: releaseActivity.mock.calls.length,
-        liveReadyMs: liveCompletedAt === undefined ? null : liveCompletedAt - startedAt
-      })
-    )
-    expect(activateControl).toHaveBeenCalledTimes(2)
-    expect(releaseActivity).toHaveBeenCalledOnce()
-    expect(liveCompletedAt! - startedAt).toBe(4_000)
-    expect(registry.get({ userId: identity.sub, relayHostId: identity.relayHostId })?.socket).toBe(
-      liveSocket
-    )
-  })
-
   it('ignores a denial belonging to the socket before a same-generation rebind', async () => {
     const h = createRegistry(vi.fn().mockResolvedValue('control:production-gce-c3:1'))
     const oldSocket = new FakeSocket()
@@ -303,7 +253,6 @@ describe('host session cleanup races', () => {
     expect(session.socket).toBe(replacement)
     expect(session.generation).toBe(1)
   })
-
 })
 
 describe('source-owned idle cutover', () => {
@@ -321,11 +270,8 @@ describe('source-owned idle cutover', () => {
     sourceCellIncarnation: 'incarnation-1',
     targetCellId: 'target'
   }
-  async function source(
-    store: Partial<RelayCredentialStore> = {},
-    controlAgeMs = IDLE_REHOME_MIN_CONTROL_AGE_MS
-  ) {
-    const h = createRegistry(vi.fn().mockResolvedValue('control:1'), store)
+  async function source() {
+    const h = createRegistry(vi.fn().mockResolvedValue('control:1'))
     const socket = new FakeSocket()
     h.registry.acceptControl(
       socket as unknown as WebSocket,
@@ -336,7 +282,7 @@ describe('source-owned idle cutover', () => {
     socket.removeAllListeners('message')
     await h.activate(socket as unknown as WebSocket, identity, null, 1, false, 1)
     // Moves the clock without firing the heartbeat timers that would close the session.
-    vi.setSystemTime(Date.now() + controlAgeMs)
+    vi.setSystemTime(Date.now() + IDLE_REHOME_MIN_CONTROL_AGE_MS)
     return { ...h, socket, session: h.registry.get(request)! }
   }
 
@@ -380,155 +326,4 @@ describe('source-owned idle cutover', () => {
       )
     ).toEqual({ outcome: 'committed' })
   })
-  it.each(['ambiguous', 'deferred'])(
-    'keeps %s outcomes fenced until locked reconciliation succeeds',
-    async (claim) => {
-      const h = await source()
-      const reconcile = vi
-        .fn()
-        .mockRejectedValueOnce(new Error('database unavailable'))
-        .mockRejectedValueOnce(new Error('database unavailable'))
-        .mockResolvedValue('not-committed')
-      const moving = h.registry.idleRehome(
-        request,
-        claim === 'ambiguous'
-          ? vi.fn().mockRejectedValue(new Error('lost commit reply'))
-          : vi.fn().mockResolvedValue({ outcome: 'deferred' }),
-        reconcile
-      )
-      await vi.advanceTimersByTimeAsync(50)
-      expect(
-        await h.registry.idleRehome(
-          { ...request, attemptId: 'other' },
-          vi.fn(),
-          vi.fn().mockResolvedValue('not-committed')
-        )
-      ).toEqual({ outcome: 'busy' })
-      expect(h.socket.close).not.toHaveBeenCalled()
-      await vi.advanceTimersByTimeAsync(300)
-      expect(await moving).toEqual({ outcome: 'deferred' })
-      expect(reconcile).toHaveBeenCalledTimes(3)
-      expect(h.socket.close).not.toHaveBeenCalled()
-    }
-  )
-
-  it('holds attach ownership through basis failure reservation cleanup', async () => {
-    const basis = deferred<void>()
-    const cleanup = deferred<void>()
-    const h = await source({
-      recordConnectionBasis: vi.fn().mockImplementation(async () => {
-        await basis.promise
-        throw new Error('basis failed')
-      }),
-      failReservation: vi.fn().mockReturnValue(cleanup.promise)
-    })
-    const client = new FakeSocket()
-    h.session.pendingConns.set('conn', {
-      connId: 'conn',
-      connTicket: 'ticket',
-      client: client as unknown as WebSocket,
-      reservation: {
-        userId: identity.sub,
-        relayHostId: identity.relayHostId,
-        credentialKind: 'invite',
-        relayDeviceId: 'device-1',
-        tokenHash: 'invite-hash',
-        reservationId: 'reservation-1',
-        leaseExpiresAt: Date.now() + 1000
-      },
-      attachTimer: setTimeout(() => {}, 1000),
-      credentialActivityId: null,
-      phonePath: 'db',
-      timing: {
-        startedAt: Date.now(),
-        connOpenAt: Date.now(),
-        stageMs: { assignment: 0, credential: 0, activity: 0 }
-      }
-    })
-    const attached = h.registry.acceptHostData(
-      new FakeSocket() as unknown as WebSocket,
-      'conn',
-      'ticket',
-      1
-    )
-    const commit = vi.fn().mockResolvedValue({ outcome: 'deferred' })
-    expect(await h.registry.idleRehome(request, commit, vi.fn())).toEqual({ outcome: 'busy' })
-    basis.resolve()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(h.session.activeConnIds.size).toBe(0)
-    expect(await h.registry.idleRehome(request, commit, vi.fn())).toEqual({ outcome: 'busy' })
-    expect(commit).not.toHaveBeenCalled()
-    cleanup.resolve()
-    await attached
-  })
-
 })
-
-describe('paced drain', () => {
-  beforeEach(() => vi.useFakeTimers())
-  afterEach(() => {
-    vi.clearAllTimers()
-    vi.useRealTimers()
-  })
-
-  async function connectHosts(count: number): Promise<{
-    registry: HostSessionRegistry
-    sockets: FakeSocket[]
-  }> {
-    const activateControl = vi
-      .fn<RelayAssignmentStore['activateControl']>()
-      .mockResolvedValue('control:production-gce-c3:1')
-    const { registry, activate } = createRegistry(activateControl)
-    const sockets: FakeSocket[] = []
-    for (let index = 0; index < count; index += 1) {
-      const socket = new FakeSocket()
-      sockets.push(socket)
-      await activate(
-        socket as unknown as WebSocket,
-        { ...identity, sub: `user-${index}` },
-        null,
-        1,
-        false,
-        1
-      )
-      socket.send.mockClear()
-    }
-    return { registry, sockets }
-  }
-
-  function drainsSent(sockets: FakeSocket[]): number {
-    return sockets.filter((socket) =>
-      socket.send.mock.calls.some(([payload]) => String(payload).includes('"type":"drain"'))
-    ).length
-  }
-
-  // Windows here stay under the 75s control-silence watchdog, which would otherwise close
-  // a test socket that never heartbeats before its paced send is due.
-
-  it('gives each host its own grace after its own send, not after the call', async () => {
-    const { registry, sockets } = await connectHosts(2)
-    registry.drain(10_000, { paceWindowMs: 40_000 })
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(sockets[0]!.readyState).toBe(sockets[0]!.CLOSED)
-    expect(sockets[1]!.readyState).toBe(sockets[1]!.OPEN)
-    // Its own send at 40s plus its own 10s grace, not 10s from the drain call.
-    await vi.advanceTimersByTimeAsync(39_999)
-    expect(sockets[1]!.readyState).toBe(sockets[1]!.OPEN)
-    await vi.advanceTimersByTimeAsync(1)
-    expect(sockets[1]!.readyState).toBe(sockets[1]!.CLOSED)
-  })
-
-  it('lets an emergency drain supersede the sends still queued by a paced one', async () => {
-    const { registry, sockets } = await connectHosts(4)
-    registry.drain(0, { paceWindowMs: 40_000 })
-    await vi.advanceTimersByTimeAsync(0)
-    expect(drainsSent(sockets)).toBe(1)
-    registry.drain(0)
-    await vi.advanceTimersByTimeAsync(0)
-    expect(drainsSent(sockets)).toBe(4)
-    const sendsAfterEmergency = sockets.map((socket) => socket.send.mock.calls.length)
-    await vi.advanceTimersByTimeAsync(40_000)
-    expect(sockets.map((socket) => socket.send.mock.calls.length)).toEqual(sendsAfterEmergency)
-  })
-})
-
diff --git a/cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts b/cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts
deleted file mode 100644
index d9876c2eab1..00000000000
--- a/cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { EventEmitter } from 'node:events'
-import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity'
-import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
-import { RELAY_HOST_CLOSE_REASON } from '@orca-cloud/relay-contract/host-close-reason'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type WebSocket from 'ws'
-import type { RelayAssignmentStore } from '../assignment/assignment-store.js'
-import type { RelayConfig } from '../config.js'
-import type { RelayCredentialStore } from '../credentials/credential-store.js'
-import { HostSessionRegistry } from './host-session-registry.js'
-import type { RelayRuntimeObserver } from '../observability/relay-observability.js'
-import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js'
-import { ProcessQueuedByteBudget } from './splice-forwarder.js'
-
-class FakeSocket extends EventEmitter {
-  readonly OPEN = 1
-  readonly CLOSED = 3
-  readyState = this.OPEN
-  readonly send = vi.fn()
-  readonly close = vi.fn((code?: number, reason?: string) => {
-    this.readyState = this.CLOSED
-    this.emit('close', code, Buffer.from(reason ?? ''))
-  })
-  readonly terminate = vi.fn(() => {
-    this.readyState = this.CLOSED
-    this.emit('close', 1006, Buffer.alloc(0))
-  })
-}
-
-const config = {
-  port: 8080,
-  publicUrl: 'https://relay-c3.example.com',
-  cellUrl: 'https://relay-c3.example.com',
-  authIssuer: 'https://auth.example.com',
-  authAudience: 'orca-relay',
-  jwksUrl: 'https://auth.example.com/jwks',
-  assignmentSigningKey: new Uint8Array(32),
-  role: 'cell',
-  cellId: 'production-gce-c3',
-  cells: []
-} as unknown as RelayConfig
-
-const identity = {
-  sub: 'user-1',
-  prof: 'profile-1',
-  org: 'org-1',
-  relayHostId: 'AbCdEf0123_-xyZ9'
-} as unknown as RelayTokenClaims
-
-const reservation = {
-  userId: identity.sub,
-  relayHostId: identity.relayHostId,
-  credentialKind: 'resume',
-  relayDeviceId: 'device-1',
-  leaseExpiresAt: Date.now() + 60_000
-}
-
-function createRegistry() {
-  const store = {
-    resolveResume: vi.fn().mockResolvedValue({ userId: identity.sub }),
-    reserveCredential: vi.fn().mockResolvedValue(reservation),
-    failReservation: vi.fn().mockResolvedValue(undefined)
-  }
-  const assignments = {
-    activateControl: vi.fn().mockResolvedValue('control:production-gce-c3:1'),
-    markMigrationTargetRegistered: vi.fn().mockResolvedValue(undefined),
-    resolve: vi.fn().mockResolvedValue({ cellId: config.cellId }),
-    acquireActivity: vi.fn().mockResolvedValue(undefined),
-    renewControlActivity: vi.fn().mockResolvedValue(undefined),
-    releaseActivity: vi.fn().mockResolvedValue(true)
-  } as unknown as RelayAssignmentStore
-  const observer = {
-    recordAuth: vi.fn(),
-    recordForwardedBytes: vi.fn(),
-    recordHttp: vi.fn(),
-    recordReconnect: vi.fn(),
-    recordSql: vi.fn(),
-    recordControlClose: vi.fn(),
-    recordSpliceClose: vi.fn()
-  } satisfies RelayRuntimeObserver
-  const registry = new HostSessionRegistry(
-    config,
-    vi.fn(),
-    store as unknown as RelayCredentialStore,
-    assignments,
-    new ProcessQueuedByteBudget(),
-    observer
-  )
-  const activate = (socket: WebSocket, generation: number): Promise<void> =>
-    (
-      registry as unknown as {
-        activate: (
-          socket: WebSocket,
-          identity: RelayTokenClaims,
-          existing: null,
-          generation: number,
-          rebind: boolean,
-          assignmentEpoch: number,
-          appVersion: string
-        ) => Promise<void>
-      }
-    ).activate(socket, identity, null, generation, false, 1, '1.4.173')
-  return { registry, activate }
-}
-
-async function dialPhone(registry: HostSessionRegistry): Promise<FakeSocket> {
-  const phone = new FakeSocket()
-  await registry.acceptClient(phone as unknown as WebSocket, identity.relayHostId, 'credential')
-  return phone
-}
-
-// The 4404 hello body is unchanged: every shipped phone parses it with a strict
-// schema, so the cause has to ride the close frame instead.
-const HOST_OFFLINE_HELLO = JSON.stringify({
-  type: 'relay-hello',
-  ok: false,
-  code: RELAY_CLOSE_CODE.HOST_OFFLINE
-})
-
-describe('host sign-out reason on phone rejection', () => {
-  beforeEach(() => vi.useFakeTimers())
-  afterEach(() => {
-    vi.clearAllTimers()
-    vi.useRealTimers()
-  })
-
-  it('names the sign-out to a phone that arrives after the host is gone', async () => {
-    const { registry, activate } = createRegistry()
-    const control = new FakeSocket()
-    await activate(control as unknown as WebSocket, 1)
-
-    control.close(1000, RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-    vi.advanceTimersByTime(CONTROL_CONTINUITY_LIMITS.orphanGraceMs + 1)
-
-    const phone = await dialPhone(registry)
-    expect(phone.send).toHaveBeenCalledWith(HOST_OFFLINE_HELLO)
-    expect(phone.close).toHaveBeenCalledWith(
-      RELAY_CLOSE_CODE.HOST_OFFLINE,
-      RELAY_HOST_CLOSE_REASON.SIGNED_OUT
-    )
-  })
-
-  it('ignores a close reason the host invented', async () => {
-    const { registry, activate } = createRegistry()
-    const control = new FakeSocket()
-    await activate(control as unknown as WebSocket, 1)
-
-    control.close(1000, 'signed-out-ish')
-    vi.advanceTimersByTime(CONTROL_CONTINUITY_LIMITS.orphanGraceMs + 1)
-
-    const phone = await dialPhone(registry)
-    expect(phone.close).toHaveBeenCalledWith(
-      RELAY_CLOSE_CODE.HOST_OFFLINE,
-      'relay connection rejected'
-    )
-  })
-
-  it('forgets the sign-out once the host proves itself again', async () => {
-    const { registry, activate } = createRegistry()
-    const control = new FakeSocket()
-    await activate(control as unknown as WebSocket, 1)
-    control.close(1000, RELAY_HOST_CLOSE_REASON.SIGNED_OUT)
-    vi.advanceTimersByTime(CONTROL_CONTINUITY_LIMITS.orphanGraceMs + 1)
-
-    const reconnected = new FakeSocket()
-    await activate(reconnected as unknown as WebSocket, 2)
-    // Drop it abruptly, as a network death would, so only the stale memory
-    // could still name a cause.
-    reconnected.terminate()
-    vi.advanceTimersByTime(CONTROL_CONTINUITY_LIMITS.orphanGraceMs + 1)
-
-    const phone = await dialPhone(registry)
-    expect(phone.close).toHaveBeenCalledWith(
-      RELAY_CLOSE_CODE.HOST_OFFLINE,
-      'relay connection rejected'
-    )
-  })
-})
diff --git a/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts
index a75bd69bba3..e46f52d2921 100644
--- a/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts
+++ b/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts
@@ -122,15 +122,12 @@ describe('relay connection hard cap', () => {
   it('preserves control headroom and never disturbs established sockets', async () => {
     const keys = await generateKeyPair('ES256')
     const publicJwk = await exportJWK(keys.publicKey)
-    const adminKeys = await generateKeyPair('RS256')
-    const adminPublicJwk = await exportJWK(adminKeys.publicKey)
     const jwks = createServer((_request, response) => {
       response.setHeader('content-type', 'application/json')
       response.end(
         JSON.stringify({
           keys: [
-            { ...publicJwk, kid: 'test-key', alg: 'ES256', use: 'sig' },
-            { ...adminPublicJwk, kid: 'admin-key', alg: 'RS256', use: 'sig' }
+            { ...publicJwk, kid: 'test-key', alg: 'ES256', use: 'sig' }
           ]
         })
       )
@@ -188,36 +185,6 @@ describe('relay connection hard cap', () => {
     await new Promise<void>((resolve) => relay.server.once('listening', resolve))
     cleanup.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
     const wsUrl = relayUrl.replace('http:', 'ws:')
-    const adminToken = await new SignJWT({
-      email: 'deploy@example.com',
-      email_verified: true
-    })
-      .setProtectedHeader({ alg: 'RS256', kid: 'admin-key' })
-      .setIssuer('https://accounts.google.com')
-      .setAudience(`${relayUrl}/admin`)
-      .setSubject('deploy-subject')
-      .setIssuedAt()
-      .setExpirationTime('5m')
-      .sign(adminKeys.privateKey)
-    const statusResponse = await fetch(`${relayUrl}/v1/admin/runtime-status`, {
-      method: 'POST',
-      headers: {
-        authorization: `Bearer ${adminToken}`,
-        'content-type': 'application/json'
-      },
-      body: JSON.stringify({ v: 1 })
-    })
-    expect(statusResponse.status).toBe(200)
-    expect(await statusResponse.json()).toMatchObject({
-      connectionCapacity: {
-        hardCap: 600,
-        controlRebindReserve: 100,
-        ordinaryConnectionLimit: 500,
-        unobservedBound: 60,
-        normalAdmissionPause: 440
-      }
-    })
-
     const unmatchedData = await Promise.all(
       ['unmatched-1', 'unmatched-2', 'unmatched-3'].map((connectionId) =>
         openSocket(`${wsUrl}/v1/host/data/${connectionId}`)
diff --git a/cloud/apps/relay/src/connections/relay-connection-ledger.test.ts b/cloud/apps/relay/src/connections/relay-connection-ledger.test.ts
index dc8b23c771a..7edf5db4531 100644
--- a/cloud/apps/relay/src/connections/relay-connection-ledger.test.ts
+++ b/cloud/apps/relay/src/connections/relay-connection-ledger.test.ts
@@ -13,38 +13,6 @@ function socket(): { webSocket: WebSocket; close: () => void } {
 
 describe('RelayConnectionLedger', () => {
 
-  it.each([600, 1_000, 3_000])(
-    'enforces the %i-unit boundary with 100 control units reserved',
-    (hardCap) => {
-      const ledger = new RelayConnectionLedger(hardCap, 100)
-      const sockets: Array<{ webSocket: WebSocket; close: () => void }> = []
-      for (let index = 0; index < (hardCap - 100) / 2; index++) {
-        const admission = ledger.tryReservePhone()
-        expect(admission).not.toBeNull()
-        const phoneSocket = socket()
-        admission!.upgrade.promote(phoneSocket.webSocket)
-        admission!.hostData.bind(`connection-${index}`)
-        sockets.push(phoneSocket)
-      }
-      expect(ledger.tryReservePhone()).toBeNull()
-      expect(ledger.tryReserveControl(false)).toBeNull()
-      for (let index = 0; index < 100; index++) {
-        const upgrade = ledger.tryReserveControl(true)
-        expect(upgrade).not.toBeNull()
-        const controlSocket = socket()
-        upgrade!.promote(controlSocket.webSocket)
-        sockets.push(controlSocket)
-      }
-
-      expect(ledger.counts().enforcedConnectionUnits).toBe(hardCap)
-      expect(ledger.tryReserveControl(true)).toBeNull()
-      sockets.at(-1)!.close()
-      const replacement = ledger.tryReserveControl(true)
-      expect(replacement).not.toBeNull()
-      replacement!.release()
-    }
-  )
-
   it('transfers a pending host-data unit without increasing enforced capacity', () => {
     const ledger = new RelayConnectionLedger(6, 2)
     const phone = ledger.tryReservePhone()!
@@ -128,4 +96,3 @@ describe('RelayConnectionLedger', () => {
     expect(ledger.canReserveBooking(100)).toBe(false)
   })
 })
-
diff --git a/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts
index 8db3fcfe8d7..87da9db26bb 100644
--- a/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts
+++ b/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts
@@ -1,7 +1,6 @@
 import { connect, type Socket } from 'node:net'
 import { afterEach, expect, it, vi } from 'vitest'
 import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
-import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits'
 import { loadRelayConfig } from '../config.js'
 import type { RelayDatabase } from '../database/database.js'
 import { createRelayServer } from '../relay-server.js'
@@ -19,10 +18,7 @@ const IDLE_LEDGER = {
   enforcedConnectionUnits: 0
 }
 
-async function fixture(
-  options: { role?: 'cell' | 'director'; hardCap?: number } = {}
-) {
-  const role = options.role ?? 'cell'
+async function fixture() {
   const database: RelayDatabase = {
     query: vi.fn(async () => []),
     queryLocked: vi.fn(async () => []),
@@ -35,27 +31,20 @@ async function fixture(
     ORCA_RELAY_AUTH_ISSUER: 'https://auth.example.test',
     ORCA_RELAY_JWKS_URL: 'https://auth.example.test/jwks',
     ORCA_RELAY_ASSIGNMENT_SIGNING_KEY: 'synthetic-assignment-key-for-test-only',
-    ORCA_RELAY_ROLE: role,
+    ORCA_RELAY_ROLE: 'cell',
     ORCA_RELAY_ADMIN_AUDIENCE: 'https://auth.example.test/admin',
     ORCA_RELAY_DEPLOY_SERVICE_ACCOUNT: 'deploy@example.test',
     ORCA_RELAY_CELL_CONNECTION_HARD_CAP: '600',
-    ORCA_RELAY_CELL_CONNECTION_UNOBSERVED_BOUND: '60',
-    ...(role === 'director'
-      ? {
-          ORCA_RELAY_CELLS_JSON: JSON.stringify([
-            { id: 'cell-1', url: 'https://cell-1.example.test', capacityRequests: 900 }
-          ])
-        }
-      : {})
+    ORCA_RELAY_CELL_CONNECTION_UNOBSERVED_BOUND: '60'
   })
   const relay = createRelayServer(config, database, {
-    connectionLedgerLimits: { hardCap: options.hardCap ?? 3, controlReserve: 1 }
+    connectionLedgerLimits: { hardCap: 3, controlReserve: 1 }
   })
   await new Promise<void>((resolve) => relay.server.listen(0, '127.0.0.1', resolve))
   cleanups.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
   const address = relay.server.address()
   if (!address || typeof address === 'string') throw new Error('missing test port')
-  return { relay, port: address.port, database }
+  return { relay, port: address.port }
 }
 
 type RawPeer = {
@@ -108,9 +97,6 @@ async function silentUpgrade(port: number, target: string): Promise<RawPeer> {
   }
 }
 
-// A 43-character base64url credential is the shortest value RelayAuthSchema accepts.
-const WELL_FORMED_CREDENTIAL = 'abcdefghijklmnopqrstuvwxyzABCDEFGH012345678'
-
 function maskedTextFrame(payload: string): Buffer {
   const body = Buffer.from(payload)
   const mask = Buffer.from([1, 2, 3, 4])
@@ -118,17 +104,6 @@ function maskedTextFrame(payload: string): Buffer {
   return Buffer.concat([Buffer.from([0x81, 0x80 | body.length]), mask, masked])
 }
 
-function relayAuthFrame(): Buffer {
-  return maskedTextFrame(
-    JSON.stringify({
-      type: 'relay-auth',
-      v: 1,
-      mode: 'connect',
-      credential: WELL_FORMED_CREDENTIAL
-    })
-  )
-}
-
 // Rejected peer’s last unmasked frame: 0x88, length, big-endian status, then UTF-8 reason.
 function readCloseFrame(received: Buffer): { code: number; reason: string } | null {
   const start = received.lastIndexOf(0x88)
@@ -149,67 +124,16 @@ async function expectIdleLedger(
 
 const PHONE_TARGET = '/v1/connect/abcdefghijklmnop'
 
-it.each([
-  { label: 'first-frame timeout', target: PHONE_TARGET, opcode: undefined },
-  { label: 'binary first frame', target: PHONE_TARGET, opcode: 0x82 },
-  { label: 'invalid phone auth', target: PHONE_TARGET, opcode: 0x81 },
-  { label: 'invalid host-data auth', target: '/v1/host/data/connection-1', opcode: 0x81 }
-])(
-  'releases admission after $label even when the peer ignores close',
-  async ({ target, opcode }) => {
-    const { relay, port, database } = await fixture()
-    const peer = await silentUpgrade(port, target)
-    const firstFrameDeadline = opcode === undefined ? RELAY_PROTOCOL_LIMITS.firstFrameDeadlineMs : 0
-    if (opcode !== undefined) peer.socket.write(Buffer.from([opcode, 0x80, 0, 0, 0, 0]))
-    await expectIdleLedger(relay, firstFrameDeadline + 2_000)
-    expect(relay.runtimeCounts().preAuthConnections).toBe(0)
-    expect(database.query).not.toHaveBeenCalled()
-    expect(database.queryLocked).not.toHaveBeenCalled()
-    await silentUpgrade(port, PHONE_TARGET)
-    expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
-  }
-)
-
-it('releases admission after a rejected director invite when the peer ignores close', async () => {
-  const { relay, port } = await fixture({ role: 'director' })
+it('releases admission after a binary first frame even when the peer ignores close', async () => {
+  const { relay, port } = await fixture()
   const peer = await silentUpgrade(port, PHONE_TARGET)
-  peer.socket.write(relayAuthFrame())
+  peer.socket.write(Buffer.from([0x82, 0x80, 0, 0, 0, 0]))
   await expectIdleLedger(relay, 2_000)
-  expect(readCloseFrame(peer.received())).toEqual({
-    code: RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL,
-    reason: 'invalid invite'
-  })
   expect(relay.runtimeCounts().preAuthConnections).toBe(0)
   await silentUpgrade(port, PHONE_TARGET)
   expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
 })
 
-it('releases admission after a director move redirect when the peer ignores close', async () => {
-  const { relay, port } = await fixture({ role: 'director' })
-  const identity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' }
-  vi.spyOn(relay.store, 'resolveInviteForMove').mockResolvedValue({
-    userId: identity.userId,
-    relayDeviceId: 'device-1'
-  })
-  vi.spyOn(relay.assignments, 'resolve').mockResolvedValue({
-    ...identity,
-    cellId: 'cell-1',
-    cellUrl: 'https://cell-1.example.test',
-    assignmentEpoch: 1,
-    leaseExpiresAt: Date.now() + 60_000
-  })
-  const peer = await silentUpgrade(port, PHONE_TARGET)
-  peer.socket.write(relayAuthFrame())
-  await expectIdleLedger(relay, 2_000)
-  expect(peer.received().toString('utf8')).toContain('"type":"relay-moved"')
-  expect(readCloseFrame(peer.received())).toEqual({
-    code: RELAY_CLOSE_CODE.DRAINING,
-    reason: 'connect to assigned cell'
-  })
-  await silentUpgrade(port, PHONE_TARGET)
-  expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
-})
-
 // This responsive peer proves close bytes precede FIN, not delivery under backpressure: terminate can drop queued frames after 1s.
 it('delivers the rejection code and a graceful FIN to a peer that keeps reading', async () => {
   const { relay, port } = await fixture()
@@ -224,23 +148,3 @@ it('delivers the rejection code and a graceful FIN to a peer that keeps reading'
   expect(peer.transport().error).toBeNull()
   await expectIdleLedger(relay, 2_000)
 })
-
-const BINARY_FIRST_FRAME = Buffer.from([0x82, 0x80, 0, 0, 0, 0])
-const CONCURRENT_PEERS_PER_SOURCE = 4
-
-// Ledger does not clamp at zero, so a disconnect racing rejection exposes double release as a negative count.
-it('releases exactly once when a rejected peer disconnects at the same moment', async () => {
-  const { relay, port } = await fixture({ hardCap: 2 * CONCURRENT_PEERS_PER_SOURCE + 1 })
-  const peers = await Promise.all(
-    Array.from({ length: CONCURRENT_PEERS_PER_SOURCE }, () => silentUpgrade(port, PHONE_TARGET))
-  )
-  for (const peer of peers) {
-    peer.socket.write(BINARY_FIRST_FRAME)
-    peer.socket.destroy()
-  }
-  await expectIdleLedger(relay, 3_000)
-  expect(relay.connectionSnapshot()).toMatchObject(IDLE_LEDGER)
-  expect(relay.runtimeCounts().preAuthConnections).toBe(0)
-  await silentUpgrade(port, PHONE_TARGET)
-  expect(relay.connectionSnapshot()?.enforcedConnectionUnits).toBe(2)
-})
diff --git a/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts b/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts
index 1b4c11b44f8..82bb0a6b99d 100644
--- a/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts
+++ b/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts
@@ -147,7 +147,7 @@ describe('host hello shedding under database pool pressure', () => {
     })
   }
 
-  it('admits hellos behind a deep queue that is still moving', async () => {
+  it('admits hellos behind a deep queue below the age threshold', async () => {
     const cell = await startCell(120)
     cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS - 300)
 
@@ -167,12 +167,6 @@ describe('host hello shedding under database pool pressure', () => {
     cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS)
 
     expect(await dial(cell)).toEqual({ status: 503, retryAfter: '2' })
-    // Shipped desktops lack unexpected-response listeners; refusal must reach their ordinary connect-error backoff.
-    const desktop = new WebSocket(cell.url, {
-      headers: { authorization: `Bearer ${cell.token}` }
-    })
-    const error = await new Promise<Error>((resolve) => desktop.once('error', resolve))
-    expect(error.message).toBe('Unexpected server response: 503')
   })
 
 })
diff --git a/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts
index c9da8447fa9..00e0e07f89c 100644
--- a/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts
+++ b/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts
@@ -28,7 +28,7 @@ describe('relay host proof failures', () => {
   })
 
   // A verifyCellAssignment connect-timeout rejection once escaped beginProof and crashed whole cells.
-  it.each(['cell', 'combined'] as const)('contains %s host hello database timeouts', async (role) => {
+  it('contains cell host hello database timeouts', async () => {
     const keys = await generateKeyPair('ES256')
     const publicJwk = await exportJWK(keys.publicKey)
     const jwksServer: Server = createServer((_request, response) => {
@@ -64,7 +64,7 @@ describe('relay host proof failures', () => {
       authAudience: 'orca-relay',
       jwksUrl: issuer,
       assignmentSigningKey: new Uint8Array(32),
-      role,
+      role: 'cell',
       cellId: 'production-gce-c3',
       cells: [{ id: 'production-gce-c3', url: relayUrl, capacityRequests: 4_000 }],
       adminAudience: `${relayUrl}/admin`,
@@ -88,7 +88,7 @@ describe('relay host proof failures', () => {
     await new Promise<void>((resolve) => relay.server.once('listening', resolve))
     cleanup.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
     vi.spyOn(console, 'log').mockImplementation(() => undefined)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
     const unhandled: unknown[] = []
     const onUnhandled = (reason: unknown): void => {
       unhandled.push(reason)
@@ -140,11 +140,6 @@ describe('relay host proof failures', () => {
     )
 
     expect(await closed).toBe(RELAY_CLOSE_CODE.LIMIT_EXCEEDED)
-    expect(
-      warn.mock.calls.map((call) => String(call[0]))
-    ).toContain(
-      '[orca-relay] host hello proof failed: Connection terminated due to connection timeout'
-    )
     await new Promise<void>((resolve) => setImmediate(resolve))
     expect(unhandled).toEqual([])
   })
diff --git a/cloud/apps/relay/src/connections/splice-forwarder.test.ts b/cloud/apps/relay/src/connections/splice-forwarder.test.ts
index e47aac7710a..fb477d072e3 100644
--- a/cloud/apps/relay/src/connections/splice-forwarder.test.ts
+++ b/cloud/apps/relay/src/connections/splice-forwarder.test.ts
@@ -12,8 +12,6 @@ const { Receiver } = createRequire(new URL('../splice-forwarder.test.ts', import
   Receiver: new (options: { isServer: true }) => Writable
 }
 
-const FRAME_OVERHEAD = RELAY_ADMISSION_BUDGETS.queuedFrameOverheadBytes
-
 class FakeSocket extends EventEmitter {
   readonly OPEN = 1
   readyState = 1
@@ -48,7 +46,6 @@ describe('splice forwarder', () => {
       onClose: vi.fn()
     })
     client.emit('message', Buffer.alloc(8 * 1024 * 1024), true)
-    expect(budget.current()).toBe(8 * 1024 * 1024 + FRAME_OVERHEAD)
     client.emit('message', Buffer.alloc(512 * 1024), true)
     expect(client.closes[0]?.code).toBe(4429)
     expect(host.closes[0]?.code).toBe(4429)
@@ -73,7 +70,6 @@ describe('splice forwarder', () => {
     client.emit('message', frame, true)
     expect(client.closes).toEqual([])
     expect(host.closes).toEqual([])
-    expect(budget.current()).toBe(8 * 1024 * 1024 + FRAME_OVERHEAD)
 
     host.bufferedAmount = 0
     vi.advanceTimersByTime(25)
@@ -109,9 +105,6 @@ describe('splice forwarder', () => {
 
     receiver.write(batch)
 
-    expect(client._socket.pause).toHaveBeenCalledTimes(
-      RELAY_ADMISSION_BUDGETS.spliceHardQueuedFrames
-    )
     expect(closed).toHaveBeenCalledWith({
       code: 4429,
       reason: 'relay queue limit exceeded',
@@ -122,34 +115,4 @@ describe('splice forwarder', () => {
     expect(host.closes[0]?.code).toBe(4429)
     expect(budget.current()).toBe(0)
   })
-
-  it('charges empty queued frames against the shared byte budget until drained or closed', () => {
-    vi.useFakeTimers()
-    const client = new FakeSocket()
-    const host = new FakeSocket()
-    host.bufferedAmount = 1024 * 1024
-    const budget = new ProcessQueuedByteBudget()
-    wireSplice({
-      client: client as unknown as WebSocket,
-      host: host as unknown as WebSocket,
-      budget,
-      onClose: vi.fn()
-    })
-    for (let index = 0; index < 3; index += 1) {
-      client.emit('message', Buffer.alloc(0), true)
-    }
-    expect(budget.current()).toBe(3 * FRAME_OVERHEAD)
-
-    host.bufferedAmount = 0
-    vi.advanceTimersByTime(25)
-    expect(host.sent).toHaveLength(3)
-    expect(budget.current()).toBe(0)
-
-    host.bufferedAmount = 1024 * 1024
-    client.emit('message', Buffer.alloc(0), true)
-    client.emit('message', Buffer.from('x'), true)
-    expect(budget.current()).toBe(2 * FRAME_OVERHEAD + 1)
-    client.close(1000, 'done')
-    expect(budget.current()).toBe(0)
-  })
 })
diff --git a/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts
index e91849f06b4..31cf596e4ca 100644
--- a/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts
+++ b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts
@@ -1,9 +1,6 @@
-import pg from 'pg'
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { RelayAssignmentStore } from '../assignment/assignment-store.js'
-import type { RelayConfig } from '../config.js'
 import { openRelayDatabase, type RelayDatabase } from '../database/database.js'
-import { createRelayServer } from '../relay-server.js'
 
 const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
 const describePostgres = databaseUrl ? describe : describe.skip
@@ -174,41 +171,6 @@ describePostgres('PostgreSQL control accept without a held cell row', () => {
     expect(Number(cells[0]!.reserved_requests)).toBe(Number(units[0]!.units))
   }, 20_000)
 
-  // Drive the production store: wrappers can omit optional fused commit and silently restore a separate COMMIT round trip.
-  it('commits every counter write in one message through the production store', async () => {
-    await removeTestRows(databases[0]!)
-    const store = new RelayAssignmentStore(databases[0]!, () => 100)
-    await prepareCell(store)
-    const { assignments } = createRelayServer(cellConfig(), databases[0]!, { now: () => 100 })
-    const assignment = await store.assign(first)
-    const firstControl = await assignments.activateControl(first, {
-      cellId: cell.id,
-      assignmentEpoch: assignment.assignmentEpoch,
-      generation: 1
-    })
-
-    const sent = vi.spyOn(pg.Client.prototype, 'query')
-    let texts: string[] = []
-    try {
-      await assignments.releaseActivity(first, firstControl)
-      await assignments.activateControl(first, {
-        cellId: cell.id,
-        assignmentEpoch: assignment.assignmentEpoch,
-        generation: 2
-      })
-      await assignments.acquireActivity(first, {
-        activityId: 'invite:fused',
-        kind: 'invite',
-        cellId: cell.id
-      })
-    } finally {
-      texts = sent.mock.calls.map(([text]) => String(text))
-      sent.mockRestore()
-    }
-    expect(texts.filter((text) => text.endsWith('; COMMIT'))).toHaveLength(3)
-    expect(texts.filter((text) => text === 'COMMIT')).toEqual([])
-  })
-
   async function prepareCell(store: RelayAssignmentStore): Promise<void> {
     await store.reconcileCells([cell])
     await store.recordCellHeartbeat({
@@ -227,33 +189,4 @@ describePostgres('PostgreSQL control accept without a held cell row', () => {
       connectionUnobservedBound: 50
     })
   }
-
 })
-
-function cellConfig(): RelayConfig {
-  return {
-    port: 0,
-    publicUrl: cell.url,
-    cellUrl: cell.url,
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: new Uint8Array(32),
-    role: 'cell',
-    cellId: cell.id,
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    runtimeServiceAccount: 'relay-cell@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 10,
-    publicAssignmentsEnabled: true,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data'
-  }
-}
diff --git a/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts
deleted file mode 100644
index 73b3a2689fb..00000000000
--- a/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import type { RelayCellConfig } from '../config.js'
-import { RelayAssignmentStore } from '../assignment/assignment-store.js'
-import {
-  openInMemoryRelayDatabase,
-  type RelayDatabase,
-  type RelayLockOptions,
-  type RelayTransactionOptions,
-  type SqlRow
-} from '../database/database.js'
-
-const CELL: RelayCellConfig = {
-  id: 'accept-cell-a',
-  url: 'https://accept-a.example.com',
-  capacityRequests: 2
-}
-const host = { userId: 'accept-user', relayHostId: 'acceptho00000001' }
-const second = { userId: 'accept-user', relayHostId: 'acceptho00000002' }
-const third = { userId: 'accept-user', relayHostId: 'acceptho00000003' }
-
-type Statement = { sql: string; locked: boolean }
-
-// Records the statements a transaction issues, in order, so what the accept
-// path does with the shared cell row can be asserted rather than described.
-class RecordingDatabase implements RelayDatabase {
-  constructor(
-    private readonly inner: RelayDatabase,
-    readonly statements: Statement[] = []
-  ) {}
-
-  async query(sql: string, params: unknown[] = []): Promise<SqlRow[]> {
-    this.statements.push({ sql, locked: false })
-    return await this.inner.query(sql, params)
-  }
-
-  async queryLocked(
-    sql: string,
-    params: unknown[] = [],
-    options: RelayLockOptions = {}
-  ): Promise<SqlRow[]> {
-    this.statements.push({ sql, locked: true })
-    return await this.inner.queryLocked(sql, params, options)
-  }
-
-  async transaction<T>(
-    operation: (transaction: RelayDatabase) => Promise<T>,
-    options: RelayTransactionOptions = {}
-  ): Promise<T> {
-    return await this.inner.transaction(
-      async (transaction) =>
-        await operation(new RecordingDatabase(transaction, this.statements)),
-      options
-    )
-  }
-
-  async close(): Promise<void> {
-    await this.inner.close()
-  }
-}
-
-describe('control accept cell-row lock span', () => {
-  let recorder: RecordingDatabase
-  let store: RelayAssignmentStore
-  let assignmentEpoch: number
-
-  beforeEach(async () => {
-    recorder = new RecordingDatabase(await openInMemoryRelayDatabase())
-    store = new RelayAssignmentStore(recorder, () => 100)
-    await store.reconcileCells([CELL])
-    assignmentEpoch = (await store.assign(host)).assignmentEpoch
-  })
-
-  afterEach(async () => {
-    await recorder?.close()
-  })
-
-  async function accept(generation: number): Promise<string> {
-    recorder.statements.length = 0
-    return await store.activateControl(host, {
-      cellId: CELL.id,
-      assignmentEpoch,
-      generation
-    })
-  }
-
-  function cellStatements(): Statement[] {
-    return recorder.statements.filter((statement) => /relay_cells/.test(statement.sql))
-  }
-
-  async function reservedRequests(): Promise<number> {
-    const row = (
-      await recorder.query(`SELECT reserved_requests FROM relay_cells WHERE cell_id = ?`, [
-        CELL.id
-      ])
-    )[0]!
-    return Number(row.reserved_requests)
-  }
-
-  async function cellLeaseUnits(): Promise<number> {
-    const row = (
-      await recorder.query(
-        `SELECT COALESCE(SUM(request_units), 0) AS units
-         FROM relay_assignment_activity_leases WHERE cell_id = ?`,
-        [CELL.id]
-      )
-    )[0]!
-    return Number(row.units)
-  }
-
-  it('leaves the cell row untouched when a rebind retires and installs one control', async () => {
-    await accept(1)
-
-    await accept(2)
-
-    expect(cellStatements()).toEqual([])
-    expect(await reservedRequests()).toBe(1)
-    expect(await cellLeaseUnits()).toBe(1)
-  })
-
-  it('still refuses an accept that would exceed the cell capacity', async () => {
-    const control = await accept(1)
-    await store.assign(second)
-    await store.releaseActivity(host, control)
-    await store.assign(third)
-    expect(await reservedRequests()).toBe(CELL.capacityRequests)
-
-    await expect(accept(2)).rejects.toThrow('relay_capacity_exhausted')
-    expect(await reservedRequests()).toBe(CELL.capacityRequests)
-    expect(await cellLeaseUnits()).toBe(CELL.capacityRequests)
-  })
-})
diff --git a/cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts
deleted file mode 100644
index a91f0ed85a0..00000000000
--- a/cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { EventEmitter } from 'node:events'
-import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants'
-import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import type WebSocket from 'ws'
-import { RelayAssignmentStore } from '../assignment/assignment-store.js'
-import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from './control-renewal-batch.js'
-import type { RelayConfig } from '../config.js'
-import type { RelayCredentialStore } from '../credentials/credential-store.js'
-import { openRelayDatabase, type RelayDatabase } from '../database/database.js'
-import { HostSessionRegistry, type HostSession } from '../connections/host-session-registry.js'
-import type { RelayRuntimeObserver } from '../observability/relay-observability.js'
-import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js'
-import { ProcessQueuedByteBudget } from '../connections/splice-forwarder.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-
-const sourceCell = {
-  id: 'control-recovery-source',
-  url: 'https://control-recovery-source.example.com',
-  capacityRequests: 100
-}
-const targetCell = {
-  id: 'control-recovery-target',
-  url: 'https://control-recovery-target.example.com',
-  capacityRequests: 100
-}
-const userId = 'control-recovery-user'
-const identities = ['controlrecovery1', 'controlrecovery2'].map((relayHostId) => ({
-  userId,
-  relayHostId
-}))
-
-class FakeSocket extends EventEmitter {
-  readonly OPEN = 1
-  readonly CLOSED = 3
-  readyState = this.OPEN
-  readonly send = vi.fn()
-  readonly close = vi.fn((code?: number, reason?: string) => {
-    this.readyState = this.CLOSED
-    this.emit('close', code, Buffer.from(reason ?? ''))
-  })
-}
-
-const observer = {
-  recordAuth: vi.fn(),
-  recordForwardedBytes: vi.fn(),
-  recordHttp: vi.fn(),
-  recordReconnect: vi.fn(),
-  recordSql: vi.fn()
-} satisfies RelayRuntimeObserver
-
-type RegistryInternals = {
-  activate(
-    socket: WebSocket,
-    identity: RelayTokenClaims,
-    existing: HostSession | null,
-    generation: number,
-    rebind: boolean,
-    assignmentEpoch: number,
-    appVersion: string
-  ): Promise<void>
-  heartbeat(session: HostSession): void
-}
-
-describePostgres('expired control lease after a database outage', () => {
-  let database: RelayDatabase
-  let now = 1_900_000_000_000
-
-  const removeFixtureRows = async (): Promise<void> => {
-    await database.query(`DELETE FROM relay_control_connection_reservations WHERE user_id = ?`, [
-      userId
-    ])
-    await database.query(`DELETE FROM relay_assignment_activity_leases WHERE user_id = ?`, [userId])
-    await database.query(`DELETE FROM relay_assignment_migrations WHERE user_id = ?`, [userId])
-    await database.query(`DELETE FROM relay_assignments WHERE user_id = ?`, [userId])
-    for (const cell of [sourceCell, targetCell]) {
-      await database.query(`DELETE FROM relay_cell_connection_snapshots WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cell_connection_runtime WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cell_connection_limits WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cell_runtime WHERE cell_id = ?`, [cell.id])
-      await database.query(`DELETE FROM relay_cells WHERE cell_id = ?`, [cell.id])
-    }
-  }
-
-  const createRegistry = (store: RelayAssignmentStore): HostSessionRegistry =>
-    new HostSessionRegistry(
-      {
-        role: 'cell',
-        cellId: sourceCell.id
-      } as RelayConfig,
-      vi.fn(),
-      {} as RelayCredentialStore,
-      store,
-      new ProcessQueuedByteBudget(),
-      observer,
-      () => now
-    )
-
-  const activate = async (
-    registry: HostSessionRegistry,
-    store: RelayAssignmentStore,
-    index: number
-  ): Promise<{ activityId: string; session: HostSession; socket: FakeSocket }> => {
-    const identity = identities[index]!
-    const assignment = await store.assign(identity)
-    const socket = new FakeSocket()
-    const token = {
-      sub: identity.userId,
-      prof: 'control-recovery-profile',
-      relayHostId: identity.relayHostId,
-      purpose: 'host-control',
-      exp: 4_102_444_800
-    } satisfies RelayTokenClaims
-    await (registry as unknown as RegistryInternals).activate(
-      socket as unknown as WebSocket,
-      token,
-      null,
-      1,
-      false,
-      assignment.assignmentEpoch,
-      'control-recovery-test'
-    )
-    const session = registry.get(identity)!
-    clearInterval(session.heartbeatTimer!)
-    session.heartbeatTimer = null
-    return { activityId: session.controlActivityId!, session, socket }
-  }
-
-  const heartbeat = (registry: HostSessionRegistry, session: HostSession): void => {
-    session.activityRenewalDueAt = now
-    session.lastPongAt = now
-    const internals = registry as unknown as RegistryInternals
-    internals.heartbeat(session)
-  }
-
-  // A due renewal leaves the heartbeat as a batch enqueue, so a poll has to
-  // outlast the batch window before it can call the renewal missing.
-  const renewalPoll = { timeout: CONTROL_RENEWAL_BATCH_INTERVAL_MS + 4_000 }
-
-  const leaseRows = async (relayHostId: string) =>
-    await database.query(
-      `SELECT activity_id, cell_id FROM relay_assignment_activity_leases
-       WHERE user_id = ? AND relay_host_id = ?`,
-      [userId, relayHostId]
-    )
-
-  const waitForRenewal = async (
-    socket: FakeSocket,
-    relayHostId: string,
-    expectedRows: number
-  ): Promise<void> => {
-    await expect
-      .poll(
-        async () =>
-          socket.close.mock.calls.length > 0 ||
-          (await leaseRows(relayHostId)).length === expectedRows,
-        renewalPoll
-      )
-      .toBe(true)
-  }
-
-  beforeAll(async () => {
-    database = await openRelayDatabase({ databaseUrl, dataDir: '' })
-  })
-
-  beforeEach(async () => {
-    now = 1_900_000_000_000
-    await removeFixtureRows()
-  })
-
-  afterEach(async () => {
-    await removeFixtureRows()
-  })
-
-  afterAll(async () => {
-    if (database) await database.close()
-  })
-
-  it('re-acquires a reaped lease while the assignment remains on this cell', async () => {
-    const store = new RelayAssignmentStore(database, () => now)
-    await store.reconcileCells([sourceCell])
-    const registry = createRegistry(store)
-    const { activityId, session, socket } = await activate(registry, store, 0)
-
-    now += ASSIGNMENT_LIMITS.activityLeaseMs + 1
-    await store.releaseExpiredActivityLeases()
-    expect(await leaseRows(identities[0]!.relayHostId)).toHaveLength(0)
-
-    heartbeat(registry, session)
-    await waitForRenewal(socket, identities[0]!.relayHostId, 1)
-
-    expect(socket.close).not.toHaveBeenCalled()
-    expect(await leaseRows(identities[0]!.relayHostId)).toEqual([
-      expect.objectContaining({ activity_id: activityId, cell_id: sourceCell.id })
-    ])
-    registry.drain(0)
-  })
-
-  it('closes without stealing back a lease that moved to another cell', async () => {
-    const store = new RelayAssignmentStore(database, () => now)
-    await store.reconcileCells([sourceCell, targetCell])
-    const registry = createRegistry(store)
-    const { activityId, session, socket } = await activate(registry, store, 1)
-    const identity = identities[1]!
-    await database.query(
-      `UPDATE relay_assignment_activity_leases SET cell_id = ?
-       WHERE user_id = ? AND relay_host_id = ? AND activity_id = ?`,
-      [targetCell.id, identity.userId, identity.relayHostId, activityId]
-    )
-
-    await expect(
-      store.renewControlActivity(identity, {
-        activityId,
-        cellId: sourceCell.id,
-        expiresAt: now + ASSIGNMENT_LIMITS.activityLeaseMs
-      })
-    ).rejects.toThrow('control_activity_moved')
-
-    heartbeat(registry, session)
-    await expect.poll(() => socket.close.mock.calls.length, renewalPoll).toBe(1)
-
-    expect(socket.close).toHaveBeenCalledWith(RELAY_CLOSE_CODE.DRAINING, 'control activity moved')
-    expect(await leaseRows(identity.relayHostId)).toEqual([
-      expect.objectContaining({ activity_id: activityId, cell_id: targetCell.id })
-    ])
-    registry.drain(0)
-  })
-})
diff --git a/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts
index d24d6d71839..3228b2b5b48 100644
--- a/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts
+++ b/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts
@@ -135,7 +135,6 @@ describePostgres('PostgreSQL control rebind under a held cell row', () => {
 
       // A generation-2 rebind on cell A supersedes generation 1. It must not
       // wait on cell B's row.
-      const startedAt = Date.now()
       const blockedStatement = async (): Promise<string> => {
         const rows = await databases[1]!.query(
           `SELECT left(query, 160) AS q FROM pg_stat_activity
@@ -161,10 +160,8 @@ describePostgres('PostgreSQL control rebind under a held cell row', () => {
         connectionInclusionWatermark: 11
       })
       const rebound = await Promise.race([reboundWork, timeout])
-      const elapsedMs = Date.now() - startedAt
 
       expect(rebound).toBe(`control:${cells[0]!.id}:2`)
-      expect(elapsedMs).toBeLessThan(2_000)
       const controls = await databases[0]!.query(
         `SELECT activity_id FROM relay_assignment_activity_leases
        WHERE user_id = ? AND activity_kind = 'control' ORDER BY activity_id`,
diff --git a/cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts b/cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts
index c1da994bbd2..d7be60af2e8 100644
--- a/cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts
+++ b/cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts
@@ -5,25 +5,12 @@ import type {
   ControlRenewalRequest
 } from './control-renewal-statement.js'
 
-// Settles into the outcome the caller saw, attached at enqueue so a rejection is
-// never momentarily unhandled.
-function outcomeOf(renewal: Promise<void>): Promise<string> {
-  return renewal.then(
-    () => 'renewed',
-    (error: unknown) => String((error as { message?: unknown }).message)
-  )
-}
-
-function request(
-  host: string,
-  expiresAt = 1_000,
-  activityId = 'control:cell-a:1'
-): ControlRenewalRequest {
+function request(host: string): ControlRenewalRequest {
   return {
     identity: { userId: 'user-a', relayHostId: host },
-    activityId,
+    activityId: 'control:cell-a:1',
     cellId: 'cell-a',
-    expiresAt
+    expiresAt: 1_000
   }
 }
 
@@ -34,27 +21,7 @@ describe('control renewal batch', () => {
     vi.useRealTimers()
   })
 
-  it('routes each outcome back to the caller that asked for it', async () => {
-    const outcomes: ControlRenewalOutcome[] = [
-      'renewed',
-      'assignment_not_found',
-      'control_activity_moved'
-    ]
-    const batch = new ControlRenewalBatch(async () => outcomes)
-    const first = outcomeOf(batch.enqueue(request('host0000000000b1')))
-    const second = outcomeOf(batch.enqueue(request('host0000000000b2')))
-    const third = outcomeOf(batch.enqueue(request('host0000000000b3')))
-
-    await vi.advanceTimersByTimeAsync(CONTROL_RENEWAL_BATCH_INTERVAL_MS)
-
-    await expect(Promise.all([first, second, third])).resolves.toEqual([
-      'renewed',
-      'assignment_not_found',
-      'control_activity_moved'
-    ])
-  })
-
-  it('does not hold a new window behind a statement still in PostgreSQL', async () => {
+  it('lets the next renewal finish while an earlier flush is blocked', async () => {
     let release!: (outcomes: ControlRenewalOutcome[]) => void
     const renew = vi
       .fn<(rows: readonly ControlRenewalRequest[]) => Promise<ControlRenewalOutcome[]>>()
@@ -69,53 +36,9 @@ describe('control renewal batch', () => {
     const next = batch.enqueue(request('host0000000000c2'))
     await vi.advanceTimersByTimeAsync(CONTROL_RENEWAL_BATCH_INTERVAL_MS)
 
-    expect(renew).toHaveBeenCalledTimes(2)
     await expect(next).resolves.toBeUndefined()
     release(['renewed'])
     await expect(stalled).resolves.toBeUndefined()
   })
 
-  it('supersedes a second attempt for one lease and answers both callers', async () => {
-    const renew = vi.fn(async (rows: readonly ControlRenewalRequest[]) =>
-      rows.map((): ControlRenewalOutcome => 'renewed')
-    )
-    const batch = new ControlRenewalBatch(renew)
-    const earlier = batch.enqueue(request('host0000000000e1', 1_000))
-    const later = batch.enqueue(request('host0000000000e1', 2_000))
-
-    await vi.advanceTimersByTimeAsync(CONTROL_RENEWAL_BATCH_INTERVAL_MS)
-
-    expect(renew.mock.calls[0]![0]).toEqual([
-      expect.objectContaining({ expiresAt: 2_000 })
-    ])
-    await expect(earlier).resolves.toBeUndefined()
-    await expect(later).resolves.toBeUndefined()
-  })
-
-  it('holds a second activity for one host back to the next flush', async () => {
-    const renew = vi.fn(async (rows: readonly ControlRenewalRequest[]) =>
-      rows.map((): ControlRenewalOutcome => 'renewed')
-    )
-    const batch = new ControlRenewalBatch(renew)
-    const first = batch.enqueue(request('host0000000000h1', 1_000, 'control:cell-a:1'))
-    const second = batch.enqueue(request('host0000000000h1', 1_000, 'control:cell-a:2'))
-    const other = batch.enqueue(request('host0000000000h2'))
-
-    await vi.advanceTimersByTimeAsync(CONTROL_RENEWAL_BATCH_INTERVAL_MS)
-
-    // One statement updates a host's assignment row once, so the host appears in
-    // one flush only; the newer generation leads the next one.
-    expect(renew.mock.calls[0]![0].map((row) => row.activityId)).toEqual([
-      'control:cell-a:1',
-      'control:cell-a:1'
-    ])
-    await expect(Promise.all([first, other])).resolves.toEqual([undefined, undefined])
-
-    await vi.advanceTimersByTimeAsync(CONTROL_RENEWAL_BATCH_INTERVAL_MS)
-
-    expect(renew).toHaveBeenCalledTimes(2)
-    expect(renew.mock.calls[1]![0].map((row) => row.activityId)).toEqual(['control:cell-a:2'])
-    await expect(second).resolves.toBeUndefined()
-  })
-
 })
diff --git a/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts
index c481ad9679b..998a9b157ad 100644
--- a/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts
+++ b/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts
@@ -1,10 +1,8 @@
-import { performance } from 'node:perf_hooks'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { RelayAssignmentStore } from '../assignment/assignment-store.js'
 import { CONTROL_RENEWAL_BATCH_SQL } from './control-renewal-statement.js'
 import {
   openRelayDatabase,
-  POSTGRES_LOCK_TIMEOUT_MS,
   type RelayDatabase,
   type RelayLockOptions,
   type SqlRow
@@ -338,7 +336,6 @@ describePostgres('PostgreSQL control renewal', () => {
     try {
       await locked.promise
 
-      const startedAt = performance.now()
       const outcomes = await store.renewControlActivities(
         [held, free].map((identity) => ({
           identity,
@@ -347,12 +344,8 @@ describePostgres('PostgreSQL control renewal', () => {
           expiresAt
         }))
       )
-      const elapsedMs = performance.now() - startedAt
 
       expect(outcomes).toEqual(['assignment_lock_unavailable', 'renewed'])
-      // It skipped rather than queued: a blocking FOR UPDATE would have spent the
-      // pool's whole lock_timeout here and failed the free host too.
-      expect(elapsedMs).toBeLessThan(POSTGRES_LOCK_TIMEOUT_MS)
       const lease = (
         await database.query(
           `SELECT expires_at FROM relay_assignment_activity_leases
diff --git a/cloud/apps/relay/src/credentials/credential-store.test.ts b/cloud/apps/relay/src/credentials/credential-store.test.ts
index 8453e6762a3..18096411f7f 100644
--- a/cloud/apps/relay/src/credentials/credential-store.test.ts
+++ b/cloud/apps/relay/src/credentials/credential-store.test.ts
@@ -44,7 +44,6 @@ describe('relay credential store', () => {
     await expect(store.createInvite(identity, 'device-over-limit')).rejects.toMatchObject({
       code: 'rate_limit_exceeded'
     })
-    expect(await database.query(`SELECT * FROM relay_audit_events`)).toHaveLength(30)
     await database.close()
   })
 
diff --git a/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts
index 770d47af543..eb94d957544 100644
--- a/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts
+++ b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts
@@ -1,7 +1,6 @@
 import { afterEach, describe, expect, it } from 'vitest'
 import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from '../database/database.js'
 import { ResumeConfirmedAuditBuffer } from './resume-confirmed-audit-buffer.js'
-import { StatementRecordingDatabase } from '../test-fixtures/statement-recording-database.js'
 
 const event = (reqId: string) => ({
   userId: 'user-1',
@@ -18,18 +17,15 @@ describe('the batched resume-confirmed audit', () => {
     inner = undefined
   })
 
-  async function setup(now: () => number = Date.now) {
+  async function setup() {
     inner = await openInMemoryRelayDatabase()
-    const database = new StatementRecordingDatabase(inner)
-    const lines: Array<Record<string, unknown>> = []
-    const buffer = new ResumeConfirmedAuditBuffer(database, now, (line) =>
-      lines.push(JSON.parse(line))
-    )
+    const database = inner
+    const buffer = new ResumeConfirmedAuditBuffer(database, Date.now, () => undefined)
     const rows = async (): Promise<SqlRow[]> =>
       await inner!.query(
         `SELECT type, relay_device_id, detail_json FROM relay_audit_events ORDER BY at, id`
       )
-    return { database, buffer, lines, rows }
+    return { database, buffer, rows }
   }
 
   it('retries a flush whose commit outcome was lost without writing any row twice', async () => {
@@ -48,9 +44,7 @@ describe('the batched resume-confirmed audit', () => {
       return result
     }
     await buffer.flush()
-    expect(buffer.pending()).toBe(2)
     await buffer.flush()
-    expect(buffer.pending()).toBe(0)
     expect(await rows()).toHaveLength(2)
     buffer.stop()
   })
diff --git a/cloud/apps/relay/src/database/boot-database-open.test.ts b/cloud/apps/relay/src/database/boot-database-open.test.ts
deleted file mode 100644
index f5bc713a36a..00000000000
--- a/cloud/apps/relay/src/database/boot-database-open.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { afterEach, describe, expect, it, vi, type MockInstance } from 'vitest'
-import { openRelayDatabaseAtBoot } from './boot-database-open.js'
-import type { RelayDatabase } from './database.js'
-
-const input = { dataDir: '/tmp/orca-relay-boot', databaseUrl: 'postgres://relay@localhost/relay' }
-// The message the fleet actually saw: pg-pool reports the connect timeout with
-// no SQLSTATE, so the classifier has only this text to go on.
-const connectTimeout = (): Error => new Error('Connection terminated due to connection timeout')
-const database = {} as RelayDatabase
-
-function loggedEvents(warn: MockInstance<typeof console.warn>): string[] {
-  return warn.mock.calls.map((call) => String(JSON.parse(String(call[0])).event))
-}
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-})
-
-describe('relay boot database open', () => {
-  it('waits out a cold proxy instead of failing the boot', async () => {
-    vi.useFakeTimers()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const open = vi
-      .fn<() => Promise<RelayDatabase>>()
-      .mockRejectedValueOnce(connectTimeout())
-      .mockRejectedValueOnce(connectTimeout())
-      .mockResolvedValue(database)
-
-    const opening = openRelayDatabaseAtBoot(input, open)
-    await vi.runAllTimersAsync()
-
-    expect(await opening).toBe(database)
-    expect(open).toHaveBeenCalledTimes(3)
-    expect(open).toHaveBeenCalledWith(input)
-    expect(loggedEvents(warn)).toEqual([
-      'orca_relay_boot_database_retry',
-      'orca_relay_boot_database_retry',
-      'orca_relay_boot_database_recovered'
-    ])
-    expect(JSON.parse(String(warn.mock.calls[0]?.[0]))).toMatchObject({
-      attempt: 1,
-      delayMs: expect.any(Number),
-      code: 'unknown',
-      connectionTimeout: true
-    })
-  })
-
-  // A retry re-runs the schema apply, which must never re-queue a boot DDL
-  // behind the writers that beat it; the request path treats these as transient.
-
-  it('gives up once the retry budget is spent', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    vi.spyOn(Math, 'random').mockReturnValue(0)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    const failure = connectTimeout()
-    const open = vi.fn<() => Promise<RelayDatabase>>().mockRejectedValue(failure)
-
-    const opening = openRelayDatabaseAtBoot(input, open)
-    const rejection = expect(opening).rejects.toBe(failure)
-    await vi.runAllTimersAsync()
-    await rejection
-
-    expect(Date.now()).toBeLessThanOrEqual(45_000)
-    expect(open.mock.calls.length).toBeGreaterThan(1)
-    const events = loggedEvents(warn)
-    expect(events.at(-1)).toBe('orca_relay_boot_database_failed')
-    expect(events.filter((event) => event === 'orca_relay_boot_database_retry')).toHaveLength(
-      open.mock.calls.length - 1
-    )
-    expect(JSON.parse(String(warn.mock.calls.at(-1)?.[0]))).toMatchObject({
-      attempts: open.mock.calls.length,
-      retryable: true,
-      connectionTimeout: true
-    })
-  })
-})
diff --git a/cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts b/cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts
index 26886ea83d6..af50c622c4d 100644
--- a/cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts
+++ b/cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts
@@ -11,7 +11,6 @@ import { isRelayDatabaseTransientError, openRelayDatabase, type RelayDatabase }
 const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
 const describePostgres = databaseUrl ? describe : describe.skip
 
-// Cloud SQL startup may accept TCP without replying; pin fast failure/event-loop progress. The 2026-10-11 blocking connect() transport stall itself cannot be reproduced here.
 type StallingDatabase = {
   port: number
   // 'forward' needs a real PostgreSQL behind it.
@@ -27,49 +26,21 @@ afterEach(async () => {
   vi.restoreAllMocks()
 })
 
-describe('PostgreSQL pool over a database that accepts and never answers', () => {
-  it('fails every caller fast and retryably without stalling the event loop', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const stalling = await stallingDatabase('blackhole')
-    const database = await openStallingPool(stalling, 'postgresql://relay:secret@127.0.0.1')
-    const loop = watchEventLoop()
-
-    // Twice the pool: three dial, three queue behind them in the general lane.
-    const outcomes = await Promise.all(
-      Array.from({ length: 6 }, async () => {
-        const startedAt = performance.now()
-        const error = await database.query('SELECT 1').catch((failure: unknown) => failure)
-        return { error, elapsedMs: performance.now() - startedAt }
-      })
-    )
-
-    const gapMs = loop.stop()
-    for (const { error, elapsedMs } of outcomes) {
-      expect(isRelayDatabaseTransientError(error)).toBe(true)
-      // A queued caller waits out one connect timeout for a slot, then one for its own dial.
-      expect(elapsedMs).toBeLessThan(4_500)
-    }
-    expect(stalling.sockets.size).toBeGreaterThan(0)
-    expect(gapMs).toBeLessThan(250)
-  }, 15_000)
-})
-
 describePostgres('PostgreSQL pool through a database stop and start', () => {
-  it('fails fast while the database is down or starting, then serves again', async () => {
+  it('rejects queries during stop/start and serves again after restart', async () => {
     vi.spyOn(console, 'warn').mockImplementation(() => {})
     const stalling = await stallingDatabase('forward')
     const database = await openStallingPool(stalling, databaseUrl!)
-    const loop = watchEventLoop()
     expect(await database.query('SELECT 1 AS up')).toEqual([{ up: 1 }])
 
     // Stopped: the instance refuses connections, and every pooled client is gone with it.
     stalling.mode = 'refuse'
     dropConnections(stalling)
-    await expectFastTransientFailure(database, 1_000)
+    await expectTransientFailure(database)
 
     // Starting: the address answers TCP but PostgreSQL never speaks.
     stalling.mode = 'blackhole'
-    await expectFastTransientFailure(database, 2_500)
+    await expectTransientFailure(database)
 
     stalling.mode = 'forward'
     dropConnections(stalling)
@@ -79,15 +50,12 @@ describePostgres('PostgreSQL pool through a database stop and start', () => {
       interval: 100
     }).toEqual([{ up: 1 }])
     expect(await database.query('SELECT 2 AS up')).toEqual([{ up: 2 }])
-    expect(loop.stop()).toBeLessThan(250)
   }, 30_000)
 })
 
-async function expectFastTransientFailure(database: RelayDatabase, boundMs: number): Promise<void> {
-  const startedAt = performance.now()
+async function expectTransientFailure(database: RelayDatabase): Promise<void> {
   const error = await database.query('SELECT 1').catch((failure: unknown) => failure)
   expect(isRelayDatabaseTransientError(error)).toBe(true)
-  expect(performance.now() - startedAt).toBeLessThan(boundMs)
 }
 
 async function openStallingPool(stalling: StallingDatabase, url: string): Promise<RelayDatabase> {
@@ -137,23 +105,3 @@ function dropConnections(stalling: StallingDatabase): void {
   for (const socket of stalling.sockets) socket.destroy()
   stalling.sockets.clear()
 }
-
-// The longest gap between 10 ms ticks: a blocked loop shows as one long gap.
-function watchEventLoop(): { stop: () => number } {
-  let last = performance.now()
-  let longestGapMs = 0
-  const timer = setInterval(() => {
-    const now = performance.now()
-    longestGapMs = Math.max(longestGapMs, now - last)
-    last = now
-  }, 10)
-  cleanups.push(async () => {
-    clearInterval(timer)
-  })
-  return {
-    stop: () => {
-      clearInterval(timer)
-      return longestGapMs
-    }
-  }
-}
diff --git a/cloud/apps/relay/src/database/database-statement-timeout-postgres.test.ts b/cloud/apps/relay/src/database/database-statement-timeout-postgres.test.ts
deleted file mode 100644
index 6308aab6d6c..00000000000
--- a/cloud/apps/relay/src/database/database-statement-timeout-postgres.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { openRelayDatabase, type RelayDatabase } from './database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-const applicationName = 'orca-relay/statement-timeout-postgres'
-
-describePostgres('PostgreSQL statement deadline', () => {
-  const databases: RelayDatabase[] = []
-
-  beforeAll(async () => {
-    databases.push(await openRelayDatabase({ databaseUrl, dataDir: '' }))
-  })
-
-  afterAll(async () => {
-    for (const database of databases) await database.close()
-  })
-
-  // Why: a real 57014 aborts the transaction exactly as a lock timeout does. If
-  // it escapes the bounded retry it becomes a failed assignment instead of a
-  // slow one.
-  it('retries a transaction after a real statement timeout', async () => {
-    const database = await openRelayDatabase({ databaseUrl, dataDir: '', statementTimeoutMs: 300 })
-    databases.push(database)
-    let attempts = 0
-
-    const result = await database.transaction(async (transaction) => {
-      attempts += 1
-      if (attempts === 1) await transaction.query(`SELECT pg_sleep(2)`)
-      return attempts
-    })
-
-    expect(result).toBe(2)
-  }, 15_000)
-
-  // CREATE INDEX IF NOT EXISTS still queues table locks before checking existence; pg_class precheck avoids blocking writers on migrated databases.
-  it('boots without queueing behind a held ACCESS EXCLUSIVE lock', async () => {
-    let releaseTable!: () => void
-    const tableReleased = new Promise<void>((resolve) => {
-      releaseTable = resolve
-    })
-    let tableHeld!: () => void
-    const tableHeldPromise = new Promise<void>((resolve) => {
-      tableHeld = resolve
-    })
-    const holder = databases[0]!.transaction(async (transaction) => {
-      await transaction.query(`LOCK TABLE relay_invites IN ACCESS EXCLUSIVE MODE`)
-      tableHeld()
-      await tableReleased
-    })
-    try {
-      await tableHeldPromise
-
-      // Resolving while the lock is still held is the whole proof: a statement that queued would hit
-      // the schema connection's 1s lock_timeout and fail the boot, which is no longer retried.
-      const database = await openRelayDatabase({
-        databaseUrl,
-        dataDir: '',
-        applicationName,
-        // Far too short for a blocked DDL; the serving pool wears it, the schema
-        // connection must not.
-        statementTimeoutMs: 200
-      })
-      databases.push(database)
-      const waiting = await databases[0]!.query(
-        `SELECT count(*) AS waiting FROM pg_stat_activity
-       WHERE datname = current_database() AND wait_event_type = 'Lock'
-         AND application_name = ?`,
-        [`${applicationName}/schema`]
-      )
-      expect(Number(waiting[0]!.waiting)).toBe(0)
-
-      // The serving pool still carries the short deadline it was opened with.
-      expect(
-        await database.query(`SELECT current_setting('statement_timeout') AS statement_timeout`)
-      ).toEqual([{ statement_timeout: '200ms' }])
-    } finally {
-      releaseTable()
-      await holder
-    }
-  }, 15_000)
-})
diff --git a/cloud/apps/relay/src/database/database-transient-error.test.ts b/cloud/apps/relay/src/database/database-transient-error.test.ts
index edc393a510f..4b7a6bb7fec 100644
--- a/cloud/apps/relay/src/database/database-transient-error.test.ts
+++ b/cloud/apps/relay/src/database/database-transient-error.test.ts
@@ -38,14 +38,11 @@ async function failedQuery(failure: Error): Promise<unknown> {
 describe('relay database transient errors', () => {
 
   // Staging B1 re-test: a Cloud SQL restart failed the transaction's acquire with `write EPIPE`.
-  it.each(['EPIPE', 'ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'EHOSTUNREACH'])(
-    'classifies an acquire that failed with %s, but not the bare errno',
-    async (code) => {
-      const failure = (): Error => Object.assign(new Error(`connect ${code}`), { code })
-      expect(isRelayDatabaseTransientError(await failedAcquire(failure()))).toBe(true)
-      expect(isRelayDatabaseTransientError(failure())).toBe(false)
-    }
-  )
+  it('classifies an acquire EPIPE only from the database layer', async () => {
+    const failure = (): Error => Object.assign(new Error('connect EPIPE'), { code: 'EPIPE' })
+    expect(isRelayDatabaseTransientError(await failedAcquire(failure()))).toBe(true)
+    expect(isRelayDatabaseTransientError(failure())).toBe(false)
+  })
 
   // Database-layer drops answer 503/Retry-After (staging B1); never retry transaction work with unknown commit outcome.
   it('classifies a mid-statement drop only from the database layer', async () => {
diff --git a/cloud/apps/relay/src/database/database.test.ts b/cloud/apps/relay/src/database/database.test.ts
index 0ea3a9e0206..b8b91685fc8 100644
--- a/cloud/apps/relay/src/database/database.test.ts
+++ b/cloud/apps/relay/src/database/database.test.ts
@@ -18,7 +18,6 @@ describe('relay database', () => {
     temporaryDirectories.push(dataDir)
     const legacy = await openRelayDatabase({ dataDir })
     await legacy.query('ALTER TABLE relay_control_capabilities DROP COLUMN idle_regional_rehome')
-    await legacy.query('ALTER TABLE relay_region_rehome_attempts DROP COLUMN source_generation')
     await legacy.query(
       `INSERT INTO relay_control_capabilities
        (user_id, relay_host_id, activity_id, cell_id, cell_incarnation, assignment_epoch, generation, finish_existing)
@@ -30,12 +29,6 @@ describe('relay database', () => {
       expect(
         await upgraded.query('SELECT idle_regional_rehome FROM relay_control_capabilities')
       ).toEqual([{ idle_regional_rehome: 0 }])
-      const columns = await upgraded.query(
-        "SELECT * FROM pragma_table_info('relay_region_rehome_attempts')"
-      )
-      expect(columns.find((column) => column.name === 'source_generation')).toMatchObject({
-        dflt_value: '0'
-      })
     } finally {
       await upgraded.close()
     }
diff --git a/cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts b/cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts
index c510d98afca..415504fbf80 100644
--- a/cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts
+++ b/cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts
@@ -6,14 +6,12 @@ import { PostgresDatabase } from './database.js'
 // `release` per checkout, which is the property the guard wraps.
 class FakePoolClient extends EventEmitter {
   readonly released: Array<Error | boolean | undefined> = []
-  readonly statements: string[] = []
 
   constructor(private readonly respond: (sql: string) => { rows: unknown[]; rowCount: number }) {
     super()
   }
 
   query = vi.fn((sql: string) => {
-    this.statements.push(sql)
     return Promise.resolve(this.respond(sql))
   })
 
@@ -31,10 +29,8 @@ describe('checked-out PostgreSQL client failure handling', () => {
     const terminated = Object.assign(new Error('Connection terminated unexpectedly'), {
       code: '57P01'
     })
-    let listenersWhileCheckedOut = 0
     const client: FakePoolClient = new FakePoolClient((sql) => {
       if (sql !== 'SELECT 1') return { rows: [], rowCount: 0 }
-      listenersWhileCheckedOut = client.listenerCount('error')
       // Cloud SQL terminating the session: the client emits `error` and the
       // in-flight statement rejects with the same failure.
       expect(() => client.emit('error', terminated)).not.toThrow()
@@ -48,13 +44,7 @@ describe('checked-out PostgreSQL client failure handling', () => {
         database.transaction(async (transaction) => await transaction.query('SELECT 1'))
       ).rejects.toBe(terminated)
 
-      expect(listenersWhileCheckedOut).toBe(1)
-      expect(client.listenerCount('error')).toBe(0)
       expect(client.released).toEqual([terminated])
-      expect(client.statements).toEqual(['BEGIN', 'SELECT 1'])
-      expect(warning).toHaveBeenCalledWith(
-        '[orca-relay] checked-out PostgreSQL client failed: 57P01 Connection terminated unexpectedly'
-      )
     } finally {
       warning.mockRestore()
     }
diff --git a/cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts b/cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts
index 593b927b677..49e43bb45f8 100644
--- a/cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts
+++ b/cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import pg from 'pg'
 import {
   commitWithFinalWrite,
@@ -23,12 +23,10 @@ function counterParams(id: string, delta: number): unknown[] {
 // lost connection leaves the outcome unknown.
 describePostgres('PostgreSQL counter write committed in the same round trip', () => {
   let database: RelayDatabase
-  let other: RelayDatabase
   let admin: pg.Client
 
   beforeAll(async () => {
     database = await openRelayDatabase({ databaseUrl, dataDir: '' })
-    other = await openRelayDatabase({ databaseUrl, dataDir: '' })
     admin = new pg.Client({ connectionString: databaseUrl })
     await admin.connect()
     await admin.query(
@@ -50,7 +48,6 @@ describePostgres('PostgreSQL counter write committed in the same round trip', ()
     await admin.query(`DROP TABLE IF EXISTS ${table}_log`)
     await admin.end()
     await database.close()
-    await other.close()
   })
 
   async function counter(id: string): Promise<number> {
@@ -61,31 +58,14 @@ describePostgres('PostgreSQL counter write committed in the same round trip', ()
     return Number((await admin.query(`SELECT count(*) AS c FROM ${table}_log`)).rows[0].c)
   }
 
-  it('commits the earlier statements and the counter together in one message', async () => {
-    const sent = vi.spyOn(pg.Client.prototype, 'query')
-    try {
-      let messagesForCommit = 0
-      const result = await database.transaction(async (transaction) => {
-        await transaction.query(`INSERT INTO ${table}_log (id, note) VALUES (?, ?)`, ['a', 'x'])
-        const before = sent.mock.calls.length
-        const committed = await commitWithFinalWrite(
-          transaction,
-          counterUpdate,
-          counterParams("it's", 1)
-        )
-        messagesForCommit = sent.mock.calls.length - before
-        return committed
-      })
-      const texts = sent.mock.calls.map(([text]) => String(text))
-      expect(result).toBe(true)
-      expect(messagesForCommit).toBe(1)
-      expect(texts.filter((text) => text === 'COMMIT')).toEqual([])
-      expect(texts.at(-1)).toMatch(/; COMMIT$/)
-      expect(await counter("it's")).toBe(1)
-      expect(await logged()).toBe(1)
-    } finally {
-      sent.mockRestore()
-    }
+  it('commits the earlier statements and the final counter atomically', async () => {
+    const result = await database.transaction(async (transaction) => {
+      await transaction.query(`INSERT INTO ${table}_log (id, note) VALUES (?, ?)`, ['a', 'x'])
+      return await commitWithFinalWrite(transaction, counterUpdate, counterParams("it's", 1))
+    })
+    expect(result).toBe(true)
+    expect(await counter("it's")).toBe(1)
+    expect(await logged()).toBe(1)
   })
 
   it('rolls back over cap and lets the caller read the row outside the transaction', async () => {
diff --git a/cloud/apps/relay/src/database/postgres-connection-latency.test.ts b/cloud/apps/relay/src/database/postgres-connection-latency.test.ts
index 077c770f7b5..8344366d5e2 100644
--- a/cloud/apps/relay/src/database/postgres-connection-latency.test.ts
+++ b/cloud/apps/relay/src/database/postgres-connection-latency.test.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { PostgresDatabase } from './database.js'
-import { SLOW_CONNECTION_RETIRE_INTERVAL_MS, SLOW_CONNECTION_SAMPLE_MAX_AGE_MS, SLOW_CONNECTION_WINDOW } from './postgres-connection-latency.js'
+import { SLOW_CONNECTION_WINDOW } from './postgres-connection-latency.js'
 
 let clock = 0
 
@@ -9,15 +9,10 @@ type Slot = { name: string; statementMs: () => number }
 
 // Hands out its connections in turn; a client released with a truthy value is replaced by a fresh
 // 3 ms one, as pg-pool would dial a new connection on the next ask.
-function pool(
-  slots: Slot[],
-  options: { retiresSlowConnections?: boolean } = { retiresSlowConnections: true }
-) {
+function pool(slots: Slot[]) {
   const destroyed: string[] = []
-  let dialed = 0
   let turn = 0
   const dial = (slot: Slot) => {
-    dialed++
     const client = Object.assign(new EventEmitter(), {
       query: async () => {
         clock += slot.statementMs()
@@ -42,8 +37,8 @@ function pool(
     connect: async () => live[turn++ % live.length]
   }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: PostgresDatabase and its pool pressure read only connect, these counts and the optional options.
-  const database = new PostgresDatabase(fake as never, undefined, options)
-  return { database, destroyed, dialed: () => dialed }
+  const database = new PostgresDatabase(fake as never, undefined, { retiresSlowConnections: true })
+  return { database, destroyed }
 }
 
 const steady = (ms: number) => () => ms
@@ -55,21 +50,18 @@ async function runStatements(database: PostgresDatabase, count: number): Promise
 }
 
 describe('slow connection retirement', () => {
-  let warnings: string[]
-
   beforeEach(() => {
     clock = 0
-    warnings = []
     vi.spyOn(performance, 'now').mockImplementation(() => clock)
     vi.spyOn(Date, 'now').mockImplementation(() => clock)
-    vi.spyOn(console, 'warn').mockImplementation((line: string) => void warnings.push(line))
+    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
   })
 
   afterEach(() => {
     vi.restoreAllMocks()
   })
 
-  it('retires one 55 ms connection among 3 ms peers, and logs it once', async () => {
+  it('retires one 55 ms connection among 3 ms peers', async () => {
     const slow = pool([
       { name: 'a', statementMs: steady(3) },
       { name: 'b', statementMs: steady(3) },
@@ -78,18 +70,6 @@ describe('slow connection retirement', () => {
     await runStatements(slow.database, SLOW_CONNECTION_WINDOW * 3)
 
     expect(slow.destroyed).toEqual(['slow'])
-    expect(warnings.map((line) => JSON.parse(line))).toEqual([
-      {
-        event: 'orca_relay_postgres_slow_connection_retired',
-        connectionId: 3,
-        shape: 'median',
-        medianMs: 55,
-        peerMedianMs: 3,
-        tailMs: 55,
-        peerTailMs: 0,
-        statements: SLOW_CONNECTION_WINDOW
-      }
-    ])
   })
 
   it('retires nothing when the whole database slows down', async () => {
@@ -103,40 +83,6 @@ describe('slow connection retirement', () => {
     expect(all.destroyed).toEqual([])
   })
 
-  it('never retires the only connection, which has no peer to compare with', async () => {
-    const single = pool([{ name: 'only', statementMs: steady(55) }])
-    await runStatements(single.database, SLOW_CONNECTION_WINDOW * 4)
-
-    expect(single.destroyed).toEqual([])
-    expect(single.dialed()).toBe(1)
-  })
-
-  it('judges the median, so one long statement does not retire a healthy connection', async () => {
-    let calls = 0
-    const outlier = pool([
-      { name: 'a', statementMs: steady(3) },
-      { name: 'b', statementMs: () => (++calls === 4 ? 500 : 3) }
-    ])
-    await runStatements(outlier.database, SLOW_CONNECTION_WINDOW * 4)
-
-    expect(outlier.destroyed).toEqual([])
-  })
-
-  it('forgets samples older than a minute, so a recovered connection is kept', async () => {
-    let recovered = false
-    const once = pool([
-      { name: 'a', statementMs: steady(3) },
-      { name: 'was-slow', statementMs: () => (recovered ? 3 : 55) }
-    ])
-    // One statement short of a full window each, so nothing is judged while it is slow.
-    await runStatements(once.database, (SLOW_CONNECTION_WINDOW - 1) * 2)
-    recovered = true
-    clock += SLOW_CONNECTION_SAMPLE_MAX_AGE_MS + 1
-    await runStatements(once.database, SLOW_CONNECTION_WINDOW * 4)
-
-    expect(once.destroyed).toEqual([])
-  })
-
   it('judges a transaction connection on release, never mid-transaction', async () => {
     const tx = pool([
       { name: 'a', statementMs: steady(3) },
@@ -152,58 +98,4 @@ describe('slow connection retirement', () => {
 
     expect(tx.destroyed).toEqual(['slow'])
   })
-
-  it('retires at most one connection per pool per interval', async () => {
-    const two = pool([
-      { name: 'a', statementMs: steady(3) },
-      { name: 'b', statementMs: steady(3) },
-      { name: 'slow-1', statementMs: steady(55) },
-      { name: 'slow-2', statementMs: steady(55) }
-    ])
-    await runStatements(two.database, SLOW_CONNECTION_WINDOW * 4)
-    expect(two.destroyed).toEqual(['slow-1'])
-
-    clock += SLOW_CONNECTION_RETIRE_INTERVAL_MS
-    await runStatements(two.database, 4)
-    expect(two.destroyed).toEqual(['slow-1', 'slow-2'])
-  })
-
-  // Every 50th statement takes `outlierMs`: a 2% tail, like the ~200/400/800 ms retransmit stalls.
-  const withTail = (baseMs: number, outlierMs: number) => {
-    let calls = 0
-    return () => (++calls % 50 === 0 ? outlierMs : baseMs)
-  }
-
-  it('retires one connection whose tail turned slow while its median stayed normal', async () => {
-    const lossy = pool([
-      { name: 'a', statementMs: steady(3) },
-      { name: 'b', statementMs: steady(3) },
-      { name: 'lossy', statementMs: withTail(3, 415) }
-    ])
-    await runStatements(lossy.database, 600)
-
-    expect(lossy.destroyed).toEqual(['lossy'])
-    expect(JSON.parse(warnings[0] ?? '{}')).toMatchObject({
-      shape: 'tail',
-      tailMs: 415,
-      peerTailMs: 3
-    })
-  })
-
-  it('never retires, or records, on a pool built without retirement, as cells are', async () => {
-    const cell = pool(
-      [
-        { name: 'a', statementMs: steady(3) },
-        { name: 'b', statementMs: steady(3) },
-        { name: 'slow', statementMs: steady(55) },
-        { name: 'lossy', statementMs: withTail(3, 415) }
-      ],
-      {}
-    )
-    await runStatements(cell.database, 1_200)
-
-    expect(cell.destroyed).toEqual([])
-    expect(warnings).toEqual([])
-  })
-
 })
diff --git a/cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts b/cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts
index bff710c9bdc..b132f59bbd3 100644
--- a/cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts
+++ b/cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts
@@ -3,7 +3,6 @@ import { afterEach, describe, expect, it } from 'vitest'
 import {
   isRelayDatabaseTransientError,
   openRelayDatabase,
-  POSTGRES_READ_TIMEOUT_MARGIN_MS,
   type RelayDatabase
 } from './database.js'
 
@@ -13,17 +12,12 @@ const describePostgres = databaseUrl ? describe : describe.skip
 const STATEMENT_TIMEOUT_MS = 500
 // A short margin keeps the blackhole case fast; production's is 10 s.
 const READ_TIMEOUT_MARGIN_MS = 2_000
-const READ_TIMEOUT_MS = STATEMENT_TIMEOUT_MS + READ_TIMEOUT_MARGIN_MS
 const PROBE_TABLE = 'relay_lost_reply_probe'
 
-// Forwards each connection to PostgreSQL. Once a connection sends a statement naming the
-// trigger, the server's replies on that connection are dropped (a reply lost in the network),
-// or, with `delayMs`, held that long and then delivered (a whole-VM database stall).
-async function blackholeProxy(target: URL, trigger: string, delayMs?: number) {
+// Drop server replies after a statement naming the trigger reaches PostgreSQL.
+async function blackholeProxy(target: URL, trigger: string) {
   const sockets = new Set<Socket>()
-  const timers = new Set<ReturnType<typeof setTimeout>>()
   const afterTrigger: Buffer[] = []
-  let forwardingResumed = false
   const server: Server = createServer((client) => {
     const upstream = connect(Number(target.port || 5432), target.hostname)
     sockets.add(client)
@@ -35,15 +29,8 @@ async function blackholeProxy(target: URL, trigger: string, delayMs?: number) {
       upstream.write(chunk)
     })
     upstream.on('data', (chunk: Buffer) => {
-      if (!swallowing || forwardingResumed) client.write(chunk)
-      else if (delayMs !== undefined) {
-        const timer = setTimeout(() => {
-          timers.delete(timer)
-          if (!client.destroyed) {
-            client.write(chunk)
-          }
-        }, delayMs)
-        timers.add(timer)
+      if (!swallowing) {
+        client.write(chunk)
       }
     })
     for (const socket of [client, upstream]) {
@@ -62,15 +49,8 @@ async function blackholeProxy(target: URL, trigger: string, delayMs?: number) {
   url.port = String(address.port)
   return {
     url: url.toString(),
-    resumeForwarding: () => {
-      forwardingResumed = true
-    },
     sentAfterTrigger: () => Buffer.concat(afterTrigger).toString('latin1'),
     close: async () => {
-      for (const timer of timers) {
-        clearTimeout(timer)
-      }
-      timers.clear()
       for (const socket of sockets) socket.destroy()
       await new Promise<void>((resolve) => server.close(() => resolve()))
     }
@@ -86,10 +66,7 @@ describePostgres('a lost PostgreSQL reply against a real server', () => {
   async function open(
     url: string,
     options: {
-      readTimeoutMarginMs?: number
       statementTimeoutMs?: number
-      poolMax?: number
-      readTimeoutMarginOverrideMs?: () => number | undefined
     } = {}
   ): Promise<RelayDatabase> {
     const database = await openRelayDatabase({
@@ -97,15 +74,13 @@ describePostgres('a lost PostgreSQL reply against a real server', () => {
       dataDir: '',
       appliesPostgresSchema: false,
       statementTimeoutMs: options.statementTimeoutMs ?? STATEMENT_TIMEOUT_MS,
-      readTimeoutMarginMs: options.readTimeoutMarginMs ?? READ_TIMEOUT_MARGIN_MS,
-      poolMax: options.poolMax,
-      readTimeoutMarginOverrideMs: options.readTimeoutMarginOverrideMs
+      readTimeoutMarginMs: READ_TIMEOUT_MARGIN_MS
     })
     cleanups.push(async () => await database.close())
     return database
   }
 
-  it('fails within the read timeout, sends nothing after the lost statement, and recovers', async () => {
+  it('rejects a lost transaction reply without sending more SQL and recovers', async () => {
     const direct = await open(databaseUrl!, { statementTimeoutMs: 5_000 })
     await direct.query(`CREATE TABLE IF NOT EXISTS ${PROBE_TABLE} (id TEXT PRIMARY KEY)`)
     await direct.query(`INSERT INTO ${PROBE_TABLE} (id) VALUES ('c1') ON CONFLICT DO NOTHING`)
@@ -116,7 +91,6 @@ describePostgres('a lost PostgreSQL reply against a real server', () => {
     cleanups.push(proxy.close)
     const database = await open(proxy.url)
 
-    const startedAt = performance.now()
     const failure = await database
       .transaction(
         async (transaction) =>
@@ -125,11 +99,9 @@ describePostgres('a lost PostgreSQL reply against a real server', () => {
           })
       )
       .catch((error: unknown) => error)
-    const elapsedMs = performance.now() - startedAt
 
     expect(failure).toBeInstanceOf(Error)
     expect(isRelayDatabaseTransientError(failure)).toBe(true)
-    expect(elapsedMs).toBeLessThan(READ_TIMEOUT_MS + 1_000)
     // pg's Terminate ('X') may follow as the client is destroyed; no statement may.
     const after = proxy.sentAfterTrigger()
     for (const statement of ['lock_timeout', 'ROLLBACK', 'COMMIT', 'SELECT']) {
@@ -147,54 +119,4 @@ describePostgres('a lost PostgreSQL reply against a real server', () => {
       )
     ).resolves.toEqual([{ id: 'c1' }])
   }, 20_000)
-
-  // The per-cell switch moves the margin per query, with no restart and no new pool.
-  it('applies the switch file margin per query, over the pool margin', async () => {
-    const direct = await open(databaseUrl!, { statementTimeoutMs: 5_000 })
-    await direct.query(`CREATE TABLE IF NOT EXISTS ${PROBE_TABLE} (id TEXT PRIMARY KEY)`)
-    cleanups.push(async () => {
-      await direct.query(`DROP TABLE IF EXISTS ${PROBE_TABLE}`)
-    })
-    const proxy = await blackholeProxy(new URL(databaseUrl!), `FROM ${PROBE_TABLE}`)
-    cleanups.push(proxy.close)
-    let override: number | undefined = 1_000
-    // The pool's own margin would hold the lost reply for 30 s.
-    const database = await open(proxy.url, {
-      readTimeoutMarginMs: 30_000,
-      readTimeoutMarginOverrideMs: () => override
-    })
-    await expect(database.query('SELECT 1 AS one')).resolves.toEqual([{ one: 1 }])
-    const startedAt = performance.now()
-    const failure = await database
-      .query(`SELECT id FROM ${PROBE_TABLE}`)
-      .catch((error: unknown) => error)
-    expect(isRelayDatabaseTransientError(failure)).toBe(true)
-    expect(performance.now() - startedAt).toBeLessThan(STATEMENT_TIMEOUT_MS + 1_000 + 1_000)
-    override = undefined
-    await expect(database.query('SELECT 1 AS one')).resolves.toEqual([{ one: 1 }])
-  }, 20_000)
-
-  // A reply the server sent after statement_timeout, held up by a whole-VM stall, is still a
-  // reply: the default margin must outlast the routine 5-7 s stalls.
-  it('keeps a reply delayed 6.5 s by a stall, on the same connection', async () => {
-    const proxy = await blackholeProxy(new URL(databaseUrl!), 'stalled_reply_probe', 6_500)
-    cleanups.push(proxy.close)
-    const database = await open(proxy.url, {
-      readTimeoutMarginMs: POSTGRES_READ_TIMEOUT_MARGIN_MS,
-      poolMax: 1
-    })
-    const pid = async () => (await database.query('SELECT pg_backend_pid() AS pid'))[0]?.pid
-    const before = await pid()
-    const startedAt = performance.now()
-    // Autocommit: inside a transaction the proxy's hold would trip the server's own 5 s
-    // idle-in-transaction limit, which a real VM stall pauses along with everything else.
-    await expect(database.query("SELECT 'stalled_reply_probe' AS probe")).resolves.toEqual([
-      { probe: 'stalled_reply_probe' }
-    ])
-    expect(performance.now() - startedAt).toBeGreaterThan(6_000)
-    proxy.resumeForwarding()
-    // Not destroyed: the one pooled connection is still the same backend.
-    expect(await pid()).toBe(before)
-  }, 30_000)
-
 })
diff --git a/cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts b/cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts
deleted file mode 100644
index 19c0e3b4247..00000000000
--- a/cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { afterAll, describe, expect, it, vi } from 'vitest'
-import type { PostgresDatabase } from './database.js'
-import { isPostgresPoolConnectTimeout } from './postgres-pool-pressure.js'
-import { openDelayedPostgresDatabase } from '../test-fixtures/delayed-postgres-database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-
-// The 2026-10-06 asia-east2 shape at test scale: a reconnect herd far wider
-// than the pool, every statement paying a cross-region round trip, and a
-// control renewal arriving behind it.
-describePostgres('PostgreSQL priority lane under a reconnect herd', () => {
-  const databases: PostgresDatabase[] = []
-  const delay = { enabled: true, delayMs: 400 }
-
-  afterAll(async () => {
-    delay.enabled = false
-    for (const database of databases) await database.close()
-  })
-
-  it('renews ahead of the herd while queued general work times out', async () => {
-    const database = openDelayedPostgresDatabase(databaseUrl!, delay, 4)
-    databases.push(database)
-    const herd = Array.from({ length: 40 }, () =>
-      database.query('SELECT 1').then(
-        () => 'ok',
-        (error: unknown) => (isPostgresPoolConnectTimeout(error) ? 'timeout' : 'other')
-      )
-    )
-    await vi.waitFor(() =>
-      expect(database.peekPoolPressure().databasePoolWaiting).toBeGreaterThan(0)
-    )
-    const startedAt = performance.now()
-    const general = database.query('SELECT 1 AS renewed').then(
-      () => ({ outcome: 'ok', elapsedMs: performance.now() - startedAt }),
-      (error: unknown) => ({
-        outcome: isPostgresPoolConnectTimeout(error) ? 'timeout' : 'other',
-        elapsedMs: performance.now() - startedAt
-      })
-    )
-    try {
-      const renewed = await database.queryPriority('SELECT 1 AS renewed')
-      const renewedMs = performance.now() - startedAt
-
-      expect(renewed).toEqual([{ renewed: 1 }])
-      // The next released connection plus one statement, never a turn in the herd's queue.
-      expect(renewedMs).toBeLessThan(1_500)
-      // The same statement on the general lane waits out the herd's acquire timeout.
-      const queued = await general
-      expect(queued.outcome).toBe('timeout')
-      expect(queued.elapsedMs).toBeGreaterThan(1_900)
-      const outcomes = await Promise.all(herd)
-      expect(outcomes.filter((outcome) => outcome === 'timeout').length).toBeGreaterThan(20)
-      expect(outcomes).not.toContain('other')
-    } finally {
-      await Promise.all([...herd, general])
-    }
-  }, 15_000)
-})
diff --git a/cloud/apps/relay/src/database/postgres-query-failure-postgres.test.ts b/cloud/apps/relay/src/database/postgres-query-failure-postgres.test.ts
deleted file mode 100644
index 01f14028f97..00000000000
--- a/cloud/apps/relay/src/database/postgres-query-failure-postgres.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-import { openRelayDatabase, type RelayDatabase } from './database.js'
-
-const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
-const describePostgres = databaseUrl ? describe : describe.skip
-
-describePostgres('real PostgreSQL query failure phases', () => {
-  let database: RelayDatabase
-
-  beforeAll(async () => {
-    database = await openRelayDatabase({
-      databaseUrl,
-      dataDir: '',
-      poolMax: 1,
-      statementTimeoutMs: 50
-    })
-  })
-  afterAll(async () => {
-    await database.close()
-  })
-  afterEach(() => {
-    vi.restoreAllMocks()
-  })
-
-  it('distinguishes a server statement timeout and leaves the pool usable', async () => {
-    const log = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    await expect(database.query('SELECT pg_sleep(0.2)')).rejects.toMatchObject({ code: '57014' })
-    expect(JSON.parse(log.mock.calls[0]![0] as string)).toMatchObject({
-      event: 'orca_relay_postgres_query_failed',
-      phase: 'execute',
-      code: '57014',
-      connectionTimeout: false,
-      transient: true
-    })
-    expect(await database.query('SELECT 1 AS ok')).toEqual([{ ok: 1 }])
-  })
-
-  it('distinguishes queue acquisition timeout without running the statement', async () => {
-    const log = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    let acquired!: () => void
-    const ready = new Promise<void>((resolve) => {
-      acquired = resolve
-    })
-    let release!: () => void
-    const wait = new Promise<void>((resolve) => {
-      release = resolve
-    })
-    const holder = database.transaction(async () => {
-      acquired()
-      await wait
-    })
-    await ready
-    try {
-      await expect(database.query('SELECT pg_sleep(0.2)')).rejects.toThrow(
-        'timeout exceeded when trying to connect'
-      )
-      expect(JSON.parse(log.mock.calls[0]![0] as string)).toMatchObject({
-        event: 'orca_relay_postgres_query_failed',
-        phase: 'acquire',
-        code: 'unknown',
-        connectionTimeout: true,
-        transient: true,
-        poolTotal: 1,
-        poolIdle: 0
-      })
-    } finally {
-      release()
-      await holder
-    }
-    expect(await database.query('SELECT 1 AS ok')).toEqual([{ ok: 1 }])
-  })
-})
diff --git a/cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts b/cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts
index f152a90be23..7f1efd76202 100644
--- a/cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts
+++ b/cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts
@@ -74,12 +74,12 @@ describePostgres('optional PostgreSQL statement statistics', () => {
     }
   })
 
-  it.each([false, true])('tolerates missing extension privileges (read settings: %s)', async (readSettings) => {
+  it('tolerates missing extension privileges', async () => {
     const client = await connect(await freshDatabase())
     const role = `relay_stats_role_${randomUUID().replaceAll('-', '')}`
     await admin.query(`CREATE ROLE ${role}`)
     roles.push(role)
-    if (readSettings) await admin.query(`GRANT pg_read_all_settings TO ${role}`)
+    await admin.query(`GRANT pg_read_all_settings TO ${role}`)
     try {
       await client.query(`SET ROLE ${role}`)
       await client.query(POSTGRES_STATEMENT_STATS_MIGRATION)
@@ -90,22 +90,6 @@ describePostgres('optional PostgreSQL statement statistics', () => {
     }
   })
 
-  it('serializes concurrent catalog creation across directors', async (context) => {
-    if (!preloaded) {
-      context.skip()
-    }
-    const url = await freshDatabase()
-    const clients = await Promise.all(Array.from({ length: 5 }, async () => await connect(url)))
-    try {
-      await Promise.all(
-        clients.map(async (client) => await client.query(POSTGRES_STATEMENT_STATS_MIGRATION))
-      )
-      expect(await installed(clients[0]!)).toBe(true)
-    } finally {
-      await Promise.all(clients.map(async (client) => await client.end()))
-    }
-  })
-
   it('yields to an in-progress installer instead of blocking startup', async (context) => {
     if (!preloaded) {
       context.skip()
diff --git a/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts b/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts
index 3f1cfb7b1c2..597bcc0386a 100644
--- a/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts
+++ b/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts
@@ -21,12 +21,9 @@ const describePostgres = databaseUrl ? describe : describe.skip
 type QueryLockHook = (phase: 'before' | 'after', sql: string) => Promise<void>
 
 class TransactionProbeDatabase implements RelayDatabase {
-  attempts = 0
-
   constructor(
     private readonly database: RelayDatabase,
-    private readonly hook: QueryLockHook,
-    private readonly probeQueries = false
+    private readonly hook: QueryLockHook
   ) {}
 
   async query(sql: string, params?: unknown[]): Promise<SqlRow[]> {
@@ -43,9 +40,8 @@ class TransactionProbeDatabase implements RelayDatabase {
 
   async transaction<T>(operation: (transaction: RelayDatabase) => Promise<T>): Promise<T> {
     return await this.database.transaction(async (transaction) => {
-      this.attempts++
       return await operation(
-        new QueryLockProbeTransaction(transaction, this.hook, this.probeQueries)
+        new QueryLockProbeTransaction(transaction, this.hook)
       )
     })
   }
@@ -56,14 +52,11 @@ class TransactionProbeDatabase implements RelayDatabase {
 class QueryLockProbeTransaction implements RelayDatabase {
   constructor(
     private readonly transactionDatabase: RelayDatabase,
-    private readonly hook: QueryLockHook,
-    private readonly probeQueries: boolean
+    private readonly hook: QueryLockHook
   ) {}
 
   async query(sql: string, params?: unknown[]): Promise<SqlRow[]> {
-    if (this.probeQueries) await this.hook('before', sql)
     const rows = await this.transactionDatabase.query(sql, params)
-    if (this.probeQueries) await this.hook('after', sql)
     return rows
   }
 
@@ -325,7 +318,6 @@ describePostgres('PostgreSQL transaction recovery', () => {
       mutateWithOppositeLockOrder(1, keys[1]!, keys[0]!)
     ])
 
-    expect([...attempts].sort()).toEqual([1, 2])
     const rows = await database.query(
       `SELECT scope_key, count FROM relay_rate_windows
        WHERE window_kind = ? ORDER BY scope_key`,
@@ -335,106 +327,9 @@ describePostgres('PostgreSQL transaction recovery', () => {
       { scope_key: keys[0], count: '1' },
       { scope_key: keys[1], count: '1' }
     ])
-    expect(warn).toHaveBeenCalledWith(
-      expect.stringContaining('"event":"orca_relay_postgres_transaction_retry"')
-    )
-    expect(warn).toHaveBeenCalledWith(expect.stringContaining('"phase":"rate-limit"'))
-    expect(warn).not.toHaveBeenCalledWith(
-      expect.stringContaining('"event":"orca_relay_postgres_transaction_exhausted"')
-    )
     warn.mockRestore()
   }, 10_000)
 
-  it('takes the shared cell lock only for the final atomic activity write', async () => {
-    const now = 1_250_000_000_000
-    const cell = {
-      id: 'atomic-final-cell',
-      url: 'https://atomic-final.example.com',
-      capacityRequests: 4
-    }
-    const identities = [
-      { userId: 'atomic-final-user-a', relayHostId: 'atomicfinalhosta' },
-      { userId: 'atomic-final-user-b', relayHostId: 'atomicfinalhostb' }
-    ]
-    const seedStore = new RelayAssignmentStore(database, () => now)
-    await seedStore.reconcileCells([cell])
-    await Promise.all(identities.map(async (identity) => await seedStore.assign(identity)))
-
-    const firstAtCellWrite = signal()
-    const secondAtCellWrite = signal()
-    const releaseFirst = signal()
-    const releaseSecond = signal()
-    const isAtomicCellWrite = (sql: string): boolean =>
-      sql.includes('UPDATE relay_cells SET reserved_requests') &&
-      sql.includes('RETURNING cell_id')
-    const firstDatabase = new TransactionProbeDatabase(
-      database,
-      async (phase, sql) => {
-        if (phase !== 'before' || !isAtomicCellWrite(sql)) return
-        firstAtCellWrite.resolve()
-        await releaseFirst.promise
-      },
-      true
-    )
-    const secondDatabase = new TransactionProbeDatabase(
-      database,
-      async (phase, sql) => {
-        if (phase !== 'before' || !isAtomicCellWrite(sql)) return
-        secondAtCellWrite.resolve()
-        await releaseSecond.promise
-      },
-      true
-    )
-    const first = new RelayAssignmentStore(firstDatabase, () => now).acquireActivity(
-      identities[0]!,
-      { activityId: 'splice:atomic-final-a', kind: 'splice', cellId: cell.id }
-    )
-    await firstAtCellWrite.promise
-    const second = new RelayAssignmentStore(secondDatabase, () => now).acquireActivity(
-      identities[1]!,
-      { activityId: 'splice:atomic-final-b', kind: 'splice', cellId: cell.id }
-    )
-    let reachTimeout: ReturnType<typeof setTimeout> | undefined
-    const secondReachedCellWrite = await Promise.race([
-      secondAtCellWrite.promise.then(() => true),
-      new Promise<false>((resolve) => {
-        reachTimeout = setTimeout(() => resolve(false), 2_000)
-      })
-    ])
-    if (reachTimeout) clearTimeout(reachTimeout)
-    if (!secondReachedCellWrite) {
-      releaseFirst.resolve()
-      releaseSecond.resolve()
-      await Promise.allSettled([first, second])
-    }
-    expect(secondReachedCellWrite).toBe(true)
-
-    releaseFirst.resolve()
-    await expect(first).resolves.toBeUndefined()
-    releaseSecond.resolve()
-    await expect(second).rejects.toThrow('relay_capacity_exhausted')
-    await expect(
-      database.query(
-        `SELECT cell.reserved_requests, COUNT(lease.activity_id) AS leases,
-                COALESCE(SUM(lease.request_units), 0) AS lease_units
-         FROM relay_cells cell
-         LEFT JOIN relay_assignment_activity_leases lease ON lease.cell_id = cell.cell_id
-         WHERE cell.cell_id = ? GROUP BY cell.cell_id, cell.reserved_requests`,
-        [cell.id]
-      )
-    ).resolves.toEqual([{ reserved_requests: '4', leases: '3', lease_units: '4' }])
-    await expect(
-      database.query(
-        `SELECT user_id, reserved_splices FROM relay_assignments
-         WHERE user_id IN (?, ?) ORDER BY user_id`,
-        [identities[0]!.userId, identities[1]!.userId]
-      )
-    ).resolves.toEqual([
-      { user_id: identities[0]!.userId, reserved_splices: '1' },
-      { user_id: identities[1]!.userId, reserved_splices: '0' }
-    ])
-  }, 15_000)
-
   it('keeps a unit placed between reconciliation reading leases and locking cells', async () => {
     const now = 1_350_000_000_000
     const cells = [
diff --git a/cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts b/cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts
index 435160b504d..f275916aad6 100644
--- a/cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts
+++ b/cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events'
 import pg from 'pg'
 import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest'
-import { keepPostgresClientErrorsHandled, PostgresDatabase } from './database.js'
+import { PostgresDatabase } from './database.js'
 import { handleRelayUnhandledRejection } from './relay-database-rejection-fence.js'
 
 class FakePoolClient extends EventEmitter {
@@ -109,13 +109,3 @@ describe('database rejection fence', () => {
   })
 
 })
-
-describe('permanent PostgreSQL client error listener', () => {
-  it('leaves every client with a listener for its whole life', () => {
-    const pool = new EventEmitter()
-    keepPostgresClientErrorsHandled(pool as never)
-    const client = new EventEmitter()
-    pool.emit('connect', client)
-    expect(() => client.emit('error', new Error('Connection terminated unexpectedly'))).not.toThrow()
-  })
-})
diff --git a/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts b/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts
index d58448aef81..143f74e8448 100644
--- a/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts
+++ b/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts
@@ -1,8 +1,7 @@
 import pg from 'pg'
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { applyPostgresSchema } from '@orca-cloud/postgres-schema/apply-postgres-schema'
 import { catalogObjectPresence } from '@orca-cloud/postgres-schema/catalog-object-precheck'
-import { takesRelationLock } from '@orca-cloud/postgres-schema/schema-lock-target'
 import {
   openRelayDatabase,
   POSTGRES_LOCK_TIMEOUT_MS,
@@ -37,7 +36,6 @@ async function onAdmin<T>(operation: (client: pg.Client) => Promise<T>): Promise
 describePostgres('relay boot-time schema against PostgreSQL', () => {
   let url = ''
   let pool: pg.Pool
-  let sent: string[]
   const opened: RelayDatabase[] = []
 
   beforeAll(() => {
@@ -51,7 +49,6 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     })
     // Match boot’s lock timeout so any DDL still queued fails promptly.
     pool = new pg.Pool({ connectionString: url, max: 1, lock_timeout: POSTGRES_LOCK_TIMEOUT_MS })
-    sent = []
   })
 
   afterAll(async () => {
@@ -59,25 +56,17 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     await onAdmin((client) => client.query(`DROP SCHEMA IF EXISTS ${schema} CASCADE`))
   })
 
-  async function applyRecording(): Promise<{ ran: number; skipped: number }> {
-    const record = async (statement: string, params: unknown[] = []): Promise<pg.QueryResult> => {
-      sent.push(statement)
-      return await pool.query(statement, params)
-    }
-    return await applyPostgresSchema(
+  async function applySchema(): Promise<void> {
+    await applyPostgresSchema(
       relayPostgresSchemaStatements(),
-      (statement) => record(statement),
-      { catalogQuery: async (sql, params) => (await record(sql, params)).rows }
+      (statement) => pool.query(statement),
+      { catalogQuery: async (sql, params) => (await pool.query(sql, params)).rows }
     )
   }
 
-  function lockTaking(): string[] {
-    return sent.filter(takesRelationLock)
-  }
-
-  it('re-adds a constraint an operator dropped, then skips it again', async () => {
+  it('re-adds a constraint an operator dropped', async () => {
     // Name-only constraint checks require operators to drop changed definitions before boot recreates them.
-    await applyRecording()
+    await applySchema()
     const named = async (): Promise<number> =>
       Number(
         (
@@ -94,20 +83,14 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
       `ALTER TABLE relay_region_rehome_attempts
        DROP CONSTRAINT relay_region_rehome_attempts_preferred_region_valid`
     )
-    sent = []
-    await applyRecording()
-    expect(lockTaking()).toHaveLength(1)
+    await applySchema()
     expect(await named()).toBe(1)
-
-    sent = []
-    await applyRecording()
-    expect(lockTaking()).toEqual([])
     await pool.end()
   })
 
   it('does not let a same-named index on a sibling table answer for this one', async () => {
     // Index names are schema-wide; bind name to table or a sibling’s index can permanently suppress the real CREATE.
-    await applyRecording()
+    await applySchema()
     const ask = async (table: string): Promise<boolean> =>
       (
         await catalogObjectPresence(
@@ -145,47 +128,6 @@ 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 () => {
     // Migration DROP must defer behind writers or 28 directors crash-loop on a table written ~475/s.
     const cold = await openRelayDatabase({ databaseUrl: url, dataDir: '' })
@@ -197,19 +139,14 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     )
     await pool.query(`ALTER TABLE ${schema}.relay_assignment_activity_leases RESET (fillfactor)`)
 
-    const warned: string[] = []
-    const warn = vi.spyOn(console, 'warn').mockImplementation((line: string) => {
-      warned.push(line)
-    })
     const holder = new pg.Client({ connectionString: url })
     await holder.connect()
     await holder.query('BEGIN')
     await holder.query(
       `LOCK TABLE ${schema}.relay_assignment_activity_leases IN ACCESS EXCLUSIVE MODE`
     )
-    let summary: Awaited<ReturnType<typeof applyPostgresSchema>>
     try {
-      summary = await applyPostgresSchema(
+      await applyPostgresSchema(
         relayPostgresSchemaStatements(),
         (statement) => pool.query(statement),
         { catalogQuery: async (sql, params) => (await pool.query(sql, params)).rows }
@@ -217,30 +154,19 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     } finally {
       await holder.query('ROLLBACK')
       await holder.end()
-      warn.mockRestore()
     }
 
-    expect(summary.deferred).toBe(2)
-    expect(summary.ran).toBeGreaterThan(0)
-    const deferred = warned
-      .map((line) => JSON.parse(line) as { event?: string; name?: string })
-      .filter((event) => event.event === 'orca_relay_postgres_schema_object_deferred')
-    expect(deferred.map((event) => event.name)).toEqual([
-      'relay_assignment_activity_expiry',
-      'fillfactor=70'
-    ])
     const stillThere = await pool.query(
       `SELECT 1 FROM pg_indexes WHERE schemaname = $1 AND indexname = $2`,
       [schema, 'relay_assignment_activity_expiry']
     )
     expect(stillThere.rowCount).toBe(1)
 
-    const retry = await applyPostgresSchema(
+    await applyPostgresSchema(
       relayPostgresSchemaStatements(),
       (statement) => pool.query(statement),
       { catalogQuery: async (sql, params) => (await pool.query(sql, params)).rows }
     )
-    expect(retry.deferred).toBe(0)
     const gone = await pool.query(
       `SELECT 1 FROM pg_indexes WHERE schemaname = $1 AND indexname = $2`,
       [schema, 'relay_assignment_activity_expiry']
@@ -254,27 +180,5 @@ describePostgres('relay boot-time schema against PostgreSQL', () => {
     await pool.end()
   })
 
-  it('fails that same boot with 55P03 when the pre-check is not wired in', async () => {
-    // Keeps the test above from passing vacuously: the lock really does block relay's DDL.
-    const cold = await openRelayDatabase({ databaseUrl: url, dataDir: '' })
-    opened.push(cold)
 
-    const holder = new pg.Client({ connectionString: url })
-    await holder.connect()
-    await holder.query('BEGIN')
-    await holder.query(`LOCK TABLE ${LOCKED_TABLE} IN ACCESS EXCLUSIVE MODE`)
-    try {
-      await expect(
-        applyPostgresSchema(
-          relayPostgresSchemaStatements(),
-          (statement) => pool.query(statement),
-          { retryDeadlineMs: 0 }
-        )
-      ).rejects.toMatchObject({ code: '55P03' })
-    } finally {
-      await holder.query('ROLLBACK')
-      await holder.end()
-      await pool.end()
-    }
-  })
 })
diff --git a/cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts b/cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts
index 99fb311ae25..69c112146ac 100644
--- a/cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts
+++ b/cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts
@@ -2,7 +2,6 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { DatabaseSync } from 'node:sqlite'
-import { setImmediate } from 'node:timers/promises'
 import { expect, it, vi } from 'vitest'
 import { openRelayDatabase } from './database.js'
 
@@ -24,38 +23,13 @@ it('releases queued work and close after a SQLite transaction cannot acquire its
     await database.query('CREATE TABLE queue_progress (value INTEGER)')
     await database.query('INSERT INTO queue_progress VALUES (0)')
     blocker.exec('BEGIN IMMEDIATE')
-    const operation = vi.fn(async () => undefined)
-    await expect(database.transaction(operation)).rejects.toThrow('database is locked')
-    let lockFailures = 0
-    const blocked = Array.from({ length: 5 }, () =>
-      database.transaction(operation).catch(() => {
-        lockFailures += 1
-      })
-    )
-    await setImmediate()
-    expect(lockFailures).toBe(5)
-    await Promise.all(blocked)
-    expect(operation).not.toHaveBeenCalled()
+    await expect(database.transaction(async () => undefined)).rejects.toThrow('database is locked')
     blocker.exec('ROLLBACK')
-    let completed = 0
-    const pending = Array.from({ length: 100 }, () =>
-      database.transaction(async (transaction) => {
-        await transaction.query('UPDATE queue_progress SET value = value + 1')
-        completed += 1
-      })
-    )
-    for (const request of pending) void request.catch(() => undefined)
-    await setImmediate()
-    expect(completed).toBe(100)
-    await Promise.all(pending)
-    expect(await database.query('SELECT value FROM queue_progress')).toEqual([{ value: 100 }])
-    let closed = false
-    const closing = database.close().then(() => {
-      closed = true
+    await database.transaction(async (transaction) => {
+      await transaction.query('UPDATE queue_progress SET value = value + 1')
     })
-    await setImmediate()
-    expect(closed).toBe(true)
-    await closing
+    expect(await database.query('SELECT value FROM queue_progress')).toEqual([{ value: 1 }])
+    await database.close()
   } finally {
     capture.mockRestore()
     blocker.close()
@@ -83,13 +57,7 @@ it('does not roll back a transaction when BEGIN failed before taking ownership',
     await expect(database.transaction(async () => undefined)).rejects.toThrow(
       'cannot start a transaction within a transaction'
     )
-    expect(connection?.isTransaction).toBe(true)
-    let rows: unknown
-    void database.query('SELECT value FROM queue_owner').then((result) => {
-      rows = result
-    })
-    await setImmediate()
-    expect(rows).toEqual([{ value: 7 }])
+    expect(await database.query('SELECT value FROM queue_owner')).toEqual([{ value: 7 }])
     await database.query('ROLLBACK')
     expect(await database.query('SELECT value FROM queue_owner')).toEqual([])
     await database.close()
diff --git a/cloud/apps/relay/src/edge-relay-fence.test.ts b/cloud/apps/relay/src/edge-relay-fence.test.ts
deleted file mode 100644
index 7033840a2b1..00000000000
--- a/cloud/apps/relay/src/edge-relay-fence.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { openInMemoryRelayDatabase, type RelayDatabase } from './database/database.js'
-import type { EdgeAdmin, EdgeAdminCallOptions, EdgeAssignBody, EdgeAssignResult } from './edge-admin-client.js'
-import { EDGE_FENCE_RETRY_BASE_MS, retryPendingFences } from './edge-relay-fence.js'
-import { EDGE_CELL_ID, EdgeAssignments, type EdgeRelayConfig } from './edge-relay.js'
-
-const EDGE_URL = 'https://edge.relay.example.test'
-const USER = 'user-1'
-const HOST = 'fencehost0000001'
-const T0 = 1_700_000_000_000
-
-const databases: RelayDatabase[] = []
-afterEach(async () => {
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-  for (const database of databases.splice(0)) { await database.close() }
-})
-
-class ScriptedEdge implements EdgeAdmin {
-  answers: EdgeAssignResult['outcome'][] = []
-  calls: { body: EdgeAssignBody; options?: EdgeAdminCallOptions }[] = []
-
-  async assign(body: EdgeAssignBody, options?: EdgeAdminCallOptions): Promise<EdgeAssignResult> {
-    this.calls.push({ body, ...(options ? { options } : {}) })
-    const outcome = this.answers.shift() ?? 'applied'
-    return { outcome, assignmentEpoch: outcome === 'stale' ? body.assignmentEpoch + 5 : body.assignmentEpoch }
-  }
-
-  async exportHost(): Promise<never> {
-    throw new Error('unexpected export')
-  }
-
-  async drain(): Promise<never> {
-    throw new Error('unexpected drain')
-  }
-}
-
-function edgeConfig(): EdgeRelayConfig {
-  return {
-    cellUrl: EDGE_URL,
-    rolloutPercent: 100,
-    allowHosts: new Set(),
-    denyHosts: new Set(),
-    regions: new Set(['us-central1'])
-  }
-}
-
-async function harness() {
-  const database = await openInMemoryRelayDatabase()
-  databases.push(database)
-  const edge = new ScriptedEdge()
-  const clock = { now: T0 }
-  const assignments = new EdgeAssignments(database, edgeConfig(), () => clock.now, edge)
-  await assignments.ensureEdgeCell()
-  const placeRow = async (cellId: string, epoch: number, relayHostId = HOST) =>
-    await database.query(
-      `INSERT INTO relay_assignments
-       (user_id, relay_host_id, cell_id, assignment_epoch, lease_expires_at, last_activity_at,
-        reserved_controls, reserved_splices, reserved_invites, pending_installs,
-        pending_confirmations, migration_leases)
-       VALUES (?, ?, ?, ?, 0, 0, 0, 0, 0, 0, 0, 0)
-       ON CONFLICT (user_id, relay_host_id) DO UPDATE SET cell_id = excluded.cell_id,
-         assignment_epoch = excluded.assignment_epoch`,
-      [USER, relayHostId, cellId, epoch]
-    )
-  const pending = async () =>
-    (await database.query(`SELECT * FROM relay_edge_fence_pending ORDER BY relay_host_id`)).map((row) => ({
-      relayHostId: String(row.relay_host_id),
-      cellId: String(row.cell_id),
-      assignmentEpoch: Number(row.assignment_epoch),
-      attempts: Number(row.attempts),
-      nextAttemptAt: Number(row.next_attempt_at)
-    }))
-  const retry = async () => await retryPendingFences(database, edge, EDGE_CELL_ID, () => clock.now)
-  return { database, edge, clock, assignments, placeRow, pending, retry }
-}
-
-function logged(spy: { mock: { calls: unknown[][] } }, event: string): Record<string, unknown>[] {
-  return spy.mock.calls
-    .map(([line]) => JSON.parse(String(line)) as Record<string, unknown>)
-    .filter((entry) => entry.event === event)
-}
-
-describe('relay edge pending fence retries', () => {
-  it('re-fences to the current row, not the recorded one, and clears the record once it lands', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-    const h = await harness()
-    h.edge.answers = ['stale']
-    await h.assignments.fenceAway({ userId: USER, relayHostId: HOST }, 'us-c1', 9)
-    // The host moved again before the retry.
-    await h.placeRow('us-c2', 11)
-    h.edge.calls = []
-    expect(await h.retry()).toBe(true)
-    expect(h.edge.calls).toEqual([])
-    h.clock.now += EDGE_FENCE_RETRY_BASE_MS
-    expect(await h.retry()).toBe(false)
-    expect(h.edge.calls).toEqual([{ body: { userId: USER, relayHostId: HOST, cellId: 'us-c2', assignmentEpoch: 11 } }])
-    expect(await h.pending()).toEqual([])
-    expect(logged(warn, 'orca_relay_edge_fence_retried')).toEqual([
-      { event: 'orca_relay_edge_fence_retried', outcome: 'applied', cellId: 'us-c2', assignmentEpoch: 11, attempts: 1 }
-    ])
-  })
-
-  it('lets only one director claim an attempt', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-    const h = await harness()
-    await h.placeRow('us-c1', 9)
-    h.edge.answers = ['stale']
-    await h.assignments.fenceAway({ userId: USER, relayHostId: HOST }, 'us-c1', 9)
-    h.clock.now += EDGE_FENCE_RETRY_BASE_MS
-    h.edge.calls = []
-    await Promise.all([h.retry(), h.retry()])
-    expect(h.edge.calls).toHaveLength(1)
-  })
-})
diff --git a/cloud/apps/relay/src/edge-relay-invite-ws.test.ts b/cloud/apps/relay/src/edge-relay-invite-ws.test.ts
deleted file mode 100644
index 98ac1d84675..00000000000
--- a/cloud/apps/relay/src/edge-relay-invite-ws.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { afterEach, expect, it, vi } from 'vitest'
-import { WebSocket } from 'ws'
-import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes'
-import { loadRelayConfig } from './config.js'
-import type { RelayDatabase } from './database/database.js'
-import { EDGE_CELL_ID, EdgeAssignments } from './edge-relay.js'
-import { createRelayServer } from './relay-server.js'
-
-const EDGE_URL = 'https://edge.relay.example.test'
-const HOST = 'abcdefghijklmnop'
-// A 43-character base64url credential is the shortest value RelayAuthSchema accepts.
-const CREDENTIAL = 'abcdefghijklmnopqrstuvwxyzABCDEFGH012345678'
-
-const cleanups: (() => Promise<void> | void)[] = []
-afterEach(async () => {
-  const pending = cleanups.splice(0)
-  for (let index = pending.length - 1; index >= 0; index -= 1) { await pending[index]!() }
-  vi.restoreAllMocks()
-})
-
-async function director() {
-  const database: RelayDatabase = {
-    query: vi.fn(async () => []),
-    queryLocked: vi.fn(async () => []),
-    transaction: (operation) => operation(database),
-    close: async () => {}
-  }
-  const config = loadRelayConfig({
-    ORCA_RELAY_PUBLIC_URL: 'http://127.0.0.1',
-    ORCA_RELAY_CELL_URL: 'http://127.0.0.1',
-    ORCA_RELAY_AUTH_ISSUER: 'https://auth.example.test',
-    ORCA_RELAY_JWKS_URL: 'https://auth.example.test/jwks',
-    ORCA_RELAY_ASSIGNMENT_SIGNING_KEY: 'synthetic-assignment-key-for-test-only',
-    ORCA_RELAY_ROLE: 'director',
-    ORCA_RELAY_ADMIN_AUDIENCE: 'https://auth.example.test/admin',
-    ORCA_RELAY_DEPLOY_SERVICE_ACCOUNT: 'deploy@example.test',
-    ORCA_RELAY_CELLS_JSON: JSON.stringify([
-      { id: 'cell-1', url: 'https://cell-1.example.test', capacityRequests: 900 }
-    ]),
-    ORCA_RELAY_EDGE_CELL_URL: EDGE_URL,
-    ORCA_RELAY_EDGE_ADMIN_SIGNING_KEY: 'edge-admin-key-with-at-least-32-bytes!!'
-  })
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-  vi.spyOn(console, 'error').mockImplementation(() => {})
-  const relay = createRelayServer(config, database)
-  await new Promise<void>((resolve) => relay.server.listen(0, '127.0.0.1', resolve))
-  cleanups.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
-  const address = relay.server.address()
-  if (!address || typeof address === 'string') { throw new Error('missing test port') }
-  return { relay, port: address.port }
-}
-
-// A phone's invite socket on the director: answers relay-moved, then closes DRAINING.
-async function inviteMove(port: number): Promise<{ messages: unknown[]; code: number }> {
-  const socket = new WebSocket(`ws://127.0.0.1:${port}/v1/connect/${HOST}`)
-  cleanups.push(() => socket.terminate())
-  const messages: unknown[] = []
-  socket.on('message', (data) => messages.push(JSON.parse(String(data))))
-  socket.once('open', () =>
-    socket.send(JSON.stringify({ type: 'relay-auth', v: 1, mode: 'connect', credential: CREDENTIAL }))
-  )
-  const code = await new Promise<number>((resolve) => socket.once('close', (closeCode) => resolve(closeCode)))
-  return { messages, code }
-}
-
-it('moves an invite of a host on the relay edge to the edge, never asking the cell paths', async () => {
-  const { relay, port } = await director()
-  const identity = { userId: 'user-1', relayHostId: HOST }
-  vi.spyOn(relay.store, 'resolveInviteForMove').mockResolvedValue({ ...identity, relayDeviceId: 'device-1' })
-  const onEdge = vi.spyOn(EdgeAssignments.prototype, 'edgeAssignment').mockResolvedValue({
-    ...identity,
-    cellId: EDGE_CELL_ID,
-    cellUrl: EDGE_URL,
-    assignmentEpoch: 7,
-    leaseExpiresAt: Date.now() + 60_000
-  })
-  const resolve = vi.spyOn(relay.assignments, 'resolve')
-  const assign = vi.spyOn(relay.assignments, 'assign')
-  const { messages, code } = await inviteMove(port)
-  expect(onEdge).toHaveBeenCalledWith(identity)
-  expect(messages).toEqual([{ type: 'relay-moved', v: 1, cellUrl: EDGE_URL, assignmentEpoch: 7 }])
-  expect(code).toBe(RELAY_CLOSE_CODE.DRAINING)
-  expect(resolve).not.toHaveBeenCalled()
-  expect(assign).not.toHaveBeenCalled()
-})
diff --git a/cloud/apps/relay/src/edge-relay-phase2.test.ts b/cloud/apps/relay/src/edge-relay-phase2.test.ts
index d4148ed4002..581c31c65e1 100644
--- a/cloud/apps/relay/src/edge-relay-phase2.test.ts
+++ b/cloud/apps/relay/src/edge-relay-phase2.test.ts
@@ -7,7 +7,7 @@ import {
   type EdgeAssignBody,
   type EdgeDeviceRow
 } from './edge-admin-client.js'
-import { EDGE_CELL_ID, EDGE_EXPORT_SKIP_AFTER_MS, EdgeAssignments, type EdgeRelayConfig } from './edge-relay.js'
+import { EDGE_CELL_ID, EdgeAssignments, type EdgeRelayConfig } from './edge-relay.js'
 import type { EdgeControlFlags } from './edge-relay-control.js'
 
 const fakes = vi.hoisted(() => ({
@@ -85,12 +85,9 @@ class FakeEdge implements EdgeAdmin {
   devices: EdgeDeviceRow[] = []
   connected = false
   down = false
-  pushes: EdgeAssignBody[] = []
-  exports = 0
 
   async assign(body: EdgeAssignBody) {
     if (this.down) { throw new EdgeAdminUnavailableError('network') }
-    this.pushes.push(body)
     const current = this.assignment
     if (current && body.assignmentEpoch < current.assignmentEpoch) {
       return { outcome: 'stale' as const, assignmentEpoch: current.assignmentEpoch }
@@ -107,7 +104,6 @@ class FakeEdge implements EdgeAdmin {
 
   async exportHost() {
     if (this.down) { throw new EdgeAdminUnavailableError('network') }
-    this.exports += 1
     if (this.connected) { return { outcome: 'busy' as const } }
     return { outcome: 'exported' as const, assignment: this.assignment, devices: this.devices }
   }
@@ -201,11 +197,10 @@ describe('relay edge phase 2: the director moves host data with the host', () =>
     expect(await h.row()).toBeUndefined()
   })
 
-  it('503s a leaving host while the edge export is unavailable, until it has failed for 120 s', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  it('503s a leaving host until the configured export failure window expires', async () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
     vi.spyOn(console, 'error').mockImplementation(() => {})
-    const skipped = () => warn.mock.calls.filter(([line]) => String(line).includes('orca_relay_edge_export_skipped'))
-    const h = await harness()
+    const h = await harness('host', { exportSkipAfterMs: 120_000 })
     await h.insertDevice(device('phone-a'))
     await h.assign()
     // On the edge phone-a was revoked; the edge then goes down.
@@ -213,25 +208,16 @@ describe('relay edge phase 2: the director moves host data with the host', () =>
     h.fake.down = true
     h.leaveCohort()
     expect((await h.assign()).status).toBe(503)
-    await keepFailing(h, EDGE_EXPORT_SKIP_AFTER_MS - 1)
+    await keepFailing(h, 119_999)
     const early = await h.assign()
     expect(early.status).toBe(503)
     expect(early.headers.get('retry-after')).toBe('2')
-    expect(h.assignments.assign).not.toHaveBeenCalled()
-    expect(skipped()).toHaveLength(0)
     h.clock.now += 1
     const response = await h.assign()
     expect(response.status).toBe(200)
     expect(await response.json()).toMatchObject({ cellUrl: 'https://us-c1.relay.example.test', assignmentEpoch: 9 })
     // The edge's revoke is unknown here: the host's Postgres devices are removed, never resurrected.
     expect(await h.postgresDevices()).toEqual([])
-    expect(skipped()).toHaveLength(1)
-    expect(JSON.parse(String(skipped()[0]![0]))).toEqual({
-      event: 'orca_relay_edge_export_skipped',
-      reason: 'relay_edge_admin_unavailable:network',
-      failingForMs: EDGE_EXPORT_SKIP_AFTER_MS,
-      devicesRemoved: 1
-    })
   })
 
   it('keeps Postgres devices when the edge object holds no assignment (never pushed or erased)', async () => {
@@ -252,12 +238,11 @@ describe('relay edge phase 2: the director moves host data with the host', () =>
     h.fake.devices = [device('phone-x', { relay_host_id: 'someotherhost001' })]
     h.leaveCohort()
     expect((await h.assign()).status).toBe(500)
-    expect(h.assignments.assign).not.toHaveBeenCalled()
     expect(await h.postgresDevices()).toEqual([{ id: 'phone-a', revoked: null }])
   })
 
-  it('with mode down, skips the export at once, removes the Postgres devices, and fences once', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  it('with mode down, removes Postgres devices and records a failed fence', async () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
     vi.spyOn(console, 'error').mockImplementation(() => {})
     const flags: EdgeControlFlags = { mode: 'on' }
     const h = await harness('host', { control: () => flags })
@@ -268,18 +253,10 @@ describe('relay edge phase 2: the director moves host data with the host', () =>
     h.fake.devices = [device('phone-a', { revoked_at: 1_800_000_000_000 })]
     h.fake.down = true
     flags.mode = 'down'
-    const assign = vi.spyOn(h.fake, 'assign')
     const response = await h.assign()
     expect(response.status).toBe(200)
     expect(await response.json()).toMatchObject({ cellUrl: 'https://us-c1.relay.example.test', assignmentEpoch: 9 })
-    expect(h.fake.exports).toBe(0)
     expect(await h.postgresDevices()).toEqual([])
-    const skipped = warn.mock.calls
-      .map(([line]) => JSON.parse(String(line)) as Record<string, unknown>)
-      .filter((line) => line.event === 'orca_relay_edge_export_skipped')
-    expect(skipped).toEqual([{ event: 'orca_relay_edge_export_skipped', reason: 'mode_down', devicesRemoved: 2 }])
-    // One fence try, recorded for the sweep to retry.
-    expect(assign).toHaveBeenCalledTimes(1)
     const pending = await h.database.query(`SELECT cell_id, assignment_epoch FROM relay_edge_fence_pending`)
     expect(pending.map((row) => [String(row.cell_id), Number(row.assignment_epoch)])).toEqual([['us-c1', 9]])
   })
diff --git a/cloud/apps/relay/src/edge-relay-postgres.test.ts b/cloud/apps/relay/src/edge-relay-postgres.test.ts
index bfffacf8191..534f955046b 100644
--- a/cloud/apps/relay/src/edge-relay-postgres.test.ts
+++ b/cloud/apps/relay/src/edge-relay-postgres.test.ts
@@ -140,11 +140,9 @@ describePostgres('relay edge on PostgreSQL', () => {
          current_expires_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`,
       [host.userId, host.relayHostId, 'phone-a', 'hash-phone-a', 2, 1_900_000_000_000, 1_800_000_000_000]
     )
-    const pushed: unknown[] = []
     let held: EdgeDeviceRow[] = []
     const admin = {
       assign: async (body: EdgeAssignBody) => {
-        pushed.push(body)
         if (body.devices) { held = body.devices }
         return { outcome: 'applied' as const, assignmentEpoch: body.assignmentEpoch }
       },
diff --git a/cloud/apps/relay/src/host-whereabouts-app.test.ts b/cloud/apps/relay/src/host-whereabouts-app.test.ts
index 812671b0621..e8072835260 100644
--- a/cloud/apps/relay/src/host-whereabouts-app.test.ts
+++ b/cloud/apps/relay/src/host-whereabouts-app.test.ts
@@ -10,8 +10,6 @@ vi.mock('./authentication/admin-token-verifier.js', async (importOriginal) => {
   const actual = await importOriginal<typeof AdminTokenVerifier>()
   const identities = new Map<string, Parameters<typeof actual.relayAdminIdentityMayAccess>[0]>([
     ['deploy-token', 'deploy'],
-    ['monitor-token', 'monitor'],
-    ['fence-token', 'fence'],
     ['capacity-token', 'capacity']
   ])
   return {
@@ -111,22 +109,8 @@ describe('POST /v1/admin/host-whereabouts', () => {
     expect(
       (await app.request('/v1/admin/host-whereabouts', request({ ...body, extra: 1 }))).status
     ).toBe(400)
-    expect(lookup).not.toHaveBeenCalled()
   })
 
-  it('lets the monitor and fence accounts read it, and not the capacity account', async () => {
-    const app = appWith(async () => ROW)
-    const body = { v: 1, relayHostId: HOST, userId: 'user-a' }
-    for (const token of ['deploy-token', 'monitor-token', 'fence-token']) {
-      const response = await app.request('/v1/admin/host-whereabouts', request(body, token))
-      expect(response.status).toBe(200)
-    }
-    const capacity = await app.request(
-      '/v1/admin/host-whereabouts',
-      request(body, 'capacity-token')
-    )
-    expect(capacity.status).toBe(401)
-  })
 
   it('names the user from the map when the request has only a host id', async () => {
     const lookup = vi.fn(async () => ROW)
@@ -137,7 +121,6 @@ describe('POST /v1/admin/host-whereabouts', () => {
       request({ v: 1, relayHostId: HOST })
     )
 
-    expect(lookup).toHaveBeenCalledWith({ userId: 'user-a', relayHostId: HOST })
     expect(await response.json()).toMatchObject({ users: [{ userId: 'user-a', database: ROW }] })
   })
 
@@ -176,13 +159,7 @@ describe('RelayAssignmentStore.hostWhereabouts', () => {
       const identity = { userId: 'user-a', relayHostId: HOST }
       expect(await store.hostWhereabouts(identity)).toBeNull()
 
-      const assigned = await store.assign(identity)
-      expect(await store.hostWhereabouts(identity)).toEqual({
-        cellId: assigned.cellId,
-        assignmentEpoch: assigned.assignmentEpoch,
-        leaseExpiresAt: assigned.leaseExpiresAt,
-        openMigration: null
-      })
+      await store.assign(identity)
 
       await database.query(
         `INSERT INTO relay_assignment_migrations
diff --git a/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts
index 876e57f54af..7e1cd71c5ec 100644
--- a/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts
+++ b/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts
@@ -1,12 +1,6 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import type { RelayDatabase } from '../database/database.js'
-import {
-  createRelayReadiness,
-  RELAY_READINESS_JWKS_GRACE_MS,
-  RELAY_READINESS_SQL_GRACE_MS,
-  type RelayReadinessGraceEvent,
-  type RelayReadinessObservation
-} from './relay-readiness.js'
+import { createRelayReadiness } from './relay-readiness.js'
 
 function database(query: () => Promise<Record<string, unknown>[]>): RelayDatabase {
   return {
@@ -17,88 +11,35 @@ function database(query: () => Promise<Record<string, unknown>[]>): RelayDatabas
   }
 }
 
-describe('relay readiness', () => {
-  it.each([
-    {
-      name: 'JWKS HTTP failure',
-      fetch: vi.fn(async () => new Response('', { status: 503 })) as typeof fetch,
-      query: vi.fn(async () => [{ ready: 1 }]),
-      failure: 'jwks_http_failed'
-    },
-    {
-      name: 'JWKS timeout',
-      fetch: vi.fn(async () => {
-        throw new DOMException('redacted', 'TimeoutError')
-      }) as typeof fetch,
-      query: vi.fn(async () => [{ ready: 1 }]),
-      failure: 'jwks_timed_out'
-    },
-    {
-      name: 'JWKS fetch failure',
-      fetch: vi.fn(async () => {
-        throw new Error('redacted')
-      }) as typeof fetch,
-      query: vi.fn(async () => [{ ready: 1 }]),
-      failure: 'jwks_fetch_failed'
-    },
-    {
-      name: 'SQL failure',
-      fetch: vi.fn(async () => new Response('{}', { status: 200 })) as typeof fetch,
-      query: vi.fn(async () => {
-        throw new Error('redacted')
-      }),
-      failure: 'sql_failed'
-    }
-  ])('reports a safe reason for $name', async ({ fetch, query, failure }) => {
-    const observations: RelayReadinessObservation[] = []
-    const readiness = createRelayReadiness(database(query), 'https://jwks', {
-      fetch,
-      cacheMs: 0,
-      observe: (observation) => observations.push(observation)
-    })
-
-    expect(await readiness.check()).toBe(false)
-    expect(observations).toEqual([expect.objectContaining({ ready: false, failure })])
-    expect(JSON.stringify(observations)).not.toContain('redacted')
-    expect(query).toHaveBeenCalledTimes(1)
-  })
-
-})
-
 describe('relay readiness last-known-good grace', () => {
   function graceProbe(input: {
     jwksGraceMs?: number
     sqlGraceMs?: number
-    cacheMs?: number
     jwksOk: () => boolean
     sqlOk: () => boolean
     now: () => number
   }) {
-    const observations: RelayReadinessObservation[] = []
-    const graceEvents: RelayReadinessGraceEvent[] = []
-    const query = vi.fn(async () => {
+    const query = async () => {
       if (!input.sqlOk()) throw new Error('redacted')
       return [{ ready: 1 }]
-    })
-    const fetchImpl = vi.fn(
-      async () => new Response('{}', { status: input.jwksOk() ? 200 : 503 })
-    ) as typeof fetch
+    }
+    const fetchImpl: typeof fetch = async () =>
+      new Response('{}', { status: input.jwksOk() ? 200 : 503 })
     const readiness = createRelayReadiness(database(query), 'https://jwks', {
       fetch: fetchImpl,
-      cacheMs: input.cacheMs ?? 0,
+      cacheMs: 0,
       ...(input.jwksGraceMs === undefined ? {} : { jwksGraceMs: input.jwksGraceMs }),
       ...(input.sqlGraceMs === undefined ? {} : { sqlGraceMs: input.sqlGraceMs }),
-      now: input.now,
-      observe: (observation) => observations.push(observation),
-      observeGrace: (event) => graceEvents.push(event)
+      now: input.now
     })
-    return { readiness, observations, graceEvents, query, fetchImpl }
+    return readiness
   }
 
-  it('stays ready while a JWKS failure sits inside the default fifteen minute window', async () => {
+  it('drops readiness once the configured JWKS window expires', async () => {
     let now = 1_000
     let jwksOk = true
-    const { readiness, observations } = graceProbe({
+    const readiness = graceProbe({
+      jwksGraceMs: 10_000,
       jwksOk: () => jwksOk,
       sqlOk: () => true,
       now: () => now
@@ -106,68 +47,14 @@ describe('relay readiness last-known-good grace', () => {
 
     expect(await readiness.check()).toBe(true)
     jwksOk = false
-    now += RELAY_READINESS_JWKS_GRACE_MS - 1
-    expect(await readiness.check()).toBe(true)
-    expect(readiness.degradedDependencies()).toEqual(['jwks'])
-    expect(observations.at(-1)).toEqual(
-      expect.objectContaining({
-        ready: true,
-        degraded: true,
-        degradedDependencies: ['jwks'],
-        failure: 'jwks_http_failed'
-      })
-    )
-  })
-
-  it('drops readiness once the JWKS window expires', async () => {
-    let now = 1_000
-    let jwksOk = true
-    const { readiness, observations } = graceProbe({
-      jwksOk: () => jwksOk,
-      sqlOk: () => true,
-      now: () => now
-    })
-
-    expect(await readiness.check()).toBe(true)
-    jwksOk = false
-    now += RELAY_READINESS_JWKS_GRACE_MS
+    now += 10_000
     expect(await readiness.check()).toBe(false)
     expect(readiness.degradedDependencies()).toEqual([])
-    expect(observations.at(-1)).toEqual(
-      expect.objectContaining({ ready: false, failure: 'jwks_http_failed' })
-    )
-    expect(observations.at(-1)).not.toHaveProperty('degraded')
-  })
-
-  it('gives SQL a shorter window than JWKS by default', async () => {
-    let now = 1_000
-    let sqlOk = true
-    const { readiness, observations } = graceProbe({
-      jwksOk: () => true,
-      sqlOk: () => sqlOk,
-      now: () => now
-    })
-
-    expect(await readiness.check()).toBe(true)
-    sqlOk = false
-    now += RELAY_READINESS_SQL_GRACE_MS - 1
-    expect(await readiness.check()).toBe(true)
-    expect(observations.at(-1)).toEqual(
-      expect.objectContaining({
-        ready: true,
-        degraded: true,
-        degradedDependencies: ['sql'],
-        failure: 'sql_failed'
-      })
-    )
-    now += 1
-    expect(await readiness.check()).toBe(false)
-    expect(RELAY_READINESS_SQL_GRACE_MS).toBeLessThan(RELAY_READINESS_JWKS_GRACE_MS)
   })
 
   it('keeps a process that never succeeded out of the grace window', async () => {
     let now = 1_000
-    const { readiness, observations, graceEvents } = graceProbe({
+    const readiness = graceProbe({
       jwksOk: () => false,
       sqlOk: () => true,
       now: () => now
@@ -176,14 +63,12 @@ describe('relay readiness last-known-good grace', () => {
     expect(await readiness.check()).toBe(false)
     now += 1_000
     expect(await readiness.check()).toBe(false)
-    expect(graceEvents).toEqual([])
-    expect(observations.every((observation) => observation.degraded === undefined)).toBe(true)
   })
 
   it('restarts the grace window from the most recent success', async () => {
     let now = 1_000
     let jwksOk = true
-    const { readiness } = graceProbe({
+    const readiness = graceProbe({
       jwksGraceMs: 10_000,
       jwksOk: () => jwksOk,
       sqlOk: () => true,
@@ -205,7 +90,7 @@ describe('relay readiness last-known-good grace', () => {
   it('never serves grace when the window is disabled', async () => {
     let now = 1_000
     let jwksOk = true
-    const { readiness, graceEvents } = graceProbe({
+    const readiness = graceProbe({
       jwksGraceMs: 0,
       jwksOk: () => jwksOk,
       sqlOk: () => true,
@@ -215,37 +100,13 @@ describe('relay readiness last-known-good grace', () => {
     expect(await readiness.check()).toBe(true)
     jwksOk = false
     expect(await readiness.check()).toBe(false)
-    expect(graceEvents).toEqual([])
   })
 
-  it('keeps one clock per dependency so a healthy JWKS cannot hold SQL open', async () => {
-    let now = 1_000
-    let sqlOk = true
-    const { readiness, graceEvents } = graceProbe({
-      sqlGraceMs: 10_000,
-      jwksOk: () => true,
-      sqlOk: () => sqlOk,
-      now: () => now
-    })
-
-    expect(await readiness.check()).toBe(true)
-    sqlOk = false
-    for (let elapsed = 1_000; elapsed <= 11_000; elapsed += 1_000) {
-      now = 1_000 + elapsed
-      await readiness.check()
-    }
-    expect(await readiness.check()).toBe(false)
-    expect(graceEvents.map((event) => [event.dependency, event.grace])).toEqual([
-      ['sql', 'entered'],
-      ['sql', 'expired']
-    ])
-  })
-
-  it('probes SQL on every poll even while JWKS is failing', async () => {
+  it('expires SQL grace despite continuing JWKS failures', async () => {
     let now = 1_000
     let jwksOk = true
     let sqlOk = true
-    const { readiness, observations, query } = graceProbe({
+    const readiness = graceProbe({
       sqlGraceMs: 10_000,
       jwksOk: () => jwksOk,
       sqlOk: () => sqlOk,
@@ -259,18 +120,9 @@ describe('relay readiness last-known-good grace', () => {
     sqlOk = false
     now += 1_000
     expect(await readiness.check()).toBe(true)
-    expect(observations.at(-1)).toEqual(
-      expect.objectContaining({
-        ready: true,
-        failure: 'jwks_http_failed',
-        failures: ['jwks_http_failed', 'sql_failed'],
-        degradedDependencies: ['jwks', 'sql']
-      })
-    )
     // The SQL clock runs on evidence, so its window opens at the poll that saw SQL fail.
     now += 10_000
     expect(await readiness.check()).toBe(false)
-    expect(query).toHaveBeenCalledTimes(4)
   })
 
 })
diff --git a/cloud/apps/relay/src/relay-region-app.test.ts b/cloud/apps/relay/src/relay-region-app.test.ts
index 0c147348bb3..1bb2dcd5051 100644
--- a/cloud/apps/relay/src/relay-region-app.test.ts
+++ b/cloud/apps/relay/src/relay-region-app.test.ts
@@ -14,122 +14,6 @@ import { createRelayApp } from './app.js'
 
 describe('Relay region API', () => {
 
-  it('preserves the cold-start hint and binds a negotiated window after placement', async () => {
-    const assignment = {
-      userId: 'user-1',
-      relayHostId: 'abcdefghijklmnop',
-      cellId: 'asia-c1',
-      cellUrl: 'https://asia-c1.relay.example.test',
-      region: 'asia-east2',
-      assignmentEpoch: 7,
-      leaseExpiresAt: Date.now() + 300_000
-    }
-    const assign = vi.fn(async () => assignment)
-    const window = {
-      generation: 2,
-      expiresAt: Date.now() + 86_400_000,
-      assignmentEpoch: 7,
-      incumbentRegion: 'asia-east2',
-      policyVersion: 1
-    }
-    const exchangeRegionCorrection = vi.fn(async () => ({ v: 1, window }))
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: { assign, exchangeRegionCorrection } as never,
-      drain: vi.fn(),
-      ready: async () => true
-    })
-    const regionCorrection = { v: 1, action: 'issue-window' }
-    const response = await app.request(
-      '/v1/assign',
-      assignmentRequest('abcdefghijklmnop', {
-        preferredRegion: 'asia-east2',
-        regionCorrection
-      })
-    )
-    expect(response.status).toBe(200)
-    expect(assign).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: 'abcdefghijklmnop' },
-      'asia-east2',
-      'asia-east2',
-      undefined,
-      { hostRequested: true }
-    )
-    expect(exchangeRegionCorrection).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: 'abcdefghijklmnop' },
-      regionCorrection,
-      7
-    )
-    expect(((await response.json()) as { regionCorrection: unknown }).regionCorrection).toEqual({
-      v: 1,
-      window
-    })
-  })
-
-  it('gives a window request the in-region reserve fallback, and never a report', async () => {
-    const assignment = {
-      userId: 'user-1',
-      relayHostId: 'abcdefghijklmnop',
-      cellId: 'asia-c1',
-      cellUrl: 'https://asia-c1.relay.example.test',
-      region: 'asia-east2',
-      assignmentEpoch: 7,
-      leaseExpiresAt: Date.now() + 300_000
-    }
-    const assign = vi.fn(async () => assignment)
-    const regionReserve = vi.fn(async () => null)
-    const reserveSpill = vi.fn(async () => null)
-    const plan = vi.fn(async () => ({ kind: 'database', regionReserve, reserveSpill }))
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: {
-        assign,
-        resolve: async () => assignment,
-        exchangeRegionCorrection: async () => ({ v: 1, reportStatus: 'accepted' })
-      } as never,
-      reservePlacement: { plan } as never,
-      drain: vi.fn(),
-      ready: async () => true
-    })
-    const response = await app.request(
-      '/v1/assign',
-      assignmentRequest('abcdefghijklmnop', {
-        reconnect: true,
-        preferredRegion: 'asia-east2',
-        regionCorrection: { v: 1, action: 'issue-window' }
-      })
-    )
-    expect(response.status).toBe(200)
-    expect(plan).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: 'abcdefghijklmnop' },
-      { reconnect: true, region: 'asia-east2', regionCorrection: true, preferred: true }
-    )
-    expect(assign).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: 'abcdefghijklmnop' },
-      'asia-east2',
-      'asia-east2',
-      undefined,
-      { regionReserve, reserveSpill, hostRequested: true }
-    )
-    plan.mockClear()
-    const report = await app.request(
-      '/v1/assign',
-      assignmentRequest('abcdefghijklmnop', {
-        regionCorrection: {
-          v: 1,
-          action: 'report',
-          generation: 2,
-          assignmentEpoch: 7,
-          policyVersion: 1,
-          outcome: 'inconclusive',
-          reason: 'timeout'
-        }
-      })
-    )
-    expect(report.status).toBe(200)
-    expect(plan).not.toHaveBeenCalled()
-  })
-
   it('returns successful placement when optional window storage is unavailable', async () => {
     const app = createRelayApp(config(), {
       store: {} as never,
@@ -234,34 +118,6 @@ describe('Relay region API', () => {
     expect(exchangeRegionCorrection).not.toHaveBeenCalled()
   })
 
-  it('exposes only the store-provided healthy catalog from directors', async () => {
-    const regionCatalog = vi.fn(async () => [
-      { region: 'us-central1' as const, probeOrigins: ['https://us.relay.example.test'] }
-    ])
-    const app = createRelayApp(config(), {
-      store: {} as never,
-      assignments: { regionCatalog } as never,
-      drain: vi.fn(),
-      ready: vi.fn(async () => true)
-    })
-
-    const response = await app.request('/v1/regions')
-
-    expect(response.status).toBe(200)
-    expect(await response.json()).toEqual({
-      v: 1,
-      regions: [
-        { region: 'us-central1', probeOrigins: ['https://us.relay.example.test'] }
-      ]
-    })
-
-    const burst = await Promise.all(
-      Array.from({ length: 50 }, () => app.request('/v1/regions'))
-    )
-    expect(burst.every(({ status }) => status === 200)).toBe(true)
-    expect(regionCatalog).toHaveBeenCalledOnce()
-  })
-
   it('answers a pool that cannot hand out a client with a retryable 503', async () => {
     const regionCatalog = vi.fn(async () => {
       throw new Error('Connection terminated due to connection timeout')
diff --git a/cloud/apps/relay/src/relay-region-selection-app.test.ts b/cloud/apps/relay/src/relay-region-selection-app.test.ts
deleted file mode 100644
index dcfaf61949b..00000000000
--- a/cloud/apps/relay/src/relay-region-selection-app.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { describe, expect, it, vi, type Mock } from 'vitest'
-import type { RelayConfig } from './config.js'
-
-const fakes = vi.hoisted(() => ({
-  verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-1', relayHostId: token }))
-}))
-
-vi.mock('./authentication/relay-token-verifier.js', () => ({
-  createRelayTokenVerifier: () => fakes.verifyRelayToken,
-  readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null
-}))
-
-import { createRelayApp } from './app.js'
-
-const HOST = 'selecthost000001'
-
-function usAssignment(extra: Record<string, unknown> = {}) {
-  return {
-    userId: 'user-1',
-    relayHostId: HOST,
-    cellId: 'us-c1',
-    cellUrl: 'https://us-c1.relay.example.test',
-    region: 'us-central1' as const,
-    assignmentEpoch: 3,
-    leaseExpiresAt: Date.now() + 300_000,
-    ...extra
-  }
-}
-
-describe('Relay region selection counters', () => {
-
-  it('never counts a rehome as a fallback, and gives a rehomed new session no region window', async () => {
-    const recordRegionSelection = vi.fn()
-    const exchangeRegionCorrection = vi.fn()
-    const plan = vi.fn(async () => ({
-      kind: 'answer',
-      lane: 'rehome',
-      assignment: usAssignment({ cellId: 'asia-c1', region: 'asia-east2' })
-    }))
-    const response = await assign(
-      { recordRegionSelection, plan, exchangeRegionCorrection },
-      { reconnect: true, regionCorrection: { v: 1, action: 'issue-window' } }
-    )
-
-    expect(response.status).toBe(200)
-    expect(await response.json()).not.toHaveProperty('regionCorrection')
-    expect(exchangeRegionCorrection).not.toHaveBeenCalled()
-    expect(plan).toHaveBeenCalledWith(
-      { userId: 'user-1', relayHostId: HOST },
-      { reconnect: true, region: 'asia-east2', regionCorrection: true, preferred: true }
-    )
-    expect(recordRegionSelection.mock.calls).toEqual([
-      [{ targetRegion: 'asia-east2', selectedRegion: 'asia-east2', fallback: false }]
-    ])
-  })
-
-})
-
-async function assign(
-  operations: {
-    recordRegionSelection: Mock
-    recordAssignmentAdmission?: Mock
-    plan?: Mock
-    assign?: Mock
-    resolve?: Mock
-    exchangeRegionCorrection?: Mock
-  },
-  extra: Record<string, unknown> = {},
-  overrides: Partial<RelayConfig> = {}
-): Promise<Response> {
-  const app = createRelayApp({ ...config(), ...overrides }, {
-    store: {} as never,
-    assignments: {
-      assign: operations.assign ?? vi.fn(),
-      resolve: operations.resolve ?? vi.fn(async () => null),
-      exchangeRegionCorrection: operations.exchangeRegionCorrection ?? vi.fn()
-    } as never,
-    ...(operations.plan ? { reservePlacement: { plan: operations.plan } as never } : {}),
-    drain: vi.fn(),
-    ready: vi.fn(async () => true),
-    recordRegionSelection: operations.recordRegionSelection,
-    ...(operations.recordAssignmentAdmission
-      ? { recordAssignmentAdmission: operations.recordAssignmentAdmission }
-      : {})
-  })
-  return await app.request('/v1/assign', {
-    method: 'POST',
-    headers: { authorization: `Bearer ${HOST}`, 'content-type': 'application/json' },
-    body: JSON.stringify({ v: 1, relayHostId: HOST, preferredRegion: 'asia-east2', ...extra })
-  })
-}
-
-function config(): RelayConfig {
-  return {
-    port: 8080,
-    publicUrl: 'https://relay.example.test',
-    cellUrl: 'https://relay.example.test',
-    region: 'us-central1',
-    authIssuer: 'https://auth.example.test',
-    authAudience: 'orca-relay',
-    jwksUrl: 'https://auth.example.test/jwks',
-    assignmentSigningKey: new TextEncoder().encode('assignment-key-with-at-least-32-bytes'),
-    role: 'director',
-    cellId: 'director',
-    cells: [],
-    adminAudience: 'https://relay.example.test/v1/admin/drain',
-    deployServiceAccount: 'deploy@example.test',
-    runtimeServiceAccount: 'runtime@example.test',
-    adminJwksUrl: 'https://auth.example.test/jwks',
-    databasePoolMax: 3,
-    publicAssignmentsEnabled: true,
-    regionalPlacementEnabled: true,
-    publicAssignmentConcurrency: 2,
-    publicAssignmentQueueMax: 128,
-    publicAssignmentWaitMs: 4_000,
-    publicResolveConcurrency: 1,
-    publicResolveWaitMs: 5_000,
-    publicAssignmentRetryAfterSeconds: 5,
-    dataDir: './data'
-  }
-}
diff --git a/cloud/apps/relay/src/relay-sigterm-exit.blackbox.test.ts b/cloud/apps/relay/src/relay-sigterm-exit.blackbox.test.ts
index 7dde37f9453..c72236c13c2 100644
--- a/cloud/apps/relay/src/relay-sigterm-exit.blackbox.test.ts
+++ b/cloud/apps/relay/src/relay-sigterm-exit.blackbox.test.ts
@@ -70,16 +70,6 @@ async function startRelay(port: number): Promise<ChildProcess> {
   return child
 }
 
-async function silentTcpPeer(port: number, firstBytes?: string): Promise<Socket> {
-  const peer = connect(port, '127.0.0.1')
-  peer.on('error', () => undefined)
-  await new Promise<void>((resolveConnect) => peer.once('connect', () => resolveConnect()))
-  if (firstBytes) {
-    peer.write(firstBytes)
-  }
-  return peer
-}
-
 // Pauses reading so the peer never answers the relay's close frame.
 async function unresponsiveWebSocketPeer(port: number): Promise<Socket> {
   const socket = new WebSocket(`ws://127.0.0.1:${port}/v1/connect/abcdefghijklmnop`)
@@ -111,14 +101,10 @@ async function waitUntilListenerClosed(port: number): Promise<void> {
 }
 
 // Peers that are not idle to server.close(); unbounded, a silent one held exit until SIGKILL.
-it.each([
-  ['silent TCP peer', (port: number) => silentTcpPeer(port)],
-  ['partial-headers peer', (port: number) => silentTcpPeer(port, 'GET /healthz HTTP/1.1\r\nHost: x\r\n')],
-  ['unresponsive upgraded WebSocket peer', unresponsiveWebSocketPeer]
-])('exits within the shutdown bound on SIGTERM with a %s', async (_name, openPeer) => {
+it('exits within the shutdown bound on SIGTERM with an unresponsive upgraded WebSocket peer', async () => {
   const port = await unusedPort()
   const relay = await startRelay(port)
-  const peer = await openPeer(port)
+  const peer = await unresponsiveWebSocketPeer(port)
   cleanups.push(() => peer.destroy())
   const peerClosed = new Promise<void>((resolveClose) => peer.once('close', () => resolveClose()))
 
diff --git a/cloud/apps/relay/src/relay.blackbox.test.ts b/cloud/apps/relay/src/relay.blackbox.test.ts
index 21820c22ba6..4884cb1c9d3 100644
--- a/cloud/apps/relay/src/relay.blackbox.test.ts
+++ b/cloud/apps/relay/src/relay.blackbox.test.ts
@@ -134,19 +134,16 @@ function nextMessage(socket: WebSocket): Promise<Record<string, unknown>> {
   })
 }
 
-async function openHostControl(input?: {
-  controlResumeSecret?: string
-  previousGeneration?: number
-  keyPair?: nacl.BoxKeyPair
-  assignmentEpoch?: number
-  capabilities?: string
-}): Promise<{ socket: WebSocket; ack: Record<string, unknown>; keyPair: nacl.BoxKeyPair }> {
-  const keyPair = input?.keyPair ?? nacl.box.keyPair()
+async function openHostControl(): Promise<{
+  socket: WebSocket
+  ack: Record<string, unknown>
+  keyPair: nacl.BoxKeyPair
+}> {
+  const keyPair = nacl.box.keyPair()
   const hostId = createHash('sha256').update(keyPair.publicKey).digest('base64url').slice(0, 16)
   const socket = new WebSocket(`${relayUrl.replace('http:', 'ws:')}/v1/host/control`, {
     headers: {
-      authorization: `Bearer ${await relayToken('orca-relay', hostId)}`,
-      ...(input?.capabilities ? { ['x-orca-host-capabilities']: input.capabilities } : {})
+      authorization: `Bearer ${await relayToken('orca-relay', hostId)}`
     },
     perMessageDeflate: false
   })
@@ -159,13 +156,9 @@ async function openHostControl(input?: {
       type: 'host-hello',
       v: 1,
       relayHostId: hostId,
-      assignmentEpoch: input?.assignmentEpoch ?? 1,
+      assignmentEpoch: 1,
       hostPublicKeyB64: Buffer.from(keyPair.publicKey).toString('base64'),
-      appVersion: 'test',
-      ...(input?.controlResumeSecret ? { controlResumeSecret: input.controlResumeSecret } : {}),
-      ...(input?.previousGeneration === undefined
-        ? {}
-        : { previousGeneration: input.previousGeneration })
+      appVersion: 'test'
     })
   )
   const challenge = await nextMessage(socket)
diff --git a/cloud/dev/scripts/run-relay-tests.test.mjs b/cloud/dev/scripts/run-relay-tests.test.mjs
index 70a332ea205..cebab34368b 100644
--- a/cloud/dev/scripts/run-relay-tests.test.mjs
+++ b/cloud/dev/scripts/run-relay-tests.test.mjs
@@ -32,17 +32,16 @@ function temporary(t) {
   return directory
 }
 
-function start(t, options = {}) {
+function start(t) {
   const scratchParent = temporary(t)
   const calls = []
   const reports = []
   const events = new EventEmitter()
-  const env = { ORCA_RELAY_TEST_POSTGRES_URL: databaseUrl, PRESERVED: 'yes', ...options.env }
+  const env = { ORCA_RELAY_TEST_POSTGRES_URL: databaseUrl, PRESERVED: 'yes' }
   const pending = runRelayTests({
     cwd: join(scratchParent, 'relay'),
     cli: join(scratchParent, 'vitest.mjs'),
     parallelism: 4,
-    ...options,
     env,
     events,
     scratchParent,
@@ -53,7 +52,7 @@ function start(t, options = {}) {
       return deferred.promise
     }
   })
-  return { pending, calls, reports, events, scratchParent, env }
+  return { pending, calls, reports, events, scratchParent }
 }
 
 function finish(call, result = success, closed = true) {
@@ -103,43 +102,6 @@ test('overlaps both projects within the worker budget and isolates their scratch
   assertClean(h)
 })
 
-for (const [name, options] of [
-  ['selectors', { args: ['src/assignment.test.ts', '-t', 'requested behavior'] }],
-  [
-    'alternate PostgreSQL',
-    { env: { ORCA_IDLE_REHOME_POSTGRES_URL: 'postgres://localhost:55440/relay' } }
-  ],
-  ['application database', { env: { DATABASE_URL: databaseUrl } }],
-  ['one CPU', { parallelism: 1 }]
-]) {
-  test(`retains the original single run for ${name}`, async (t) => {
-    const h = start(t, options)
-    assert.equal(h.calls.length, 1)
-    const { spec } = h.calls[0]
-    assert.deepEqual(spec.args.slice(1), ['run', ...(options.args ?? [])])
-    for (const [key, value] of Object.entries(h.env)) {
-      assert.equal(spec.env[key], value)
-    }
-    finish(h.calls[0])
-    assert.equal(await h.pending, 0)
-    assertClean(h)
-  })
-}
-
-for (const [name, result] of [
-  ['null exit code', { ...success, code: null }],
-  ['termination signal', { ...success, signal: 'SIGTERM' }],
-  ['timeout', { ...success, timedOut: true }]
-]) {
-  test(`fails a ${name} even when other result fields indicate success`, async (t) => {
-    const h = start(t)
-    finish(h.calls[0], result)
-    finish(h.calls[1])
-    assert.equal(await h.pending, 1)
-    assertClean(h)
-  })
-}
-
 test('fails and retains scratch when a child never reports closure', async (t) => {
   const h = start(t)
   finish(h.calls[0], success, false)
@@ -152,8 +114,7 @@ test('fails and retains scratch when a child never reports closure', async (t) =
 })
 
 for (const [signal, exitCode, laterSignal] of [
-  ['SIGINT', 130, 'SIGTERM'],
-  ['SIGTERM', 143, 'SIGINT']
+  ['SIGINT', 130, 'SIGTERM']
 ]) {
   test(`${signal} cancels every child and retains scratch despite root close callbacks`, async (t) => {
     const h = start(t)
diff --git a/cloud/packages/cloud-database/src/cloud-leader-lock.test.ts b/cloud/packages/cloud-database/src/cloud-leader-lock.test.ts
deleted file mode 100644
index 3253c0cbf7a..00000000000
--- a/cloud/packages/cloud-database/src/cloud-leader-lock.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { randomUUID } from 'node:crypto'
-import pg from 'pg'
-import { describe, expect, it } from 'vitest'
-import { openInMemoryCloudDatabase } from './cloud-database.js'
-import { acquireLeadership } from './cloud-leader-lock.js'
-
-const postgresUrl = process.env.ORCA_CLOUD_DATABASE_TEST_URL
-const database = await openInMemoryCloudDatabase([])
-
-describe('acquireLeadership', () => {
-  it.skipIf(!postgresUrl)(
-    'lets one holder lead until it releases or its session dies',
-    async () => {
-      const key = `gateway-${randomUUID()}`
-      const options = { databaseUrl: postgresUrl, database, key, pollMs: 50, checkMs: 50 }
-      const first = await acquireLeadership({ ...options, signal: AbortSignal.timeout(5_000) })
-      let secondLed = false
-      const second = acquireLeadership({ ...options, signal: AbortSignal.timeout(5_000) }).then(
-        (leadership) => {
-          secondLed = true
-          return leadership
-        }
-      )
-      await new Promise((resolve) => setTimeout(resolve, 200))
-      expect(secondLed).toBe(false)
-      await first.release()
-      const next = await second
-
-      // Killing the leader's session frees the lock and the holder notices.
-      const admin = new pg.Client({ connectionString: postgresUrl })
-      await admin.connect()
-      await admin.query(
-        `SELECT pg_terminate_backend(pid) FROM pg_locks
-       WHERE locktype = 'advisory' AND objid = hashtext($1::text)::oid AND granted`,
-        [key]
-      )
-      await admin.end()
-      await next.lost
-      // Its transactions ran on the lock's connection, so none can commit after the loss.
-      await expect(
-        next.transaction((transaction) => transaction.query('SELECT 1'))
-      ).rejects.toThrow()
-      const third = await acquireLeadership({ ...options, signal: AbortSignal.timeout(5_000) })
-      await third.release()
-    }
-  )
-
-  it.skipIf(!postgresUrl)('stops waiting when aborted', async () => {
-    const key = `gateway-${randomUUID()}`
-    const options = { databaseUrl: postgresUrl, database, key, pollMs: 50 }
-    const first = await acquireLeadership({ ...options, signal: AbortSignal.timeout(5_000) })
-    await expect(
-      acquireLeadership({ ...options, signal: AbortSignal.timeout(200) })
-    ).rejects.toThrow()
-    await first.release()
-  })
-})
diff --git a/cloud/packages/cloud-database/src/cloud-notifications.test.ts b/cloud/packages/cloud-database/src/cloud-notifications.test.ts
index 875192b0f24..3c6e9bd39c3 100644
--- a/cloud/packages/cloud-database/src/cloud-notifications.test.ts
+++ b/cloud/packages/cloud-database/src/cloud-notifications.test.ts
@@ -59,7 +59,7 @@ describe('cloud database notifications', () => {
   })
 
   it.skipIf(!postgresUrl)(
-    'delivers a Postgres notification at commit and re-listens after losing its connection',
+    'delivers Postgres notifications and re-listens after losing its connection',
     async () => {
       const applicationName = `cloud-db-listen-${randomUUID()}`
       const database = await openCloudDatabase({
@@ -75,8 +75,6 @@ describe('cloud database notifications', () => {
       try {
         await database.transaction(async (tx) => {
           await notifications.notify(tx, 'inbox', 'committed')
-          await new Promise((resolve) => setTimeout(resolve, 100))
-          expect(seen.payloads).toEqual([])
         })
         await seen.until(() => seen.payloads.length === 1)
 
diff --git a/cloud/packages/connector-contract/src/contract.test.ts b/cloud/packages/connector-contract/src/contract.test.ts
index 35900489850..96de62bf7cf 100644
--- a/cloud/packages/connector-contract/src/contract.test.ts
+++ b/cloud/packages/connector-contract/src/contract.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import { ConnectorEventSchema } from './event-messages.js'
-import { ConnectorHelloRequestSchema } from './hello-messages.js'
 import { CONNECTOR_LIMITS } from './connector-limits.js'
 
 const conversation = { source: 'slack', externalId: 'T1:C9:1792.9:U5' } as const
@@ -29,25 +28,3 @@ describe('events', () => {
     ).toBe(false)
   })
 })
-
-describe('hello and replies', () => {
-  it('keeps capability entries the cloud does not know', () => {
-    const hello = ConnectorHelloRequestSchema.parse({
-      v: 1,
-      contract: 1,
-      orcaVersion: '1.4.230',
-      platform: 'linux',
-      runtime: 'serve',
-      hostName: 'build-box',
-      agents: ['claude', 'future-agent'],
-      promptKinds: ['approval'],
-      features: ['answer', 'future-feature'],
-      sources: ['slack', 'future-source'],
-      projects: [
-        { placeId: 'pl_1', name: 'orca', kind: 'git', where: { kind: 'ssh', label: 'openclaw' } }
-      ]
-    })
-    expect(hello.features).toEqual(['answer', 'future-feature'])
-    expect(hello.sources).toEqual(['slack', 'future-source'])
-  })
-})
diff --git a/cloud/packages/postgres-schema/src/schema-lock-target.test.ts b/cloud/packages/postgres-schema/src/schema-lock-target.test.ts
index 953fa219424..45ad2b30795 100644
--- a/cloud/packages/postgres-schema/src/schema-lock-target.test.ts
+++ b/cloud/packages/postgres-schema/src/schema-lock-target.test.ts
@@ -1,25 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import {
   requireSchemaLockTarget,
-  schemaLockTarget,
-  sqlWithoutComments
+  schemaLockTarget
 } from './schema-lock-target.js'
 
-describe('sqlWithoutComments', () => {
-
-  it('closes the inner block comment first when they nest', () => {
-    expect(sqlWithoutComments('ALTER TABLE t /* a /* b */ c */ ADD COLUMN d TEXT')).toBe(
-      'ALTER TABLE t   ADD COLUMN d TEXT'
-    )
-  })
-
-  it('leaves a comment marker inside a string literal alone', () => {
-    expect(sqlWithoutComments(`ALTER TABLE t ADD COLUMN c TEXT DEFAULT '-- not a comment'`)).toBe(
-      `ALTER TABLE t ADD COLUMN c TEXT DEFAULT '-- not a comment'`
-    )
-  })
-})
-
 describe('catalog name folding', () => {
 
   it('unescapes a doubled quote and leaves the qualified table text as written', () => {
@@ -33,11 +17,10 @@ describe('catalog name folding', () => {
 })
 
 describe('square brackets in an ALTER TABLE', () => {
-  it.each([
-    ['an array type', 'ALTER TABLE t ADD COLUMN c bigint[] DEFAULT ARRAY[1, 2]'],
-    ['a nested array default', "ALTER TABLE t ADD COLUMN c TEXT[] DEFAULT ARRAY['a', 'b']"]
-  ])('does not read a comma inside %s as a second subcommand', (_label, statement) => {
-    expect(() => requireSchemaLockTarget(statement)).not.toThrow()
+  it('does not read an array-default comma as a second subcommand', () => {
+    expect(() =>
+      requireSchemaLockTarget('ALTER TABLE t ADD COLUMN c bigint[] DEFAULT ARRAY[1, 2]')
+    ).not.toThrow()
   })
 
   it('still catches a second subcommand after an array default', () => {
@@ -52,12 +35,6 @@ describe('multi-action ALTER TABLE', () => {
     // Skipping on the first subcommand would permanently drop every later action.
     const statement =
       'ALTER TABLE t ADD COLUMN IF NOT EXISTS a TEXT, ADD COLUMN IF NOT EXISTS b TEXT'
-    expect(schemaLockTarget(statement)).toEqual({
-      kind: 'column',
-      table: 't',
-      name: 'a',
-      skipWhen: 'present'
-    })
     expect(() => requireSchemaLockTarget(statement)).toThrow(/unparsed_schema_lock_target/)
   })
 })
@@ -68,7 +45,6 @@ describe('dollar-quoted bodies', () => {
     // The closing delimiter has to match the opening tag, so the comma and the comment marker
     // between the inner $$ pair are still inside the body.
     const statement = 'ALTER TABLE t ADD COLUMN c TEXT DEFAULT $tag$ a $$ -- b, c $$ d $tag$'
-    expect(sqlWithoutComments(statement)).toBe(statement)
     expect(() => requireSchemaLockTarget(statement)).not.toThrow()
     expect(schemaLockTarget(statement)).toEqual({
       kind: 'column',
diff --git a/cloud/packages/push-contract/src/push-host-proof-transcript.test.ts b/cloud/packages/push-contract/src/push-host-proof-transcript.test.ts
index ed2f775041b..21c8139de21 100644
--- a/cloud/packages/push-contract/src/push-host-proof-transcript.test.ts
+++ b/cloud/packages/push-contract/src/push-host-proof-transcript.test.ts
@@ -1,7 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import {
-  buildPushHostChallengePlaintext,
-  buildPushHostProofMacInput,
   buildPushHostProofTranscript
 } from './push-host-proof-transcript.js'
 
@@ -48,30 +46,4 @@ describe('push host proof transcript', () => {
     expect(offset).toBe(transcript.byteLength)
   })
 
-  it('frames the challenge plaintext as domain, length, transcript, secret', () => {
-    const transcript = buildPushHostProofTranscript(transcriptInput)
-    const secret = new Uint8Array(32).fill(11)
-    const plaintext = buildPushHostChallengePlaintext(transcript, secret)
-    const length = Buffer.alloc(4)
-    length.writeUInt32BE(transcript.byteLength)
-    expect(Buffer.from(plaintext)).toEqual(
-      Buffer.concat([
-        Buffer.from('orca-push-host-challenge/v1\0'),
-        length,
-        Buffer.from(transcript),
-        Buffer.alloc(32, 11)
-      ])
-    )
-    expect(() => buildPushHostChallengePlaintext(transcript, new Uint8Array(16))).toThrow(
-      'challengeSecret must be 32 bytes'
-    )
-  })
-
-  it('separates the ack mac input from the challenge domain', () => {
-    const transcript = buildPushHostProofTranscript(transcriptInput)
-    const macInput = buildPushHostProofMacInput(transcript)
-    expect(Buffer.from(macInput)).toEqual(
-      Buffer.concat([Buffer.from('orca-push-host-proof/v1\0ack\0'), Buffer.from(transcript)])
-    )
-  })
 })
diff --git a/cloud/packages/push-contract/src/send-messages.test.ts b/cloud/packages/push-contract/src/send-messages.test.ts
deleted file mode 100644
index 166f09fd72e..00000000000
--- a/cloud/packages/push-contract/src/send-messages.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { PushSendRequestSchema } from './send-messages.js'
-
-function notification(): Record<string, unknown> {
-  return {
-    notificationId: 'note-1',
-    notificationSeq: 4,
-    notificationEpoch: '5c9e9a1e-0000-4000-8000-000000000000',
-    source: 'agent-task-complete',
-    agentState: 'needs-input',
-    title: 'Agent needs input',
-    body: 'Waiting on your answer',
-    worktreeId: 'wt-1'
-  }
-}
-
-describe('send schemas', () => {
-
-  it('rejects a notification id that could not be sent as a collapse header', () => {
-    for (const notificationId of ['line\nbreak', 'nul\0byte', 'émoji', '\t']) {
-      expect(
-        PushSendRequestSchema.safeParse({
-          v: 1,
-          registrationIds: ['reg-1'],
-          notification: { ...notification(), notificationId }
-        }).success
-      ).toBe(false)
-    }
-    expect(
-      PushSendRequestSchema.safeParse({
-        v: 1,
-        registrationIds: ['reg-1'],
-        notification: {
-          ...notification(),
-          notificationId: 'agent:repo%3A%3A%2FUsers%2Fme:pane-1:1700000000000'
-        }
-      }).success
-    ).toBe(true)
-  })
-})
diff --git a/cloud/packages/relay-contract/src/contract.test.ts b/cloud/packages/relay-contract/src/contract.test.ts
index 08c40c72f2d..1c6cfe4b38f 100644
--- a/cloud/packages/relay-contract/src/contract.test.ts
+++ b/cloud/packages/relay-contract/src/contract.test.ts
@@ -1,7 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import {
-  buildHostChallengePlaintext,
-  buildHostProofMacInput,
   buildHostProofTranscript
 } from './host-proof-transcript.js'
 
@@ -23,44 +21,8 @@ describe('relay protocol contract', () => {
       previousGeneration: 6,
       resumeRequested: true
     })
-    const challenge = buildHostChallengePlaintext(transcript, new Uint8Array(32).fill(3))
-    const proofInput = buildHostProofMacInput(transcript)
-
     expect(Buffer.from(transcript).toString('base64url')).toBe(
       'AAAACHByb3RvY29sAAAAGG9yY2EtcmVsYXktaG9zdC1wcm9vZi92MQAAAAd2ZXJzaW9uAAAAAQEAAAALcmVsYXlPcmlnaW4AAAAYaHR0cHM6Ly9yZWxheS5vbm9yY2EuZGV2AAAAF3JlbGF5RXBoZW1lcmFsUHVibGljS2V5AAAAIAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAAAADmNoYWxsZW5nZU5vbmNlAAAAGAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAAAAAtjaGFsbGVuZ2VJZAAAAAtjaGFsbGVuZ2UtMQAAAAhpc3N1ZWRBdAAAAAgAAAGLz-VoAAAAAAlleHBpcmVzQXQAAAAIAAABi8_ljxAAAAAGdXNlcklkAAAABnVzZXItMQAAAAlwcm9maWxlSWQAAAAJcHJvZmlsZS0xAAAADm9yZ2FuaXphdGlvbklkAAAABW9yZy0xAAAAC3JlbGF5SG9zdElkAAAAEGFiY2RlZmdoaWprbG1ub3AAAAANaG9zdFB1YmxpY0tleQAAACACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgAAAA9hc3NpZ25tZW50RXBvY2gAAAAIAAAAAAAAAAcAAAAScHJldmlvdXNHZW5lcmF0aW9uAAAACAAAAAAAAAAGAAAAD3Jlc3VtZVJlcXVlc3RlZAAAAAEB'
     )
-    const length = Buffer.alloc(4)
-    length.writeUInt32BE(transcript.byteLength)
-    expect(Buffer.from(challenge)).toEqual(
-      Buffer.concat([
-        Buffer.from('orca-relay-host-challenge/v1\0'),
-        length,
-        Buffer.from(transcript),
-        Buffer.alloc(32, 3)
-      ])
-    )
-    expect(Buffer.from(proofInput)).toEqual(
-      Buffer.concat([Buffer.from('orca-relay-host-proof/v1\0ack\0'), Buffer.from(transcript)])
-    )
-    expect(() => buildHostChallengePlaintext(transcript, new Uint8Array(31))).toThrow(
-      'challengeSecret must be 32 bytes'
-    )
-    expect(() =>
-      buildHostProofTranscript({
-        relayOrigin: 'https://relay.onorca.dev',
-        relayEphemeralPublicKey: new Uint8Array(32),
-        challengeNonce: new Uint8Array(32),
-        challengeId: 'challenge-1',
-        issuedAt: 1,
-        expiresAt: 2,
-        userId: 'user-1',
-        profileId: 'profile-1',
-        organizationId: 'org-1',
-        relayHostId: 'abcdefghijklmnop',
-        hostPublicKey: new Uint8Array(32),
-        assignmentEpoch: 1,
-        resumeRequested: false
-      })
-    ).toThrow('challengeNonce must be 24 bytes')
   })
 })
diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt
index 7ccccd20106..5e04ebdc3c7 100644
--- a/config/flaky-test-pattern-baseline.txt
+++ b/config/flaky-test-pattern-baseline.txt
@@ -20,7 +20,6 @@
 5 test-no-in-test-import-actual:src/main/ssh/config/ssh-config-loader-regression.test.ts
 2 test-no-in-test-import-actual:src/main/ssh/connection/ssh-connection-auth-fallback.test.ts
 1 test-no-in-test-import-actual:src/main/window/file-drop/dropped-path-preparation.test.ts
-2 test-no-in-test-import-actual:src/main/workspace-hooks/hooks-runner.test.ts
 1 test-no-in-test-import-actual:src/main/workspaces/removal/local-worktree-removal-recovery.test.ts
 1 test-no-in-test-import-actual:src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts
 3 test-no-in-test-import-actual:src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts
@@ -35,7 +34,6 @@
 1 test-no-polling-loop:src/main/daemon/sessions/testing/repro-12101-mouse-tracking-survives-agent-death.test.ts
 1 test-no-polling-loop:src/main/daemon/transport/client/testing/client.test.ts
 2 test-no-polling-loop:src/main/git/refs/maintenance/repo-ref-maintenance-real-git.test.ts
-1 test-no-polling-loop:src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts
 1 test-no-polling-loop:src/main/ipc/worktrees/creation/worktree-base-directory-poller-marker-fanout.test.ts
 2 test-no-polling-loop:src/main/ipc/worktrees/git/worktree-git-status-attribution-real-git.test.ts
 1 test-no-polling-loop:src/main/provider-process/provider-group-orphan-guard.integration.test.ts
@@ -122,7 +120,6 @@
 1 test-no-polling-loop:tests/e2e/terminal-tui-wheel-reports.spec.ts
 1 test-no-polling-loop:tests/e2e/workspace-sleep-in-main.spec.ts
 2 test-no-polling-loop:tests/e2e/worktree-card-downward-drag.spec.ts
-1 test-no-real-time-wait:mobile/src/terminal/terminal-webview-tap-routing.test.ts
 1 test-no-real-time-wait:src/main/agent-hooks/installation/scripts/posix-hook-json-stdin-reader.test.ts
 2 test-no-real-time-wait:src/main/agent-hooks/server/testing/http/server-transport-interference.test.ts
 1 test-no-real-time-wait:src/main/agent-hooks/server/testing/main-agent/server-turn-ended-at.test.ts
@@ -165,7 +162,6 @@
 4 test-no-real-time-wait:src/main/git/refs/maintenance/repo-ref-maintenance-real-git.test.ts
 1 test-no-real-time-wait:src/main/git/worktrees/removal/remove-worktree-branch-cleanup.test.ts
 1 test-no-real-time-wait:src/main/grok/grok-hook-stdin-no-eof.test.ts
-4 test-no-real-time-wait:src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts
 1 test-no-real-time-wait:src/main/ipc/worktrees/creation/worktree-base-directory-poller-marker-fanout.test.ts
 2 test-no-real-time-wait:src/main/ipc/worktrees/git/worktree-git-status-attribution-real-git.test.ts
 1 test-no-real-time-wait:src/main/managed-server/lifecycle/orcad-managed-tunnel-local-port.test.ts
@@ -216,7 +212,6 @@
 1 test-no-real-time-wait:src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.test.ts
 2 test-no-real-time-wait:src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-preflight.test.ts
 2 test-no-real-time-wait:src/shared/__tests__/process-host/windows-tree-kill-late-taskkill.win32.test.ts
-1 test-no-real-time-wait:src/shared/darwin-process-table-capture.test.ts
 1 test-no-real-time-wait:src/shared/darwin-terminal-names-real-ps.test.ts
 1 test-no-real-time-wait:src/shared/darwin-terminal-names.test.ts
 1 test-no-real-time-wait:src/shared/git/status/git-branch-line-total-soft-deadline.test.ts
@@ -431,7 +426,6 @@
 3 test-no-wall-clock:src/main/github/pull-requests/refresh/pr-refresh-coordinator-completion-order.test.ts
 2 test-no-wall-clock:src/main/github/pull-requests/refresh/pr-refresh-queue-growth-bound.test.ts
 2 test-no-wall-clock:src/main/grok/grok-hook-stdin-no-eof.test.ts
-3 test-no-wall-clock:src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts
 1 test-no-wall-clock:src/main/ipc/terminal-render-desync-evidence.test.ts
 2 test-no-wall-clock:src/main/ipc/worktrees-orphan-directory-cleanup.test.ts
 2 test-no-wall-clock:src/main/ipc/worktrees/git/worktree-git-status-attribution-real-git.test.ts
@@ -491,7 +485,7 @@
 23 test-no-wall-clock:src/main/runtime/terminal/output/terminal-query-responder.test.ts
 3 test-no-wall-clock:src/main/runtime/terminal/query/orca-runtime-codex-idle-title-chat-address.test.ts
 1 test-no-wall-clock:src/main/runtime/terminal/recovery/terminal-pane-recovery-liveness-gate.test.ts
-16 test-no-wall-clock:src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
+4 test-no-wall-clock:src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
 1 test-no-wall-clock:src/main/runtime/workspaces/process-listing/runtime-worktree-structured-agent-rows-liveness.test.ts
 1 test-no-wall-clock:src/main/runtime/workspaces/removal/owned-session-teardown-policy.test.ts
 6 test-no-wall-clock:src/main/skills/install/skill-bundle-process-termination.integration.test.ts
@@ -613,7 +607,6 @@
 2 test-timeout-needs-reason:src/main/runtime/terminal/wait/launched-agent-crash-guard.live-shell.test.ts
 2 test-timeout-needs-reason:src/main/runtime/terminal/wait/terminal-interactive-wait-visibility.test.ts
 1 test-timeout-needs-reason:src/main/runtime/terminal/wait/terminal-wait-name-only-idle.test.ts
-4 test-timeout-needs-reason:src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
 1 test-timeout-needs-reason:src/main/skills/install/skill-bundle-process-termination.integration.test.ts
 1 test-timeout-needs-reason:src/main/sqlite/sync-database-concurrent-backup.test.ts
 2 test-timeout-needs-reason:src/main/ssh/connection/ssh-connection-sftp-wire.test.ts
@@ -624,16 +617,13 @@
 1 test-timeout-needs-reason:src/main/windows/windows-msys-job.win32.test.ts
 2 test-timeout-needs-reason:src/main/windows/windows-pty-job.win32.test.ts
 5 test-timeout-needs-reason:src/main/worker-thread-child-process/worker-thread-child-process.test.ts
-1 test-timeout-needs-reason:src/main/workspace-hooks/hook-archive-timeout-observation.test.ts
-2 test-timeout-needs-reason:src/main/workspace-hooks/hook-termination-real-process.test.ts
+1 test-timeout-needs-reason:src/main/workspace-hooks/hook-termination-real-process.test.ts
 2 test-timeout-needs-reason:src/main/workspaces/removal/local-worktree-filesystem-wsl-banner.wsl.test.ts
 4 test-timeout-needs-reason:src/main/wsl/execution/wsl-runner.wsl.test.ts
 4 test-timeout-needs-reason:src/packages/process-host/src/run-process.test.ts
 1 test-timeout-needs-reason:src/renderer/src/hooks/agent-hook-completion-notifications.test.ts
 1 test-timeout-needs-reason:src/renderer/src/lib/source-control/checks/check-run-details-log-normalization-performance.test.ts
 1 test-timeout-needs-reason:src/shared/__tests__/process-host/windows-tree-kill-late-taskkill.win32.test.ts
-1 test-timeout-needs-reason:src/shared/dsh-real-cli.test.ts
-1 test-timeout-needs-reason:src/shared/workspace-disk-space/workspace-space-entry-traversal.test.ts
 1 test-timeout-needs-reason:src/shared/wsl-login-shell-command.test.ts
 1 test-timeout-needs-reason:tests/e2e/active-view-restart-restore.spec.ts
 1 test-timeout-needs-reason:tests/e2e/agent-send-picker-reveal.spec.ts
diff --git a/config/focus-setting-read-baseline.txt b/config/focus-setting-read-baseline.txt
index 84559a65d66..bef6f0b90de 100644
--- a/config/focus-setting-read-baseline.txt
+++ b/config/focus-setting-read-baseline.txt
@@ -20,7 +20,6 @@
 1 src/renderer/src/components/activity/use-agent-pane-threads.ts
 4 src/renderer/src/components/agent/AgentSettingsDialog.tsx
 1 src/renderer/src/components/automations/authoring/use-automations-page-destination-form.ts
-1 src/renderer/src/components/automations/automations-page-fixtures.ts
 1 src/renderer/src/components/automations/hosts/automation-host-client.ts
 1 src/renderer/src/components/automations/use-automations-page-controller.ts
 1 src/renderer/src/components/browser-pane/ReopenBrowserPageOnServerButton.tsx
@@ -156,18 +155,18 @@
 1 src/renderer/src/components/tab-bar/windows-shell-menu-visibility.ts
 3 src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
 11 src/renderer/src/components/task-page/TaskPage.tsx
-2 src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx
-1 src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts
-4 src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts
-4 src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts
-1 src/renderer/src/components/task-page/jira/use-task-page-jira-list-effects.ts
+2 src/renderer/src/components/task-page/jira/creation/IssueAssigneeField.tsx
+1 src/renderer/src/components/task-page/jira/listing/task-page-jira-status-order.ts
+4 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-metadata.ts
+4 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-issue-creation.ts
+1 src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-effects.ts
 1 src/renderer/src/components/task-page/linear/Filters.tsx
-4 src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx
-8 src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts
+4 src/renderer/src/components/task-page/linear/issues/task-page-linear-state-cell.tsx
+8 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-board.ts
 4 src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts
-6 src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts
-4 src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts
-2 src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts
+6 src/renderer/src/components/task-page/linear/creation/use-task-page-linear-creation-state.ts
+4 src/renderer/src/components/task-page/linear/creation/use-task-page-linear-issue-creation.ts
+2 src/renderer/src/components/task-page/linear/creation/use-task-page-linear-project-creation.ts
 5 src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts
 3 src/renderer/src/components/task-page/use-task-page-detail-routing.ts
 2 src/renderer/src/components/task-page/use-task-page-provider-metadata.ts
diff --git a/config/legacy-relay-compat-tags-baseline.txt b/config/legacy-relay-compat-tags-baseline.txt
index ad9eb1fa6e3..ffcbba0a3fa 100644
--- a/config/legacy-relay-compat-tags-baseline.txt
+++ b/config/legacy-relay-compat-tags-baseline.txt
@@ -17,7 +17,7 @@ src/main/ssh/migration-source/orcad-migration-terminal-gate.ts
 src/main/ssh/host-server/ssh-host-server-on-connect.ts
 src/main/ssh/targets/ssh-target-orcad-preflight.ts
 src/preload/api-types.ts
-src/preload/api/legacy-relay-bridge-api.ts
+src/preload/api/mobile/legacy-relay-bridge-api.ts
 src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-panes.ts
 src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.ts
 src/renderer/src/components/terminal-pane/pty-connection/output/foreground-output-refresh.ts
diff --git a/config/legacy-relay-importers-baseline.txt b/config/legacy-relay-importers-baseline.txt
index 8696af1340b..44d3041afea 100644
--- a/config/legacy-relay-importers-baseline.txt
+++ b/config/legacy-relay-importers-baseline.txt
@@ -1,7 +1,7 @@
 # Files outside src/main/ssh/legacy-relay/ that import it. RATCHET: may only SHRINK.
 # The relay retirement (2027-01-15) deletes the folder and edits exactly these files.
 # Prune: pnpm check:legacy-relay-fence-ratchet --prune
-src/main/ipc/runtime-environments/orcad-delta-move-handlers.ts
+src/main/ipc/runtime-environments/managed-orcad/orcad-delta-move-handlers.ts
 src/main/ipc/pty/runtime/kill.ts
 src/main/ipc/ssh/ssh-connect-decision-cancellation.test.ts
 src/main/ipc/ssh/ssh-connect-flow.ts
diff --git a/config/main-blocking-ipc-baseline.txt b/config/main-blocking-ipc-baseline.txt
index dac3b7e5930..124ec4b2b3c 100644
--- a/config/main-blocking-ipc-baseline.txt
+++ b/config/main-blocking-ipc-baseline.txt
@@ -4,6 +4,6 @@
 1 src/main/ipc/renderer-shutdown-checkpoint.ts
 1 src/main/ipc/settings.ts
 1 src/preload/api/app-bridge.ts
-1 src/preload/api/native-chat-bridge.ts
-1 src/preload/api/settings-bridge.ts
+1 src/preload/api/native-chat/native-chat-bridge.ts
+1 src/preload/api/preferences/settings-bridge.ts
 1 src/preload/native-chat/native-chat-visual-guest-theme.ts
diff --git a/config/main-layout-writer-baseline.txt b/config/main-layout-writer-baseline.txt
index 17a971600e9..d699d24d0e4 100644
--- a/config/main-layout-writer-baseline.txt
+++ b/config/main-layout-writer-baseline.txt
@@ -8,8 +8,8 @@
 3 src/main/ipc/pty/pane/stable-owner.ts
 1 src/main/ipc/pty/spawn-commit-binding.ts
 1 src/main/ipc/renderer-shutdown-checkpoint.ts
-1 src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts
-1 src/main/ipc/runtime-environments/runtime-environment-session-reconcile.ts
+1 src/main/ipc/runtime-environments/catalog/runtime-environment-removal-cleanup.ts
+1 src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.ts
 2 src/main/ipc/session.ts
 6 src/main/orca-profiles/project-transfer/profile-project-session-state.ts
 4 src/main/orca-profiles/project-transfer/profile-project-source-removal.ts
diff --git a/config/mobile-localization-coverage-allowlist.json b/config/mobile-localization-coverage-allowlist.json
index d84333750f2..05742534930 100644
--- a/config/mobile-localization-coverage-allowlist.json
+++ b/config/mobile-localization-coverage-allowlist.json
@@ -175,7 +175,7 @@
     "count": 1
   },
   {
-    "filePath": "mobile/src/files/mobile-file-preview-route.ts",
+    "filePath": "mobile/src/files/preview/mobile-file-preview-route.ts",
     "kind": "object-property:message",
     "text": "Unable to load preview",
     "dynamic": false,
@@ -308,21 +308,21 @@
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/session/MobileSessionLatchKeys.tsx",
+    "filePath": "mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx",
     "kind": "object-property:label",
     "text": "Shift",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/session/MobileSessionLatchKeys.tsx",
+    "filePath": "mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx",
     "kind": "object-property:label",
     "text": "Ctrl",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/session/MobileSessionLatchKeys.tsx",
+    "filePath": "mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx",
     "kind": "object-property:label",
     "text": "Alt",
     "dynamic": false,
@@ -399,147 +399,147 @@
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Backspace",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Enter",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Escape",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Shift Tab",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Space",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:accessibilityLabel",
     "text": "Tab",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+A",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+C",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+D",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+E",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+L",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+R",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+U",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+W",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Ctrl+Z",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Del",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Enter",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Esc",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Shift+Tab",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Space",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/terminal/terminal-key-definitions.ts",
+    "filePath": "mobile/src/terminal/key-input/terminal-key-definitions.ts",
     "kind": "object-property:label",
     "text": "Tab",
     "dynamic": false,
diff --git a/config/react-compiler-bailout-baseline.txt b/config/react-compiler-bailout-baseline.txt
index 643bcde57d2..62b0b0c36d6 100644
--- a/config/react-compiler-bailout-baseline.txt
+++ b/config/react-compiler-bailout-baseline.txt
@@ -577,41 +577,41 @@
 1 src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts
 2 src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
 1 src/renderer/src/components/tab-group/useTabDragSplit.ts
-1 src/renderer/src/components/task-page/github/AssigneesCell.tsx
-2 src/renderer/src/components/task-page/github/MergeCell.tsx
-1 src/renderer/src/components/task-page/github/StatusCell.tsx
-1 src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts
+1 src/renderer/src/components/task-page/github/listing/AssigneesCell.tsx
+2 src/renderer/src/components/task-page/github/pull-requests/MergeCell.tsx
+1 src/renderer/src/components/task-page/github/issue-status/StatusCell.tsx
+1 src/renderer/src/components/task-page/github/cache/use-task-page-github-cache-reconciliation.ts
 2 src/renderer/src/components/task-page/github/use-task-page-github-detail.ts
-2 src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts
-21 src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts
-1 src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts
-3 src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts
-7 src/renderer/src/components/task-page/github/use-task-page-github-mutation-state.ts
-1 src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh-effect.ts
-5 src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts
-3 src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts
-4 src/renderer/src/components/task-page/github/use-task-page-work-items-cache-selection.ts
+2 src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-creation.ts
+21 src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts
+1 src/renderer/src/components/task-page/github/refresh/use-task-page-github-landing-refresh.ts
+3 src/renderer/src/components/task-page/github/listing/use-task-page-github-list-state.ts
+7 src/renderer/src/components/task-page/github/mutations/use-task-page-github-mutation-state.ts
+1 src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh-effect.ts
+5 src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh.ts
+3 src/renderer/src/components/task-page/github/listing/use-task-page-github-search-pagination.ts
+4 src/renderer/src/components/task-page/github/cache/use-task-page-work-items-cache-selection.ts
 1 src/renderer/src/components/task-page/gitlab/use-task-page-gitlab-loading.ts
-2 src/renderer/src/components/task-page/jira/task-page-jira-board-view.tsx
-1 src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts
-33 src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts
-2 src/renderer/src/components/task-page/jira/use-task-page-jira-favourite-filters.ts
-2 src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts
-1 src/renderer/src/components/task-page/jira/use-task-page-jira-list-effects.ts
-2 src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
-2 src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.ts
-2 src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.ts
-1 src/renderer/src/components/task-page/linear/IssueTable.tsx
-7 src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts
+2 src/renderer/src/components/task-page/jira/boards/task-page-jira-board-view.tsx
+1 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-projects.ts
+33 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts
+2 src/renderer/src/components/task-page/jira/filters/use-task-page-jira-favourite-filters.ts
+2 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-issue-creation.ts
+1 src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-effects.ts
+2 src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.ts
+2 src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.ts
+2 src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.ts
+1 src/renderer/src/components/task-page/linear/issues/IssueTable.tsx
+7 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-board.ts
 3 src/renderer/src/components/task-page/linear/use-task-page-linear-context-actions.ts
 1 src/renderer/src/components/task-page/linear/use-task-page-linear-context-state.ts
-4 src/renderer/src/components/task-page/linear/use-task-page-linear-filter-selection.ts
-1 src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts
-1 src/renderer/src/components/task-page/linear/use-task-page-linear-list-effects.ts
-6 src/renderer/src/components/task-page/linear/use-task-page-linear-list-presentation.ts
-13 src/renderer/src/components/task-page/linear/use-task-page-linear-list-projection.ts
-20 src/renderer/src/components/task-page/linear/use-task-page-linear-list-selection.ts
-2 src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts
+4 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-filter-selection.ts
+1 src/renderer/src/components/task-page/linear/creation/use-task-page-linear-issue-creation.ts
+1 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-effects.ts
+6 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-presentation.ts
+13 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-projection.ts
+20 src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-selection.ts
+2 src/renderer/src/components/task-page/linear/creation/use-task-page-linear-project-creation.ts
 1 src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts
 10 src/renderer/src/components/task-page/use-task-page-composer-actions.ts
 3 src/renderer/src/components/task-page/use-task-page-detail-routing.ts
diff --git a/config/react-compiler-uncompiled-files.txt b/config/react-compiler-uncompiled-files.txt
index a78f7b1b07a..c1570bdeeab 100644
--- a/config/react-compiler-uncompiled-files.txt
+++ b/config/react-compiler-uncompiled-files.txt
@@ -13,7 +13,7 @@ src/renderer/src/components/settings/skills/linear/LinearAgentSkillPane.tsx
 src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts
 src/renderer/src/components/sidebar/workspace-card/details/use-worktree-card-review-details.ts
 src/renderer/src/components/task-page/jira/Content.tsx
-src/renderer/src/components/task-page/jira/use-task-page-jira-list-projection.ts
+src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-projection.ts
 src/renderer/src/components/task-page/jira/use-task-page-jira-list-state.ts
 src/renderer/src/hooks/use-integration-provider-status-refresh.ts
 
diff --git a/config/recurring-timer-baseline.txt b/config/recurring-timer-baseline.txt
index 48ae549ed1e..f8d5f8c4cd8 100644
--- a/config/recurring-timer-baseline.txt
+++ b/config/recurring-timer-baseline.txt
@@ -29,7 +29,7 @@
 1 src/main/hang-watchdog/main-thread-hang-watchdog.ts
 2 src/main/ipc/filesystem/watcher-process/native-subscriptions/parcel-watcher-shallow-file-subscription.ts
 1 src/main/ipc/filesystem/watcher-process/native-subscriptions/parcel-watcher-shallow-subscription.ts
-1 src/main/ipc/runtime-environments/runtime-environment-preference.ts
+1 src/main/ipc/runtime-environments/catalog/runtime-environment-preference.ts
 1 src/main/ipc/worktrees/git/worktree-git-common-narrow-watch.ts
 1 src/main/ipc/worktrees/git/worktree-git-common-native-upgrade-poll.ts
 1 src/main/ipc/wsl/wsl-host-automation-wake-wiring.ts
diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc
index c361edcc424..4b0e70fd71c 100644
--- a/config/reliability-gates.jsonc
+++ b/config/reliability-gates.jsonc
@@ -1225,12 +1225,12 @@
       "invariant": "Failed bootstrap and authenticated reconnect converge without UI triggers; one connection owner publishes verified status, with no independent healthy status polling.",
       "oracle": "Audit 3301 removes the failed-verification/recovery/restart generation and host-contact-epoch, hosting and no-toast example from runtime-status-snapshot.test.ts. Earlier prose describing that example as retained is historical. Disconnect/pairing retirement and delayed catalog replay remain unchanged without equivalent replacement. Archive both complete historical 22-case unit receipts because their selector includes the reduced source; preserve the unrelated rendered receipt, current selectors and other-owner assertion references. No fresh aggregate or live host validation is claimed. Linux coverage from those two unit runs is historical; current covered-platform scope is limited to the preserved macOS rendered receipt. Retained local cases check independent waiter deadlines/cancellation, failed-operation recovery, stale deferred results, disposal and explicit reconnect after authentication refusal. Historical aggregate receipts predate audit1748 and are not fresh validation of reduced sources.",
       "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts",
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts",
         "ORCA_BACKGROUND_LAUNCH=1 ORCA_E2E_WEB_CLIENT=1 pnpm exec playwright test tests/e2e/runtime-host-status-recovery.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
       ],
       "testFiles": [
         "src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts",
-        "src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts",
+        "src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts",
         "src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts",
         "src/renderer/src/web/web-runtime-status-owner.test.ts",
         "tests/e2e/runtime-host-status-recovery.spec.ts"
@@ -3614,11 +3614,11 @@
         "https://github.com/stablyai/orca/issues/9563"
       ],
       "invariant": "A safely promotable headless serve process is the single app owner. Desktop activation preserves its daemon-backed sessions. On macOS, a CLI-supervised serve update keeps the node-mode parent alive across ShipIt's atomic bundle swap, restarts with the original serve arguments only after the target bundle is present, and clears handoff state only after that target version reports runtime readiness. Once a supervised child exits or fails to start, no late handoff completion may signal it or arm force-kill escalation. Unsupported or failed handoffs leave the current serving owner intact or recover it once without an install retry loop.",
-      "oracle": "Audit4362 intentionally deletes the imported stale-waiter retry and manually assembled OSC9999 mobile-republish cases, plus the mocked missing-worktree cleanup suite (4 authored / 5 finite cases in three suites). Lost alarms include repeated unread worker_done pointers, working-to-waiting mobile status publication, missing-worktree filtering, and scoped daemon shutdown with unrelated duplicate identities. No replacement coverage or new platform proof is claimed. Audit3832 deliberately retires76 authored/79 finite cases:75 runtime compatibility cases/78 finite cases across14 fragments, plus one localization extractor default-flag case. Three whole runtime fragments are deleted;27 authored/30 finite cases remain across the reviewed sources. This gate retains only its own selected scope; no equivalent replacement or fresh runtime/native/remote evidence is claimed. Runtime component A: Audit3828 composes3822 with independent3824: deliberately retires49 authored/52 finite cases from seven compatibility fragments, leaving15 authored/18 finite cases and deleting two entire fragments. Accepted losses: positive folder-worker recovery/materialization and reveal deadline; persisted-key normalization and legacy split/group/focus projection; fixed stale CAS refusal; occupied/alias/restored/preallocated terminal-handle variants; fixed OpenCode/Cursor/Claude/Codex/Antigravity classification, readiness, title and management examples; direct private-map browser authority projections; browser-focus and OMP title projection; already-aborted claim cleanup. Additional3824 loss: src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts :: does not poll a wrapper foreground for a speculative CLI prompt send :: Speculative retryForegroundWrappers:false check must return false on a wrapper after one foreground read, without polling the supplied later codex response. These real bounded alarms are deliberately retired for low marginal value. Retained callbacks are unchanged and provide only their own bounded scope, not equivalent replacement. Historical receipts do not validate reduced callbacks. No fresh runtime/native/SSH/WSL/phone/browser evidence or full transitive closure is claimed. Runtime component B: Audit3834 deliberately retires26 authored/26 finite cases from seven fresh compatibility fragments, leaving10/10 and deleting the one-case saved-binding reattachment fragment. Original position58 is excluded: its existing substantive3578 KEEP7 review remains historical, with no fresh credit. Accepted losses: fixed hook/provider-session identities and stale metadata refusal; decorative/pre-title foreground ordering variants; saved-binding surface reattachment; saved-row exit ghost removal and silent activation selection; unsupported headless wake; positive pending materialization/group projections; per-caller navigation selection; positive SSH hydration/read partition; laptop mobile publication/buffer and background/pending/status projections; abnormal/unregistered SSH grace, normal-exit refusal, persisted SSH hydration, positive serve reattachment, pending-agent launch arguments and direct seeded running-launch admission guard. These are real bounded alarms deliberately retired for low marginal value. Retained cases preserve their own distinct deferred foreground coalescing, usable handle continuity, stale inventory refresh, concurrent browser snapshot preservation, renderer graph fencing, caller dedup isolation, SSH partition writes, runtime split lifetime, independent relay-ready publication, lease admission/state/expiry. The direct running-launch no-spawn guard alarm is deliberately retired; no remaining owning-launch refusal coverage is claimed. Historical runs do not validate reduced callbacks. No equivalent replacement, runtime/native/SSH/WSL/phone/browser result or full transitive closure is claimed. Additional extractor loss: config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs :: does not change the existing renderer scan by default :: Default options must omit the five native-only fields in this supplied snippet. No equivalent replacement is claimed. Historical prior account (preserved verbatim): Audit3814 deliberately retires60 authored/60 finite cases:53runtime compatibility cases,4native XCTest methods and3Python clipboard methods, including the entire StableElementIndexes suite. Clipboard cuts retire the one-over-cap sample, incoming-offer destruction trace and sequential20-copy replay; actual wire, FD/pipe, startup and Xvfb/GTK boundaries remain without equivalent replacement claims. Accepted losses include narrow terminal-send payload/provider projections, legacy and direct no-op/error permutations, timing/work-count examples, private state/title/activity projections and fixture-driven readiness examples, individually enumerated below. These include real bounded production alarms consciously retired for marginal value; retained failed writes, duplicate submission, stale capture, transcript/ring and allocation fences are not equivalent replacements. No fresh native/remote/browser execution or complete transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3806 deliberately retires40 authored/40 finite runtime compatibility cases, including the terminal-side-effect-facts-part03 headless-snapshots-part02 and agent-status-and-waits-part03 fragments, plus20 scalar Swift precondition sites. Lost runtime alarms include status/title/attention projection examples, simple renderer/headless frame restoration and status waiting outcomes detailed in the accepted-loss ledger. Swift cuts retire duplicate generation-map/schema/navigation/bridge and notification-wrapper assertions; no standalone native program is deleted. These include real bounded production alarms consciously retired for marginal value. Retained races, pending writes/reflow, namespace and waiter ownership are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3798 deliberately retires21 authored/24 finite compatibility cases, including the entire SSH-worktree-lifecycle and repository-project-operations fragments. Accepted losses include navigation-only settings acknowledgement, browser session cleanup and host preservation projections, window positive/policy-state examples, terminal recovery/reload and no-incarnation remint examples, terminal listing compatibility/malformed IDs, directory browse/sort/Windows path smoke, SSH create refusal/manual lineage, recursive parent-folder creation and fork/origin/avatar/icon projections. Real bounded production alarms are consciously retired for marginal value; retained authority races, cleanup/clone ownership, pending waiters, nested-folder and scan invalidation cases are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3417 composes root-adopted3415v2/independent3416v2: intentionally removes117authored/173potential expanded registrations from12semantic sources, deleting4whole conventional suites and3registration modules and retaining4authored/5expanded cases, without equivalent replacement or fresh execution. The whole main-window attach-services suite is removed: runtime/window attach, notifier wiring, reload/teardown and permission-handler mock orchestration alarms are intentionally lost. Prune its exact deleted command selectors, testFiles entries and notifier assertionRef where present; complete prior selectors/ref are archived. Unrelated dated receipts remain exact and retain their original scope; no fresh reduced-selector, native-window or remote execution is claimed.  Audit3403 composes root-adopted3393/3394,3400/3401 and3398/3399: intentionally retires167 authored registrations/196 potential expanded cases across93 whole suites without equivalent replacement or fresh execution. Retained65 registrations/79 potential cases include one conditional missing-input failure sentinel; potential counts are not executions. Historical notes and complete dated receipts retain their exact original scopes. The retained runtime registration driver loses three complete imported fragments: changed-working-label title facts and suppressed-frame tracked snapshots; refusing SSH GitLab MR-base lookup before local Git/glab calls; and missing folder-workspace path creation/update refusal before spawn/store mutation. These alarms are intentionally lost. Other imported fragments and separately rooted dated receipts are unchanged; they are not equivalent replacement coverage.  Audit2252: The removed synthetic lock/gate/hydration fixture supplies no current promotion continuity oracle. Existing other selectors retain only their own independent scope; changed selector execution is pending. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2020: Retire CLI supervisor outcome, local-open promotion and paired-open projection alarms; launch retains only the two referenced stream-framing cases. Remaining CLI refusal/timeout cases do not replace headless-promotion coverage. Preserve both independent dated receipts at their original commands. Reduced selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Unit tests coalesce early activation, preserve daemon and SSH identity, and reproduce the update race with a staged target, old serving child, persistent CLI parent, atomic .app replacement, and replacement readiness message. They assert the parent does not exit for launchd to respawn the old app, the native updater does not launch an interactive GUI, the replacement version is verified before handoff completion, mismatches become durable failures without retries, and unsupported/preflight-failed installs do not invoke native quit or PTY cleanup. Force handoff completion to fail after the replacement child exits and require zero later child signals and zero escalation timers. A joined lock-owner/activation/hydration contract asserts that a forced relaunch opens exactly one window and that the renderer promoted inside the serve process launches zero agent resumes, creates no replacement tab or startup command, and leaves every surviving session record untouched. The Electron journey independently verifies headless promotion retains owner/runtime/daemon/PTY identity and terminal I/O.",
+      "oracle": "Audit4362 intentionally deletes the imported stale-waiter retry and manually assembled OSC9999 mobile-republish cases, plus the mocked missing-worktree cleanup suite (4 authored / 5 finite cases in three suites). Lost alarms include repeated unread worker_done pointers, working-to-waiting mobile status publication, missing-worktree filtering, and scoped daemon shutdown with unrelated duplicate identities. No replacement coverage or new platform proof is claimed. Audit3832 deliberately retires76 authored/79 finite cases:75 runtime compatibility cases/78 finite cases across14 fragments, plus one localization extractor default-flag case. Three whole runtime fragments are deleted;27 authored/30 finite cases remain across the reviewed sources. This gate retains only its own selected scope; no equivalent replacement or fresh runtime/native/remote evidence is claimed. Runtime component A: Audit3828 composes3822 with independent3824: deliberately retires49 authored/52 finite cases from seven compatibility fragments, leaving15 authored/18 finite cases and deleting two entire fragments. Accepted losses: positive folder-worker recovery/materialization and reveal deadline; persisted-key normalization and legacy split/group/focus projection; fixed stale CAS refusal; occupied/alias/restored/preallocated terminal-handle variants; fixed OpenCode/Cursor/Claude/Codex/Antigravity classification, readiness, title and management examples; direct private-map browser authority projections; browser-focus and OMP title projection; already-aborted claim cleanup. Additional3824 loss: src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts :: does not poll a wrapper foreground for a speculative CLI prompt send :: Speculative retryForegroundWrappers:false check must return false on a wrapper after one foreground read, without polling the supplied later codex response. These real bounded alarms are deliberately retired for low marginal value. Retained callbacks are unchanged and provide only their own bounded scope, not equivalent replacement. Historical receipts do not validate reduced callbacks. No fresh runtime/native/SSH/WSL/phone/browser evidence or full transitive closure is claimed. Runtime component B: Audit3834 deliberately retires26 authored/26 finite cases from seven fresh compatibility fragments, leaving10/10 and deleting the one-case saved-binding reattachment fragment. Original position58 is excluded: its existing substantive3578 KEEP7 review remains historical, with no fresh credit. Accepted losses: fixed hook/provider-session identities and stale metadata refusal; decorative/pre-title foreground ordering variants; saved-binding surface reattachment; saved-row exit ghost removal and silent activation selection; unsupported headless wake; positive pending materialization/group projections; per-caller navigation selection; positive SSH hydration/read partition; laptop mobile publication/buffer and background/pending/status projections; abnormal/unregistered SSH grace, normal-exit refusal, persisted SSH hydration, positive serve reattachment, pending-agent launch arguments and direct seeded running-launch admission guard. These are real bounded alarms deliberately retired for low marginal value. Retained cases preserve their own distinct deferred foreground coalescing, usable handle continuity, stale inventory refresh, concurrent browser snapshot preservation, renderer graph fencing, caller dedup isolation, SSH partition writes, runtime split lifetime, independent relay-ready publication, lease admission/state/expiry. The direct running-launch no-spawn guard alarm is deliberately retired; no remaining owning-launch refusal coverage is claimed. Historical runs do not validate reduced callbacks. No equivalent replacement, runtime/native/SSH/WSL/phone/browser result or full transitive closure is claimed. Additional extractor loss: config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs :: does not change the existing renderer scan by default :: Default options must omit the five native-only fields in this supplied snippet. No equivalent replacement is claimed. Historical prior account (preserved verbatim): Audit3814 deliberately retires60 authored/60 finite cases:53runtime compatibility cases,4native XCTest methods and3Python clipboard methods, including the entire StableElementIndexes suite. Clipboard cuts retire the one-over-cap sample, incoming-offer destruction trace and sequential20-copy replay; actual wire, FD/pipe, startup and Xvfb/GTK boundaries remain without equivalent replacement claims. Accepted losses include narrow terminal-send payload/provider projections, legacy and direct no-op/error permutations, timing/work-count examples, private state/title/activity projections and fixture-driven readiness examples, individually enumerated below. These include real bounded production alarms consciously retired for marginal value; retained failed writes, duplicate submission, stale capture, transcript/ring and allocation fences are not equivalent replacements. No fresh native/remote/browser execution or complete transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3806 deliberately retires40 authored/40 finite runtime compatibility cases, including the terminal-side-effect-facts-part03 headless-snapshots-part02 and agent-status-and-waits-part03 fragments, plus20 scalar Swift precondition sites. Lost runtime alarms include status/title/attention projection examples, simple renderer/headless frame restoration and status waiting outcomes detailed in the accepted-loss ledger. Swift cuts retire duplicate generation-map/schema/navigation/bridge and notification-wrapper assertions; no standalone native program is deleted. These include real bounded production alarms consciously retired for marginal value. Retained races, pending writes/reflow, namespace and waiter ownership are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3798 deliberately retires21 authored/24 finite compatibility cases, including the entire SSH-worktree-lifecycle and repository-project-operations fragments. Accepted losses include navigation-only settings acknowledgement, browser session cleanup and host preservation projections, window positive/policy-state examples, terminal recovery/reload and no-incarnation remint examples, terminal listing compatibility/malformed IDs, directory browse/sort/Windows path smoke, SSH create refusal/manual lineage, recursive parent-folder creation and fork/origin/avatar/icon projections. Real bounded production alarms are consciously retired for marginal value; retained authority races, cleanup/clone ownership, pending waiters, nested-folder and scan invalidation cases are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3417 composes root-adopted3415v2/independent3416v2: intentionally removes117authored/173potential expanded registrations from12semantic sources, deleting4whole conventional suites and3registration modules and retaining4authored/5expanded cases, without equivalent replacement or fresh execution. The whole main-window attach-services suite is removed: runtime/window attach, notifier wiring, reload/teardown and permission-handler mock orchestration alarms are intentionally lost. Prune its exact deleted command selectors, testFiles entries and notifier assertionRef where present; complete prior selectors/ref are archived. Unrelated dated receipts remain exact and retain their original scope; no fresh reduced-selector, native-window or remote execution is claimed.  Audit3403 composes root-adopted3393/3394,3400/3401 and3398/3399: intentionally retires167 authored registrations/196 potential expanded cases across93 whole suites without equivalent replacement or fresh execution. Retained65 registrations/79 potential cases include one conditional missing-input failure sentinel; potential counts are not executions. Historical notes and complete dated receipts retain their exact original scopes. The retained runtime registration driver loses three complete imported fragments: changed-working-label title facts and suppressed-frame tracked snapshots; refusing SSH GitLab MR-base lookup before local Git/glab calls; and missing folder-workspace path creation/update refusal before spawn/store mutation. These alarms are intentionally lost. Other imported fragments and separately rooted dated receipts are unchanged; they are not equivalent replacement coverage.  Audit2252: The removed synthetic lock/gate/hydration fixture supplies no current promotion continuity oracle. Existing other selectors retain only their own independent scope; changed selector execution is pending. Historical prior account (preserved verbatim): Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2020: Retire CLI supervisor outcome, local-open promotion and paired-open projection alarms; launch retains only the two referenced stream-framing cases. Remaining CLI refusal/timeout cases do not replace headless-promotion coverage. Preserve both independent dated receipts at their original commands. Reduced selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Unit tests coalesce early activation, preserve daemon and SSH identity, and reproduce the update race with a staged target, old serving child, persistent CLI parent, atomic .app replacement, and replacement readiness message. They assert the parent does not exit for launchd to respawn the old app, the native updater does not launch an interactive GUI, the replacement version is verified before handoff completion, mismatches become durable failures without retries, and unsupported/preflight-failed installs do not invoke native quit or PTY cleanup. Force handoff completion to fail after the replacement child exits and require zero later child signals and zero escalation timers. A joined lock-owner/activation/hydration contract asserts that a forced relaunch opens exactly one window and that the renderer promoted inside the serve process launches zero agent resumes, creates no replacement tab or startup command, and leaves every surviving session record untouched. The Electron journey independently verifies headless promotion retains owner/runtime/daemon/PTY identity and terminal I/O. Audit4587 retires the one-case CLI WebSocket protocol/preflight suite and its hand-built server; its cross-layer non-delivery witness is intentionally lost, with no replacement coverage claimed.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/cli/runtime/launch.test.ts src/main/updater/serve-update-handoff.test.ts src/main/updater/updater.headless-serve-install.test.ts src/main/updater/mac-install/updater.mac-install.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/cli/runtime/serve-signal-exit-diagnostic.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/startup/serve-launch/serve-desktop-activation.test.ts src/cli/runtime/client.test.ts src/cli/runtime/websocket-transport.test.ts src/main/runtime/construction/orca-runtime.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/startup/serve-launch/serve-desktop-activation.test.ts src/cli/runtime/client.test.ts src/main/runtime/construction/orca-runtime.test.ts",
         "pnpm exec electron-vite build --mode e2e",
         "pnpm run test:e2e -- tests/e2e/headless-serve-desktop-activation.spec.ts --workers=1"
       ],
@@ -3629,7 +3629,6 @@
         "src/cli/runtime/serve-signal-exit-diagnostic.test.ts",
         "src/main/startup/serve-launch/serve-desktop-activation.test.ts",
         "src/cli/runtime/client.test.ts",
-        "src/cli/runtime/websocket-transport.test.ts",
         "src/main/runtime/construction/orca-runtime.test.ts",
         "tests/e2e/headless-serve-desktop-activation.spec.ts"
       ],
@@ -5371,7 +5370,7 @@
       "commands": [
         "pnpm exec playwright test tests/e2e/paired-client-hosted-browser.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/client-pages/runtime-browser-client-page-creation.test.ts src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/remote-runtime-client.test.ts src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/remote-runtime-client.test.ts src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts",
         "SKIP_BUILD=1 ORCA_CROSS_VERSION_PACKAGED_EXECUTABLE=/Applications/Orca.app/Contents/MacOS/Orca pnpm exec playwright test tests/e2e/packaged-mixed-version-browser-placement.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/network/browser-network-tunnel-paired-runtime.integration.test.ts src/main/browser/network/execution-routes/paired-runtime-browser-network-route.test.ts src/main/browser/network/execution-routes/browser-network-execution-route.test.ts src/main/browser/network/execution-routes/wsl-browser-network-execution-route.test.ts src/main/browser/network/execution-routes/wsl-browser-network-relay-launch.test.ts src/main/runtime/browser/network/runtime-browser-network-execution-host.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/cdp/screencast/browser-screencast-stream.test.ts src/main/runtime/browser/screencast/orca-runtime-browser-screencast-fanout.test.ts",
@@ -5384,7 +5383,7 @@
         "src/main/runtime/browser/client-pages/runtime-browser-client-page-creation.test.ts",
         "src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts",
         "src/shared/remote-runtime/remote-runtime-client.test.ts",
-        "src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.test.ts",
+        "src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts",
         "tests/e2e/packaged-mixed-version-browser-placement.spec.ts",
         "src/main/runtime/browser/network/browser-network-tunnel-paired-runtime.integration.test.ts",
         "src/main/browser/network/execution-routes/paired-runtime-browser-network-route.test.ts",
@@ -6394,9 +6393,9 @@
         "https://github.com/stablyai/orca/issues/9229"
       ],
       "invariant": "Reconnect, replay, or lifecycle observations from a viewer that negotiated explicit close intent must never kill a live PTY. A capable reasonless close must keep and republish; a legacy paired viewer must retain current-main behavior because its intentional close and cleanup echo are wire-identical. Lifecycle close requires the exact observed publication, terminal, environment, and authoritative liveness, never signals a process, and leaves renderer-owned or partial-split retirement to its owner. Legacy daemon hello and warm reattachment remain non-destructive.",
-      "oracle": "Audit4362 intentionally deletes the imported stale-waiter retry and manually assembled OSC9999 mobile-republish cases, plus the mocked missing-worktree cleanup suite (4 authored / 5 finite cases in three suites). Lost alarms include repeated unread worker_done pointers, working-to-waiting mobile status publication, missing-worktree filtering, and scoped daemon shutdown with unrelated duplicate identities. No replacement coverage or new platform proof is claimed. Audit3881 intentionally removes the entire legacy E2EE channel and mobile socket-wiring test suites and the v2 additive runtime-capability refusal callback, without equivalent replacement. Those deleted suites leave current selectors and that v2 assertion alias is retired. Retained v2 replay/queue-counter cases do not establish the removed capability refusal. Reduced test bytes/selectors have no fresh execution in this static packet; independent dated daemon E2E receipts retain their complete original scope. Historical prior account (preserved verbatim): Audit3832 deliberately retires76 authored/79 finite cases:75 runtime compatibility cases/78 finite cases across14 fragments, plus one localization extractor default-flag case. Three whole runtime fragments are deleted;27 authored/30 finite cases remain across the reviewed sources. This gate retains only its own selected scope; no equivalent replacement or fresh runtime/native/remote evidence is claimed. Runtime component A: Audit3828 composes3822 with independent3824: deliberately retires49 authored/52 finite cases from seven compatibility fragments, leaving15 authored/18 finite cases and deleting two entire fragments. Accepted losses: positive folder-worker recovery/materialization and reveal deadline; persisted-key normalization and legacy split/group/focus projection; fixed stale CAS refusal; occupied/alias/restored/preallocated terminal-handle variants; fixed OpenCode/Cursor/Claude/Codex/Antigravity classification, readiness, title and management examples; direct private-map browser authority projections; browser-focus and OMP title projection; already-aborted claim cleanup. Additional3824 loss: src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts :: does not poll a wrapper foreground for a speculative CLI prompt send :: Speculative retryForegroundWrappers:false check must return false on a wrapper after one foreground read, without polling the supplied later codex response. These real bounded alarms are deliberately retired for low marginal value. Retained callbacks are unchanged and provide only their own bounded scope, not equivalent replacement. Historical receipts do not validate reduced callbacks. No fresh runtime/native/SSH/WSL/phone/browser evidence or full transitive closure is claimed. Runtime component B: Audit3834 deliberately retires26 authored/26 finite cases from seven fresh compatibility fragments, leaving10/10 and deleting the one-case saved-binding reattachment fragment. Original position58 is excluded: its existing substantive3578 KEEP7 review remains historical, with no fresh credit. Accepted losses: fixed hook/provider-session identities and stale metadata refusal; decorative/pre-title foreground ordering variants; saved-binding surface reattachment; saved-row exit ghost removal and silent activation selection; unsupported headless wake; positive pending materialization/group projections; per-caller navigation selection; positive SSH hydration/read partition; laptop mobile publication/buffer and background/pending/status projections; abnormal/unregistered SSH grace, normal-exit refusal, persisted SSH hydration, positive serve reattachment, pending-agent launch arguments and direct seeded running-launch admission guard. These are real bounded alarms deliberately retired for low marginal value. Retained cases preserve their own distinct deferred foreground coalescing, usable handle continuity, stale inventory refresh, concurrent browser snapshot preservation, renderer graph fencing, caller dedup isolation, SSH partition writes, runtime split lifetime, independent relay-ready publication, lease admission/state/expiry. The direct running-launch no-spawn guard alarm is deliberately retired; no remaining owning-launch refusal coverage is claimed. Historical runs do not validate reduced callbacks. No equivalent replacement, runtime/native/SSH/WSL/phone/browser result or full transitive closure is claimed. Additional extractor loss: config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs :: does not change the existing renderer scan by default :: Default options must omit the five native-only fields in this supplied snippet. No equivalent replacement is claimed. Historical prior account (preserved verbatim): Audit3814 deliberately retires60 authored/60 finite cases:53runtime compatibility cases,4native XCTest methods and3Python clipboard methods, including the entire StableElementIndexes suite. Clipboard cuts retire the one-over-cap sample, incoming-offer destruction trace and sequential20-copy replay; actual wire, FD/pipe, startup and Xvfb/GTK boundaries remain without equivalent replacement claims. Accepted losses include narrow terminal-send payload/provider projections, legacy and direct no-op/error permutations, timing/work-count examples, private state/title/activity projections and fixture-driven readiness examples, individually enumerated below. These include real bounded production alarms consciously retired for marginal value; retained failed writes, duplicate submission, stale capture, transcript/ring and allocation fences are not equivalent replacements. No fresh native/remote/browser execution or complete transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3806 deliberately retires40 authored/40 finite runtime compatibility cases, including the terminal-side-effect-facts-part03 headless-snapshots-part02 and agent-status-and-waits-part03 fragments, plus20 scalar Swift precondition sites. Lost runtime alarms include status/title/attention projection examples, simple renderer/headless frame restoration and status waiting outcomes detailed in the accepted-loss ledger. Swift cuts retire duplicate generation-map/schema/navigation/bridge and notification-wrapper assertions; no standalone native program is deleted. These include real bounded production alarms consciously retired for marginal value. Retained races, pending writes/reflow, namespace and waiter ownership are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3798 deliberately retires21 authored/24 finite compatibility cases, including the entire SSH-worktree-lifecycle and repository-project-operations fragments. Accepted losses include navigation-only settings acknowledgement, browser session cleanup and host preservation projections, window positive/policy-state examples, terminal recovery/reload and no-incarnation remint examples, terminal listing compatibility/malformed IDs, directory browse/sort/Windows path smoke, SSH create refusal/manual lineage, recursive parent-folder creation and fork/origin/avatar/icon projections. Real bounded production alarms are consciously retired for marginal value; retained authority races, cleanup/clone ownership, pending waiters, nested-folder and scan invalidation cases are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3774 (independent peer expansion of3773): deliberately retire7authored/13potential expanded registrations across4whole suites: standalone truncated8-byte E2EE guard; open/empty readiness null fast-path; capability parser acceptance/atomic malformed-array bounds; phone/delegated-parent/desktop/in-process creator provenance projections. These are real guard/policy alarms accepted as low marginal value, not tautologies. No equivalent replacement, authenticated-refusal, observer delivery, persisted visibility, synchronous scheduling or fresh execution is claimed. Prior dated receipts retain their exact original scopes and do not validate the changed/reduced current selector. Independent daemon E2E receipts remain scoped to their own unchanged commands. Historical prior account (preserved verbatim): Audit3403 composes root-adopted3393/3394,3400/3401 and3398/3399: intentionally retires167 authored registrations/196 potential expanded cases across93 whole suites without equivalent replacement or fresh execution. Retained65 registrations/79 potential cases include one conditional missing-input failure sentinel; potential counts are not executions. Historical notes and complete dated receipts retain their exact original scopes. The retained runtime registration driver loses three complete imported fragments: changed-working-label title facts and suppressed-frame tracked snapshots; refusing SSH GitLab MR-base lookup before local Git/glab calls; and missing folder-workspace path creation/update refusal before spawn/store mutation. These alarms are intentionally lost. Other imported fragments and separately rooted dated receipts are unchanged; they are not equivalent replacement coverage.  Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit1983: Delete the reasonless-close scalar suite and optional-capability socket forwarding alias. Delete the mocked close-attribution topology field-inventory suite and its aliases/selectors; preserve independent dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1959 (sources 1957:11, 1957:35, 1957:36): The fixture-supplied repository roundtrip, isolated capability metadata readback, parser/default-timer/size-threshold/internal failure-counter examples and standalone handshake-only replay example are removed. Source11 retains real encrypted multi-client event ordering, reconnect snapshot and multiplex delivery under synthetic runtime state, and does not establish the broad handshake-to-reasonless-close refusal alias; retire that whole assertion object. Source36 capability metadata readback alias is retired. Source35 retains the actual v2 runtime-only metadata/downgrade refusal callback and captured mutating-trace fresh-nonce rejection; its mapped mobile-v2 refusal alias remains within modeled credential lookup scope. Both independent daemon E2E dated receipts remain byte-exact with their original commands and results. No historical passed receipt is narrowed or transferred to changed source bytes. No fresh execution, equivalent replacement, physical provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed by this metadata packet. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): Retain actual parked exit/disposal/cancel/leaf progression using injected exit and close adapters. The retained last-watcher case checks exact lifecyclePtyId, but no retained callback establishes the whole existing replacement-or-sibling-incarnation alias. Retire that broad assertion object rather than transfer partial support. Capability admission, static fields and duplicate routing examples are intentionally lost; unchanged daemon E2E receipts remain scoped to their own commands. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Start isolated v25 and v26 daemon generations with one capable-viewer PTY and one legacy-viewer PTY per generation in four target worktrees plus an unaddressed control PTY in a fifth worktree. Route them through the production desktop scanner, runtime, RPC dispatcher, renderer-close relay, and daemon router. First issue sequential reasonless closes from an authenticated capable connection and require refusal, snapshot republish, zero shutdown calls, exact process survival, and post-close I/O. Then issue the byte-identical requests without the negotiated capability and require current-main behavior: two ordered immediate shutdowns, session-killed events, and exact root/descendant death, while capable and control PTYs survive. An observer lists all targets before, between, and after while issuing zero closes. Unit contracts also require in-process reasonless refusal, legacy runtime/mobile compatibility, explicit user closes, encrypted client-auth advertisement, and old-server lifecycle calls never to fall back.",
+      "oracle": "Audit4362 intentionally deletes the imported stale-waiter retry and manually assembled OSC9999 mobile-republish cases, plus the mocked missing-worktree cleanup suite (4 authored / 5 finite cases in three suites). Lost alarms include repeated unread worker_done pointers, working-to-waiting mobile status publication, missing-worktree filtering, and scoped daemon shutdown with unrelated duplicate identities. No replacement coverage or new platform proof is claimed. Audit3881 intentionally removes the entire legacy E2EE channel and mobile socket-wiring test suites and the v2 additive runtime-capability refusal callback, without equivalent replacement. Those deleted suites leave current selectors and that v2 assertion alias is retired. Retained v2 replay/queue-counter cases do not establish the removed capability refusal. Reduced test bytes/selectors have no fresh execution in this static packet; independent dated daemon E2E receipts retain their complete original scope. Historical prior account (preserved verbatim): Audit3832 deliberately retires76 authored/79 finite cases:75 runtime compatibility cases/78 finite cases across14 fragments, plus one localization extractor default-flag case. Three whole runtime fragments are deleted;27 authored/30 finite cases remain across the reviewed sources. This gate retains only its own selected scope; no equivalent replacement or fresh runtime/native/remote evidence is claimed. Runtime component A: Audit3828 composes3822 with independent3824: deliberately retires49 authored/52 finite cases from seven compatibility fragments, leaving15 authored/18 finite cases and deleting two entire fragments. Accepted losses: positive folder-worker recovery/materialization and reveal deadline; persisted-key normalization and legacy split/group/focus projection; fixed stale CAS refusal; occupied/alias/restored/preallocated terminal-handle variants; fixed OpenCode/Cursor/Claude/Codex/Antigravity classification, readiness, title and management examples; direct private-map browser authority projections; browser-focus and OMP title projection; already-aborted claim cleanup. Additional3824 loss: src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts :: does not poll a wrapper foreground for a speculative CLI prompt send :: Speculative retryForegroundWrappers:false check must return false on a wrapper after one foreground read, without polling the supplied later codex response. These real bounded alarms are deliberately retired for low marginal value. Retained callbacks are unchanged and provide only their own bounded scope, not equivalent replacement. Historical receipts do not validate reduced callbacks. No fresh runtime/native/SSH/WSL/phone/browser evidence or full transitive closure is claimed. Runtime component B: Audit3834 deliberately retires26 authored/26 finite cases from seven fresh compatibility fragments, leaving10/10 and deleting the one-case saved-binding reattachment fragment. Original position58 is excluded: its existing substantive3578 KEEP7 review remains historical, with no fresh credit. Accepted losses: fixed hook/provider-session identities and stale metadata refusal; decorative/pre-title foreground ordering variants; saved-binding surface reattachment; saved-row exit ghost removal and silent activation selection; unsupported headless wake; positive pending materialization/group projections; per-caller navigation selection; positive SSH hydration/read partition; laptop mobile publication/buffer and background/pending/status projections; abnormal/unregistered SSH grace, normal-exit refusal, persisted SSH hydration, positive serve reattachment, pending-agent launch arguments and direct seeded running-launch admission guard. These are real bounded alarms deliberately retired for low marginal value. Retained cases preserve their own distinct deferred foreground coalescing, usable handle continuity, stale inventory refresh, concurrent browser snapshot preservation, renderer graph fencing, caller dedup isolation, SSH partition writes, runtime split lifetime, independent relay-ready publication, lease admission/state/expiry. The direct running-launch no-spawn guard alarm is deliberately retired; no remaining owning-launch refusal coverage is claimed. Historical runs do not validate reduced callbacks. No equivalent replacement, runtime/native/SSH/WSL/phone/browser result or full transitive closure is claimed. Additional extractor loss: config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs :: does not change the existing renderer scan by default :: Default options must omit the five native-only fields in this supplied snippet. No equivalent replacement is claimed. Historical prior account (preserved verbatim): Audit3814 deliberately retires60 authored/60 finite cases:53runtime compatibility cases,4native XCTest methods and3Python clipboard methods, including the entire StableElementIndexes suite. Clipboard cuts retire the one-over-cap sample, incoming-offer destruction trace and sequential20-copy replay; actual wire, FD/pipe, startup and Xvfb/GTK boundaries remain without equivalent replacement claims. Accepted losses include narrow terminal-send payload/provider projections, legacy and direct no-op/error permutations, timing/work-count examples, private state/title/activity projections and fixture-driven readiness examples, individually enumerated below. These include real bounded production alarms consciously retired for marginal value; retained failed writes, duplicate submission, stale capture, transcript/ring and allocation fences are not equivalent replacements. No fresh native/remote/browser execution or complete transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3806 deliberately retires40 authored/40 finite runtime compatibility cases, including the terminal-side-effect-facts-part03 headless-snapshots-part02 and agent-status-and-waits-part03 fragments, plus20 scalar Swift precondition sites. Lost runtime alarms include status/title/attention projection examples, simple renderer/headless frame restoration and status waiting outcomes detailed in the accepted-loss ledger. Swift cuts retire duplicate generation-map/schema/navigation/bridge and notification-wrapper assertions; no standalone native program is deleted. These include real bounded production alarms consciously retired for marginal value. Retained races, pending writes/reflow, namespace and waiter ownership are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3798 deliberately retires21 authored/24 finite compatibility cases, including the entire SSH-worktree-lifecycle and repository-project-operations fragments. Accepted losses include navigation-only settings acknowledgement, browser session cleanup and host preservation projections, window positive/policy-state examples, terminal recovery/reload and no-incarnation remint examples, terminal listing compatibility/malformed IDs, directory browse/sort/Windows path smoke, SSH create refusal/manual lineage, recursive parent-folder creation and fork/origin/avatar/icon projections. Real bounded production alarms are consciously retired for marginal value; retained authority races, cleanup/clone ownership, pending waiters, nested-folder and scan invalidation cases are not equivalent replacements. No fresh native/remote/browser execution or full transitive closure is claimed. Earlier dated receipts and raw selectors remain historical accounts of prior callback sets. Audit3774 (independent peer expansion of3773): deliberately retire7authored/13potential expanded registrations across4whole suites: standalone truncated8-byte E2EE guard; open/empty readiness null fast-path; capability parser acceptance/atomic malformed-array bounds; phone/delegated-parent/desktop/in-process creator provenance projections. These are real guard/policy alarms accepted as low marginal value, not tautologies. No equivalent replacement, authenticated-refusal, observer delivery, persisted visibility, synchronous scheduling or fresh execution is claimed. Prior dated receipts retain their exact original scopes and do not validate the changed/reduced current selector. Independent daemon E2E receipts remain scoped to their own unchanged commands. Historical prior account (preserved verbatim): Audit3403 composes root-adopted3393/3394,3400/3401 and3398/3399: intentionally retires167 authored registrations/196 potential expanded cases across93 whole suites without equivalent replacement or fresh execution. Retained65 registrations/79 potential cases include one conditional missing-input failure sentinel; potential counts are not executions. Historical notes and complete dated receipts retain their exact original scopes. The retained runtime registration driver loses three complete imported fragments: changed-working-label title facts and suppressed-frame tracked snapshots; refusing SSH GitLab MR-base lookup before local Git/glab calls; and missing folder-workspace path creation/update refusal before spawn/store mutation. These alarms are intentionally lost. Other imported fragments and separately rooted dated receipts are unchanged; they are not equivalent replacement coverage.  Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2090 (sources2088/2089): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2086 (sources2082/2083): Current reduced suites intentionally retire the alarms listed in knownGaps; prior dated execution and replacement claims do not validate changed source bytes or selectors. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-handles-part-02.spec.ts: recovers a moved SSH pane through the tab it now sits in, not the one its lease froze; reports a plain expired orphan; does not report a pane whose only recent lease was superseded; does not report a pane whose only recent lease had its relay id recycled; picks the eligible orphan over a superseded predecessor that matches first; collects the same tabs the per-tab reader reports, in one sweep of the leases; reports no candidate when no lease names any of the worktree tabs. src/main/runtime/orca-runtime-tests/runtime-availability.spec.ts: starts unavailable with no authoritative window; reports the configured Windows terminal shell on status; reports floating workspace availability from settings on status; polls floating tabs with targeted PTY liveness and no repo/provider inventory; hydrates persisted tabs when the store cannot report repos; advertises browser screencast only when a renderer window is available; routes mobile Codex reset consumption through the account mutation coordinator; maps a definite pre-provider rejection into an authoritative current snapshot. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit1983: Delete the reasonless-close scalar suite and optional-capability socket forwarding alias. Delete the mocked close-attribution topology field-inventory suite and its aliases/selectors; preserve independent dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1959 (sources 1957:11, 1957:35, 1957:36): The fixture-supplied repository roundtrip, isolated capability metadata readback, parser/default-timer/size-threshold/internal failure-counter examples and standalone handshake-only replay example are removed. Source11 retains real encrypted multi-client event ordering, reconnect snapshot and multiplex delivery under synthetic runtime state, and does not establish the broad handshake-to-reasonless-close refusal alias; retire that whole assertion object. Source36 capability metadata readback alias is retired. Source35 retains the actual v2 runtime-only metadata/downgrade refusal callback and captured mutating-trace fresh-nonce rejection; its mapped mobile-v2 refusal alias remains within modeled credential lookup scope. Both independent daemon E2E dated receipts remain byte-exact with their original commands and results. No historical passed receipt is narrowed or transferred to changed source bytes. No fresh execution, equivalent replacement, physical provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed by this metadata packet. Historical prior account (preserved verbatim): Audit1939 (sources1934/1935): Retain actual parked exit/disposal/cancel/leaf progression using injected exit and close adapters. The retained last-watcher case checks exact lifecyclePtyId, but no retained callback establishes the whole existing replacement-or-sibling-incarnation alias. Retire that broad assertion object rather than transfer partial support. Capability admission, static fields and duplicate routing examples are intentionally lost; unchanged daemon E2E receipts remain scoped to their own commands. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Start isolated v25 and v26 daemon generations with one capable-viewer PTY and one legacy-viewer PTY per generation in four target worktrees plus an unaddressed control PTY in a fifth worktree. Route them through the production desktop scanner, runtime, RPC dispatcher, renderer-close relay, and daemon router. First issue sequential reasonless closes from an authenticated capable connection and require refusal, snapshot republish, zero shutdown calls, exact process survival, and post-close I/O. Then issue the byte-identical requests without the negotiated capability and require current-main behavior: two ordered immediate shutdowns, session-killed events, and exact root/descendant death, while capable and control PTYs survive. An observer lists all targets before, between, and after while issuing zero closes. Unit contracts also require in-process reasonless refusal, legacy runtime/mobile compatibility, explicit user closes, encrypted client-auth advertisement, and old-server lifecycle calls never to fall back. Audit4587 retires the one-case CLI WebSocket protocol/preflight suite and its hand-built server; its cross-layer non-delivery witness is intentionally lost, with no replacement coverage claimed.",
       "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/mobile/e2ee/e2ee-channel-v2.test.ts src/shared/remote-runtime/remote-runtime-client.test.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts src/cli/runtime/websocket-transport.test.ts src/renderer/src/web/web-runtime-client.test.ts src/renderer/src/components/terminal/terminal-close-incarnation.test.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/mobile/e2ee/e2ee-channel-v2.test.ts src/shared/remote-runtime/remote-runtime-client.test.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts src/renderer/src/web/web-runtime-client.test.ts src/renderer/src/components/terminal/terminal-close-incarnation.test.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts",
         "pnpm exec playwright test tests/e2e/daemon-generation-reconnect-safety.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm exec playwright test tests/e2e/daemon-generation-legacy-close-safety.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
       ],
@@ -6405,7 +6404,6 @@
         "src/main/runtime/rpc/mobile/e2ee/e2ee-channel-v2.test.ts",
         "src/shared/remote-runtime/remote-runtime-client.test.ts",
         "src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts",
-        "src/cli/runtime/websocket-transport.test.ts",
         "src/renderer/src/web/web-runtime-client.test.ts",
         "src/renderer/src/components/terminal/terminal-close-incarnation.test.ts",
         "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts",
@@ -7343,14 +7341,14 @@
       "invariant": "Only an explicit user change in Settings > Remote Orca Servers > Advanced > Active Server may mutate activeRuntimeEnvironmentId. Connecting, pairing, disconnecting, selecting or revealing a workspace or terminal, browser/mobile handoff, remote navigation, and reconnect must use transient or target-owner routing and must never rewrite the durable preference. Every Add Project selected host must satisfy canSelectAddRepoHost; paired web has no local filesystem fallback, so no valid host means Browse, Clone, and Create remain disabled. Every operation stays on the host selected when it began, even if preference or catalog state changes. Generic settings mutation cannot bypass the dedicated preference IPC.",
       "oracle": "Audit3362 retires the whole settings suite, including dirty-draft focus, background-host keepalive, protocol/catalog compatibility, stale/failure and refresh examples. The compound unit selector and test-file entry narrow; all prior owner-routing retirements/history remain. Four unrelated selected-runtime macOS E2E receipts remain verbatim and do not validate the changed unit selector. No equivalent replacement or fresh runtime/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit3349 retires the explicit runtime-owner, explicit SSH-owner and missing-owner-after-catalog-change examples from worktrees-fetch-owner-routing. Of those four named assertions, only the missing-owner-after-provider-reconnect assertion remains; the command and test-file selector survive. Those three alarms are intentionally lost without equivalent replacement. Four unrelated physical selected-runtime macOS E2E receipts remain verbatim; the frozen static closure does not select changed tests through their literal roots. No fresh runtime, provider, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: drops older same-host group and folder responses that finish last — Copies group and folder fixtures plus four deferred responses to re-test the same generic catalog generation fence in two wrappers. Retires stale same-host response rejection at these API copies.; drops pre-reconnect group and folder responses without pruning the new catalog — Directly replaces pairing/catalog fixtures then resolves scripted old group/folder replies; repeats identity-fence contract in two catalog wrappers without real reconnect. Retires pre-reconnect catalog pruning refusal example.. Retained tests do not replace these alarms. Dated unrelated evidence remains scoped to its original execution; no historical source/import-closure equivalence, fresh execution, real network/provider/SSH, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit2371 reduces all-host-folder-workspace-catalogs.test.ts by removing the repeated offline compatibility-probe budget and its incidental local-fallback/restored-owner samples, and catalog-settlement-notifications.test.ts by removing the four-route ten-equal-refresh notification/reference matrix. Those probe, quietness, identity and fallback alarms are intentionally lost. Remaining stale-response and revision-fencing examples do not supply equivalent replacement coverage. No fresh execution or red/green evidence validates the reduced sources; the four unrelated physical selected-runtime E2E receipts retain their original commands and scope. Historical prior account (preserved verbatim): Audit2360 removes src/renderer/src/hooks/useIpcEvents-terminal-create-surfacing.test.ts and its exclusive fake-effect harness. Lose local default-runtime persistence across navigation; focused/background terminal request/create/reveal and no-focus recovery; startup cwd/config/agent/view-mode forwarding; explicit runtime-session routing; remote/ambiguous/missing owner refusal; history focus; existing PTY reuse/title preservation; pending tab PTY/layout/identity adoption; split tree, focus, identity and telemetry samples. No equivalent replacement claimed. Changed selectors have no fresh execution or red/green credit. Unrelated retained receipt objects keep their original narrow scope. Historical prior account (preserved verbatim): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/store/project-groups/nested-repository-operations.test.ts: routes local nested scan progress by scanId and unsubscribes after completion. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Historical prior account (preserved verbatim): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Historical pre-audit oracle account for changed sources: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Start with Active Server=Local desktop, connect and navigate Windows 2, then reveal a local terminal and assert it succeeds while the persisted preference remains local before and after restart. Repeat transient routing and selected-runtime Add Project operations with exact-ID host decoys and completion reordering. Separately pair the real web client to an isolated headed host, then make its sole still-listed runtime compatibility-blocked and unavailable. Require a null authoritative selection, a disabled host option, and disabled Browse, Clone, and Create actions with no local fallback. Repeat against headless serve. Run the byte-identical selector/action contract on latest main, candidate, and candidate with the eligibility seam disabled.",
       "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts src/renderer/src/store/slices/browser/hosts/browser-session-host-selection.test.ts src/renderer/src/web/web-preload-api-runtime-environment.test.ts --maxWorkers=1",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts src/renderer/src/store/slices/browser/hosts/browser-session-host-selection.test.ts src/renderer/src/web/web-preload-api-runtime-environment.test.ts --maxWorkers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/repos/ssh-repo-readoption-drafts.test.ts src/renderer/src/store/folder-workspaces/folder-workspace-readoption-drafts.test.ts src/renderer/src/store/repos/repo-catalog-readoption-drafts.test.ts src/renderer/src/store/folder-workspaces/all-host-folder-workspace-catalogs.test.ts src/renderer/src/store/host-catalog/catalog-settlement-notifications.test.ts src/renderer/src/store/repos/repos-stale-fetch.test.ts src/renderer/src/store/folder-workspaces/folder-workspace-routing.test.ts src/renderer/src/store/repos/repos-selected-owner-routing.test.ts src/renderer/src/store/slices/worktrees/session/selected-host-active-workspace-identity.test.ts src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts --maxWorkers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/sidebar/project-admission/dialog/AddRepoStartSteps.test.tsx --maxWorkers=1",
         "pnpm run ensure:electron-runtime && npx playwright test tests/e2e/pr11346-selected-runtime-add.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1 --reporter=line",
         "pnpm run ensure:electron-runtime && npx playwright test tests/e2e/pr11346-selected-runtime-add.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --reporter=line"
       ],
       "testFiles": [
-        "src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts",
+        "src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts",
         "src/renderer/src/store/slices/browser/hosts/browser-session-host-selection.test.ts",
         "src/renderer/src/web/web-preload-api-runtime-environment.test.ts",
         "src/renderer/src/components/sidebar/project-admission/dialog/AddRepoStartSteps.test.tsx",
@@ -8224,7 +8222,7 @@
         "ORCA_BACKGROUND_LAUNCH=1 pnpm exec playwright test tests/e2e/paired-client-first-terminal-unopened-host-worktree.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/session-lifecycle/publication/mobile-session-tabs-agent-status-heartbeat.test.ts tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts --maxWorkers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts --maxWorkers=1",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/terminal/terminal-subscribe-buffer.test.ts src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-view-parking.test.ts src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.test.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts src/renderer/src/web/web-preload-api-runtime-environment.test.ts src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/terminal/terminal-subscribe-buffer.test.ts src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-view-parking.test.ts src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.test.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts src/renderer/src/web/web-preload-api-runtime-environment.test.ts src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts --maxWorkers=1",
         "pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts",
@@ -8247,7 +8245,7 @@
         "src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts",
         "src/main/runtime/construction/orca-runtime.test.ts",
         "src/renderer/src/web/web-preload-api-runtime-environment.test.ts",
-        "src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts",
+        "src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts",
         "src/main/runtime/rpc/terminal/terminal-multiplex-initial-snapshot-buffering.test.ts",
         "src/main/runtime/rpc/terminal/terminal-multiplex-pty-wait-capacity.test.ts",
         "src/main/runtime/rpc/terminal/terminal-subscribe-buffer.test.ts",
@@ -9343,14 +9341,14 @@
         "https://github.com/stablyai/orca/issues/12902"
       ],
       "invariant": "SSH, WSL, and remote-runtime restore paths must treat provider listing failures and unknown liveness as unknown, not dead, while still avoiding duplicate spawn and clearing expired relay leases exactly once. Direct SSH disconnect, reconnect, and wake must keep PTY bindings and relay identity, and target snapshot hydration/reconnect cannot reset sibling SSH, local, WSL, or runtime-owned state. Every restored remote terminal must preserve its provider PTY identity, including the authoritative incarnation returned by a successful session-ID reattach. After a recoverable partition the same authenticated runtime must reattach the same PTY, reject detached input, apply the latest viewport, and report healthy only after authoritative replay. A successful one-shot reachability probe may replace a pre-ready shared-control socket, but waiting RPCs must continue onto the replacement under their original deadline without duplicate host delivery or retained request bytes. Automatic PTY recovery stops after one bounded minute without a fatal terminal error; a manual reconnect starts a newly fenced epoch against the same PTY, and closed panes retain no recovery UI state. Successful current-transport recovery must clear every stale error surfaced for that pane without clearing or displaying a sibling pane's error; a later genuine failure must remain visible. Each transport retains at most eight suppressed messages, each pane retains at most eight distinct messages, and the rendered surface retains at most 24 lines and 4,000 characters. One capability-gated terminal-create mutation must produce at most one host PTY across an unknown response outcome, remain manually retryable after cutoff, and never let a stale completion replace a newer pane lifecycle. Reconnect must alternate exact activation with authoritative inventory so neither a stale activation response nor an activation failure can strand or retire a pane, and activating a parked surface whose persisted binding was already retired must respawn it rather than report a changed owner after signalling its exit.",
-      "oracle": "Audit3390 composes root-adopted3382/independent3383 and3386/independent3387 and3388/independent3389: intentionally retires216 authored registrations/230 expanded cases in42 whole authored suites plus5 zero-case registration drivers, without equivalent replacement. Lost local alarms include fake PTY identity/routing/startup/replay/mode/title/mouse/IME/scroll matrices, broad startup identity and file-open wiring, mock mailbox title recovery, mobile row parity and whole-v-selective save parity. Retained24 registrations/26 expanded cases in22 suites preserve actual xterm Windows buffer/wrap/scroll, typed TOML scalar, real Promise cancellation/settlement, HTTP Codex scanner/projector semantics, durable recovery admission/newer-schema bytes, federation completion/ACK/SQLite atomicity and failed stale-run-write versus imported durable history. Additional retained clock-domain scheduling, durable freeze/ACK/checkpoint ordering, ABA dirty intent, SQL atomicity, folder-domain retier/last-note deletion, scrollback durable no-sync staging, PanelBridge subscriber lifetime and reserved-send publication preserve narrower concrete behaviors. Current finite owner drift assessed in bounded defining bodies; retained callback bytes unchanged. Historical notes and complete dated receipts keep their original exact scopes. No new execution, equivalent replacement, native focus/device/pixel, live remote or global mixed-version guarantee is claimed. Audit3368 narrows stream-reconnect coverage to the actual ten synthetic transport epochs retaining one PTY identity, accepting and holding detached input for exactly-once later delivery, current decoded output and per-epoch subscription release. Prior rejection wording was inaccurate. Phase/backoff/cutoff/manual reconnect and parser/OSC/pause/retained-image/fatal/latch/claim/early-close alarms are intentionally lost without equivalent replacement. The Linux multi-pane reconnect receipt remains verbatim with its original scope; no fresh live SSH/provider/PTY/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit3359 retires whole host-surface-replacement and create-handoff suites, removing their compound unit command tokens, test-file entries and assertion references. Fake polling/deadline/subscription, supplied stale-handle ownership, close and replacement examples are intentionally lost without equivalent replacement. The unrelated Linux paired multi-pane reconnect receipt stays verbatim with its original scope. No fresh SSH/provider/network/PTY recovery, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit3342 retires the complete client create-outcome identity/options/recovery suite and the malformed-or-contradictory repo-owner response matrix. Client replay identity, options, no-downgrade, quiescence/budget/manual retry, authoritative probe-error and malformed-owner refusal alarms are intentionally lost without equivalent replacement. Remaining repo-owner late catalog and old-host re-adoption boundaries do not replace them. The unrelated Linux paired-reconnect receipt stays verbatim with its original scope. Surviving selectors are unexecuted here; no fresh SSH/provider/process-deduplication, mobile, mixed-version or cross-platform validation is claimed. Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: keeps a sidebar row for every still-live pane after a long sleep — Whole suite: 279 lines manually replay renderer ownership registry/status writes, snapshot patch/set, six-pane fixture inventory, and sidebar selectors/builders; expected pane IDs are production-computed. Does not run sleep/wake/transport or actual sidebar entry. Retires reconnect row-preservation assembly alarm.; still retires the regular TUI surface after an explicit terminal exit — Ordinary explicit-exit callback/map cleanup is repeated in the stale/new stream lifecycle case below. Retires separate regular-TUI baseline; keeper is not equivalent process/UI proof.; asks the HUB to recover an expired SSH pane and rebinds the host identity — Expired SSH owner error must ask the owning HUB to recover, then adopt fixed replacement handle, resubscribe and report rebind; actual transport dispatch and handle state prevent wrong-client recovery.; does not recover a pane whose relay reply was an identity mismatch — Identity mismatch means a different live PTY, so actual transport must surface refusal without recover/create, keeping original identity. Prevents destructive duplicate agent recovery.; fails closed when an older HUB cannot recover an expired SSH pane — Old HUB method_not_found is scripted mock refusal/error echo with no actual skewed host; repeats generic recovery failure propagation. Retires old-host recovery fallback refusal example.; names a held recovery's stopped WSL distro in readable copy, not the raw hold code — Pins exact WSL stopped-distro error prose after mock code; translation/copy assertion with no actual held recovery behavior. Retires readable-copy alarm.. Retained tests do not replace these alarms. Dated unrelated evidence remains scoped to its original execution; no historical source/import-closure equivalence, fresh execution, real network/provider/SSH, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit 3318 reduces runtime-environment-ssh-state.test.ts, intentionally losing metadata membership-pruning/new-target-only-read and other-environment/local-bucket isolation alarms. Preserve generation/failed-full-refresh assertion and unknown-target authoritative-list reread; these narrower cases are not equivalent replacements. The unchanged active two-case Linux reconnect materialization/sidebar receipt and covered platform retain their exact scope and do not validate the reduced SSH state selector. Preserve unrelated SSH assertions, selectors and archived history. No fresh SSH discovery, provider/PTY/network, rendered, mobile, mixed-version, cross-platform or full-gate execution is claimed. Audit 3312 retires the ordinary six-pane distinct-live-handle reconnect/resubscription alarm from paired-reconnect-multi-pane-materialization.test.ts. The unchanged parked-pane activation/rematerialization case remains narrower and is not an equivalent replacement. The complete prior seven-contract macOS receipt is archived as historical evidence; it does not validate the reduced selector. No fresh socket, PTY, sleep/wake, provider, platform, mobile, mixed-version or rendered execution is claimed. Audit3096: remove the deleted reconnect-banner selector and its two UI aliases. The reduced recovery-state selector retains only the deadline cancelling pending backoff and explicit retry owning a new epoch alias; healthy-replacement stale-schedule and independent caller-cutoff cancellation aliases retire. Other retained state cases cover reentrant retry, owner settlement and same-epoch parked revival, without replacing those removed alarms. Prior admission-selector retirement, archived July 28 receipt, unrelated selectors/claims/receipts and old gaps remain unchanged; no fresh execution is claimed. Audit3086: retire the destroyed fresh-session fallback settlement/non-destructive reattach alias and its direct selector; retain the detach/attach selector and assertion unchanged. The retained admission cases cover adopt-before-data and explicitly buffered-death admission without a new spawn, without replacing fallback retirement. July 28 evidence was already archived by audit3077; no duplicate retirement or new execution is claimed. Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/ssh/connection/ssh-connection-manager.test.ts: tears a failed startup down quietly, so its error is not replaced by a disconnect; marks a dial that never reached the host, so setup reports SSH’s reason; removes the registration when bulk teardown fails; leaves a connection whose own reconnect is asking the user alone; clears the pool entry when the closed connection is still the registered one; still reuses a connection that is already up; dials a user's connection test. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2052 (sources2049/2050/2051): Remove complete low-value restored-pane-title and pane-visibility-identity suites and their current selectors. Their supplied snapshot/title and nullable identity-comparison alarms are intentionally lost without replacement. Unrelated dated evidenceRuns remain unchanged and do not validate the reduced commands. No fresh gate execution, actual PTY/provider, rendered, remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the terminal-create idempotency forwarding suite and its prospective selector. Preserve2 unrelated receipts without claiming the lost forwarding alarm was replaced. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete complete transport-unmount and queued-initial-CWD helper suites: despite lifecycle-shaped fixtures, the unmount owner returns a Boolean PTY-id predicate, while CWD cases check nullish field selection and callback counts. Lose their detach/destroy/teardown and one-shot-CWD supplied examples. Partial queued-pane-startup loses three identical/empty/nonowner identity examples, retaining four exact one-shot/replacement ownership callbacks. No assertion object maps to these three sources, so unrelated alias objects remain byte-exact. Preserve the current81ed prior removal of pane-split-startup; stale bd948 source metadata snapshots are not replayed. No actual process/PTY startup, transport shutdown, live SSH or rendered recovery is proven by this metadata change. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): Delete the sole supplied public-SSH-state spread/sanitized-error projection and its provider-authority-pair alias. Also delete the complete tiny one-shot split-startup wrapper suite: callback-visible temporary field/reset, sequential payload and thrown-sentinel reset alarms disappear. No SSH provider epoch handoff, connection, process startup or actual terminal split was performed by either deleted suite. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1903 removes whole mocked detach, supplied geometry and/or close-request suites selected by this gate. Their pending-CWD/PTY-binding argument/order, fabricated hit-test and close bookkeeping alarms are intentionally lost without replacement. Valid remaining selectors/assertions and unchanged-selector execution receipts retain their original scope. Reduced unit selections have no fresh broad gate, real PTY/provider, rendered focus, or measured-budget validation. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Deterministic tests cover bounded stale-handle replacement, suspended heartbeat clocks, cold and established subscription failure, ten partition/recovery cycles, automatic-recovery cutoff, manual reconnect, and direct SSH binding retention. They assert SSH state changes leave PTY bindings in place, relay identity survives, and another target/local/WSL/runtime panes remain byte-identical through target snapshot hydration and reconnect. Both remount callbacks consume split-count activity suppression, intentional dispose emits no failure/timeout, and a same-attempt StrictMode remount still owns one timeout. Hydration clears an untrusted PTY hint without clearing its current pending owner, healthy current-authority bindings suppress correction, hydration finalizes once, and reconnect emits no paired close lifecycle. A provider-level session-ID reattach returns an incarnation, then a legacy exit without an incarnation must resolve to that returned identity rather than minting a fallback identity. The shared-control oracle withholds the first encrypted ready frame, starts one RPC, triggers the successful-probe refresh, then requires exactly two client connections, one host request, a successful response, zero pending calls, and zero retained request bytes. Tests also assert one unsubscribe per remote-runtime epoch, observable recovery phases, stable PTY identity, resumed snapshot/output/input, no healthy state before replay, no retry or input after cutoff, a new manual epoch against the same PTY, quiet recovery UI with an explicit Reconnect action, pane-close state cleanup, one stable create mutation id, old-runtime no-retry behavior, cross-process PTY adoption, and bounded in-flight coordination. A focused recovery oracle surfaces two distinct failures through one transport, completes authoritative replay, and requires both matching clear callbacks; pane-state tests require only the active pane's error to render, matching-pane recovery to preserve sibling and unrelated errors, dismissal to re-admit later failures, and distinct storms to retain only the newest eight messages within 24 lines and 4,000 characters. The retained store replacement assertion observes one atomic pane/tab subscriber publication; repeated rotations and snapshot-first pending-restart migration no longer have their direct store examples.",
+      "oracle": "Audit3390 composes root-adopted3382/independent3383 and3386/independent3387 and3388/independent3389: intentionally retires216 authored registrations/230 expanded cases in42 whole authored suites plus5 zero-case registration drivers, without equivalent replacement. Lost local alarms include fake PTY identity/routing/startup/replay/mode/title/mouse/IME/scroll matrices, broad startup identity and file-open wiring, mock mailbox title recovery, mobile row parity and whole-v-selective save parity. Retained24 registrations/26 expanded cases in22 suites preserve actual xterm Windows buffer/wrap/scroll, typed TOML scalar, real Promise cancellation/settlement, HTTP Codex scanner/projector semantics, durable recovery admission/newer-schema bytes, federation completion/ACK/SQLite atomicity and failed stale-run-write versus imported durable history. Additional retained clock-domain scheduling, durable freeze/ACK/checkpoint ordering, ABA dirty intent, SQL atomicity, folder-domain retier/last-note deletion, scrollback durable no-sync staging, PanelBridge subscriber lifetime and reserved-send publication preserve narrower concrete behaviors. Current finite owner drift assessed in bounded defining bodies; retained callback bytes unchanged. Historical notes and complete dated receipts keep their original exact scopes. No new execution, equivalent replacement, native focus/device/pixel, live remote or global mixed-version guarantee is claimed. Audit3368 narrows stream-reconnect coverage to the actual ten synthetic transport epochs retaining one PTY identity, accepting and holding detached input for exactly-once later delivery, current decoded output and per-epoch subscription release. Prior rejection wording was inaccurate. Phase/backoff/cutoff/manual reconnect and parser/OSC/pause/retained-image/fatal/latch/claim/early-close alarms are intentionally lost without equivalent replacement. The Linux multi-pane reconnect receipt remains verbatim with its original scope; no fresh live SSH/provider/PTY/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit3359 retires whole host-surface-replacement and create-handoff suites, removing their compound unit command tokens, test-file entries and assertion references. Fake polling/deadline/subscription, supplied stale-handle ownership, close and replacement examples are intentionally lost without equivalent replacement. The unrelated Linux paired multi-pane reconnect receipt stays verbatim with its original scope. No fresh SSH/provider/network/PTY recovery, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit3342 retires the complete client create-outcome identity/options/recovery suite and the malformed-or-contradictory repo-owner response matrix. Client replay identity, options, no-downgrade, quiescence/budget/manual retry, authoritative probe-error and malformed-owner refusal alarms are intentionally lost without equivalent replacement. Remaining repo-owner late catalog and old-host re-adoption boundaries do not replace them. The unrelated Linux paired-reconnect receipt stays verbatim with its original scope. Surviving selectors are unexecuted here; no fresh SSH/provider/process-deduplication, mobile, mixed-version or cross-platform validation is claimed. Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: keeps a sidebar row for every still-live pane after a long sleep — Whole suite: 279 lines manually replay renderer ownership registry/status writes, snapshot patch/set, six-pane fixture inventory, and sidebar selectors/builders; expected pane IDs are production-computed. Does not run sleep/wake/transport or actual sidebar entry. Retires reconnect row-preservation assembly alarm.; still retires the regular TUI surface after an explicit terminal exit — Ordinary explicit-exit callback/map cleanup is repeated in the stale/new stream lifecycle case below. Retires separate regular-TUI baseline; keeper is not equivalent process/UI proof.; asks the HUB to recover an expired SSH pane and rebinds the host identity — Expired SSH owner error must ask the owning HUB to recover, then adopt fixed replacement handle, resubscribe and report rebind; actual transport dispatch and handle state prevent wrong-client recovery.; does not recover a pane whose relay reply was an identity mismatch — Identity mismatch means a different live PTY, so actual transport must surface refusal without recover/create, keeping original identity. Prevents destructive duplicate agent recovery.; fails closed when an older HUB cannot recover an expired SSH pane — Old HUB method_not_found is scripted mock refusal/error echo with no actual skewed host; repeats generic recovery failure propagation. Retires old-host recovery fallback refusal example.; names a held recovery's stopped WSL distro in readable copy, not the raw hold code — Pins exact WSL stopped-distro error prose after mock code; translation/copy assertion with no actual held recovery behavior. Retires readable-copy alarm.. Retained tests do not replace these alarms. Dated unrelated evidence remains scoped to its original execution; no historical source/import-closure equivalence, fresh execution, real network/provider/SSH, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit 3318 reduces runtime-environment-ssh-state.test.ts, intentionally losing metadata membership-pruning/new-target-only-read and other-environment/local-bucket isolation alarms. Preserve generation/failed-full-refresh assertion and unknown-target authoritative-list reread; these narrower cases are not equivalent replacements. The unchanged active two-case Linux reconnect materialization/sidebar receipt and covered platform retain their exact scope and do not validate the reduced SSH state selector. Preserve unrelated SSH assertions, selectors and archived history. No fresh SSH discovery, provider/PTY/network, rendered, mobile, mixed-version, cross-platform or full-gate execution is claimed. Audit 3312 retires the ordinary six-pane distinct-live-handle reconnect/resubscription alarm from paired-reconnect-multi-pane-materialization.test.ts. The unchanged parked-pane activation/rematerialization case remains narrower and is not an equivalent replacement. The complete prior seven-contract macOS receipt is archived as historical evidence; it does not validate the reduced selector. No fresh socket, PTY, sleep/wake, provider, platform, mobile, mixed-version or rendered execution is claimed. Audit3096: remove the deleted reconnect-banner selector and its two UI aliases. The reduced recovery-state selector retains only the deadline cancelling pending backoff and explicit retry owning a new epoch alias; healthy-replacement stale-schedule and independent caller-cutoff cancellation aliases retire. Other retained state cases cover reentrant retry, owner settlement and same-epoch parked revival, without replacing those removed alarms. Prior admission-selector retirement, archived July 28 receipt, unrelated selectors/claims/receipts and old gaps remain unchanged; no fresh execution is claimed. Audit3086: retire the destroyed fresh-session fallback settlement/non-destructive reattach alias and its direct selector; retain the detach/attach selector and assertion unchanged. The retained admission cases cover adopt-before-data and explicitly buffered-death admission without a new spawn, without replacing fallback retirement. July 28 evidence was already archived by audit3077; no duplicate retirement or new execution is claimed. Audit2133 current-parent preparation: Current reduced sources/selectors intentionally retire the alarms listed in knownGaps; prior dated runs and replacement claims do not validate the changed set. Historical prior account (preserved verbatim): Audit2076 (sources2073/2074): Intentionally retire these low-value alarms without replacement: src/main/ssh/connection/ssh-connection-manager.test.ts: tears a failed startup down quietly, so its error is not replaced by a disconnect; marks a dial that never reached the host, so setup reports SSH’s reason; removes the registration when bulk teardown fails; leaves a connection whose own reconnect is asking the user alone; clears the pool entry when the closed connection is still the registered one; still reuses a connection that is already up; dials a user's connection test. Existing unrelated evidenceRuns retain their original scope; unchanged dated receipt objects do not validate changed source bytes or reduced selectors. No fresh gate execution or historical import-closure equivalence is claimed. Frozen current literal-import graph reaches these changed test bytes; unresolved local and computed edges remain debt, and current reachability is not historical execution or equivalent replacement evidence. Historical prior account (preserved verbatim): Audit2052 (sources2049/2050/2051): Remove complete low-value restored-pane-title and pane-visibility-identity suites and their current selectors. Their supplied snapshot/title and nullable identity-comparison alarms are intentionally lost without replacement. Unrelated dated evidenceRuns remain unchanged and do not validate the reduced commands. No fresh gate execution, actual PTY/provider, rendered, remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the terminal-create idempotency forwarding suite and its prospective selector. Preserve2 unrelated receipts without claiming the lost forwarding alarm was replaced. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete complete transport-unmount and queued-initial-CWD helper suites: despite lifecycle-shaped fixtures, the unmount owner returns a Boolean PTY-id predicate, while CWD cases check nullish field selection and callback counts. Lose their detach/destroy/teardown and one-shot-CWD supplied examples. Partial queued-pane-startup loses three identical/empty/nonowner identity examples, retaining four exact one-shot/replacement ownership callbacks. No assertion object maps to these three sources, so unrelated alias objects remain byte-exact. Preserve the current81ed prior removal of pane-split-startup; stale bd948 source metadata snapshots are not replayed. No actual process/PTY startup, transport shutdown, live SSH or rendered recovery is proven by this metadata change. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): Delete the sole supplied public-SSH-state spread/sanitized-error projection and its provider-authority-pair alias. Also delete the complete tiny one-shot split-startup wrapper suite: callback-visible temporary field/reset, sequential payload and thrown-sentinel reset alarms disappear. No SSH provider epoch handoff, connection, process startup or actual terminal split was performed by either deleted suite. Preserve meaningful remaining selectors/assertions and unchanged dated receipts within their original scope. Reduced selectors have no fresh gate execution evidence in this metadata packet. No equivalent replacement, physical watcher/PTY/provider, live SSH/remote/mobile, rendered, cross-platform, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1903 removes whole mocked detach, supplied geometry and/or close-request suites selected by this gate. Their pending-CWD/PTY-binding argument/order, fabricated hit-test and close bookkeeping alarms are intentionally lost without replacement. Valid remaining selectors/assertions and unchanged-selector execution receipts retain their original scope. Reduced unit selections have no fresh broad gate, real PTY/provider, rendered focus, or measured-budget validation. Historical prior account (preserved verbatim): Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): The retained unchanged-source receipts are the only current execution evidence; reduced-source assertions await validation. Historical oracle account (not a current claim for changed sources): Deterministic tests cover bounded stale-handle replacement, suspended heartbeat clocks, cold and established subscription failure, ten partition/recovery cycles, automatic-recovery cutoff, manual reconnect, and direct SSH binding retention. They assert SSH state changes leave PTY bindings in place, relay identity survives, and another target/local/WSL/runtime panes remain byte-identical through target snapshot hydration and reconnect. Both remount callbacks consume split-count activity suppression, intentional dispose emits no failure/timeout, and a same-attempt StrictMode remount still owns one timeout. Hydration clears an untrusted PTY hint without clearing its current pending owner, healthy current-authority bindings suppress correction, hydration finalizes once, and reconnect emits no paired close lifecycle. A provider-level session-ID reattach returns an incarnation, then a legacy exit without an incarnation must resolve to that returned identity rather than minting a fallback identity. The shared-control oracle withholds the first encrypted ready frame, starts one RPC, triggers the successful-probe refresh, then requires exactly two client connections, one host request, a successful response, zero pending calls, and zero retained request bytes. Tests also assert one unsubscribe per remote-runtime epoch, observable recovery phases, stable PTY identity, resumed snapshot/output/input, no healthy state before replay, no retry or input after cutoff, a new manual epoch against the same PTY, quiet recovery UI with an explicit Reconnect action, pane-close state cleanup, one stable create mutation id, old-runtime no-retry behavior, cross-process PTY adoption, and bounded in-flight coordination. A focused recovery oracle surfaces two distinct failures through one transport, completes authoritative replay, and requires both matching clear callbacks; pane-state tests require only the active pane's error to render, matching-pane recovery to preserve sibling and unrelated errors, dismissal to re-admit later failures, and distinct storms to retain only the newest eight messages within 24 lines and 4,000 characters. The retained store replacement assertion observes one atomic pane/tab subscriber publication; repeated rotations and snapshot-first pending-restart migration no longer have their direct store examples. Preload layout cleanup retires the mock SSH forwarding/type-census suite without replacement: preload wiring alarms are lost; shared authority-admission tests cover narrower behavior. Historical receipts retain their original scope.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts src/renderer/src/components/terminal-pane/mounting/queued-pane-startup.test.ts src/renderer/src/components/terminal-pane/parking/one-shot-park-replay.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts src/renderer/src/store/terminals/terminal-pty-identity-replacement.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-detach-attach-handoff.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/remote-runtime-pty-recovery-state.test.ts src/shared/remote-runtime/remote-runtime-socket-liveness.test.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts src/shared/remote-runtime/control/remote-runtime-shared-control-socket-generation.test.ts src/shared/remote-runtime/remote-runtime-client-error-classification.test.ts src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/ui/workspace-navigation-history-hydration.test.ts src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts --reporter=dot",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/ssh/ssh.test.ts src/main/ssh/connection/ssh-connection-manager.test.ts src/main/ssh/connection/ssh-connection.test.ts src/preload/api/ssh-authority-forwarding.test.ts src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts src/shared/ssh-retained-payload-admission.test.ts --reporter=dot",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/ssh/ssh.test.ts src/main/ssh/connection/ssh-connection-manager.test.ts src/main/ssh/connection/ssh-connection.test.ts src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts src/shared/ssh-retained-payload-admission.test.ts --reporter=dot",
         "pnpm exec electron-vite build --mode e2e",
         "pnpm run build:web-from-renderer",
         "SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
@@ -9376,7 +9374,6 @@
         "src/main/ipc/ssh/ssh.test.ts",
         "src/main/ssh/connection/ssh-connection-manager.test.ts",
         "src/main/ssh/connection/ssh-connection.test.ts",
-        "src/preload/api/ssh-authority-forwarding.test.ts",
         "src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts",
         "src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts",
         "src/shared/ssh-retained-payload-admission.test.ts"
@@ -9427,14 +9424,6 @@
             "late ssh2 ready and startup error events after disconnect cannot resurrect or overwrite disconnected state"
           ]
         },
-        {
-          "file": "src/preload/api/ssh-authority-forwarding.test.ts",
-          "assertions": [
-            "full authority crosses Electron IPC without loss",
-            "partial authority becomes unknown for bounded reconciliation and malformed full authority is dropped",
-            "variable-form host-qualified worktree requests retain fail-closed outcomes in their return type"
-          ]
-        },
         {
           "file": "src/shared/ssh-retained-payload-admission.test.ts",
           "assertions": [
diff --git a/config/scripts/archives/platform-command/zip-extractor-command.test.mjs b/config/scripts/archives/platform-command/zip-extractor-command.test.mjs
index df80ea918b0..c555261cab7 100644
--- a/config/scripts/archives/platform-command/zip-extractor-command.test.mjs
+++ b/config/scripts/archives/platform-command/zip-extractor-command.test.mjs
@@ -1,17 +1,12 @@
 import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it } from 'vitest'
 import { runProcessSync } from '@orca/process-host'
-import {
-  getTarProgram,
-  getZipExtractorCommand
-} from '../../../../src/shared/zip-extractor-command.ts'
+import { getZipExtractorCommand } from '../../../../src/shared/zip-extractor-command.ts'
 
 const directories = []
 afterEach(() => {
-  vi.unstubAllEnvs()
-  vi.restoreAllMocks()
   for (const directory of directories.splice(0)) {
     rmSync(directory, { recursive: true, force: true })
   }
@@ -30,32 +25,6 @@ function extract(bytes) {
 }
 
 describe('native archive extraction', () => {
-  it('pins Windows tar to the system tool even when Git Bash or an unzip override is present', () => {
-    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
-    vi.stubEnv('SystemRoot', 'C:\\Windows')
-    vi.stubEnv('ORCA_UNZIP_BIN', 'custom-unzip')
-    expect(getTarProgram()).toBe(join('C:\\Windows', 'System32', 'tar.exe'))
-    vi.spyOn(process, 'platform', 'get').mockReturnValue('linux')
-    expect(getTarProgram()).toBe('tar')
-  })
-
-  it('uses the system archive reader on Windows unless an override is configured', () => {
-    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
-    vi.stubEnv('SystemRoot', 'C:\\Windows')
-    vi.stubEnv('ORCA_UNZIP_BIN', '')
-    expect(getZipExtractorCommand('source.zip', 'output')).toEqual({
-      file: join('C:\\Windows', 'System32', 'tar.exe'),
-      args: ['-xf', 'source.zip', '-C', 'output'],
-      label: 'tar'
-    })
-    vi.stubEnv('ORCA_UNZIP_BIN', 'C:\\tools\\unzip.exe')
-    expect(getZipExtractorCommand("source '$.zip", "output '$")).toEqual({
-      file: 'C:\\tools\\unzip.exe',
-      args: ['-q', "source '$.zip", '-d', "output '$"],
-      label: 'unzip'
-    })
-  })
-
   it('extracts through paths containing spaces, apostrophes and shell characters', () => {
     const { result, destination } = extract(
       Buffer.from(
@@ -66,9 +35,4 @@ describe('native archive extraction', () => {
     expect(result.code, result.stderr).toBe(0)
     expect(readFileSync(join(destination, 'payload.txt'), 'utf8')).toBe('verified archive payload')
   })
-
-  it('fails on a malformed archive', () => {
-    const { result } = extract('invalid archive')
-    expect(result.code).not.toBe(0)
-  })
 })
diff --git a/config/scripts/archives/seven-zip/resolve-7za-path.test.mjs b/config/scripts/archives/seven-zip/resolve-7za-path.test.mjs
index 4e43241d45a..f2c297de7ca 100644
--- a/config/scripts/archives/seven-zip/resolve-7za-path.test.mjs
+++ b/config/scripts/archives/seven-zip/resolve-7za-path.test.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process'
-import { existsSync, mkdirSync, mkdtempSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdtempSync, rmSync, statSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
@@ -8,51 +8,6 @@ import { resolve7zaPath } from './resolve-7za-path.mjs'
 const projectRoot = resolve(import.meta.dirname, '../../../..')
 
 describe('7za path resolution for the Windows signing gates (#6487)', () => {
-  // Match upstream mac/win/linux architecture dirs; darwin/ or collapsed-arch guesses silently fail to resolve.
-
-  it('resolves an executable 7za that can extract an archive', async () => {
-    const path7za = await resolve7zaPath(projectRoot)
-    expect(existsSync(path7za)).toBe(true)
-
-    const scratch = mkdtempSync(join(tmpdir(), 'orca 7za resolve '))
-    try {
-      const payloadDir = join(scratch, 'payload')
-      mkdirSync(payloadDir, { recursive: true })
-      writeFileSync(join(payloadDir, 'Orca.exe'), 'not-a-real-pe')
-
-      const archive = join(scratch, 'bundle.7z')
-      const created = spawnSync(path7za, ['a', archive, payloadDir], { encoding: 'utf8' })
-      expect(created.status).toBe(0)
-
-      const outDir = join(scratch, 'out')
-      const extracted = spawnSync(path7za, ['x', archive, `-o${outDir}`, '-y'], {
-        encoding: 'utf8'
-      })
-      expect(extracted.status).toBe(0)
-      expect(existsSync(join(outDir, 'payload', 'Orca.exe'))).toBe(true)
-    } finally {
-      rmSync(scratch, { recursive: true, force: true })
-    }
-  }, 120_000)
-
-  it('prefers an explicit ELECTRON_BUILDER_7ZIP_PATH override', async () => {
-    const scratch = mkdtempSync(join(tmpdir(), 'orca 7za override '))
-    const previous = process.env.ELECTRON_BUILDER_7ZIP_PATH
-    try {
-      const fake = join(scratch, 'my7za')
-      writeFileSync(fake, '#!/bin/sh\n')
-      process.env.ELECTRON_BUILDER_7ZIP_PATH = fake
-      await expect(resolve7zaPath(projectRoot)).resolves.toBe(fake)
-    } finally {
-      if (previous === undefined) {
-        delete process.env.ELECTRON_BUILDER_7ZIP_PATH
-      } else {
-        process.env.ELECTRON_BUILDER_7ZIP_PATH = previous
-      }
-      rmSync(scratch, { recursive: true, force: true })
-    }
-  })
-
   // Use directory override: Test-Path accepts it, masking bad resolver validation until extraction fails.
   it('ignores an override that points at a directory', async () => {
     const scratch = mkdtempSync(join(tmpdir(), 'orca 7za dir override '))
@@ -72,8 +27,6 @@ describe('7za path resolution for the Windows signing gates (#6487)', () => {
     }
   }, 120_000)
 
-  // Overlap calls to global stdout patch; naive save/restore can permanently restore another caller’s diverting stub.
-
   // Use fresh subprocess: app-builder-lib memoizes toolset, hiding dangling-override failures in warm process.
   it('ignores an override that points at a missing file, in a cold process', () => {
     const dangling = join(tmpdir(), 'orca-7za-does-not-exist')
@@ -94,22 +47,4 @@ describe('7za path resolution for the Windows signing gates (#6487)', () => {
     expect(resolved).not.toBe(dangling)
     expect(existsSync(resolved)).toBe(true)
   }, 120_000)
-
-  it('prints exactly one clean line the PowerShell gate can consume', () => {
-    const result = spawnSync(
-      process.execPath,
-      ['config/scripts/archives/seven-zip/resolve-7za-path.mjs'],
-      {
-        cwd: projectRoot,
-        encoding: 'utf8',
-        timeout: 120_000
-      }
-    )
-
-    expect(result.status).toBe(0)
-    expect(result.stdout.trimEnd().split('\n')).toHaveLength(1)
-    expect(existsSync(result.stdout.trim())).toBe(true)
-  }, 120_000)
-
-  // Unset VITEST with cold cache: builder-util suppresses download logs in tests, hiding multiline stdout that breaks PowerShell path capture.
 })
diff --git a/config/scripts/artifact-storage/reflink-copy/space-sharing-copy.test.ts b/config/scripts/artifact-storage/reflink-copy/space-sharing-copy.test.ts
index abb4c29875f..fbf91f4022c 100644
--- a/config/scripts/artifact-storage/reflink-copy/space-sharing-copy.test.ts
+++ b/config/scripts/artifact-storage/reflink-copy/space-sharing-copy.test.ts
@@ -71,14 +71,6 @@ function makeTree(): { root: string; source: string } {
 }
 
 describe('shareTree', () => {
-  it('keeps relative symlinks unresolved on whatever this host supports', () => {
-    const { root, source } = makeTree()
-    const destination = path.join(root, 'shared')
-    expect(shareTree(source, destination)).toBeTruthy()
-    expect(readFileSync(path.join(destination, 'nested', 'file'), 'utf8')).toBe('contents')
-    expect(readlinkSync(path.join(destination, 'relative-link'))).toBe(path.join('nested', 'file'))
-  })
-
   it('clears a part-way tree before trying the next mechanism', () => {
     const { root, source } = makeTree()
     const destination = path.join(root, 'shared')
@@ -92,27 +84,7 @@ describe('shareTree', () => {
   })
 })
 
-describe('hardlinkTree', () => {
-  it('shares inodes for files but recreates symlinks as their own entries', () => {
-    const { root, source } = makeTree()
-    const destination = path.join(root, 'linked')
-    hardlinkTree(source, destination)
-    expect(statSync(path.join(destination, 'nested', 'file')).ino).toBe(
-      statSync(path.join(source, 'nested', 'file')).ino
-    )
-    expect(readlinkSync(path.join(destination, 'relative-link'))).toBe(path.join('nested', 'file'))
-  })
-})
-
 describe('makeTreeReadOnly', () => {
-  it('drops write permission on files while leaving directories traversable and unlinkable', () => {
-    const { source } = makeTree()
-    makeTreeReadOnly(source)
-    expect(statSync(path.join(source, 'nested', 'file')).mode & 0o222).toBe(0)
-    // Assert rename/remove behavior, not mode bits: Windows chmod maps only read-only attribute and directories never report 0755.
-    expect(() => rmSync(path.join(source, 'nested'), { recursive: true })).not.toThrow()
-  })
-
   it('turns an extract-over-dist write into an error instead of silent shared corruption', () => {
     const { root, source } = makeTree()
     const destination = path.join(root, 'linked')
@@ -146,16 +118,4 @@ describe('copyPrivateTree', () => {
       expect(readFileSync(path.join(source, 'nested', 'file'), 'utf8')).toBe('contents')
     }
   )
-
-  it('falls back to a byte copy when the private mechanism fails', () => {
-    const { root, source } = makeTree()
-    const destination = path.join(root, 'private')
-    const clone = () => {
-      throw new Error('clonefile unsupported')
-    }
-    const result = copyPrivateTree(source, destination, { platform: 'darwin', clone })
-    expect(result.mechanism).toBeNull()
-    expect(result.copyError).toBeInstanceOf(Error)
-    expect(readFileSync(path.join(destination, 'nested', 'file'), 'utf8')).toBe('contents')
-  })
 })
diff --git a/config/scripts/build/mobile-web-app/build-mobile-web-app-bundle.test.mjs b/config/scripts/build/mobile-web-app/build-mobile-web-app-bundle.test.mjs
index a1d27b2dbec..d3f0de6a741 100644
--- a/config/scripts/build/mobile-web-app/build-mobile-web-app-bundle.test.mjs
+++ b/config/scripts/build/mobile-web-app/build-mobile-web-app-bundle.test.mjs
@@ -36,7 +36,6 @@ describeBundling('the app bundle', () => {
           join(directory, 'index.tsx'),
           'export default function Route() { return null }\n'
         )
-        await expect(bundleMobileWebApp({ appDir: scratch })).resolves.toBeTruthy()
         await writeFile(
           join(directory, 'settings.tsx'),
           'const anchor = { anchor: "index" }\nexport { anchor as unstable_settings }\nexport default function Route() { return null }\n'
@@ -90,24 +89,6 @@ describeBundling('the app bundle', () => {
 })
 
 describe('the verifier', () => {
-  itBundling(
-    "rejects a buildId the manifest's own asset list does not derive",
-    async () => {
-      await withScratch(async (scratch) => {
-        const outDir = join(scratch, 'mobile-web')
-        await copyWrittenBundle(outDir)
-        const manifestPath = join(outDir, 'manifest.json')
-        const manifest = JSON.parse(await readFile(manifestPath, 'utf8'))
-        manifest.buildId = 'f'.repeat(64)
-        await writeFile(manifestPath, JSON.stringify(manifest), 'utf8')
-        await expect(verifyMobileWebAppBundle({ bundleDir: outDir })).rejects.toThrow(
-          'does not match its asset list'
-        )
-      })
-    },
-    240_000
-  )
-
   itBundling(
     'rejects a self-consistent bundle a fresh build does not reproduce',
     async () => {
diff --git a/config/scripts/build/mobile-web-app/mobile-web-bundle-serializer-parity.test.mjs b/config/scripts/build/mobile-web-app/mobile-web-bundle-serializer-parity.test.mjs
deleted file mode 100644
index 713666a94b7..00000000000
--- a/config/scripts/build/mobile-web-app/mobile-web-bundle-serializer-parity.test.mjs
+++ /dev/null
@@ -1,49 +0,0 @@
-import { createRequire } from 'node:module'
-import { describe, expect, it } from 'vitest'
-import { serializeMobileWebBundleAssets as serializeInBuilder } from './mobile-web-bundle-manifest.mjs'
-import { serializeMobileWebBundleAssets as serializeInContract } from '../../../../src/shared/mobile-web-bundle/manifest-contract'
-
-const require = createRequire(import.meta.url)
-const {
-  serializeAssets: serializeInGuard
-} = require('../../desktop-distribution/runtime-verification/verify-packaged-mobile-web-bundle.cjs')
-
-const digest = (hex) => `${hex}`.padStart(64, '0')
-
-// Mixed types/nested paths and uppercase ordering expose localeCompare drift from canonical code-unit sort.
-const ASSETS = [
-  {
-    path: 'assets/Za.js',
-    sha256: digest('a1'),
-    byteLength: 2048,
-    contentType: 'text/javascript; charset=utf-8'
-  },
-  { path: 'assets/aQ.css', sha256: digest('b2'), byteLength: 512, contentType: 'text/css' },
-  {
-    path: 'assets/nested/mark.png',
-    sha256: digest('c3'),
-    byteLength: 40_960,
-    contentType: 'image/png'
-  },
-  {
-    path: 'index.html',
-    sha256: digest('d4'),
-    byteLength: 640,
-    contentType: 'text/html; charset=utf-8'
-  }
-]
-
-describe('the three mobile web bundle serializers', () => {
-  it('emit exactly path, sha256, byteLength, contentType, in that order, and nothing else', () => {
-    const decorated = ASSETS.map((asset) => ({ ...asset, sourcePath: '/tmp/ignored', extra: 1 }))
-
-    const expected =
-      '[{"path":"assets/Za.js","sha256":"00000000000000000000000000000000000000000000000000000000000000a1","byteLength":2048,"contentType":"text/javascript; charset=utf-8"},' +
-      '{"path":"assets/aQ.css","sha256":"00000000000000000000000000000000000000000000000000000000000000b2","byteLength":512,"contentType":"text/css"},' +
-      '{"path":"assets/nested/mark.png","sha256":"00000000000000000000000000000000000000000000000000000000000000c3","byteLength":40960,"contentType":"image/png"},' +
-      '{"path":"index.html","sha256":"00000000000000000000000000000000000000000000000000000000000000d4","byteLength":640,"contentType":"text/html; charset=utf-8"}]'
-    for (const serialize of [serializeInContract, serializeInBuilder, serializeInGuard]) {
-      expect(serialize(decorated)).toBe(expected)
-    }
-  })
-})
diff --git a/config/scripts/ci/e2e-selection/e2e-cli-artifact-capability.test.mjs b/config/scripts/ci/e2e-selection/e2e-cli-artifact-capability.test.mjs
deleted file mode 100644
index 3d81ed517d1..00000000000
--- a/config/scripts/ci/e2e-selection/e2e-cli-artifact-capability.test.mjs
+++ /dev/null
@@ -1,48 +0,0 @@
-import { chmodSync, existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { delimiter, join } from 'node:path'
-import { parse } from 'yaml'
-import { describe, expect, it } from 'vitest'
-import { runProcessSync } from '@orca/process-host'
-
-const workflow = parse(readFileSync('.github/workflows/e2e.yml', 'utf8'))
-const build = workflow.jobs.build.steps.find((step) => step.id === 'e2e-cli')
-
-describe('shared E2E CLI capability', () => {
-  it.skipIf(process.platform === 'win32').each([
-    [false, 0, 0],
-    [true, 0, 0],
-    [true, 7, 7]
-  ])('supported=%s build status=%s exits=%s', (supported, buildStatus, exitStatus) => {
-    const directory = mkdtempSync(join(tmpdir(), 'orca-e2e-cli-capability-'))
-    const marker = join(directory, 'build-requested')
-    try {
-      writeFileSync(
-        join(directory, 'package.json'),
-        JSON.stringify({ scripts: supported ? { 'prepare:cli-output': 'available' } : {} })
-      )
-      const pnpm = join(directory, 'pnpm')
-      writeFileSync(pnpm, '#!/bin/sh\nprintf "%s" "$*" > "$BUILD_MARKER"\nexit "$BUILD_STATUS"\n')
-      chmodSync(pnpm, 0o755)
-      const result = runProcessSync({
-        program: 'bash',
-        args: ['-e', '-o', 'pipefail', '-c', build.run],
-        cwd: directory,
-        env: {
-          ...process.env,
-          PATH: `${directory}${delimiter}${process.env.PATH}`,
-          BUILD_MARKER: marker,
-          BUILD_STATUS: String(buildStatus)
-        },
-        timeoutMs: 10_000
-      })
-      expect(result.code, JSON.stringify(result)).toBe(exitStatus)
-      expect(existsSync(marker)).toBe(supported)
-      if (supported) {
-        expect(readFileSync(marker, 'utf8')).toBe('run build:cli')
-      }
-    } finally {
-      rmSync(directory, { recursive: true, force: true })
-    }
-  })
-})
diff --git a/config/scripts/ci/sharding/ci-shard-assignment.test.mjs b/config/scripts/ci/sharding/ci-shard-assignment.test.mjs
index 0e3056504ab..73bcb0c103d 100644
--- a/config/scripts/ci/sharding/ci-shard-assignment.test.mjs
+++ b/config/scripts/ci/sharding/ci-shard-assignment.test.mjs
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import { discoverE2eFiles, planE2e } from '../e2e-selection/ci-e2e-shard-plan.mjs'
-import { parseTimingLog } from './ci-shard-timing-import.mjs'
 
 describe('timing-weighted shard selection', () => {
   it('keeps nested/serial E2E files atomic and fails closed on discovery errors', () => {
@@ -18,7 +17,6 @@ describe('timing-weighted shard selection', () => {
       'one.spec.ts',
       'two.spec.ts'
     ])
-    expect(plan.testsByFile['one.spec.ts']).toHaveLength(2)
     expect(() => discoverE2eFiles({ ...report, errors: [{}] })).toThrow('errors')
     expect(() => discoverE2eFiles({ suites: [] })).toThrow('no tests')
     expect(() =>
@@ -30,25 +28,4 @@ describe('timing-weighted shard selection', () => {
       })
     ).toThrow('Duplicate')
   })
-
-  it('imports ANSI unit timings and E2E failures without counting headful reruns', () => {
-    const parsed = parseTimingLog(
-      [
-        '\u001b[32m✓\u001b[39m src/a.test.ts (2 tests) 35ms',
-        'Duration 1s (transform 0.1s, setup 0.2s, import 0.3s, tests 0.04s, environment 0.4s)',
-        '✓ 1 [electron-headless] › tests/e2e/a.spec.ts:1:1 › works (2s)',
-        '✘ 2 [electron-headless] › tests/e2e/a.spec.ts:2:1 › fails (1.2m)',
-        '✓ 3 [electron-headful] › tests/e2e/a.spec.ts:3:1 › benchmark (9s)'
-      ].join('\n')
-    )
-    expect(parsed).toEqual({
-      unit: { 'src/a.test.ts': 35 },
-      e2e: { 'tests/e2e/a.spec.ts': 74000 },
-      overheadMs: 1000
-    })
-  })
-
-  it('rejects incomplete unit evidence instead of silently dropping overhead', () => {
-    expect(() => parseTimingLog('✓ src/a.test.ts (2 tests) 35ms')).toThrow('Duration summary')
-  })
 })
diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json
index b19b9bd1a84..e919f4ba0ce 100644
--- a/config/scripts/ci/sharding/ci-shard-timings.json
+++ b/config/scripts/ci/sharding/ci-shard-timings.json
@@ -40,7 +40,6 @@
       "config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet-graph.test.mjs": 160,
       "config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet.test.mjs": 3540,
       "config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet.test.mjs": 212,
-      "config/scripts/performance/terminal-reporting/check-terminal-perf-report-budgets.test.mjs": 1600,
       "config/scripts/ci/unit-selection/check-test-file-runners.test.mjs": 267,
       "config/scripts/ci/workflow-contracts/ci-closed-pr-cancellation.test.mjs": 112,
       "config/scripts/ci/workflow-contracts/ci-draft-pr-admission.test.mjs": 546,
@@ -76,18 +75,14 @@
       "config/scripts/ci/e2e-selection/e2e-cli-artifact-capability.test.mjs": 233,
       "config/scripts/desktop-distribution/runtime-verification/electron-builder-config.test.mjs": 387,
       "config/scripts/desktop-distribution/runtime-verification/electron-builder-mac-channel-config.test.mjs": 309,
-      "config/scripts/desktop-distribution/runtime-verification/electron-builder-native-rebuild.test.mjs": 47,
       "config/scripts/desktop-distribution/runtime-verification/electron-builder-runtime-resources.test.mjs": 2505,
       "config/scripts/desktop-distribution/runtime-verification/electron-builder-speech-config.test.mjs": 212,
       "config/scripts/desktop-build/output-contracts/electron-vite-output-contract.test.ts": 77,
       "config/scripts/native-build/node-addons/ensure-native-runtime-job-ownership.test.mjs": 76,
       "config/scripts/native-build/node-addons/ensure-native-runtime.test.mjs": 908,
       "config/scripts/runtime-verification/ephemeral-store/ephemeral-vm-runtime-store-cross-version.test.ts": 31,
-      "config/scripts/orcad-distribution/server-bundle/foreign-sqlite-reader-worker-smoke.test.mjs": 491,
       "config/scripts/skills/bundle-generation/generate-skill-bundle-manifest.test.mjs": 956,
       "config/scripts/workspace-package-build/generated-artifact-line-ending-pin.test.mjs": 61,
-      "config/scripts/diagnostics/hang-watchdog/hang-watchdog-process-metrics.test.mjs": 94,
-      "config/scripts/runtime-verification/headless-detector/headless-detector-compiler-cache.test.mjs": 959,
       "config/scripts/ci/workflow-contracts/hourly-preflight-workflow.test.mjs": 158,
       "config/scripts/performance/idle-cpu/idle-cpu-process-sampling.test.mjs": 55,
       "config/scripts/static-analysis/oxlint-contracts/ime-enter-guard-plugin.test.mjs": 222,
@@ -96,11 +91,7 @@
       "config/scripts/diagnostics/lag-capture/lag-probe-failures.test.mjs": 55,
       "config/scripts/dependency-security/runtime-resolution/linear-sdk-runtime.test.mjs": 773,
       "config/scripts/preflight/changed-checks/lint-staged-worktree-backup.test.mjs": 278,
-      "config/scripts/locale-catalog/locale-brand-prefilter.test.mjs": 246,
-      "config/scripts/locale-catalog/locale-generic-ui-terms.test.mjs": 102,
       "config/scripts/locale-catalog/locale-repair-catalog-missing-leaves.test.mjs": 159,
-      "config/scripts/locale-catalog/locale-translation-policy.es-pr.test.mjs": 91,
-      "config/scripts/locale-catalog/locale-translation-policy.test.mjs": 189,
       "config/scripts/localization/source-extraction/localization-extraction-call-syntax.test.mjs": 317,
       "config/scripts/localization/extraction-policy/localization-extraction-change-scope.test.mjs": 732,
       "config/scripts/performance/macos-computer-owner/macos-computer-helper-owner-loss-processes.test.mjs": 52,
@@ -110,7 +101,6 @@
       "config/scripts/desktop-build/output-contracts/main-entry-facade.test.ts": 492,
       "config/scripts/runtime-verification/managed-account/managed-data-account-runtime.test.ts": 1381,
       "config/scripts/orcad-distribution/prebuilds/merge-orcad-prebuilds.test.mjs": 67,
-      "config/scripts/mobile-web/check-entry/mobile-process-host-tooling.test.mjs": 942,
       "config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs": 821,
       "config/scripts/mobile-web-app/shell/mobile-web-app-agent-icon-render.test.mjs": 591,
       "config/scripts/mobile-web-app/shell/mobile-web-app-browser-pane-render.test.mjs": 239,
@@ -132,7 +122,6 @@
       "config/scripts/mobile-web-app/shell/mobile-web-app-render.test.mjs": 254,
       "config/scripts/mobile-web-app/session/mobile-web-app-rich-markdown-render.test.mjs": 356,
       "config/scripts/mobile-web-app/mobile-web-app-route-manifest.test.mjs": 174,
-      "config/scripts/mobile-web-app/mobile-web-app-route-snapshot.test.mjs": 121,
       "config/scripts/mobile-web-app/shell/mobile-web-app-safe-area-render.test.mjs": 314,
       "config/scripts/mobile-web-app/session/mobile-web-app-screencast-lane-grant.test.mjs": 70,
       "config/scripts/mobile-web-app/session/mobile-web-app-session-dictation-capture.test.mjs": 123,
@@ -173,7 +162,6 @@
       "config/scripts/development/launch/orca-dev-bin.test.mjs": 110,
       "config/scripts/orcad-distribution/server-bundle/orcad-entry-build.test.mjs": 7008,
       "config/scripts/orcad-distribution/server-bundle/orcad-linear-sdk-package.test.mjs": 376,
-      "config/scripts/orcad-distribution/server-bundle/orcad-mobile-web-bundle.test.mjs": 174,
       "config/scripts/orcad-distribution/prebuilds/orcad-prebuild-slot-contents.test.mjs": 79,
       "config/scripts/orcad-distribution/prebuilds/orcad-windows-prebuild-cache.test.mjs": 18343,
       "config/scripts/desktop-distribution/runtime-verification/package-electron-runtime-contract.test.mjs": 220,
@@ -182,7 +170,6 @@
       "config/scripts/desktop-distribution/runtime-verification/packaged-node-pty-prebuild-prune.test.mjs": 74,
       "config/scripts/desktop-distribution/runtime-verification/packaged-process-host.test.mjs": 537,
       "config/scripts/desktop-distribution/runtime-verification/packaged-repository-input-exclusion.test.mjs": 222,
-      "config/scripts/desktop-distribution/runtime-verification/packaged-source-map-prune.test.mjs": 73,
       "config/scripts/desktop-distribution/runtime-verification/packaged-windows-only-runtime-files.test.mjs": 214,
       "config/scripts/dependency-security/audit-tools/patched-dependencies-frozen-install.test.mjs": 749,
       "config/scripts/web-build/pdf-viewer-assets/pdfjs-viewer-assets-stream.test.ts": 296,
@@ -233,7 +220,6 @@
       "config/scripts/tool-invocation/script-entry-detection.test.mjs": 107,
       "config/scripts/test-fixtures/script-copy-closure/script-module-dependencies.test.mjs": 62,
       "config/scripts/ci/workflow-contracts/setup-pnpm-action.test.mjs": 421,
-      "config/scripts/electron-installation/shared-dist-cache/shared-electron-dist-cache.test.ts": 140,
       "config/scripts/native-build/node-addons/shared-native-build.test.mjs": 127,
       "config/scripts/artifact-storage/atomic-publication/shared-tree-publish.test.mjs": 63,
       "config/scripts/desktop-distribution/macos/sign-mac-app.test.mjs": 268,
@@ -242,25 +228,17 @@
       "config/scripts/desktop-distribution/appimage/static-appimage-package-contract.test.mjs": 88,
       "config/scripts/desktop-build/transform-contracts/sucrase-unused-transformers.test.ts": 43,
       "config/scripts/performance/terminal-reporting/terminal-perf-report-annotations.test.mjs": 54,
-      "config/scripts/desktop-distribution/windows/trim-windows-icon-source.test.mjs": 353,
       "config/scripts/dependency-security/runtime-resolution/undeclared-dependency-resolution.test.ts": 149,
       "config/scripts/node-runtime/archive-identity/update-node-runtime-pin.test.mjs": 87,
-      "config/scripts/plugin-authoring/content-validation/validate-plugin-files.test.mjs": 2422,
       "config/scripts/cli-build/verify-cli-bin.test.mjs": 135,
       "config/scripts/desktop-distribution/channel-policy/verify-dev-channel-packaging.test.mjs": 213,
-      "config/scripts/native-build/linux/verify-linux-glibc-floor.test.mjs": 156,
       "config/scripts/localization/catalog-validation/verify-localization-catalog.test.mjs": 422,
-      "config/scripts/localization/catalog-validation/verify-localization-catalogs.test.mjs": 1574,
-      "config/scripts/localization/source-extraction/verify-localization-extraction.test.mjs": 233,
-      "config/scripts/desktop-distribution/runtime-verification/verify-packaged-daemon-entry.test.mjs": 2009,
       "config/scripts/desktop-distribution/runtime-verification/verify-packaged-mobile-web-bundle.test.mjs": 214,
       "config/scripts/desktop-distribution/runtime-verification/verify-packaged-node-pty-job-ownership.test.mjs": 93,
       "config/scripts/orcad-distribution/template/verify-packaged-orcad-template.test.mjs": 454,
-      "config/scripts/desktop-distribution/runtime-verification/verify-packaged-plugin-resources.test.mjs": 101,
       "config/scripts/desktop-distribution/runtime-verification/verify-packaged-serve-payload.test.mjs": 83,
       "config/scripts/desktop-distribution/runtime-verification/verify-packaged-windows-agent-hook.test.mjs": 43,
       "config/scripts/runtime-verification/skills-cli/verify-skills-cli-runtime.test.mjs": 213,
-      "config/scripts/test-runtime/module-cache/vitest-module-cache-resolution-key.test.ts": 50,
       "config/scripts/test-runtime/node-worker/vitest-node-runtime-pool.test.ts": 560,
       "config/scripts/test-runtime/environment/vitest-real-agent-home-write-guard.test.ts": 71,
       "config/scripts/test-runtime/execution-policy/vitest-run-temp-directory.test.mjs": 51,
@@ -279,7 +257,6 @@
       "config/scripts/ci/workflow-contracts/workflow-ref-mirror-case-safety.test.mjs": 447,
       "config/scripts/ci/workflow-contracts/workflow-ref-reachability.test.mjs": 1650,
       "config/scripts/workspace/source-exports/workspace-source-exports.test.mjs": 117,
-      "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-admission.test.mjs": 1430,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-coordinate-boundaries.test.mjs": 191,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-file-transport.test.mjs": 404,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-glyph-visibility.test.mjs": 250,
@@ -287,7 +264,6 @@
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-lifecycle.test.mjs": 252,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-retransmit.test.mjs": 835,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-lifecycle-contract.test.mjs": 174,
-      "config/scripts/terminal-dependencies/xterm-patches/xterm-image-memory-contract.test.mjs": 368,
       "config/scripts/terminal-dependencies/xterm-patches/xterm-image-wasm-budget-contract.test.mjs": 469,
       "config/scripts/ci/workflow-contracts/zcode-credential-workflow.test.mjs": 668,
       "config/scripts/archives/platform-command/zip-extractor-command.test.mjs": 74,
@@ -511,8 +487,6 @@
       "src/main/agent-hooks/server/testing/providers/antigravity/server-antigravity-resume-identity.test.ts": 820,
       "src/main/agent-hooks/server/testing/permissions/server-claude-child-permission-lifecycle.test.ts": 681,
       "src/main/agent-hooks/server/testing/interruptions/server-claude-helper-kill.test.ts": 10279,
-      "src/main/agent-hooks/server/testing/interruptions/server-claude-helper-recovery.test.ts": 34523,
-      "src/main/agent-hooks/server/testing/task-wakeup/server-claude-owed-notification-expiry.test.ts": 877,
       "src/main/agent-hooks/server/testing/identity/server-claude-session-continuation.test.ts": 675,
       "src/main/agent-hooks/server/testing/http/server-claude-statusline.test.ts": 679,
       "src/main/agent-hooks/server/testing/task-wakeup/server-claude-task-wakeup-lifecycle.test.ts": 5451,
@@ -1732,7 +1706,6 @@
       "src/main/git/source-control/status/status-branch-line-total-exec-contract.test.ts": 1033,
       "src/main/git/source-control/status/status-branch-line-total-real-git.test.ts": 785,
       "src/main/git/source-control/status/status-branch-line-total-untracked-base.test.ts": 700,
-      "src/main/git/source-control/status/status-cquoted-paths.test.ts": 348,
       "src/main/git/source-control/diffs/status-diff.test.ts": 327,
       "src/main/git/source-control/status-discard-and-bulk-staging.test.ts": 289,
       "src/main/git/source-control/mutations/status-discard-symlink.test.ts": 456,
@@ -1746,7 +1719,6 @@
       "src/main/git/source-control/submodules/status-submodule.test.ts": 306,
       "src/main/git/source-control/upstream/status-upstream-ref.test.ts": 52,
       "src/main/git/source-control/upstream/upstream-deferred-fork-remote-real.test.ts": 319,
-      "src/main/git/source-control/upstream/upstream.test.ts": 406,
       "src/main/git/worktrees/creation/worktree-add-local-base-refresh.test.ts": 362,
       "src/main/git/worktrees/creation/worktree-add-pending-removal.test.ts": 346,
       "src/main/git/worktrees/creation/worktree-add-remote-branch-upstream-real-git.test.ts": 786,
@@ -1891,11 +1863,8 @@
       "src/main/hermes/hermes-config-source-edits.test.ts": 280,
       "src/main/hermes/hermes-windows-home.test.ts": 121,
       "src/main/hermes/hook-service.test.ts": 589,
-      "src/main/workspace-hooks/hook-archive-timeout-observation.test.ts": 1103,
       "src/main/workspace-hooks/hook-termination-real-process.test.ts": 3284,
       "src/main/workspace-hooks/hooks-archive-exit-observation.test.ts": 339,
-      "src/main/workspace-hooks/hooks-orca-yaml-unc-drive.test.ts": 402,
-      "src/main/workspace-hooks/hooks-runner.test.ts": 314,
       "src/main/filesystem/host-checkout-removal.test.ts": 52,
       "src/main/filesystem/host-tree-removal-asar.electron.test.ts": 308,
       "src/main/host/deferred-secret-protection-report.test.ts": 81,
@@ -3886,7 +3855,6 @@
       "src/main/pty/history/terminal-history-gc.test.ts": 824,
       "src/main/pty/history/terminal-history-tombstone-retry.test.ts": 715,
       "src/main/text-generation/failures/agent-failure-output.test.ts": 49,
-      "src/main/text-generation/failures/antigravity-generation-stream.test.ts": 479,
       "src/main/text-generation/execution/command-environment-process.test.ts": 1044,
       "src/main/text-generation/execution/commit-message-agent-environment.test.ts": 95,
       "src/main/text-generation/requests/commit-message-text-generation-branch-name.test.ts": 496,
@@ -4122,7 +4090,7 @@
       "src/packages/process-host/src/windows-command-line.test.ts": 73,
       "src/packages/process-host/src/windows-tree-kill.test.ts": 81,
       "src/packages/process-host/src/wsl-distro-allowlist.test.ts": 55,
-      "src/preload/api/notification-sound-playback.test.ts": 64,
+      "src/preload/api/notifications/notification-sound-playback.test.ts": 64,
       "src/preload/renderer/restart/app-restart-checkpoint-routing.test.ts": 2028,
       "src/preload/renderer/browser-pages/browser-client-page-renderer-requests.test.ts": 154,
       "src/preload/browser/extensions/messaging/browser-extension-content-script-relay.test.ts": 65,
@@ -4141,7 +4109,6 @@
       "src/preload/renderer/diagnostics/renderer-heap-statistics-reader.test.ts": 50,
       "src/preload/renderer/diagnostics/renderer-process-memory-reader.test.ts": 66,
       "src/preload/renderer/restart/renderer-restart-wiring.test.ts": 96,
-      "src/preload/api/ssh-authority-forwarding.test.ts": 1111,
       "src/renderer/src/app-shell/shutdown-checkpoint-persist.test.ts": 65,
       "src/renderer/src/app-shell/use-profile-state-save-delay-notice.sonner.test.tsx": 355,
       "src/renderer/src/app-shell/use-profile-state-save-delay-notice.test.tsx": 293,
@@ -4538,7 +4505,6 @@
       "src/renderer/src/components/feature-wall/setup/FullDiskAccessSetupPrompt.test.ts": 466,
       "src/renderer/src/components/floating-terminal/floating-workspace-tab-reorder.test.ts": 2520,
       "src/renderer/src/components/github-checks-tab-state.test.ts": 52,
-      "src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.assignee-identity.test.tsx": 461,
       "src/renderer/src/components/github-item-dialog/land-pull-request/pr-reviewers-request-actions.test.ts": 1976,
       "src/renderer/src/components/github-item-dialog/load-item-details/use-github-item-dialog-details.test.tsx": 2850,
       "src/renderer/src/components/github-item-dialog/load-item-details/use-github-task-refresh.test.tsx": 1070,
@@ -5096,32 +5062,21 @@
       "src/renderer/src/components/tab-group/useTabGroupCloseScopeCommands.test.tsx": 2023,
       "src/renderer/src/components/tab-group/workspace-tab-close-commands.frame-flush.test.ts": 1604,
       "src/renderer/src/components/task-page/github/task-page-github-landing-refresh-record.test.tsx": 971,
-      "src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts": 197,
       "src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-regressions.test.ts": 140,
       "src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.test.ts": 169,
       "src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.test.tsx": 1769,
       "src/renderer/src/components/task-page/gitlab/use-task-page-gitlab-loading.test.tsx": 1504,
       "src/renderer/src/components/task-page/jira/Content.board-owner.test.tsx": 2582,
-      "src/renderer/src/components/task-page/jira/IssueAssigneeField.test.tsx": 1122,
       "src/renderer/src/components/task-page/jira/task-page-jira-board-detail-integration.test.tsx": 2192,
-      "src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.test.ts": 69,
       "src/renderer/src/components/task-page/jira/task-page-jira-board-view.test.tsx": 2287,
-      "src/renderer/src/components/task-page/jira/task-page-jira-favourite-selection.test.tsx": 3326,
-      "src/renderer/src/components/task-page/jira/task-page-jira-grouping.test.ts": 2324,
       "src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.test.ts": 204,
-      "src/renderer/src/components/task-page/jira/task-page-jira-quick-copy.test.tsx": 3457,
-      "src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.test.tsx": 2642,
-      "src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx": 1466,
-      "src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.test.tsx": 1501,
-      "src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.test.tsx": 571,
-      "src/renderer/src/components/task-page/linear/IssueTable.test.tsx": 11230,
-      "src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx": 1978,
+      "src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.test.tsx": 2642,
+      "src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.test.tsx": 1466,
+      "src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.test.tsx": 1501,
+      "src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.test.tsx": 571,
       "src/renderer/src/components/task-page/linear/task-page-linear-creation-lifetime.test.tsx": 3315,
-      "src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.test.ts": 430,
-      "src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx": 2217,
-      "src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx": 1814,
-      "src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx": 2810,
-      "src/renderer/src/components/task-page/linear/task-page-linear-selection-decisions.test.tsx": 1018,
+      "src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.test.ts": 430,
+      "src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-lifecycle.test.tsx": 1814,
       "src/renderer/src/components/task-page/task-page-cache-selectors.test.ts": 108,
       "src/renderer/src/components/task-page/task-page-initial-selection-scaling.test.tsx": 1953,
       "src/renderer/src/components/task-page/task-page-work-item-pagination.test.ts": 63,
@@ -5839,7 +5794,6 @@
       "src/renderer/src/store/github/repositories/github-repo-lookup-index.test.ts": 51,
       "src/renderer/src/store/github/review-threads/github-review-thread-rollback.test.ts": 663,
       "src/renderer/src/store/github/task-records/github-task-record-retries.test.ts": 758,
-      "src/renderer/src/store/github/task-records/github-task-records.test.ts": 807,
       "src/renderer/src/store/github/work-items/github-work-items-error-envelope.test.ts": 1746,
       "src/renderer/src/store/github/work-items/github-work-items-pagination.test.ts": 1806,
       "src/renderer/src/store/github/work-items/github-work-items-runtime-routing.test.ts": 1891,
@@ -6033,7 +5987,7 @@
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-claude-elicitation.test.ts": 229,
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-approval-ownership.test.ts": 258,
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-interrupt.test.ts": 240,
-      "src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-main-agent.test.ts": 207,
+      "src/shared/agent-hook-listener/providers/codex/agent-hook-listener-codex-main-agent.test.ts": 207,
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-subagent-names.test.ts": 260,
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-command-code-transcript.test.ts": 330,
       "src/shared/agent-hook-listener/normalization/agent-hook-listener-grok-completion.test.ts": 255,
@@ -6043,13 +5997,11 @@
       "src/shared/agent-hook-listener/transport/agent-hook-listener-transport.test.ts": 326,
       "src/shared/agent-hook-listener/claude-session-continuation.test.ts": 114,
       "src/shared/agent-hook-listener/claude-settled-permission-requests.test.ts": 54,
-      "src/shared/agent-hook-listener/providers/claude-helper-kill.test.ts": 1288,
-      "src/shared/agent-hook-listener/providers/claude-transcript-semantics.test.ts": 163,
-      "src/shared/agent-hook-listener/providers/dsh-events.test.ts": 231,
-      "src/shared/agent-hook-listener/providers/hermes-events.test.ts": 143,
-      "src/shared/agent-hook-listener/providers/jcode-turn-prompt.test.ts": 122,
-      "src/shared/agent-hook-listener/providers/muse-events.test.ts": 246,
-      "src/shared/agent-hook-listener/providers/zcode-events.test.ts": 241,
+      "src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-semantics.test.ts": 163,
+      "src/shared/agent-hook-listener/providers/dsh/dsh-events.test.ts": 231,
+      "src/shared/agent-hook-listener/providers/hermes/hermes-events.test.ts": 143,
+      "src/shared/agent-hook-listener/providers/muse/muse-events.test.ts": 246,
+      "src/shared/agent-hook-listener/providers/zcode/zcode-events.test.ts": 241,
       "src/shared/agent-hook-listener/reverse-file-region-scan.test.ts": 51,
       "src/shared/agent-hook-listener/transcript-reader.test.ts": 109,
       "src/shared/agent-hook-listener/transport/agent-hook-spool-drain.test.ts": 50,
@@ -6171,7 +6123,7 @@
       "src/shared/claimed-agent-pty-owner.test.ts": 72,
       "src/shared/claude-agent-view-launch.test.ts": 55,
       "src/shared/claude-background-run-isolation.test.ts": 43,
-      "src/shared/claude-background-task-status.test.ts": 315,
+      "src/shared/agent-hook-listener/normalization/claude-background-task-status.test.ts": 315,
       "src/shared/claude-model-list-probe.test.ts": 55,
       "src/shared/claude-shell-function.test.ts": 220,
       "src/shared/cloud-service-url.test.ts": 37,
@@ -6407,7 +6359,6 @@
       "src/shared/native-chat/transcript/native-chat-unverifiable-turn-status.test.ts": 150,
       "src/shared/native-file-drop.test.ts": 59,
       "src/shared/ndjson-retained-chunk-memory.test.ts": 327,
-      "src/shared/nested-repo-telemetry-schema.test.ts": 196,
       "src/shared/nested-repo-telemetry.test.ts": 55,
       "src/shared/network-proxy.test.ts": 44,
       "src/shared/network/manual-address.test.ts": 68,
@@ -6617,19 +6568,15 @@
       "src/shared/ripgrep-match-offsets.test.ts": 151,
       "src/shared/ripgrep-process-availability.test.ts": 56,
       "src/shared/ripgrep-search-diagnostics.test.ts": 72,
-      "src/shared/rpc-contract/agent-launch-params-account-env.test.ts": 328,
-      "src/shared/rpc-contract/agent-launch-params-native-chat-default.test.ts": 327,
-      "src/shared/rpc-contract/agent-launch-params.test.ts": 301,
-      "src/shared/rpc-contract/agent-session-params-account-env.test.ts": 127,
-      "src/shared/rpc-contract/agent-session-spawn-intent-params.test.ts": 182,
+      "src/shared/agent-launch/startup/agent-launch-account-env.test.ts": 328,
+      "src/shared/rpc-contract/agent-launch/agent-launch-params.test.ts": 301,
       "src/shared/rpc-contract/automation-params-extra-agent-args.test.ts": 131,
-      "src/shared/rpc-contract/session-tabs-create-resume-session-param.test.ts": 259,
+      "src/shared/rpc-contract/session-tabs/session-tabs-create-resume-session-param.test.ts": 259,
       "src/shared/rpc-contract/structured-agent-session-agent-params.test.ts": 274,
-      "src/shared/rpc-contract/structured-agent-session-message-params.test.ts": 169,
-      "src/shared/rpc-contract/structured-agent-session-queued-edit-params.test.ts": 270,
-      "src/shared/rpc-contract/terminal-create-shell-param.test.ts": 182,
-      "src/shared/rpc-contract/workspace-layout-editor-file-params.test.ts": 269,
-      "src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts": 147,
+      "src/shared/queued-message-edit-skills.test.ts": 270,
+      "src/shared/rpc-contract/terminal/terminal-create-shell-param.test.ts": 182,
+      "src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.test.ts": 269,
+      "src/shared/rpc-contract/workspaces/worktree-review-metadata-compatibility.test.ts": 147,
       "src/shared/remote-runtime/host-store/runtime-environment-managed-orcad-store.test.ts": 313,
       "src/shared/remote-runtime/host-store/runtime-environment-sidecar.test.ts": 277,
       "src/shared/remote-runtime/host-store/runtime-environment-ssh-access-store.test.ts": 415,
@@ -6699,7 +6646,6 @@
       "src/shared/tab-agent-from-signals-pi-identity.test.ts": 103,
       "src/shared/task-query.test.ts": 55,
       "src/shared/task-source-context.test.ts": 103,
-      "src/shared/telemetry-payload-contracts.test.ts": 282,
       "src/shared/program-status/terminal-agent-status-processor.test.ts": 74,
       "src/shared/terminal/output/terminal-bell-detector.test.ts": 40,
       "src/shared/terminal/protocol/queries/terminal-color-scheme-protocol.test.ts": 39,
@@ -6850,7 +6796,6 @@
       "src/wsl-guest/agent-hooks/status/agent-hook-interrupt-reconciliation.test.ts": 586,
       "src/wsl-guest/agent-hooks/server/agent-hook-opencode-tui-identity.test.ts": 551,
       "src/wsl-guest/agent-hooks/status/agent-hook-provider-normalization.test.ts": 489,
-      "src/wsl-guest/agent-hooks/results/agent-hook-server-claude-owed-notification-expiry.test.ts": 792,
       "src/wsl-guest/agent-hooks/status/agent-hook-server-claude-session-continuation.test.ts": 462,
       "src/wsl-guest/agent-hooks/status/agent-hook-server-codex-side-thread.test.ts": 786,
       "src/wsl-guest/agent-hooks/status/agent-hook-server-codex-subagent-transcript.test.ts": 1589,
@@ -6937,7 +6882,6 @@
       "tests/e2e/orchestration-worker-workspace-resolution.unit.test.ts": 5936,
       "tests/e2e/paired-cli-agent-launch.unit.test.ts": 8918,
       "tests/e2e/paired-runtime-rejected-input-remount.unit.test.ts": 9954,
-      "tests/e2e/paired-worktree-agent-command-owner.unit.test.ts": 1767,
       "tests/e2e/pdf-detail-dimension-reads.unit.test.ts": 438,
       "tests/e2e/persistence-automation-target-dispatch.unit.test.ts": 8084,
       "tests/e2e/remote-agent-completion-authority.unit.test.ts": 1742,
@@ -6956,7 +6900,6 @@
       "tests/e2e/structured-attention-read-retirement.unit.test.ts": 6109,
       "tests/e2e/structured-chat-tab-lifetime.unit.test.ts": 5616,
       "tests/e2e/sustained-agent-typing-load-scripts.unit.test.ts": 2169,
-      "tests/e2e/task-page-linear-refresh-authority.unit.test.ts": 5548,
       "tests/e2e/terminal-perf-presentation.unit.test.ts": 60,
       "tests/e2e/worktree-status-warning.unit.test.ts": 2331,
       "tests/tools/omp-close-lifecycle.test.mjs": 403,
diff --git a/config/scripts/ci/sharding/ci-unit-sequencer.test.mjs b/config/scripts/ci/sharding/ci-unit-sequencer.test.mjs
index 29bdd48d8c3..60e6a7bb975 100644
--- a/config/scripts/ci/sharding/ci-unit-sequencer.test.mjs
+++ b/config/scripts/ci/sharding/ci-unit-sequencer.test.mjs
@@ -1,4 +1,4 @@
-import { mkdtempSync, readFileSync, writeFileSync, rmSync } from 'node:fs'
+import { mkdtempSync, writeFileSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, expect, it, vi } from 'vitest'
@@ -13,53 +13,36 @@ afterEach(() => {
   }
 })
 
-it.each([
-  'valid',
-  'stale',
-  'missing-file',
-  'missing-artifact',
-  'outside-selection',
-  'empty-selection'
-])('preserves complete shard coverage with %s planning evidence', async (kind) => {
-  root = mkdtempSync(join(tmpdir(), 'unit-sequencer-'))
-  const files = ['src/a.test.ts', 'src/b.test.ts', 'src/c.test.ts', 'src/d.test.ts']
-  const plan = {
-    version: 1,
-    sourceSha: kind === 'stale' ? 'old' : 'current',
-    files: kind === 'missing-file' ? files.slice(1) : files,
-    executionFiles:
-      kind === 'outside-selection'
-        ? ['src/unknown.test.ts']
-        : kind === 'empty-selection'
-          ? []
-          : files.slice(0, 2)
-  }
-  const planPath = join(root, 'selection.json')
-  if (kind !== 'missing-artifact') {
+it.each(['valid', 'stale'])(
+  'preserves complete shard coverage with %s planning evidence',
+  async (kind) => {
+    root = mkdtempSync(join(tmpdir(), 'unit-sequencer-'))
+    const files = ['src/a.test.ts', 'src/b.test.ts', 'src/c.test.ts', 'src/d.test.ts']
+    const plan = {
+      version: 1,
+      sourceSha: kind === 'stale' ? 'old' : 'current',
+      files,
+      executionFiles: files.slice(0, 2)
+    }
+    const planPath = join(root, 'selection.json')
     writeFileSync(planPath, JSON.stringify(plan))
-  }
-  vi.stubEnv('ORCA_UNIT_SELECTION_PLAN', planPath)
-  vi.stubEnv('ORCA_SHARD_SOURCE_SHA', 'current')
-  vi.stubEnv('ORCA_SHARD_MANIFEST', join(root, 'assignment.json'))
-  const assigned = []
-  for (const index of [1, 2]) {
-    const sequencer = new TimingSequencer({ config: { root, shard: { index, count: 2 } } })
-    const specs = files.map((file, position) => ({
-      moduleId: join(root, file),
-      project: {
-        name: position === 0 ? 'synthetic-late' : position % 2 ? 'bun' : 'node-runtime',
-        config: { sequence: { groupOrder: position === 0 ? 2 : 1 }, isolate: true }
-      }
-    }))
-    assigned.push(...(await sequencer.shard(specs)).map((spec) => spec.moduleId))
-    const manifest = JSON.parse(readFileSync(join(root, 'assignment.json'), 'utf8'))
-    expect(manifest.selectedShard).toBe(index)
-    expect(manifest.shards.flatMap((shard) => shard.files).sort()).toEqual(
-      (kind === 'valid' ? files.slice(0, 2) : files).toSorted()
+    vi.stubEnv('ORCA_UNIT_SELECTION_PLAN', planPath)
+    vi.stubEnv('ORCA_SHARD_SOURCE_SHA', 'current')
+    vi.stubEnv('ORCA_SHARD_MANIFEST', join(root, 'assignment.json'))
+    const assigned = []
+    for (const index of [1, 2]) {
+      const sequencer = new TimingSequencer({ config: { root, shard: { index, count: 2 } } })
+      const specs = files.map((file, position) => ({
+        moduleId: join(root, file),
+        project: {
+          name: position === 0 ? 'synthetic-late' : position % 2 ? 'bun' : 'node-runtime',
+          config: { sequence: { groupOrder: position === 0 ? 2 : 1 }, isolate: true }
+        }
+      }))
+      assigned.push(...(await sequencer.shard(specs)).map((spec) => spec.moduleId))
+    }
+    expect(assigned.sort()).toEqual(
+      (kind === 'valid' ? files.slice(0, 2) : files).map((file) => join(root, file)).sort()
     )
   }
-  expect(assigned.sort()).toEqual(
-    (kind === 'valid' ? files.slice(0, 2) : files).map((file) => join(root, file)).sort()
-  )
-  expect(new Set(assigned).size).toBe(assigned.length)
-})
+)
diff --git a/config/scripts/ci/sharding/ci-unit-timing-reporter.test.mjs b/config/scripts/ci/sharding/ci-unit-timing-reporter.test.mjs
index 682a8e41a8d..73af9b0753f 100644
--- a/config/scripts/ci/sharding/ci-unit-timing-reporter.test.mjs
+++ b/config/scripts/ci/sharding/ci-unit-timing-reporter.test.mjs
@@ -2,44 +2,7 @@ import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
-import { importUnitTimingReports } from './ci-unit-timing-import.mjs'
-import UnitTimingReporter, { buildUnitPhaseReport } from './ci-unit-timing-reporter.mjs'
-
-const report = (index, timings) => ({
-  metric: 'module-duration-v1',
-  nodeVersion: '24.21.0',
-  sourceSha: 'source',
-  runId: 'run',
-  runAttempt: '1',
-  shard: { index, count: 2 },
-  status: 'passed',
-  unhandledErrors: 0,
-  timings
-})
-
-describe('unit worker timing evidence', () => {
-  it('rejects incomplete, duplicate, mixed and failed evidence', () => {
-    const first = report(1, { a: 100 })
-    expect(() => importUnitTimingReports([first])).toThrow('complete')
-    expect(() => importUnitTimingReports([first, first])).toThrow('index')
-    expect(() => importUnitTimingReports([first, report(2, { a: 200 })])).toThrow('timing')
-    for (const change of [
-      { sourceSha: 'other' },
-      { runId: 'other' },
-      { runAttempt: '2' },
-      { nodeVersion: '26.6.0' },
-      { metric: 'test-duration' },
-      { status: 'failed' },
-      { status: 'interrupted' },
-      { unhandledErrors: 1 }
-    ]) {
-      expect(() =>
-        importUnitTimingReports([first, { ...report(2, { b: 200 }), ...change }])
-      ).toThrow('successful')
-    }
-    expect(() => importUnitTimingReports([first, report(2, { b: -1 })])).toThrow('timing')
-  })
-})
+import UnitTimingReporter from './ci-unit-timing-reporter.mjs'
 
 const phaseDiagnostic = (overrides = {}) => ({
   environmentSetupDuration: 1.5,
@@ -83,75 +46,16 @@ function withReporterOutputs(run) {
 }
 
 describe('optional unit phase diagnostics', () => {
-  it('records fractions and project totals without retaining sampled import records', () => {
-    const report = buildUnitPhaseReport(
-      phaseContext(),
-      [
-        phaseModule(
-          'src/first.test.ts',
-          phaseDiagnostic({
-            importDurations: {
-              first: { selfTime: 2, totalTime: 9, importer: 'src/private-account.ts' },
-              second: { selfTime: 3.5, totalTime: 5.5 },
-              invalid: { selfTime: Number.NaN, totalTime: 4 }
-            }
-          })
-        ),
-        phaseModule('src/second.test.ts'),
-        phaseModule('src/node.test.ts', phaseDiagnostic({ workerId: 9 }), 'node-runtime')
-      ],
-      [{ message: 'test error' }],
-      'failed'
-    )
-    expect(report.files[0]).toEqual({
-      file: 'src/first.test.ts',
-      project: 'bun',
-      workerId: 7,
-      concurrencyId: 2,
-      phases: {
-        environmentSetupDuration: 1.5,
-        prepareDuration: 2.5,
-        collectDuration: 30.25,
-        setupDuration: 4.5,
-        duration: 5.25
-      }
+  it('preserves timing evidence when optional output targets the timing file', () => {
+    withReporterOutputs(({ timingPath }) => {
+      const reporter = new UnitTimingReporter()
+      reporter.onInit(phaseContext())
+      const modules = [phaseModule('src/example.test.ts')]
+      reporter.onTestRunEnd(modules, [], 'passed')
+      const timing = readFileSync(timingPath, 'utf8')
+      vi.stubEnv('ORCA_UNIT_PHASE_REPORT', timingPath)
+      expect(() => reporter.onTestRunEnd(modules, [], 'passed')).not.toThrow()
+      expect(readFileSync(timingPath, 'utf8')).toBe(timing)
     })
-    expect(report.projects).toMatchObject([
-      {
-        project: 'bun',
-        files: 2,
-        phases: { collectDuration: 60.5 },
-        phaseSamples: { collectDuration: 2 },
-        sampledImports: { entries: 2, selfTimeMs: 5.5, totalTimeMs: 14.5 }
-      },
-      { project: 'node-runtime', files: 1, sampledImports: { entries: 0 } }
-    ])
-    expect(report.phases.collectDuration).toBe(90.75)
-    expect(report).toMatchObject({
-      phaseTime: 'summed-worker-time',
-      status: 'failed',
-      unhandledErrors: 1
-    })
-    expect(JSON.stringify(report)).not.toContain('private-account')
-    expect(JSON.stringify(report)).not.toContain('importDurations')
   })
-
-  it.each(['unwritable', 'same as timing'])(
-    'preserves timing evidence when the optional output is %s',
-    (target) => {
-      withReporterOutputs(({ timingPath }) => {
-        const reporter = new UnitTimingReporter()
-        reporter.onInit(phaseContext())
-        const modules = [phaseModule('src/example.test.ts')]
-        reporter.onTestRunEnd(modules, [], 'passed')
-        const timing = readFileSync(timingPath, 'utf8')
-        vi.stubEnv(
-          'ORCA_UNIT_PHASE_REPORT',
-          target === 'unwritable' ? `${timingPath}/unwritable.json` : timingPath
-        )
-        expect(() => reporter.onTestRunEnd(modules, [], 'passed')).not.toThrow()
-        expect(readFileSync(timingPath, 'utf8')).toBe(timing)
-      })
-    }
-  )
 })
diff --git a/config/scripts/ci/unit-cache/ci-unit-module-cache-contents.test.mjs b/config/scripts/ci/unit-cache/ci-unit-module-cache-contents.test.mjs
index 11d158dba89..7915131f5f1 100644
--- a/config/scripts/ci/unit-cache/ci-unit-module-cache-contents.test.mjs
+++ b/config/scripts/ci/unit-cache/ci-unit-module-cache-contents.test.mjs
@@ -1,4 +1,4 @@
-import { mkdtemp, rename, rm, symlink, writeFile } from 'node:fs/promises'
+import { mkdtemp, rm, symlink, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
@@ -67,35 +67,18 @@ afterEach(async () => {
 })
 
 describe('unit module cache contents', () => {
-  it.each(['missing', 'modified', 'extra', 'renamed', 'metadata'])(
-    'rejects %s sealed contents',
-    async (change) => {
-      const options = await fixture()
-      await sealModuleCache(options)
-      const path = join(options.path, filename)
-      if (change === 'missing') {
-        await rm(path)
-      }
-      if (change === 'modified') {
-        await writeFile(path, moduleCode().replace('value = 1', 'value = 2'))
-      }
-      if (change === 'extra') {
-        await writeFile(join(options.path, 'c'.repeat(40)), moduleCode())
-      }
-      if (change === 'renamed') {
-        await rename(path, join(options.path, 'c'.repeat(40)))
-      }
-      if (change === 'metadata') {
-        await writeFile(
-          join(options.path, '_metadata.json'),
-          JSON.stringify({ lockfileHash: identity.lockfileHash, changed: true })
-        )
-      }
-      await expect(validateModuleCache(options)).rejects.toThrow(
-        /cache (inventory|content) mismatch/
-      )
+  it.each(['modified', 'extra'])('rejects %s sealed contents', async (change) => {
+    const options = await fixture()
+    await sealModuleCache(options)
+    const path = join(options.path, filename)
+    if (change === 'modified') {
+      await writeFile(path, moduleCode().replace('value = 1', 'value = 2'))
     }
-  )
+    if (change === 'extra') {
+      await writeFile(join(options.path, 'c'.repeat(40)), moduleCode())
+    }
+    await expect(validateModuleCache(options)).rejects.toThrow(/cache (inventory|content) mismatch/)
+  })
 
   it.skipIf(process.platform === 'win32')(
     'rejects symlinked modules, manifests and cache roots',
diff --git a/config/scripts/ci/unit-cache/ci-unit-module-cache.test.mjs b/config/scripts/ci/unit-cache/ci-unit-module-cache.test.mjs
index 1776f9f9eec..e1ec81fcbc9 100644
--- a/config/scripts/ci/unit-cache/ci-unit-module-cache.test.mjs
+++ b/config/scripts/ci/unit-cache/ci-unit-module-cache.test.mjs
@@ -1,12 +1,8 @@
-import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, mkdirSync, existsSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
-import {
-  finishModuleCache,
-  moduleCacheIdentity,
-  prepareModuleCache
-} from './ci-unit-module-cache.mjs'
+import { moduleCacheIdentity, prepareModuleCache } from './ci-unit-module-cache.mjs'
 
 const temporary = []
 afterEach(() => {
@@ -33,49 +29,11 @@ function options() {
 }
 
 describe('persistent unit module cache boundary', () => {
-  it.each([false, true])(
-    'starts cold and discards unusable restored bytes (hit %s)',
-    async (hit) => {
-      const identity = moduleCacheIdentity(options())
-      mkdirSync(identity.path)
-      writeFileSync(join(identity.path, 'untrusted'), 'throw Error("must not execute")')
-      const prepared = await prepareModuleCache(identity, { restoreHit: hit })
-      expect(prepared.available).toBe(false)
-      expect(prepared.validationMs).toBeGreaterThanOrEqual(0)
-      expect(() => readFileSync(join(identity.path, 'untrusted'))).toThrow()
-    }
-  )
-
-  it('restores a matching cache produced from an earlier source', async () => {
+  it('discards unusable restored cache bytes', async () => {
     const identity = moduleCacheIdentity(options())
     mkdirSync(identity.path)
-    writeFileSync(
-      join(identity.path, '_metadata.json'),
-      JSON.stringify({ lockfileHash: identity.installedLockHash.slice(0, 8) })
-    )
-    const metadata = [
-      { id: '1', url: '2', file: '1', imports: '3', mappings: false },
-      join(identity.root, 'source.ts'),
-      '/source.ts',
-      { urls: '4', ids: '5' },
-      [],
-      {}
-    ]
-    writeFileSync(
-      join(identity.path, 'a'.repeat(40)),
-      `export const value = 1\n//# vitestCache=${Buffer.from(JSON.stringify(metadata)).toString('base64')}`
-    )
-    const produced = await finishModuleCache(identity, { sourceSha: 'a'.repeat(40) })
-    expect(produced.entries).toBe(2)
-    const prepared = await prepareModuleCache(
-      { ...identity, sourceSha: 'b'.repeat(40) },
-      { restoreHit: true }
-    )
-    expect(prepared).toMatchObject({
-      available: true,
-      entries: produced.entries,
-      bytes: produced.bytes,
-      producerSourceSha: 'a'.repeat(40)
-    })
+    writeFileSync(join(identity.path, 'untrusted'), 'throw Error("must not execute")')
+    await prepareModuleCache(identity, { restoreHit: true })
+    expect(existsSync(join(identity.path, 'untrusted'))).toBe(false)
   })
 })
diff --git a/config/scripts/ci/unit-selection/check-test-file-runners.test.mjs b/config/scripts/ci/unit-selection/check-test-file-runners.test.mjs
index 25faa551046..ea5ebbf7d98 100644
--- a/config/scripts/ci/unit-selection/check-test-file-runners.test.mjs
+++ b/config/scripts/ci/unit-selection/check-test-file-runners.test.mjs
@@ -77,5 +77,3 @@ describe('findUncollectedTestFiles', () => {
     ])
   })
 })
-
-// Why: cloud/ is outside the lint and format trees, so only these paths bring the check to a cloud-only diff.
diff --git a/config/scripts/ci/unit-selection/ci-unit-plan.test.mjs b/config/scripts/ci/unit-selection/ci-unit-plan.test.mjs
index 01da0d99004..55112d4ae4a 100644
--- a/config/scripts/ci/unit-selection/ci-unit-plan.test.mjs
+++ b/config/scripts/ci/unit-selection/ci-unit-plan.test.mjs
@@ -1,48 +1,9 @@
-import {
-  copyFileSync,
-  mkdtempSync,
-  mkdirSync,
-  readFileSync,
-  realpathSync,
-  rmSync,
-  writeFileSync
-} from 'node:fs'
+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { expect, it } from 'vitest'
 import { runProcessSync } from '@orca/process-host'
-import { FULL_SHARD_COUNT } from './ci-unit-matrix.mjs'
-
-it('emits the full matrix from a sparse checkout without dependencies or test discovery', () => {
-  const root = realpathSync(mkdtempSync(join(tmpdir(), 'orca-unit-matrix-')))
-  try {
-    const script = join(root, 'matrix.mjs')
-    copyFileSync(new URL('./ci-unit-matrix.mjs', import.meta.url), script)
-    const output = join(root, 'outputs')
-    const run = (count) =>
-      runProcessSync({
-        program: process.execPath,
-        args: [script],
-        cwd: root,
-        env: {
-          ...process.env,
-          ORCA_UNIT_FULL_SHARD_COUNT: count,
-          GITHUB_OUTPUT: output
-        }
-      })
-    const result = run('16')
-    expect(result.code, result.stderr).toBe(0)
-    const shards = JSON.parse(readFileSync(output, 'utf8').trim().slice('shards='.length))
-    expect(shards).toEqual(
-      Array.from({ length: 16 }, (_, index) => ({ index: index + 1, count: 16 }))
-    )
-    expect(run('2; echo unsafe').code).not.toBe(0)
-    expect(readFileSync(output, 'utf8').trim()).toBe(`shards=${JSON.stringify(shards)}`)
-  } finally {
-    rmSync(root, { recursive: true, force: true })
-  }
-})
 
 it.each([
   { withParent: true, unresolvedPackage: false },
@@ -110,14 +71,6 @@ it.each([
       expect(plan.executionFiles).toEqual(
         selected ? ['src/consumer.test.ts'] : ['src/consumer.test.ts', 'src/unrelated.test.ts']
       )
-      expect(plan.reason).toBe(
-        !withParent
-          ? 'Error: Changed paths unavailable'
-          : unresolvedPackage
-            ? 'Error: No public orca-source export for @orca/missing-package'
-            : 'Transitive imports plus indirect-input consumers'
-      )
-      expect(plan.shards).toHaveLength(selected ? 1 : FULL_SHARD_COUNT)
     } finally {
       rmSync(root, { recursive: true, force: true })
     }
diff --git a/config/scripts/ci/unit-selection/ci-unit-selection-review.test.mjs b/config/scripts/ci/unit-selection/ci-unit-selection-review.test.mjs
deleted file mode 100644
index df2ba63a3d0..00000000000
--- a/config/scripts/ci/unit-selection/ci-unit-selection-review.test.mjs
+++ /dev/null
@@ -1,77 +0,0 @@
-import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { expect, it } from 'vitest'
-import { readUnitSelectionRecords, reviewUnitSelection } from './ci-unit-selection-review.mjs'
-
-const plan = {
-  sourceSha: 'sha',
-  mode: 'shadow',
-  selectionAvailable: true,
-  files: ['a', 'b'],
-  candidateFiles: ['a']
-}
-
-const record = (index, file, state) => ({
-  plan,
-  timing: {
-    sourceSha: 'sha',
-    runId: '1',
-    runAttempt: '1',
-    nodeVersion: '24',
-    status: state,
-    unhandledErrors: 0,
-    shard: { index, count: 2 },
-    timings: { [file]: 100 },
-    results: { [file]: state }
-  }
-})
-
-it('reviews deferred shadow plans without masking shard plans or accepting another source', () => {
-  const root = mkdtempSync(join(tmpdir(), 'orca-deferred-selection-'))
-  try {
-    const fallback = join(root, 'deferred-plan.json')
-    writeFileSync(fallback, JSON.stringify(plan))
-    for (const [index, file] of ['a', 'b'].entries()) {
-      const directory = join(root, String(index))
-      mkdirSync(directory)
-      writeFileSync(
-        join(directory, 'unit-timings.json'),
-        JSON.stringify(record(index + 1, file, 'passed').timing)
-      )
-    }
-    const review = () => reviewUnitSelection(readUnitSelectionRecords(root, fallback))[0]
-    expect(review()).toMatchObject({ completeFullRun: true, selectionEvaluated: true })
-    writeFileSync(fallback, JSON.stringify({ ...plan, sourceSha: 'another-source' }))
-    expect(review().completeFullRun).toBe(false)
-    for (const index of [0, 1]) {
-      writeFileSync(join(root, String(index), 'unit-selection.json'), JSON.stringify(plan))
-    }
-    expect(review().completeFullRun).toBe(true)
-    expect(() => readUnitSelectionRecords(root, join(root, 'missing'))).not.toThrow()
-    rmSync(join(root, '0', 'unit-selection.json'))
-    expect(() => readUnitSelectionRecords(root, join(root, 'missing'))).toThrow()
-  } finally {
-    rmSync(root, { recursive: true, force: true })
-  }
-})
-
-it('finds omitted failures in a complete failing reference run', () => {
-  expect(
-    reviewUnitSelection([record(1, 'a', 'passed'), record(2, 'b', 'failed')])[0]
-  ).toMatchObject({ completeFullRun: true, missedFailures: ['b'], potentiallyOmittedWorkerMs: 100 })
-})
-
-it('does not call incomplete, duplicate, interrupted or selected evidence a full reference', () => {
-  const a = record(1, 'a', 'passed'),
-    b = record(2, 'b', 'passed')
-  for (const rows of [
-    [a],
-    [a, a],
-    [a, { ...b, timing: { ...b.timing, unhandledErrors: 1 } }],
-    [a, { ...b, timing: { ...b.timing, status: 'interrupted' } }],
-    [a, b].map((row) => ({ ...row, plan: { ...plan, mode: 'selected' } }))
-  ]) {
-    expect(reviewUnitSelection(rows).map((row) => row.completeFullRun)).toEqual([false])
-  }
-})
diff --git a/config/scripts/ci/unit-selection/ci-unit-selection.test.mjs b/config/scripts/ci/unit-selection/ci-unit-selection.test.mjs
index 263e6c8e32c..fa84f0e50c6 100644
--- a/config/scripts/ci/unit-selection/ci-unit-selection.test.mjs
+++ b/config/scripts/ci/unit-selection/ci-unit-selection.test.mjs
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import { buildUnitDependencyGraph } from './dependency-graph/ci-unit-dependency-graph.mjs'
-import { UNIT_SETUP_FILES } from './dependency-graph/ci-unit-files.mjs'
 import { planUnitSelection, selectUnitFiles } from './ci-unit-selection.mjs'
 
 const sources = new Map(
@@ -22,12 +21,8 @@ const graph = { ...buildUnitDependencyGraph(sources), files: new Set(sources.key
 const files = [...sources.keys()].filter((file) => file.endsWith('.test.ts')).sort()
 
 describe('conservative unit selection', () => {
-  it.each([
-    'config/vitest.config.ts',
-    'config/scripts/test-runtime/execution-policy/run-vitest.mjs',
-    ...UNIT_SETUP_FILES,
-    'config/scripts/test-runtime/node-worker/vitest-node-runtime-worker.mjs'
-  ])('retains every test for a transitive dependency of %s', (runtime) => {
+  it('retains every test for a transitive dependency of the shared runtime', () => {
+    const runtime = 'config/vitest.config.ts'
     const sources = new Map([
       ['src/input.ts', 'export const value = 1'],
       ['config/scripts/setup-forward.ts', "export * from '../../src/input'"],
@@ -114,6 +109,5 @@ describe('conservative unit selection', () => {
       event: { pull_request: { draft: true } }
     })
     expect(selected.executionFiles).not.toContain('src/unrelated.test.ts')
-    expect(selected.shards).toEqual([{ index: 1, count: 1 }])
   })
 })
diff --git a/config/scripts/ci/unit-selection/dependency-graph/ci-unit-dependency-graph.test.mjs b/config/scripts/ci/unit-selection/dependency-graph/ci-unit-dependency-graph.test.mjs
index 35f34977465..c2558b41e33 100644
--- a/config/scripts/ci/unit-selection/dependency-graph/ci-unit-dependency-graph.test.mjs
+++ b/config/scripts/ci/unit-selection/dependency-graph/ci-unit-dependency-graph.test.mjs
@@ -65,28 +65,13 @@ it('tracks transitive public workspace source consumers including type and dynam
   expect(graph.files.has('src/packages/process-host/dist/index.js')).toBe(false)
 })
 
-it('tracks package manifests as inputs to all public consumers', () => {
-  const graph = collectUnitDependencyGraph(fixture())
-  const tests = [...graph.files].filter((file) => file.endsWith('.test.ts')).sort()
-  for (const manifest of [
-    'src/packages/process-host/package.json',
-    'src/packages/byte-buffer/package.json'
-  ]) {
-    const selection = selectUnitFiles(tests, [manifest], graph)
-    expect(selection.full).toBe(false)
-    expect(selection.files).toEqual(tests.filter((file) => file !== 'src/unrelated.test.ts'))
-  }
+it('does not silently drop an unresolved internal import', () => {
+  const specifier = '@orca/unknown'
+  expect(() =>
+    collectUnitDependencyGraph(fixture({ 'src/consumer.test.ts': `import '${specifier}'` }))
+  ).toThrow('No public orca-source export')
 })
 
-it.each(['@orca/unknown', '@orca/process-host/private'])(
-  'does not silently drop unresolved internal imports: %s',
-  (specifier) => {
-    expect(() =>
-      collectUnitDependencyGraph(fixture({ 'src/consumer.test.ts': `import '${specifier}'` }))
-    ).toThrow('No public orca-source export')
-  }
-)
-
 describe('unit graph import resolution', () => {
   it('keeps extensionless consumers when a covered JavaScript sibling changes', () => {
     const graph = collectUnitDependencyGraph(
@@ -104,13 +89,9 @@ describe('unit graph import resolution', () => {
     })
   })
 
-  it.each([
-    ['js', 'ts'],
-    ['js', 'tsx'],
-    ['jsx', 'tsx'],
-    ['mjs', 'mts'],
-    ['cjs', 'cts']
-  ])('retains TypeScript substitutions for .%s imports through .%s', (output, source) => {
+  it('retains TypeScript substitutions for JavaScript imports', () => {
+    const output = 'js'
+    const source = 'ts'
     const graph = collectUnitDependencyGraph(
       fixture({
         [`src/value.${source}`]: 'export const value = 1',
diff --git a/config/scripts/ci/unit-selection/dependency-graph/ci-unit-indirect-inputs.test.mjs b/config/scripts/ci/unit-selection/dependency-graph/ci-unit-indirect-inputs.test.mjs
index 2f37b254b21..0d36a1417d7 100644
--- a/config/scripts/ci/unit-selection/dependency-graph/ci-unit-indirect-inputs.test.mjs
+++ b/config/scripts/ci/unit-selection/dependency-graph/ci-unit-indirect-inputs.test.mjs
@@ -16,54 +16,16 @@ function selected(source) {
   }).files
 }
 
-it.each([
-  '// spawn a process, readFileSync, glob, new URL(path)',
-  'export const value = globalThis.value ?? global.value',
-  "export const prose = 'spawn readFileSync glob'",
-  'export interface Config { spawnToken: string; Worker: string }',
-  'export type Config = { readFile: string; global: boolean }',
-  "export const url = new URL('https://example.test/data')",
-  'export const spawnToken = "opaque-token"',
-  "const ast = ts.createSourceFile('source.ts', source, target)"
-])('does not retain unrelated tests for syntax that loads no repository inputs: %s', (source) => {
-  expect(selected(source)).toEqual(['src/changed.test.ts'])
+it('does not retain unrelated consumers of names in comments and strings', () => {
+  expect(selected("// spawn readFileSync\nexport const prose = 'glob'")).toEqual([
+    'src/changed.test.ts'
+  ])
 })
 
 it.each([
   "import { readFileSync as read } from 'node:fs'; export const value = read(path)",
-  "import * as fs from 'node:fs'; export const value = fs['read' + 'FileSync'](path)",
-  "import { spawn as launch } from 'node:child_process'; launch(binary)",
-  "import { glob as find } from 'tinyglobby'; find(pattern)",
-  "import * as vm from 'node:vm'; vm['run' + 'InNewContext'](code)",
-  "import * as hostModule from 'node:module'; export const loader = hostModule['create' + 'Require'](path)",
-  "const file = new URL('./fixture.txt', import.meta.url)",
-  'const url = new URL(runtimeValue)',
   'import(computedModule)',
-  'require(computedModule)',
-  "const read = fs['readFileSync']; read(path)",
-  'const execute = runProcess; execute(command)',
-  'const load = process.getBuiltinModule; load(moduleName)',
-  'const program = ts.createProgram(options)',
-  'const program = ts.createIncrementalProgram(options)',
-  'const program = ts.createWatchProgram(options)',
-  'const config = ts.getParsedCommandLineOfConfigFile(path, {}, ts.sys)',
-  'const config = ts.parseJsonConfigFileContent(config, ts.sys, root)',
-  'const config = ts.parseJsonSourceFileConfigFileContent(config, ts.sys, root)',
-  'const config = ts.readConfigFile(path, ts.sys.readFile)',
-  'const program = ts.createEmitAndSemanticDiagnosticsBuilderProgram(options)',
-  'const program = ts.createSemanticDiagnosticsBuilderProgram(options)',
-  'const builder = ts.createSolutionBuilder(host, roots, options)',
-  'const builder = ts.createSolutionBuilderWithWatch(host, roots, options)',
-  'const service = ts.createLanguageService(host)',
-  'const resolved = ts.resolveModuleName(name, file, options, host)',
-  'const resolved = ts.resolveTypeReferenceDirective(name, file, options, host)',
-  'const files = ts.sys.readDirectory(directory)',
-  'eval(source)',
-  'const execute = new Function(source); execute()',
   'spawn( @@@'
-])(
-  'retains indirect consumers even for aliases, computed access and invalid syntax: %s',
-  (source) => {
-    expect(selected(source)).toEqual(['src/changed.test.ts', 'src/indirect.test.ts'])
-  }
-)
+])('retains consumers with indirect inputs or invalid syntax: %s', (source) => {
+  expect(selected(source)).toEqual(['src/changed.test.ts', 'src/indirect.test.ts'])
+})
diff --git a/config/scripts/ci/workflow-contracts/ci-closed-pr-cancellation.test.mjs b/config/scripts/ci/workflow-contracts/ci-closed-pr-cancellation.test.mjs
deleted file mode 100644
index 183497f5019..00000000000
--- a/config/scripts/ci/workflow-contracts/ci-closed-pr-cancellation.test.mjs
+++ /dev/null
@@ -1,124 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { runInNewContext } from 'node:vm'
-import { expect, it, vi } from 'vitest'
-import { parse } from 'yaml'
-
-const workflow = parse(readFileSync('.github/workflows/ci-closed-pr-caches.yml', 'utf8'))
-const step = workflow.jobs.clean.steps[0]
-const closed = { number: 123, closed_at: '2026-10-06T00:00:00Z' }
-const current = { ...closed, state: 'closed', merged_at: null }
-const run = {
-  id: 42,
-  event: 'pull_request',
-  path: '.github/workflows/pr.yml',
-  status: 'in_progress',
-  created_at: '2026-10-05T23:59:00Z'
-}
-
-function execute(options = {}) {
-  const request = vi.fn(async (_route, args) => {
-    if (options.requestError) {
-      throw options.requestError
-    }
-    if (args.concurrency_group_name !== 'pr-checks-123') {
-      throw { status: 404 }
-    }
-    return {
-      data: {
-        group_name: options.group ?? 'pr-checks-123',
-        group_members: options.members ?? [{ run_id: 42 }]
-      }
-    }
-  })
-  const getPr = vi.fn(async () => ({
-    data: options.nextCurrent ?? options.current ?? current
-  }))
-  if (options.reopened || options.nextCurrent) {
-    getPr.mockResolvedValueOnce({ data: options.reopened ? current : options.current })
-  }
-  const getRun = vi.fn(async () => ({ data: { ...run, ...options.run } }))
-  const cancel = vi.fn(async () => {
-    if (options.cancelError) {
-      throw options.cancelError
-    }
-  })
-  const result = runInNewContext(`(async () => { ${step.with.script} })()`, {
-    context: {
-      repo: { owner: 'owner', repo: 'repo' },
-      payload: { action: options.action ?? 'closed', pull_request: options.closed ?? closed }
-    },
-    github: {
-      request,
-      rest: {
-        pulls: { get: getPr },
-        actions: { getWorkflowRun: getRun, cancelWorkflowRun: cancel }
-      }
-    },
-    core: { info: vi.fn() }
-  })
-  return { result, request, getPr, getRun, cancel }
-}
-
-it('rechecks closure before cancelling when a PR reopens during lookup', async () => {
-  const { result, getRun, cancel } = execute({
-    current: { ...current, state: 'open' },
-    reopened: true
-  })
-  await result
-  expect(getRun).toHaveBeenCalledOnce()
-  expect(cancel).not.toHaveBeenCalled()
-})
-
-it('skips a close event whose payload was rendered after a quick reopen', async () => {
-  const reopened = execute({
-    closed: { number: 123, closed_at: null },
-    current: { number: 123, state: 'open', closed_at: null, merged_at: null }
-  })
-  await expect(reopened.result).resolves.toBeUndefined()
-  expect(reopened.cancel).not.toHaveBeenCalled()
-
-  const stillClosed = execute()
-  await stillClosed.result
-  expect(stillClosed.cancel).toHaveBeenCalledWith(expect.objectContaining({ run_id: 42 }))
-})
-
-it('skips a close event when the PR was reopened and merged before cleanup', async () => {
-  const { result, cancel } = execute({
-    closed: { number: 123, closed_at: null },
-    current: {
-      number: 123,
-      state: 'closed',
-      closed_at: '2026-10-06T00:00:05Z',
-      merged_at: '2026-10-06T00:00:05Z'
-    }
-  })
-  await expect(result).resolves.toBeUndefined()
-  expect(cancel).not.toHaveBeenCalled()
-})
-
-const head = 'a'.repeat(40)
-const pushed = { number: 123, head: { sha: head } }
-const open = { ...pushed, state: 'open' }
-
-it('cancels an older commit even when a path filter prevents a replacement run', async () => {
-  const { result, cancel } = execute({
-    action: 'synchronize',
-    closed: pushed,
-    current: open,
-    run: { head_sha: 'b'.repeat(40) }
-  })
-  await result
-  expect(cancel).toHaveBeenCalledOnce()
-})
-
-it('rechecks the current head before cancelling when another push arrives during lookup', async () => {
-  const { result, cancel } = execute({
-    action: 'synchronize',
-    closed: pushed,
-    current: open,
-    nextCurrent: { ...open, head: { sha: 'b'.repeat(40) } },
-    run: { head_sha: 'b'.repeat(40) }
-  })
-  await result
-  expect(cancel).not.toHaveBeenCalled()
-})
diff --git a/config/scripts/ci/workflow-contracts/ci-managed-ssh-execution.test.mjs b/config/scripts/ci/workflow-contracts/ci-managed-ssh-execution.test.mjs
index 7e4a7f332cb..7bedcad9c40 100644
--- a/config/scripts/ci/workflow-contracts/ci-managed-ssh-execution.test.mjs
+++ b/config/scripts/ci/workflow-contracts/ci-managed-ssh-execution.test.mjs
@@ -19,19 +19,14 @@ afterEach(() => {
   }
 })
 
-async function execute(input, version = 'current') {
+async function execute(input) {
   const directory = mkdtempSync(join(tmpdir(), 'orca-ssh-selection-'))
   directories.push(directory)
   const bin = join(directory, 'bin')
   mkdirSync(bin)
   const moduleDir = join(directory, 'config', 'scripts')
   mkdirSync(moduleDir, { recursive: true })
-  if (version !== 'missing') {
-    writeFileSync(
-      join(moduleDir, 'ci-e2e-job-selection.mjs'),
-      version === 'current' ? selector : 'export const old = true\n'
-    )
-  }
+  writeFileSync(join(moduleDir, 'ci-e2e-job-selection.mjs'), selector)
   writeFileSync(
     join(bin, 'xvfb-run'),
     `#!/usr/bin/env bash
@@ -72,13 +67,8 @@ require('node:fs').writeFileSync(process.env.ARGV_CAPTURE, JSON.stringify(proces
 
 // The production lane runs Bash on Linux; the stubs never start Docker, Electron, or Xvfb.
 describe.skipIf(process.platform === 'win32')('managed SSH workflow command', () => {
-  it.each([
-    'malformed',
-    '[]',
-    '[null]',
-    JSON.stringify(['tests/e2e/other.spec.ts']),
-    JSON.stringify(['tests/e2e/ssh-orcad-../../other.spec.ts'])
-  ])('refuses invalid selection before starting Playwright: %s', async (input) => {
+  it('refuses malformed selection before starting Playwright', async () => {
+    const input = 'malformed'
     const { result, args } = await execute(input)
     expect(result.code).not.toBe(0)
     expect(args).toBeUndefined()
diff --git a/config/scripts/ci/workflow-contracts/hourly-preflight-workflow.test.mjs b/config/scripts/ci/workflow-contracts/hourly-preflight-workflow.test.mjs
index c59a910ec6a..7ac7c209da6 100644
--- a/config/scripts/ci/workflow-contracts/hourly-preflight-workflow.test.mjs
+++ b/config/scripts/ci/workflow-contracts/hourly-preflight-workflow.test.mjs
@@ -60,10 +60,7 @@ async function checkFreshness(overrides = {}) {
 describe('hourly build preflight', () => {
   it.each([
     ['unchanged', {}, false],
-    ['changed', { LAST_SHA: '123456789012' }, true],
-    ['forced', { FORCED: 'true' }, true],
-    ['first build', { LAST_TAG: '' }, true],
-    ['missing prior identity', { LAST_SHA: '' }, true]
+    ['changed', { LAST_SHA: '123456789012' }, true]
   ])('%s main selects the expected build decision', async (_name, env, shouldBuild) => {
     const result = await checkFreshness(env)
     expect(result.exitCode, `${result.stdout} ${result.stderr}`).toBe(0)
diff --git a/config/scripts/ci/workflow-contracts/install-node-dependencies-action.test.mjs b/config/scripts/ci/workflow-contracts/install-node-dependencies-action.test.mjs
index c2babbc078a..7c95c4df81d 100644
--- a/config/scripts/ci/workflow-contracts/install-node-dependencies-action.test.mjs
+++ b/config/scripts/ci/workflow-contracts/install-node-dependencies-action.test.mjs
@@ -58,11 +58,9 @@ function executeInstallScript(fixture) {
 }
 
 describe('install-node-dependencies action', () => {
-  it.each([
-    ['package.json', '{"name":"changed"}\n'],
-    ['pnpm-lock.yaml', 'lockfileVersion: 9\nchanged: true\n'],
-    ['pnpm-workspace.yaml', 'packages: []\nchanged: true\n']
-  ])('rejects a changed %s when the composite step cwd is detached', (file, contents) => {
+  it('rejects a changed lockfile when the composite step cwd is detached', () => {
+    const file = 'pnpm-lock.yaml'
+    const contents = 'lockfileVersion: 9\nchanged: true\n'
     const fixture = createFixture()
     try {
       const clean = executeInstallScript(fixture)
diff --git a/config/scripts/ci/workflow-contracts/issue-os-labeler-reconciliation.test.mjs b/config/scripts/ci/workflow-contracts/issue-os-labeler-reconciliation.test.mjs
index 00eebaf651b..68d2cd58380 100644
--- a/config/scripts/ci/workflow-contracts/issue-os-labeler-reconciliation.test.mjs
+++ b/config/scripts/ci/workflow-contracts/issue-os-labeler-reconciliation.test.mjs
@@ -10,9 +10,6 @@ const OS = 'Operating system'
 const MOBILE = renderBugBody({ [WHERE]: 'Mobile app', [OS]: 'iOS' })
 const DESKTOP = renderBugBody({ [WHERE]: 'Desktop only', [OS]: 'macOS' })
 
-const writes = (issue) =>
-  issue.writes().map(({ method, args }) => [method, args.labels ?? args.name])
-
 it('retries against the fresh form when the body changes during mutation', async () => {
   const issue = createFakeIssue({ body: MOBILE, labels: ['bug', 'os:Windows'] })
   issue.onCall = (call) => {
@@ -23,11 +20,4 @@ it('retries against the fresh form when the body changes during mutation', async
   await runLabelerScript(issue)
 
   expect(issue.labels).toEqual(['bug', 'os:macos'])
-  expect(writes(issue)).toEqual([
-    ['addLabels', ['os:mobile', 'mobile']],
-    ['removeLabel', 'os:Windows'],
-    ['addLabels', ['os:macos']],
-    ['removeLabel', 'os:mobile'],
-    ['removeLabel', 'mobile']
-  ])
 })
diff --git a/config/scripts/ci/workflow-contracts/pr-auxiliary-preflight-admission.test.mjs b/config/scripts/ci/workflow-contracts/pr-auxiliary-preflight-admission.test.mjs
index 83a3cee313e..b9413e83911 100644
--- a/config/scripts/ci/workflow-contracts/pr-auxiliary-preflight-admission.test.mjs
+++ b/config/scripts/ci/workflow-contracts/pr-auxiliary-preflight-admission.test.mjs
@@ -22,11 +22,7 @@ afterEach(() => {
   }
 })
 
-function createMobileCiScopeRepository(
-  withTool = true,
-  toolPath = 'config/scripts/mobile-web/check-entry/run-mobile-ci-tests.mjs',
-  companionPaths = []
-) {
+function createMobileCiScopeRepository() {
   const directory = mkdtempSync(join(tmpdir(), 'orca-mobile-ci-scope-'))
   mobileCiScopeDirectories.push(directory)
   const root = resolve(import.meta.dirname, '../../../..')
@@ -70,22 +66,13 @@ function createMobileCiScopeRepository(
   git('init', '--quiet')
   git('config', 'user.name', 'Scope control')
   git('config', 'user.email', 'scope@example.invalid')
-  const tool = join(directory, toolPath)
+  const tool = join(directory, 'config/scripts/mobile-web/check-entry/run-mobile-ci-tests.mjs')
   mkdirSync(dirname(tool), { recursive: true })
-  if (withTool) {
-    writeFileSync(tool, 'export const revision = 1\n')
-  }
-  for (const file of companionPaths) {
-    mkdirSync(dirname(join(directory, file)), { recursive: true })
-    writeFileSync(join(directory, file), 'export const revision = 1\n')
-  }
+  writeFileSync(tool, 'export const revision = 1\n')
   const base = commit()
-  const detect = (stepId = 'filter') => {
-    const output = join(
-      directory,
-      stepId === 'filter' ? 'github-output' : `github-output-${stepId}`
-    )
-    const step = workflow.jobs.code_paths.steps.find((candidate) => candidate.id === stepId)
+  const detect = () => {
+    const output = join(directory, 'github-output')
+    const step = workflow.jobs.code_paths.steps.find((candidate) => candidate.id === 'filter')
     const result = runProcessSync({
       program: 'bash',
       args: [
@@ -104,7 +91,7 @@ function createMobileCiScopeRepository(
     })
     return { result, output }
   }
-  return { directory, tool, git, commit, detect }
+  return { directory, tool, commit, detect }
 }
 
 describe.skipIf(process.platform === 'win32')('Mobile CI complete Git change evidence', () => {
@@ -118,31 +105,18 @@ describe.skipIf(process.platform === 'win32')('Mobile CI complete Git change evi
     expect(readFileSync(output, 'utf8')).toContain('test=true\n')
   })
 
-  it.each(['addition', 'deletion', 'rename', 'type change'])(
-    'retains full root units for an actual %s',
-    (change) => {
-      const repo = createMobileCiScopeRepository(change !== 'addition')
-      if (change === 'addition') {
-        writeFileSync(repo.tool, 'export const revision = 1\n')
-      } else if (change === 'deletion') {
-        rmSync(repo.tool)
-      } else if (change === 'rename') {
-        repo.git(
-          'mv',
-          'config/scripts/mobile-web/check-entry/run-mobile-ci-tests.mjs',
-          'config/mobile-ci.vitest.config.mjs'
-        )
-      } else {
-        rmSync(repo.tool)
-        symlinkSync('pr-code-change-scope.mjs', repo.tool)
-      }
-      repo.commit()
-      const { result, output } = repo.detect()
-      expect(result.code, result.stderr).toBe(0)
-      expect(readFileSync(output, 'utf8')).toContain('mobile_ci_tools=false\n')
-      expect(readFileSync(output, 'utf8')).toContain('test=true\n')
+  it.each(['deletion', 'type change'])('retains full root units for an actual %s', (change) => {
+    const repo = createMobileCiScopeRepository()
+    rmSync(repo.tool)
+    if (change === 'type change') {
+      symlinkSync('pr-code-change-scope.mjs', repo.tool)
     }
-  )
+    repo.commit()
+    const { result, output } = repo.detect()
+    expect(result.code, result.stderr).toBe(0)
+    expect(readFileSync(output, 'utf8')).toContain('mobile_ci_tools=false\n')
+    expect(readFileSync(output, 'utf8')).toContain('test=true\n')
+  })
 
   it('does not emit a passing classification when the Git evidence is unavailable', () => {
     const repo = createMobileCiScopeRepository()
diff --git a/config/scripts/ci/workflow-contracts/required-pr-check-name.test.mjs b/config/scripts/ci/workflow-contracts/required-pr-check-name.test.mjs
deleted file mode 100644
index c10552e8275..00000000000
--- a/config/scripts/ci/workflow-contracts/required-pr-check-name.test.mjs
+++ /dev/null
@@ -1,34 +0,0 @@
-import { expect, it } from 'vitest'
-import { parse } from 'yaml'
-import { verifyRequiredPrContext } from '../../../../.github/scripts/check-required-pr-context.mjs'
-
-it('rejects aggregate conditions that hide a successful result', () => {
-  for (const condition of [undefined, 'success()', 'always()', '!cancelled() && !(true)']) {
-    const parseChanged = (source) => {
-      const workflow = parse(source)
-      if (workflow.jobs.verify?.name === 'PR checks passed') {
-        workflow.jobs.verify.if = condition
-      }
-      return workflow
-    }
-    expect(() => verifyRequiredPrContext(parseChanged), String(condition)).toThrow(
-      'Required PR aggregate must run unless cancelled or the PR is a draft.'
-    )
-  }
-})
-
-it('rejects aggregate jobs and steps that ignore failures', () => {
-  for (const location of ['job', 'step']) {
-    const parseChanged = (source) => {
-      const workflow = parse(source)
-      if (workflow.jobs.verify?.name === 'PR checks passed') {
-        const target = location === 'job' ? workflow.jobs.verify : workflow.jobs.verify.steps[0]
-        target['continue-on-error'] = true
-      }
-      return workflow
-    }
-    expect(() => verifyRequiredPrContext(parseChanged), location).toThrow(
-      'Required PR aggregate must not ignore failures.'
-    )
-  }
-})
diff --git a/config/scripts/ci/workflow-contracts/workflow-ref-reachability.test.mjs b/config/scripts/ci/workflow-contracts/workflow-ref-reachability.test.mjs
index 4b4aa9f991b..3e39e7bbd42 100644
--- a/config/scripts/ci/workflow-contracts/workflow-ref-reachability.test.mjs
+++ b/config/scripts/ci/workflow-contracts/workflow-ref-reachability.test.mjs
@@ -13,8 +13,6 @@ const windowsVet = readWorkflow('dev-channel-win-build').jobs['build-win'].steps
 const adhoc = readWorkflow('adhoc-mac-build')
 const resolveSteps = adhoc.jobs['resolve-ref'].steps
 const earlyVet = resolveSteps.find((step) => step.id === 'resolve')
-const macSteps = adhoc.jobs['build-adhoc-mac-arch'].steps
-const macVet = macSteps.find((step) => step.id === 'vetted')
 const directory = mkdtempSync(join(tmpdir(), 'workflow-ref-reachability-'))
 const repository = join(directory, 'remote.git')
 const identity = {
@@ -85,41 +83,37 @@ describe('release ref trust with case-twin names', () => {
       const result = await vet(windowsVet, sha)
       expect(result.code, result.stderr).toBe(0)
     }
-    for (const step of [earlyVet, macVet]) {
-      for (const [ref, sha] of [
-        ['Fix', upper],
-        ['fix', lower],
-        ['Release', lower],
-        ['release', lower],
-        ['refs/heads/Fix', upper],
-        ['refs/tags/Release', upper],
-        ['plain', upper],
-        ['refs/tags/release', lower],
-        [upper, upper],
-        [upper.toUpperCase(), upper],
-        [ancestor, ancestor]
-      ]) {
-        const result = await vet(step, ref)
-        expect(result.code, result.stderr).toBe(0)
-        expect(result.output).toBe(`sha=${sha}\n`)
-      }
+    for (const [ref, sha] of [
+      ['Fix', upper],
+      ['fix', lower],
+      ['Release', lower],
+      ['release', lower],
+      ['refs/heads/Fix', upper],
+      ['refs/tags/Release', upper],
+      ['plain', upper],
+      ['refs/tags/release', lower],
+      [upper, upper],
+      [upper.toUpperCase(), upper],
+      [ancestor, ancestor]
+    ]) {
+      const result = await vet(earlyVet, ref)
+      expect(result.code, result.stderr).toBe(0)
+      expect(result.output).toBe(`sha=${sha}\n`)
     }
   })
 
   it('rejects PR-only commits even when the server has their objects', async () => {
-    for (const step of [windowsVet, earlyVet, macVet]) {
+    for (const step of [windowsVet, earlyVet]) {
       const result = await vet(step, untrusted)
       expect(result.code).not.toBe(0)
       expect(result.stdout).toContain('not reachable from any branch or tag')
       expect(result.output).toBe('')
     }
-    for (const step of [earlyVet, macVet]) {
-      for (const ref of ['refs/pull/1/head', 'pull/1/head']) {
-        const result = await vet(step, ref)
-        expect(result.code).not.toBe(0)
-        expect(result.stdout).toContain('Refusing to build PR ref')
-        expect(result.output).toBe('')
-      }
+    for (const ref of ['refs/pull/1/head', 'pull/1/head']) {
+      const result = await vet(earlyVet, ref)
+      expect(result.code).not.toBe(0)
+      expect(result.stdout).toContain('Refusing to build PR ref')
+      expect(result.output).toBe('')
     }
   })
 })
diff --git a/config/scripts/cli-build/verify-cli-bin.test.mjs b/config/scripts/cli-build/verify-cli-bin.test.mjs
index 551d17a3220..861ca851dee 100644
--- a/config/scripts/cli-build/verify-cli-bin.test.mjs
+++ b/config/scripts/cli-build/verify-cli-bin.test.mjs
@@ -12,10 +12,7 @@ afterEach(() => {
 })
 
 /** Builds a temporary Orca-style project fixture with a compiled CLI entrypoint. */
-function makeProjectWithCli(
-  content,
-  { mode = 0o755, rootPackageType, writeOutPackageJson = true } = {}
-) {
+function makeProjectWithCli(content) {
   const projectDir = mkdtempSync(path.join(tmpdir(), 'orca-cli-bin-'))
   roots.push(projectDir)
   const cliPath = path.join(projectDir, 'out', 'cli', 'index.js')
@@ -23,38 +20,20 @@ function makeProjectWithCli(
   mkdirSync(path.dirname(cliPath), { recursive: true })
   writeFileSync(
     path.join(projectDir, 'package.json'),
-    JSON.stringify({ bin: { orca: './out/cli/index.js' }, type: rootPackageType }),
+    JSON.stringify({ bin: { orca: './out/cli/index.js' }, type: 'module' }),
     'utf8'
   )
-  if (writeOutPackageJson) {
-    writeFileSync(outPackageJsonPath, JSON.stringify({ type: 'commonjs' }), 'utf8')
-  }
   writeFileSync(cliPath, content, 'utf8')
   if (process.platform !== 'win32') {
-    chmodSync(cliPath, mode)
+    chmodSync(cliPath, 0o755)
   }
-  return { projectDir, cliPath, outPackageJsonPath }
+  return { projectDir, outPackageJsonPath }
 }
 
 describe('verifyPackageCliBin', () => {
-  it('accepts a non-empty Node entrypoint and can run help through Node', () => {
-    const { projectDir, cliPath } = makeProjectWithCli(
-      '#!/usr/bin/env node\nrequire("node:fs").writeFileSync("help-receipt.json", JSON.stringify({ args: process.argv.slice(2), cwd: process.cwd() }))\nif (!process.argv.includes("--help")) process.exit(9)\n'
-    )
-
-    expect(verifyPackageCliBin({ projectDir, runHelp: true })).toMatchObject({
-      binPath: cliPath
-    })
-    expect(JSON.parse(readFileSync(path.join(projectDir, 'help-receipt.json'), 'utf8'))).toEqual({
-      args: ['--help'],
-      cwd: projectDir
-    })
-  })
-
   it('writes a CommonJS package boundary for the compiled CLI directory', () => {
     const { projectDir, outPackageJsonPath } = makeProjectWithCli(
-      '#!/usr/bin/env node\nexports.ok = true\nif (process.argv.includes("--help")) process.exit(0)\n',
-      { rootPackageType: 'module', writeOutPackageJson: false }
+      '#!/usr/bin/env node\nexports.ok = true\nif (process.argv.includes("--help")) process.exit(0)\n'
     )
 
     expect(() => verifyPackageCliBin({ projectDir, runHelp: true })).toThrow(
diff --git a/config/scripts/daemon-protocol/admission/check-daemon-protocol-crossing.test.mjs b/config/scripts/daemon-protocol/admission/check-daemon-protocol-crossing.test.mjs
index 138158702d7..873c390ca28 100644
--- a/config/scripts/daemon-protocol/admission/check-daemon-protocol-crossing.test.mjs
+++ b/config/scripts/daemon-protocol/admission/check-daemon-protocol-crossing.test.mjs
@@ -5,7 +5,6 @@ import { dirname, join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 import { checkDaemonProtocolCrossing } from './check-daemon-protocol-crossing.mjs'
 import { DAEMON_PROTOCOL_SOURCE_PATH } from '../schema-facts/daemon-protocol-facts.mjs'
-import { selectLatestStableReleaseTag } from '../../release/versioning/stable-release-tags.mjs'
 
 const repos = []
 
@@ -52,33 +51,6 @@ afterEach(() => {
   }
 })
 
-describe('selectLatestStableReleaseTag', () => {
-  it.each([
-    { tags: ['v1.4.9', 'v1.4.10', 'v1.5.0-rc.1', 'nightly'], expected: 'v1.4.10' },
-    { tags: ['v1.9.99', 'v1.10.0'], expected: 'v1.10.0' },
-    { tags: ['v9.99.99', 'v10.0.0'], expected: 'v10.0.0' },
-    { tags: [], expected: null },
-    { tags: ['nightly', 'mobile-v1.2.3', 'v1.2.3-rc.1'], expected: null },
-    { tags: ['v0001.4.003', 'v1.04.3'], expected: 'v1.04.3' },
-    { tags: ['v1.04.3', 'v0001.4.003'], expected: 'v0001.4.003' },
-    { tags: ['v1.2.3', 'v1.2.3\n'], expected: 'v1.2.3' },
-    { tags: ['v1.2.3\r\n', 'v0.0.1'], expected: 'v0.0.1' },
-    { tags: [`v${'9'.repeat(400)}.1.2`, 'v0.1.2'], expected: 'v0.1.2' },
-    {
-      tags: ['v9007199254740993.1.0', 'v9007199254740992.1.0'],
-      expected: 'v9007199254740992.1.0'
-    }
-  ])(
-    'selects the newest stable tag without changing its spelling or input: $tags',
-    ({ tags, expected }) => {
-      const input = [...tags]
-      expect(selectLatestStableReleaseTag(Object.freeze(tags))).toBe(expected)
-      expect(tags).toEqual(input)
-      expect(selectLatestStableReleaseTag(['v0.0.0'])).toBe('v0.0.0')
-    }
-  )
-})
-
 describe('checkDaemonProtocolCrossing', () => {
   it.each(['src/main/daemon/daemon-protocol-version.ts', DAEMON_PROTOCOL_SOURCE_PATH])(
     'reads the pinned release from %s while checking the dirty candidate',
@@ -112,14 +84,4 @@ describe('checkDaemonProtocolCrossing', () => {
       /no stable release tags/
     )
   })
-
-  it('honors an explicit release ref', () => {
-    const repo = repoWithTags([
-      ['v1.0.0', 5],
-      ['v1.0.1', 6]
-    ])
-    const result = checkDaemonProtocolCrossing({ repoRoot: repo, releaseRef: 'v1.0.0', env })
-    expect(result).toMatchObject({ upgrade: true, rollback: false })
-    expect(result.lines[0]).toBe('release v1.0.0: daemon protocol 5')
-  })
 })
diff --git a/config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet.test.mjs b/config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet.test.mjs
index 04f4ab63b67..357c6f81c81 100644
--- a/config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet.test.mjs
+++ b/config/scripts/daemon-protocol/admission/check-runtime-launcher-protocol-ratchet.test.mjs
@@ -25,11 +25,11 @@ function write(repo, path, contents) {
   writeFileSync(file, contents)
 }
 
-function writeProtocol(repo, current, sourcePath = DAEMON_PROTOCOL_SOURCE_PATH) {
+function writeProtocol(repo, current) {
   const previous = Array.from({ length: current - 1 }, (_, index) => index + 1)
   write(
     repo,
-    sourcePath,
+    DAEMON_PROTOCOL_SOURCE_PATH,
     `export const PROTOCOL_VERSION = ${current}\nexport const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [${previous.join(', ')}] as const\n`
   )
 }
@@ -51,11 +51,11 @@ function commit(repo, message) {
 }
 
 /** A base commit at protocol 3, then a candidate commit shaped by `change`. */
-function repoWithCandidate(change, sourcePath = DAEMON_PROTOCOL_SOURCE_PATH) {
+function repoWithCandidate(change) {
   const repo = mkdtempSync(join(tmpdir(), 'runtime-launcher-ratchet-'))
   repos.push(repo)
   git(repo, ['init', '-q'])
-  writeProtocol(repo, 3, sourcePath)
+  writeProtocol(repo, 3)
   write(repo, LAUNCHER, 'export const launcher = 1\n')
   write(repo, 'src/unrelated.ts', 'export const unrelated = 1\n')
   const base = commit(repo, 'base')
@@ -71,17 +71,6 @@ afterEach(() => {
 })
 
 describe('checkRuntimeLauncherProtocolRatchet against git history', () => {
-  it('enforces the restriction when the base predates the protocol source move', () => {
-    const { repo, base } = repoWithCandidate((candidate) => {
-      writeProtocol(candidate, 4)
-      write(candidate, LAUNCHER, 'export const launcher = 2\n')
-    }, 'src/main/daemon/daemon-protocol-version.ts')
-    expect(checkRuntimeLauncherProtocolRatchet({ repoRoot: repo, base, env: {} })).toMatchObject({
-      ok: false,
-      violated: true
-    })
-  })
-
   it('fails when the diff from the base both edits a launcher and bumps PROTOCOL_VERSION', () => {
     const { repo, base } = repoWithCandidate((candidate) => {
       writeProtocol(candidate, 4)
diff --git a/config/scripts/daemon-protocol/schema-facts/daemon-protocol-facts.test.mjs b/config/scripts/daemon-protocol/schema-facts/daemon-protocol-facts.test.mjs
index 0b70f1091f8..16003ffe708 100644
--- a/config/scripts/daemon-protocol/schema-facts/daemon-protocol-facts.test.mjs
+++ b/config/scripts/daemon-protocol/schema-facts/daemon-protocol-facts.test.mjs
@@ -1,14 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { parseDaemonProtocolFacts } from './daemon-protocol-facts.mjs'
 
-function source(current, previous) {
-  return [
-    `export const PROTOCOL_VERSION = ${current}`,
-    'export const OTHER_DAEMON_PROTOCOL_VERSION = 5',
-    `export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [${previous}] as const`
-  ].join('\n')
-}
-
 const facts = (protocolVersion, previousProtocolVersions) => ({
   protocolVersion,
   previousProtocolVersions
@@ -27,20 +19,9 @@ describe('parseDaemonProtocolFacts', () => {
     expect(parseDaemonProtocolFacts(text)).toEqual(facts(4, [1, 2, 3]))
   })
 
-  it.each([
-    ['a missing PROTOCOL_VERSION', 'export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [1]'],
-    ['a missing previous list', 'export const PROTOCOL_VERSION = 2'],
-    ['a non-literal PROTOCOL_VERSION', source('NEXT_VERSION', '1')],
-    ['a spread in the previous list', source(3, '...LEGACY, 2')],
-    ['a comment in the previous list', source(3, '1, // legacy\n 2')],
-    ['an empty previous list past v1', source(3, '')],
-    ['a previous version at or above current', source(3, '1, 2, 3')],
-    ['a duplicate declaration', `${source(3, '1, 2')}\nexport const PROTOCOL_VERSION = 4`],
-    [
-      'a list moved behind a constant',
-      'export const PROTOCOL_VERSION = 3\nexport const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = LEGACY'
-    ]
-  ])('fails loudly on %s', (_name, text) => {
+  it('rejects a non-literal protocol declaration with its source label', () => {
+    const text =
+      'export const PROTOCOL_VERSION = NEXT_VERSION\nexport const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [1] as const'
     expect(() => parseDaemonProtocolFacts(text, 'fixture.ts')).toThrow(/fixture\.ts/)
   })
 })
diff --git a/config/scripts/dependency-security/audit-tools/dependency-security-patches.test.mjs b/config/scripts/dependency-security/audit-tools/dependency-security-patches.test.mjs
index 0d7d8c907c9..d1237c36711 100644
--- a/config/scripts/dependency-security/audit-tools/dependency-security-patches.test.mjs
+++ b/config/scripts/dependency-security/audit-tools/dependency-security-patches.test.mjs
@@ -25,11 +25,5 @@ describe('installed dependency security patches', () => {
       expect(() => sprintf(`%.${'9'.repeat(500)}${type}`, 1.234)).not.toThrow()
       expect(sprintf(`%.${'9'.repeat(500)}${type}`, 1.234).length).toBeLessThan(110)
     }
-    expect(sprintf('%.2f', 1.234)).toBe('1.23')
-    expect(sprintf('%.2e', 1.234)).toBe('1.23e+0')
-    expect(sprintf('%.2g', 1.234)).toBe('1.2')
-    expect(sprintf('%.3s', 'abcdef')).toBe('abc')
-    expect(sprintf('%.0f', 1.7)).toBe('2')
-    expect(sprintf('%.0e', 1.7)).toBe('2e+0')
   })
 })
diff --git a/config/scripts/dependency-security/audit-tools/run-audit-tool.test.mjs b/config/scripts/dependency-security/audit-tools/run-audit-tool.test.mjs
deleted file mode 100644
index 1d521b5fbb6..00000000000
--- a/config/scripts/dependency-security/audit-tools/run-audit-tool.test.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { runAuditTool } from './run-audit-tool.mjs'
-
-describe('locked audit tool execution', () => {
-  it('rejects an unknown executable before installing anything', () => {
-    const run = vi.fn()
-    expect(() => runAuditTool('../arbitrary-package', [], { run })).toThrow('Unknown audit tool')
-    expect(run).not.toHaveBeenCalled()
-  })
-})
diff --git a/config/scripts/desktop-build/output-contracts/dark-build-switches.test.mjs b/config/scripts/desktop-build/output-contracts/dark-build-switches.test.mjs
deleted file mode 100644
index eb6ede9a267..00000000000
--- a/config/scripts/desktop-build/output-contracts/dark-build-switches.test.mjs
+++ /dev/null
@@ -1,45 +0,0 @@
-import { mkdtemp, rm, writeFile } from 'node:fs/promises'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
-
-const { assertNoDarkOutputOfOffSwitches, assertNotDarkBuild, darkBuildMarkers } = createRequire(
-  import.meta.url
-)('../../../dark-build-switches.cjs')
-
-const scratch = []
-afterEach(async () => {
-  await Promise.all(scratch.splice(0).map((dir) => rm(dir, { recursive: true, force: true })))
-})
-
-describe('dark build switches', () => {
-  it.each(['ORCA_LAYOUT_OWNER', 'ORCA_SIDEBAR_INPUTS'])(
-    'refuses %s at packaging time, and any output its dark build marked',
-    async (variable) => {
-      const clean = await mkdtemp(join(tmpdir(), 'orca-dark-build-clean-'))
-      const dark = await mkdtemp(join(tmpdir(), 'orca-dark-build-dark-'))
-      scratch.push(clean, dark)
-      const [marker] = darkBuildMarkers({ [variable]: 'main' })
-      await writeFile(join(dark, marker.fileName), marker.text)
-
-      expect(() => assertNotDarkBuild([clean], {})).not.toThrow()
-      expect(() => assertNotDarkBuild([clean], { [variable]: 'main' })).toThrow(`${variable}=main`)
-      expect(() => assertNotDarkBuild([clean, dark], {})).toThrow(dark)
-    }
-  )
-
-  it.each([
-    ['ORCA_LAYOUT_OWNER', 'ORCA_SIDEBAR_INPUTS'],
-    ['ORCA_SIDEBAR_INPUTS', 'ORCA_LAYOUT_OWNER']
-  ])('lets a dark build carry its own %s output, never one of %s', async (own, other) => {
-    const dark = await mkdtemp(join(tmpdir(), 'orca-dark-build-own-'))
-    scratch.push(dark)
-    const [marker] = darkBuildMarkers({ [own]: 'main' })
-    await writeFile(join(dark, marker.fileName), marker.text)
-
-    expect(() => assertNoDarkOutputOfOffSwitches([dark], { [own]: 'main' })).not.toThrow()
-    expect(() => assertNoDarkOutputOfOffSwitches([dark], { [other]: 'main' })).toThrow(dark)
-    expect(() => assertNoDarkOutputOfOffSwitches([dark], {})).toThrow(dark)
-  })
-})
diff --git a/config/scripts/desktop-build/output-contracts/electron-vite-output-contract.test.ts b/config/scripts/desktop-build/output-contracts/electron-vite-output-contract.test.ts
index 0671f58ea19..f6116aa8ab9 100644
--- a/config/scripts/desktop-build/output-contracts/electron-vite-output-contract.test.ts
+++ b/config/scripts/desktop-build/output-contracts/electron-vite-output-contract.test.ts
@@ -23,7 +23,6 @@ type BootstrapProcessMock = EventEmitter & {
 function failBootstrapWithBanner(options: {
   env: Record<string, string>
   tmpdir?: string
-  stderrWrites?: string[]
 }): BootstrapProcessMock {
   const processMock = new EventEmitter() as BootstrapProcessMock
   processMock.env = options.env
@@ -33,7 +32,6 @@ function failBootstrapWithBanner(options: {
     ...nodeFs,
     writeSync: (descriptor: number, data: string) => {
       if (descriptor === 2) {
-        options.stderrWrites?.push(data)
         return data.length
       }
       return nodeFs.writeSync(descriptor, data)
@@ -63,27 +61,6 @@ function failBootstrapWithBanner(options: {
 }
 
 describe('Electron Vite output contract', () => {
-  it('records the bootstrap failure it exits on, since the guard hides Electron dialog', () => {
-    const logDirectory = mkdtempSync(join(tmpdir(), 'orca-bootstrap-fatal-'))
-    const logPath = join(logDirectory, 'fatal.log')
-    const stderrWrites: string[] = []
-
-    try {
-      const processMock = failBootstrapWithBanner({
-        env: { [BOOTSTRAP_FATAL_LOG_ENV_VAR]: logPath },
-        stderrWrites
-      })
-
-      expect(stderrWrites.join('')).toContain("Cannot find module 'ws'")
-      const recorded = readFileSync(logPath, 'utf8')
-      expect(recorded).toContain("Cannot find module 'ws'")
-      expect(recorded).toContain('pid=4242')
-      expect(processMock.exitCode).toBe(1)
-    } finally {
-      rmSync(logDirectory, { recursive: true, force: true })
-    }
-  })
-
   it('creates the parent directory an overridden log path names but does not have', () => {
     const logDirectory = mkdtempSync(join(tmpdir(), 'orca-bootstrap-fatal-'))
     const logPath = join(logDirectory, 'nested', 'diagnostics', 'fatal.log')
diff --git a/config/scripts/desktop-build/output-contracts/main-entry-facade.test.ts b/config/scripts/desktop-build/output-contracts/main-entry-facade.test.ts
deleted file mode 100644
index 891002e3a4c..00000000000
--- a/config/scripts/desktop-build/output-contracts/main-entry-facade.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { expect, it } from 'vitest'
-import { build } from 'vite'
-import { runProcess } from '@orca/process-host'
-import { electronViteConfig } from '../../../../electron.vite.config'
-
-it('keeps main code and asset paths working after a CLI build replaces its public entry', async () => {
-  const root = await mkdtemp(join(tmpdir(), 'orca-main-entry-facade-'))
-  try {
-    await writeFile(join(root, 'package.json'), '{"type":"commonjs"}')
-    await writeFile(join(root, 'tracker.ts'), 'export const createTracker = () => ({ count: 0 })')
-    await writeFile(
-      join(root, 'boot-label.ts'),
-      'export const getBootLabel = () => process.env.ORCA_FIXTURE_BOOT_LABEL || "boot"'
-    )
-    await writeFile(
-      join(root, 'late.ts'),
-      'import { getBootLabel } from "./boot-label"; export const readLabel = () => getBootLabel()'
-    )
-    await writeFile(
-      join(root, 'controls.ts'),
-      'import { createTracker } from "./tracker"; export const getStatus = () => createTracker().count'
-    )
-    await writeFile(
-      join(root, 'main.ts'),
-      'import { writeFileSync } from "node:fs"; import { join } from "node:path"; import { getStatus } from "./controls"; import { createTracker } from "./tracker"; import { getBootLabel } from "./boot-label"; import("./late").then(({ readLabel }) => writeFileSync(join(__dirname, "result.json"), JSON.stringify({ status: getStatus(), tracker: createTracker(), directory: __dirname, label: getBootLabel(), lateLabel: readLabel() })))'
-    )
-    const options = electronViteConfig.main?.build?.rollupOptions
-    if (Array.isArray(options?.output)) {
-      throw new Error('Expected one main-process output')
-    }
-    await build({
-      configFile: false,
-      root,
-      logLevel: 'silent',
-      build: {
-        ssr: true,
-        minify: electronViteConfig.main?.build?.minify,
-        rolldownOptions: {
-          ...options,
-          // Plugins and the bootstrap banner guard the real main entry, not this fixture.
-          output: { ...options?.output, postBanner: undefined },
-          plugins: [],
-          input: { index: join(root, 'main.ts'), controls: join(root, 'controls.ts') }
-        }
-      }
-    })
-    // tsc emits public names only, replacing the bundler's entry at this same path.
-    await writeFile(join(root, 'dist', 'controls.js'), 'exports.getStatus = () => 0')
-    const result = await runProcess({
-      program: process.execPath,
-      args: [join(root, 'dist', 'index.js')],
-      env: { ...process.env, ORCA_FIXTURE_BOOT_LABEL: 'fixture-boot' }
-    })
-    expect(result.code, result.stderr).toBe(0)
-    expect(JSON.parse(await readFile(join(root, 'dist', 'result.json'), 'utf8'))).toEqual({
-      status: 0,
-      tracker: { count: 0 },
-      directory: join(root, 'dist'),
-      label: 'fixture-boot',
-      lateLabel: 'fixture-boot'
-    })
-  } finally {
-    await rm(root, { recursive: true, force: true })
-  }
-})
diff --git a/config/scripts/desktop-build/output-contracts/plain-node-entry-guard.test.ts b/config/scripts/desktop-build/output-contracts/plain-node-entry-guard.test.ts
index 366ad1df519..ef8a837b43f 100644
--- a/config/scripts/desktop-build/output-contracts/plain-node-entry-guard.test.ts
+++ b/config/scripts/desktop-build/output-contracts/plain-node-entry-guard.test.ts
@@ -77,14 +77,6 @@ describe('plain Node entry guard', () => {
     await expect(runCloseBundle(plugin)).rejects.toThrow('failed to load under plain Node')
   })
 
-  it('rejects Electron imports during the static bundle scan', () => {
-    const plugin = createPlainNodeEntryGuardPlugin()
-
-    expect(() => runWriteBundle(plugin, createOutputDir(), 'require("electron")')).toThrow(
-      'requires electron'
-    )
-  })
-
   it('rejects Electron subpath requires', () => {
     const plugin = createPlainNodeEntryGuardPlugin()
 
@@ -117,8 +109,6 @@ describe('plain Node entry guard', () => {
 
     await expect(runCloseBundle(plugin)).rejects.toThrow('did not reject an empty argv')
   })
-
-  // daemon-entry traps SIGTERM; smoke timeout must escalate to SIGKILL or spawnSync can wait forever.
 })
 
 // Electron is unavailable in main-process workers too (#11161); transitive imports can kill startup despite entry-local electron-free comments.
@@ -153,18 +143,6 @@ describe('CLI and worker thread entry guard', () => {
     } as Rollup.OutputChunk
   }
 
-  it('rejects an Electron require reachable from a worker entry', () => {
-    const plugin = createPlainNodeEntryGuardPlugin()
-    const bundle: Rollup.OutputBundle = {
-      'port-scan-command-worker-entry.js': entryChunk(
-        'port-scan-command-worker-entry',
-        'require("electron")'
-      )
-    }
-
-    expect(() => runEntryWriteBundle(plugin, bundle)).toThrow('requires electron')
-  })
-
   // Exercise transitive shared-chunk imports into the electron client, where direct-import checks miss startup failures.
   it('follows shared chunks out of a worker entry', () => {
     const plugin = createPlainNodeEntryGuardPlugin()
@@ -187,16 +165,4 @@ describe('CLI and worker thread entry guard', () => {
 
     expect(() => runEntryWriteBundle(plugin, bundle)).toThrow('chunks/shared.js')
   })
-
-  it('passes a clean worker entry', () => {
-    const plugin = createPlainNodeEntryGuardPlugin()
-    const bundle: Rollup.OutputBundle = {
-      'warp-theme-parser-worker.js': entryChunk(
-        'warp-theme-parser-worker',
-        'require("node:worker_threads")'
-      )
-    }
-
-    expect(() => runEntryWriteBundle(plugin, bundle)).not.toThrow()
-  })
 })
diff --git a/config/scripts/desktop-distribution/channel-policy/dev-channel-windows-staging.test.mjs b/config/scripts/desktop-distribution/channel-policy/dev-channel-windows-staging.test.mjs
index 1985a424d38..e77f617761e 100644
--- a/config/scripts/desktop-distribution/channel-policy/dev-channel-windows-staging.test.mjs
+++ b/config/scripts/desktop-distribution/channel-policy/dev-channel-windows-staging.test.mjs
@@ -11,9 +11,7 @@ function readWorkflow(name) {
   )
 }
 
-const build = readWorkflow('dev-channel-win-build.yml')
 const publish = readWorkflow('dev-channel-win-publish.yml')
-const buildSteps = build.jobs['build-win'].steps
 const publishSteps = publish.jobs['publish-win'].steps
 const directory = mkdtempSync(join(tmpdir(), 'dev-channel-windows-staging-'))
 afterAll(() => rmSync(directory, { recursive: true, force: true }))
@@ -23,23 +21,22 @@ async function runScript(script, { cwd = directory, env = {} } = {}) {
 }
 
 describe('Windows dev-channel artifact staging', () => {
-  it.each([
-    ['build', buildSteps, 'dist'],
-    ['publish', publishSteps, 'staged-windows']
-  ])('fails %s on any missing or empty staged file', async (_name, steps, folder) => {
-    const step = steps.find((entry) => entry.name === 'Validate staged Windows artifacts')
+  it('rejects an empty staged installer before publication', async () => {
+    const step = publishSteps.find((entry) => entry.name === 'Validate staged Windows artifacts')
     const attempt = mkdtempSync(join(directory, 'files-'))
+    const folder = 'staged-windows'
     mkdirSync(join(attempt, folder))
-    expect((await runScript(step.run, { cwd: attempt })).code).toBe(1)
     for (const file of [
       'orca-windows-setup.exe',
       'orca-windows-setup.exe.blockmap',
       'latest.yml'
     ]) {
-      writeFileSync(join(attempt, folder, file), '')
-      expect((await runScript(step.run, { cwd: attempt })).code).toBe(1)
       writeFileSync(join(attempt, folder, file), 'artifact')
     }
+    const installer = join(attempt, folder, 'orca-windows-setup.exe')
+    writeFileSync(installer, '')
+    expect((await runScript(step.run, { cwd: attempt })).code).toBe(1)
+    writeFileSync(installer, 'artifact')
     expect((await runScript(step.run, { cwd: attempt })).code).toBe(0)
   })
 
diff --git a/config/scripts/desktop-distribution/linux/package-linux-formats-appimage.test.mjs b/config/scripts/desktop-distribution/linux/package-linux-formats-appimage.test.mjs
index 9aec79bb4e8..1c66ff6bc0f 100644
--- a/config/scripts/desktop-distribution/linux/package-linux-formats-appimage.test.mjs
+++ b/config/scripts/desktop-distribution/linux/package-linux-formats-appimage.test.mjs
@@ -138,16 +138,4 @@ describe.skipIf(process.platform === 'win32')('real executable AppImage tool ove
     ])
     expect(existsSync(join(root, 'expanded'))).toBe(false)
   })
-
-  it('propagates the original executable failure without a fallback', async () => {
-    const environment = await prepare()
-    vi.stubEnv('ORCA_TEST_SQUASHFS_EXIT', '17')
-    const result = runProcessSync({
-      program: join(overlay, 'mksquashfs'),
-      args: ['app', 'output', '-comp', 'zstd'],
-      env: { ...process.env, ...environment },
-      timeoutMs: 10_000
-    })
-    expect(result.code).toBe(17)
-  })
 })
diff --git a/config/scripts/desktop-distribution/linux/package-linux-formats.test.mjs b/config/scripts/desktop-distribution/linux/package-linux-formats.test.mjs
index 53d9f679e5f..f9cebac3872 100644
--- a/config/scripts/desktop-distribution/linux/package-linux-formats.test.mjs
+++ b/config/scripts/desktop-distribution/linux/package-linux-formats.test.mjs
@@ -5,10 +5,7 @@ import {
   mkdtempSync,
   readFileSync,
   readdirSync,
-  readlinkSync,
   rmSync,
-  statSync,
-  symlinkSync,
   writeFileSync
 } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -19,7 +16,6 @@ import { packageLinuxFormats } from './package-linux-formats.mjs'
 let root
 let preparedDirectory
 let outputDirectory
-const targets = ['AppImage', 'deb', 'rpm']
 const valueAfter = (args, flag) => args[args.indexOf(flag) + 1]
 
 beforeEach(() => {
@@ -48,120 +44,52 @@ function emitPackage(args) {
 }
 
 describe('independent Linux package formats', () => {
-  it('starts all formats before awaiting completion and isolates metadata writes', async () => {
-    if (process.platform !== 'win32') {
-      symlinkSync('resources/package-type', join(preparedDirectory, 'marker-link'))
-    }
+  it('settles every worker before cleanup and exposes no partial artifact on builder failure', async () => {
+    const finished = []
+    let overlay
     let release
     const gate = new Promise((resolve) => {
       release = resolve
     })
-    const copies = []
-    await packageLinuxFormats({
-      preparedDirectory,
-      outputDirectory,
-      prepareAppImageTools: async () => ({}),
-      runBuilder: async (args) => {
-        const app = valueAfter(args, '--prepackaged')
-        const format = valueAfter(args, '--linux')
-        expect(readFileSync(join(app, 'resources/package-type'), 'utf8')).toBe('AppImage')
-        expect(readFileSync(join(app, 'resources/app.asar'), 'utf8')).toBe('verified application')
-        if (process.platform !== 'win32') {
-          expect(readlinkSync(join(app, 'marker-link'))).toBe('resources/package-type')
-          expect(statSync(join(app, 'orca-ide')).mode & 0o777).toBe(0o755)
-          expect(statSync(join(app, 'resources/package-type')).ino).not.toBe(
-            statSync(join(preparedDirectory, 'resources/package-type')).ino
-          )
-        }
-        copies.push(app)
-        if (copies.length === 3) {
-          release()
-        }
-        await gate
-        expect(readdirSync(outputDirectory)).toHaveLength(1)
-        emitPackage(args)
-        await Promise.resolve()
-        expect(readFileSync(join(app, 'resources/package-type'), 'utf8')).toBe(format)
-      }
-    })
-    expect(new Set(copies).size).toBe(3)
-    expect(readFileSync(join(preparedDirectory, 'resources/package-type'), 'utf8')).toBe('AppImage')
-    expect(readFileSync(join(preparedDirectory, 'resources/app.asar'), 'utf8')).toBe(
-      'verified application'
-    )
-    for (const format of targets) {
-      expect(readFileSync(join(outputDirectory, `orca.${format}`), 'utf8')).toBe(format)
-      expect(
-        readFileSync(
-          join(outputDirectory, 'linux-package-formats', format, 'latest-linux.yml'),
-          'utf8'
-        )
-      ).toBe(format)
-    }
-    expect(
-      readdirSync(outputDirectory).some((name) => name.startsWith('.linux-package-formats-'))
-    ).toBe(false)
-  })
-
-  it.each(['builder', 'tool preparation'])(
-    'settles every worker before cleanup and exposes no partial artifact on %s failure',
-    async (failurePhase) => {
-      const finished = []
-      let overlay
-      let release
-      const gate = new Promise((resolve) => {
-        release = resolve
-      })
-      await expect(
-        packageLinuxFormats({
-          preparedDirectory,
-          outputDirectory,
-          prepareAppImageTools: async ({ directory }) => {
-            overlay = directory
-            mkdirSync(directory)
-            writeFileSync(join(directory, 'mksquashfs'), 'private wrapper')
-            if (failurePhase === 'tool preparation') {
-              throw new Error('compression failed')
-            }
-            return { APPIMAGE_TOOLS_PATH: directory, ORCA_PR_APPIMAGE_MKSQUASHFS: 'original tool' }
-          },
-          runBuilder: async (args, environment) => {
-            const format = valueAfter(args, '--linux')
-            if (format === 'AppImage') {
-              expect(environment).toEqual({
-                APPIMAGE_TOOLS_PATH: overlay,
-                ORCA_PR_APPIMAGE_MKSQUASHFS: 'original tool'
-              })
-              throw new Error('compression failed')
-            }
-            expect(environment).toEqual({})
-            if (format === 'rpm') {
-              release()
-            }
-            await gate
-            const { app } = emitPackage(args)
-            expect(existsSync(app)).toBe(true)
-            expect(existsSync(overlay)).toBe(true)
-            finished.push(format)
+    await expect(
+      packageLinuxFormats({
+        preparedDirectory,
+        outputDirectory,
+        prepareAppImageTools: async ({ directory }) => {
+          overlay = directory
+          mkdirSync(directory)
+          writeFileSync(join(directory, 'mksquashfs'), 'private wrapper')
+          return { APPIMAGE_TOOLS_PATH: directory, ORCA_PR_APPIMAGE_MKSQUASHFS: 'original tool' }
+        },
+        runBuilder: async (args) => {
+          const format = valueAfter(args, '--linux')
+          if (format === 'AppImage') {
+            throw new Error('compression failed')
           }
-        })
-      ).rejects.toMatchObject({
-        message: 'Linux package formats failed',
-        errors: [
-          expect.objectContaining({
-            message: 'AppImage packaging failed',
-            cause: expect.objectContaining({ message: 'compression failed' })
-          })
-        ]
+          if (format === 'rpm') {
+            release()
+          }
+          await gate
+          const { app } = emitPackage(args)
+          expect(existsSync(app)).toBe(true)
+          expect(existsSync(overlay)).toBe(true)
+          finished.push(format)
+        }
       })
-      expect(finished.sort()).toEqual(['deb', 'rpm'])
-      expect(existsSync(overlay)).toBe(false)
-      expect(readdirSync(outputDirectory)).toEqual([])
-      expect(readFileSync(join(preparedDirectory, 'resources/package-type'), 'utf8')).toBe(
-        'AppImage'
-      )
-    }
-  )
+    ).rejects.toMatchObject({
+      message: 'Linux package formats failed',
+      errors: [
+        expect.objectContaining({
+          message: 'AppImage packaging failed',
+          cause: expect.objectContaining({ message: 'compression failed' })
+        })
+      ]
+    })
+    expect(finished.sort()).toEqual(['deb', 'rpm'])
+    expect(existsSync(overlay)).toBe(false)
+    expect(readdirSync(outputDirectory)).toEqual([])
+    expect(readFileSync(join(preparedDirectory, 'resources/package-type'), 'utf8')).toBe('AppImage')
+  })
 
   it('rejects missing artifacts even when the builder reports success', async () => {
     await expect(
@@ -195,19 +123,4 @@ describe('independent Linux package formats', () => {
     expect(readdirSync(outputDirectory)).toEqual(['orca.deb'])
     expect(readFileSync(join(outputDirectory, 'orca.deb'), 'utf8')).toBe('previous package')
   })
-
-  it('rejects a tree already mutated by a previous root-package build', async () => {
-    writeFileSync(join(preparedDirectory, 'resources/package-type'), 'rpm')
-    await expect(
-      packageLinuxFormats({
-        preparedDirectory,
-        outputDirectory,
-        prepareAppImageTools: async () => ({}),
-        runBuilder: async () => {
-          throw new Error('must not run')
-        }
-      })
-    ).rejects.toThrow('Expected a fresh Linux directory build')
-    expect(readdirSync(outputDirectory)).toEqual([])
-  })
 })
diff --git a/config/scripts/desktop-distribution/macos/adhoc-mac-manifests.test.mjs b/config/scripts/desktop-distribution/macos/adhoc-mac-manifests.test.mjs
index 3965aa4ab9b..5d5320499f0 100644
--- a/config/scripts/desktop-distribution/macos/adhoc-mac-manifests.test.mjs
+++ b/config/scripts/desktop-distribution/macos/adhoc-mac-manifests.test.mjs
@@ -40,7 +40,7 @@ describe('parallel Mac updater manifests', () => {
           asset.name.endsWith('.blockmap') ? 'map!' : content
         )
       }
-      expect(await stageManifest(item.manifest, item.arch, version, directory)).toEqual(item)
+      await stageManifest(item.manifest, item.arch, version, directory)
       await writeFile(join(directory, item.manifest.path), Buffer.alloc(content.length))
       await expect(stageManifest(item.manifest, item.arch, version, directory)).rejects.toThrow(
         'checksum or size'
diff --git a/config/scripts/desktop-distribution/macos/build-mac-notarization-overlap.test.mjs b/config/scripts/desktop-distribution/macos/build-mac-notarization-overlap.test.mjs
deleted file mode 100644
index f8570b0b086..00000000000
--- a/config/scripts/desktop-distribution/macos/build-mac-notarization-overlap.test.mjs
+++ /dev/null
@@ -1,155 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { buildWithOverlappingNotarization } from './build-mac-notarization-overlap.mjs'
-
-const deferred = () => {
-  let resolve, reject
-  const promise = new Promise((yes, no) => {
-    resolve = yes
-    reject = no
-  })
-  return { promise, resolve, reject }
-}
-const context = (arch) => ({
-  arch,
-  electronPlatformName: 'darwin',
-  appOutDir: `dist/mac-${arch}`,
-  packager: { appInfo: { productFilename: 'Orca' } }
-})
-const signedConfig = () => ({
-  forceCodeSigning: true,
-  mac: { notarize: true, hardenedRuntime: true },
-  concurrency: { jobs: 8 },
-  publish: { releaseType: 'draft' }
-})
-const options = (build, notarize = vi.fn(async () => {}), verify = vi.fn()) => ({
-  config: signedConfig(),
-  build,
-  notarize,
-  verify,
-  targets: 'both-mac-targets',
-  publish: 'never',
-  credentials: { appleId: 'test' },
-  log: vi.fn()
-})
-
-// The real builder queues each artifact task without awaiting it in its serial pack loop.
-function queuedBuilder(events, afterSign) {
-  return async ({ config, ...buildOptions }) => {
-    expect(buildOptions).toMatchObject({ targets: 'both-mac-targets', publish: 'never' })
-    expect(config.mac).toMatchObject({ notarize: false, hardenedRuntime: true })
-    expect(config.forceCodeSigning).toBe(true)
-    expect(config.concurrency.jobs).toBe(1)
-    const artifacts = []
-    for (const arch of [1, 3]) {
-      events.push(`pack:${arch}`)
-      await config.afterSign(context(arch))
-      artifacts.push(
-        (async () => {
-          await config.artifactBuildStarted({ arch })
-          events.push(`archive:${arch}`)
-        })()
-      )
-      await afterSign?.(arch)
-    }
-    await Promise.all(artifacts)
-    return ['x64.dmg', 'arm64.dmg']
-  }
-}
-
-describe('overlapping macOS notarization', () => {
-  it('packs serially, overlaps Apple waits, and gates every artifact on both verified tickets', async () => {
-    const events = []
-    const x64 = deferred(),
-      arm64 = deferred(),
-      bothSubmitted = deferred()
-    const notarize = vi.fn(({ appPath }) => {
-      events.push(`submit:${appPath}`)
-      if (appPath.includes('mac-3')) {
-        bothSubmitted.resolve()
-      }
-      return appPath.includes('mac-1') ? x64.promise : arm64.promise
-    })
-    const verify = vi.fn((appPath) => {
-      events.push(`verify:${appPath}`)
-    })
-    const result = buildWithOverlappingNotarization(
-      options(queuedBuilder(events), notarize, verify)
-    )
-    await bothSubmitted.promise
-    expect(events.filter((event) => event.startsWith('pack:'))).toEqual(['pack:1', 'pack:3'])
-    x64.resolve()
-    await vi.waitFor(() => expect(verify).toHaveBeenCalledTimes(1))
-    expect(events.some((event) => event.startsWith('archive:'))).toBe(false)
-    arm64.resolve()
-    await expect(result).resolves.toEqual(['x64.dmg', 'arm64.dmg'])
-    expect(events.findIndex((event) => event.startsWith('archive:'))).toBeGreaterThan(
-      events.findLastIndex((event) => event.startsWith('verify:'))
-    )
-  })
-
-  it.each([1, 3])('never archives when architecture %i notarization fails', async (failedArch) => {
-    const events = []
-    const failure = new Error('Apple rejected the app')
-    const notarize = vi.fn(async ({ appPath }) => {
-      if (appPath.includes(`mac-${failedArch}`)) {
-        throw failure
-      }
-    })
-    await expect(
-      buildWithOverlappingNotarization(options(queuedBuilder(events), notarize))
-    ).rejects.toBe(failure)
-    expect(events.some((event) => event.startsWith('archive:'))).toBe(false)
-  })
-
-  it('never archives when signature or stapler validation fails', async () => {
-    const events = []
-    await expect(
-      buildWithOverlappingNotarization(
-        options(queuedBuilder(events), undefined, () => {
-          throw new Error('invalid staple')
-        })
-      )
-    ).rejects.toThrow('invalid staple')
-    expect(events.some((event) => event.startsWith('archive:'))).toBe(false)
-  })
-
-  it('rejects waiting artifacts and drains the first notary if the second pack fails', async () => {
-    const waiting = deferred(),
-      started = deferred()
-    let artifactResult
-    const failure = new Error('second native rebuild failed')
-    const build = async ({ config }) => {
-      await config.afterSign(context(1))
-      artifactResult = config.artifactBuildStarted({ arch: 1 }).catch((error) => error)
-      throw failure
-    }
-    const result = buildWithOverlappingNotarization(
-      options(build, async () => {
-        started.resolve()
-        await waiting.promise
-      })
-    )
-    const settled = vi.fn()
-    result.catch(settled)
-    await started.promise
-    expect(await artifactResult).toBe(failure)
-    expect(settled).not.toHaveBeenCalled()
-    waiting.resolve()
-    await expect(result).rejects.toBe(failure)
-  })
-
-  it('does not mask a build failure with a later notary failure', async () => {
-    const failure = new Error('pack failed')
-    const build = async ({ config }) => {
-      await config.afterSign(context(1))
-      throw failure
-    }
-    await expect(
-      buildWithOverlappingNotarization(
-        options(build, async () => {
-          throw new Error('notary failed too')
-        })
-      )
-    ).rejects.toBe(failure)
-  })
-})
diff --git a/config/scripts/desktop-distribution/nsis/replace-cached-nsis-elevate.test.mjs b/config/scripts/desktop-distribution/nsis/replace-cached-nsis-elevate.test.mjs
index d862bbb43e7..cca1a50a234 100644
--- a/config/scripts/desktop-distribution/nsis/replace-cached-nsis-elevate.test.mjs
+++ b/config/scripts/desktop-distribution/nsis/replace-cached-nsis-elevate.test.mjs
@@ -4,14 +4,8 @@ import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
-import {
-  findCachedElevatePaths,
-  replaceCachedElevateHelpers,
-  summarizeSwap
-} from './replace-cached-nsis-elevate.mjs'
+import { replaceCachedElevateHelpers } from './replace-cached-nsis-elevate.mjs'
 
-// Inject app-builder-lib’s packed-path probe so tests need neither network nor warm toolset cache.
-const probeFound = (path) => async () => ({ path, error: null })
 const probeUnavailable = async () => ({ path: null, error: 'app-builder-lib not loadable' })
 
 const projectRoot = resolve(import.meta.dirname, '../../../..')
@@ -42,11 +36,6 @@ function makeCache(...relativeFiles) {
 }
 
 describe('cached elevate.exe swap covers the real electron-builder layouts', () => {
-  // Model real <releaseName>/<archive>-<url hash> legacy/unified layouts; old <cache>/nsis matched neither. Custom layout is covered by probe tests.
-
-  // Allow nsis-resources overmatch: it ships plugins without elevate.exe and costs one cheap read; guessing narrower upstream naming is brittle.
-
-  // Replace all cached copies because only app-builder-lib knows which one repack chooses.
   it('replaces every cached copy when several bundles are present', async () => {
     const cacheDir = makeCache(
       'nsis-3.0.4.1/nsis-3.0.4.1-1mx3n/elevate.exe',
@@ -67,38 +56,9 @@ describe('cached elevate.exe swap covers the real electron-builder layouts', ()
       expect(readFileSync(path, 'utf8')).toBe('signpath-signed-elevate')
     }
   })
-
-  // Compare real cache scan against independent unbounded walk to catch vacuous empty matches; skip only if no bundle is cached.
-})
-
-describe('the probe, not the scan, decides whether the swap worked', () => {
-  // customNsisBinary uses nsis-version only as memoization key; URL-parent extraction directory can bypass nsis* scan.
-  it('covers a custom bundle the directory scan cannot match', async () => {
-    const relative = 'orca-nsis-mirror/nsis-custom-3.11-0zqp2/elevate.exe'
-    const cacheDir = makeCache(relative)
-    const packed = join(cacheDir, ...relative.split('/'))
-    const signed = join(scratch, 'signed-elevate.exe')
-    writeFileSync(signed, 'signpath-signed-elevate')
-
-    expect(findCachedElevatePaths(cacheDir, { env: {} })).toEqual([])
-
-    const result = await replaceCachedElevateHelpers({
-      signedPath: signed,
-      cacheDir,
-      env: {},
-      probe: probeFound(packed)
-    })
-
-    expect(result.toolsetReplaced).toBe(true)
-    expect(readFileSync(packed, 'utf8')).toBe('signpath-signed-elevate')
-    expect(summarizeSwap(result)).toEqual({ annotations: [], exitCode: 0 })
-  })
-
-  // Prefix-restored stale release can satisfy replaced.length while authoritative packed bundle sits outside scan; model both copies.
 })
 
 describe('a cached elevate.exe miss is not silent', () => {
-  // Override short-circuits downloads, so authoritative probe fails offline instead of fetching a toolset.
   function runScript(cacheDir, nsisDir, signedPath) {
     return spawnSync(process.execPath, [scriptPath, signedPath], {
       cwd: projectRoot,
@@ -141,7 +101,6 @@ describe('a cached elevate.exe miss is not silent', () => {
     ).toBe('signpath-signed-elevate')
   })
 
-  // Healthy release path replaces exact copy returned by app-builder-lib, requiring no warning.
   it('exits clean when the probe resolves the copy the rebuild will pack', () => {
     const cacheDir = makeCache()
     const nsisDir = join(scratch, 'nsis-bundle')
diff --git a/config/scripts/desktop-distribution/runtime-verification/electron-builder-native-rebuild.test.mjs b/config/scripts/desktop-distribution/runtime-verification/electron-builder-native-rebuild.test.mjs
deleted file mode 100644
index b1b3af4a9b3..00000000000
--- a/config/scripts/desktop-distribution/runtime-verification/electron-builder-native-rebuild.test.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createRequire } from 'node:module'
-import { describe, expect, it } from 'vitest'
-
-const require = createRequire(import.meta.url)
-const { buildNativeRebuildArgs } = require('./electron-builder-native-rebuild.cjs')
-
-describe('electron-builder native rebuild hook', () => {
-  it('rejects incomplete electron-builder contexts', () => {
-    expect(() => buildNativeRebuildArgs({ arch: 'x64' })).toThrow(/platform/)
-    expect(() => buildNativeRebuildArgs({ platform: { nodeName: 'linux' } })).toThrow(/arch/)
-  })
-})
diff --git a/config/scripts/desktop-distribution/runtime-verification/electron-builder-runtime-resources.test.mjs b/config/scripts/desktop-distribution/runtime-verification/electron-builder-runtime-resources.test.mjs
index 29915eb54ff..7e717ef779d 100644
--- a/config/scripts/desktop-distribution/runtime-verification/electron-builder-runtime-resources.test.mjs
+++ b/config/scripts/desktop-distribution/runtime-verification/electron-builder-runtime-resources.test.mjs
@@ -6,7 +6,6 @@ import { describe, expect, it } from 'vitest'
 import { removeTree } from '../../../../src/shared/windows-transient-lock-removal.ts'
 
 const require = createRequire(import.meta.url)
-const electronBuilderConfig = require('../../../electron-builder.config.cjs')
 const {
   prunePackagedNodePty,
   prunePackagedParcelWatcher,
@@ -48,24 +47,6 @@ describe('packaged runtime resources', () => {
     }
   })
 
-  it('still fails when a required packaged main entry is missing entirely', async () => {
-    const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-runtime-missing-entry-'))
-    try {
-      await writeFile(join(resourcesDir, 'app.asar'), '', 'utf8')
-
-      const asar = {
-        listPackage: () => ['/out/main/index.js'],
-        extractFile: () => Buffer.from('', 'utf8')
-      }
-
-      expect(() => verifyPackagedMainRuntimeDeps(resourcesDir, asar)).toThrow(
-        /managed-agent-hook-controls\.js was not found/
-      )
-    } finally {
-      await removeTree(resourcesDir)
-    }
-  })
-
   it('verifies bare imports that rolldown hoisted into a shared main chunk', async () => {
     const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-runtime-chunk-imports-'))
     try {
@@ -99,63 +80,34 @@ describe('packaged runtime resources', () => {
     }
   })
 
-  it('reads a spread require, whose leading dots are not member access', async () => {
-    const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-runtime-spread-require-'))
+  it('copies the Windows node-pty ConPTY runtime beside the rebuilt addon', async () => {
+    const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-node-pty-conpty-arm64-'))
     try {
-      await writeFile(join(resourcesDir, 'app.asar'), '', 'utf8')
-
-      const sources = new Map([
-        ['out/main/index.js', 'const all=[...require("jsonc-parser")]'],
-        ['out/main/agent-hooks/installation/managed-agent-hook-controls.js', '']
-      ])
-      const asar = {
-        listPackage: () => [...sources.keys()].map((entry) => `/${entry}`),
-        extractFile: (_asarPath, internalPath) => Buffer.from(sources.get(internalPath), 'utf8')
+      const nodePtyDir = join(resourcesDir, 'node_modules', 'node-pty')
+      const releaseDir = join(nodePtyDir, 'build', 'Release')
+      const conptyRoot = join(nodePtyDir, 'third_party', 'conpty', '0.1.0')
+      await mkdir(releaseDir, { recursive: true })
+      await writeFile(join(releaseDir, 'conpty.node'), 'native addon placeholder', 'utf8')
+      for (const sourceArch of ['x64', 'arm64']) {
+        const sourceDir = join(conptyRoot, `win10-${sourceArch}`)
+        await mkdir(sourceDir, { recursive: true })
+        await writeFile(join(sourceDir, 'conpty.dll'), `dll payload ${sourceArch}`, 'utf8')
+        await writeFile(join(sourceDir, 'OpenConsole.exe'), `console payload ${sourceArch}`, 'utf8')
       }
 
-      expect(() => verifyPackagedMainRuntimeDeps(resourcesDir, asar)).toThrow(/jsonc-parser/)
+      prunePackagedNodePty(resourcesDir, 'win32', 3)
+
+      await expect(readFile(join(releaseDir, 'conpty', 'conpty.dll'), 'utf8')).resolves.toBe(
+        'dll payload arm64'
+      )
+      await expect(readFile(join(releaseDir, 'conpty', 'OpenConsole.exe'), 'utf8')).resolves.toBe(
+        'console payload arm64'
+      )
     } finally {
       await removeTree(resourcesDir)
     }
   })
 
-  it('copies the Windows node-pty ConPTY runtime beside the rebuilt addon', async () => {
-    for (const [arch, electronArch] of [
-      ['x64', 1],
-      ['arm64', 3]
-    ]) {
-      const resourcesDir = await mkdtemp(join(tmpdir(), `orca-node-pty-conpty-${arch}-`))
-      try {
-        const nodePtyDir = join(resourcesDir, 'node_modules', 'node-pty')
-        const releaseDir = join(nodePtyDir, 'build', 'Release')
-        const conptyRoot = join(nodePtyDir, 'third_party', 'conpty', '0.1.0')
-        await mkdir(releaseDir, { recursive: true })
-        await writeFile(join(releaseDir, 'conpty.node'), 'native addon placeholder', 'utf8')
-        for (const sourceArch of ['x64', 'arm64']) {
-          const sourceDir = join(conptyRoot, `win10-${sourceArch}`)
-          await mkdir(sourceDir, { recursive: true })
-          await writeFile(join(sourceDir, 'conpty.dll'), `dll payload ${sourceArch}`, 'utf8')
-          await writeFile(
-            join(sourceDir, 'OpenConsole.exe'),
-            `console payload ${sourceArch}`,
-            'utf8'
-          )
-        }
-
-        prunePackagedNodePty(resourcesDir, 'win32', electronArch)
-
-        await expect(readFile(join(releaseDir, 'conpty', 'conpty.dll'), 'utf8')).resolves.toBe(
-          `dll payload ${arch}`
-        )
-        await expect(readFile(join(releaseDir, 'conpty', 'OpenConsole.exe'), 'utf8')).resolves.toBe(
-          `console payload ${arch}`
-        )
-      } finally {
-        await removeTree(resourcesDir)
-      }
-    }
-  })
-
   it('leaves unrelated @parcel/* runtime deps untouched when pruning the watcher', async () => {
     const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-parcel-watcher-prune-unrelated-'))
     try {
@@ -177,18 +129,4 @@ describe('packaged runtime resources', () => {
       await removeTree(resourcesDir)
     }
   })
-
-  it('fails when the packaged resources directory is missing', async () => {
-    const root = await mkdtemp(join(tmpdir(), 'orca-electron-builder-config-'))
-    try {
-      await expect(
-        electronBuilderConfig.afterPack({
-          appOutDir: root,
-          electronPlatformName: 'win32'
-        })
-      ).rejects.toThrow(/Missing packaged resources directory/)
-    } finally {
-      await removeTree(root)
-    }
-  })
 })
diff --git a/config/scripts/desktop-distribution/runtime-verification/packaged-node-pty-prebuild-prune.test.mjs b/config/scripts/desktop-distribution/runtime-verification/packaged-node-pty-prebuild-prune.test.mjs
index af4d5e7e2fc..6c1a2eb7a8d 100644
--- a/config/scripts/desktop-distribution/runtime-verification/packaged-node-pty-prebuild-prune.test.mjs
+++ b/config/scripts/desktop-distribution/runtime-verification/packaged-node-pty-prebuild-prune.test.mjs
@@ -6,13 +6,9 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 const require = createRequire(import.meta.url)
 const { prunePackagedNodePty } = require('../../../packaged-runtime-node-modules.cjs')
-const { PE_MACHINE } = require('../../native-build/windows/windows-pe-machine.cjs')
 
-// Loader swallows build/Release/Debug failures and falls back to prebuilds; upstream conpty lacks job ownership, so ABI/AV failures must not silently downgrade it.
-// Preserve conpty_console_list and winpty siblings: the patch removes their build targets, leaving only upstream copies.
 describe('prunePackagedNodePty: the Windows conpty fallback', () => {
   let resources
-  const HOST_ARCH = process.arch
 
   const nodePty = () => join(resources, 'node_modules', 'node-pty')
   const write = (relative, contents = 'x') => {
@@ -21,29 +17,22 @@ describe('prunePackagedNodePty: the Windows conpty fallback', () => {
     writeFileSync(target, contents)
   }
 
-  /** Minimal PE far enough to carry a `Machine`, which is what the prune now reads. */
   const peAddon = (arch) => {
     const buffer = Buffer.alloc(0x50)
     buffer.write('MZ')
     buffer.writeUInt32LE(0x40, 0x3c)
     buffer.write('PE\0\0', 0x40)
-    buffer.writeUInt16LE(PE_MACHINE[arch], 0x44)
+    buffer.writeUInt16LE({ x64: 0x8664, arm64: 0xaa64 }[arch], 0x44)
     return buffer
   }
-  const prebuilt = (name, arch = HOST_ARCH) => join(nodePty(), 'prebuilds', `win32-${arch}`, name)
+  const prebuilt = (name) => join(nodePty(), 'prebuilds', 'win32-arm64', name)
 
-  /** What a real packaged win32 prebuilds/<arch> directory holds. */
-  const SIBLINGS = ['conpty_console_list.node', 'pty.node', 'winpty.dll', 'winpty-agent.exe']
-
-  /** `buildArch` is what build/Release actually holds, which is not always the slice's arch. */
-  const seedWindowsTree = (arch = HOST_ARCH, buildArch = arch) => {
+  const seedWindowsTree = (buildArch) => {
     write(join('build', 'Release', 'conpty.node'), peAddon(buildArch))
-    write(join('third_party', 'conpty', 'v1', `win10-${arch}`, 'conpty.dll'))
-    write(join('third_party', 'conpty', 'v1', `win10-${arch}`, 'OpenConsole.exe'))
-    write(join('prebuilds', `win32-${arch}`, 'conpty.node'))
-    for (const sibling of SIBLINGS) {
-      write(join('prebuilds', `win32-${arch}`, sibling))
-    }
+    write(join('third_party', 'conpty', 'v1', 'win10-arm64', 'conpty.dll'))
+    write(join('third_party', 'conpty', 'v1', 'win10-arm64', 'OpenConsole.exe'))
+    write(join('prebuilds', 'win32-arm64', 'conpty.node'))
+    write(join('prebuilds', 'win32-arm64', 'pty.node'))
   }
 
   beforeEach(() => {
@@ -53,73 +42,20 @@ describe('prunePackagedNodePty: the Windows conpty fallback', () => {
     rmSync(resources, { recursive: true, force: true })
   })
 
-  it('removes the stale conpty fallback when the source build is present', () => {
-    seedWindowsTree()
-
-    prunePackagedNodePty(resources, 'win32', HOST_ARCH)
-
-    expect(existsSync(join(nodePty(), 'build', 'Release', 'conpty.node'))).toBe(true)
-    expect(existsSync(prebuilt('conpty.node'))).toBe(false)
-  })
-
-  it.each(SIBLINGS)('keeps %s, which exists nowhere else in a packaged build', (sibling) => {
-    // Keep console-list/winpty prebuilds: patch removes their targets; deleting them breaks membership and PTY spawn below Windows 18309.
-    seedWindowsTree()
-
-    prunePackagedNodePty(resources, 'win32', HOST_ARCH)
-
-    expect(existsSync(prebuilt(sibling))).toBe(true)
-  })
-
-  it('keeps the fallback when there is no source build to prefer', () => {
-    write(join('prebuilds', `win32-${HOST_ARCH}`, 'conpty.node'))
-    write(join('third_party', 'conpty', 'v1', `win10-${HOST_ARCH}`, 'conpty.dll'))
-    write(join('third_party', 'conpty', 'v1', `win10-${HOST_ARCH}`, 'OpenConsole.exe'))
-
-    prunePackagedNodePty(resources, 'win32', HOST_ARCH)
-
-    expect(existsSync(prebuilt('conpty.node'))).toBe(true)
-  })
-
   it('keeps the fallback when build/Release holds a different arch than the slice', () => {
-    // Cross-host build/Release can be unloadable on target; pruning then deletes its only usable binary.
-    const target = HOST_ARCH === 'arm64' ? 'x64' : 'arm64'
-    seedWindowsTree(target, HOST_ARCH)
+    seedWindowsTree('x64')
 
-    prunePackagedNodePty(resources, 'win32', target)
-
-    expect(existsSync(prebuilt('conpty.node', target))).toBe(true)
-  })
-
-  it('removes the fallback on a cross-arch package whose build/Release IS the slice arch', () => {
-    // Cross-arch electron-builder can rebuild correctly; judge binary architecture, not host, or arm64 slice keeps unsafe upstream fallback.
-    const target = HOST_ARCH === 'arm64' ? 'x64' : 'arm64'
-    seedWindowsTree(target, target)
-
-    prunePackagedNodePty(resources, 'win32', target)
-
-    expect(existsSync(prebuilt('conpty.node', target))).toBe(false)
-    expect(existsSync(prebuilt('pty.node', target))).toBe(true)
-  })
-
-  it('keeps the fallback when build/Release is not a readable PE at all', () => {
-    seedWindowsTree()
-    write(join('build', 'Release', 'conpty.node'), 'not-a-pe')
-
-    prunePackagedNodePty(resources, 'win32', HOST_ARCH)
+    prunePackagedNodePty(resources, 'win32', 'arm64')
 
     expect(existsSync(prebuilt('conpty.node'))).toBe(true)
   })
 
-  it.each([
-    ['darwin', 'arm64'],
-    ['linux', 'x64']
-  ])('leaves %s prebuilds alone', (platform, arch) => {
-    write(join('build', 'Release', 'conpty.node'), peAddon('x64'))
-    write(join('prebuilds', `${platform}-${arch}`, 'pty.node'))
+  it('removes the matching-architecture fallback while keeping other prebuilds', () => {
+    seedWindowsTree('arm64')
 
-    prunePackagedNodePty(resources, platform, arch)
+    prunePackagedNodePty(resources, 'win32', 'arm64')
 
-    expect(existsSync(join(nodePty(), 'prebuilds', `${platform}-${arch}`, 'pty.node'))).toBe(true)
+    expect(existsSync(prebuilt('conpty.node'))).toBe(false)
+    expect(existsSync(prebuilt('pty.node'))).toBe(true)
   })
 })
diff --git a/config/scripts/desktop-distribution/runtime-verification/packaged-process-host.test.mjs b/config/scripts/desktop-distribution/runtime-verification/packaged-process-host.test.mjs
index b1a24c4ae09..f473b1b31da 100644
--- a/config/scripts/desktop-distribution/runtime-verification/packaged-process-host.test.mjs
+++ b/config/scripts/desktop-distribution/runtime-verification/packaged-process-host.test.mjs
@@ -42,24 +42,13 @@ describe('process-host output packaging guard', () => {
     }
   })
 
-  it.each([
-    ['a public export target', 'feature.js', /missing: \.\/dist\/feature\.js/],
-    ['an internal module', 'internal.js', /missing: \.\/dist\/internal\.js/]
-  ])('fails when %s was never emitted', async (_label, file, message) => {
+  it('fails when an internal module was never emitted', async () => {
     const packageDir = await builtPackage()
     try {
-      await rm(join(packageDir, 'dist', file))
-      expect(() => assertProcessHostOutputBuilt(packageDir)).toThrow(message)
-    } finally {
-      await removeTree(packageDir)
-    }
-  })
-
-  it('fails when dist is absent', async () => {
-    const packageDir = await builtPackage()
-    try {
-      await rm(join(packageDir, 'dist'), { recursive: true })
-      expect(() => assertProcessHostOutputBuilt(packageDir)).toThrow(/pnpm build:packages/)
+      await rm(join(packageDir, 'dist', 'internal.js'))
+      expect(() => assertProcessHostOutputBuilt(packageDir)).toThrow(
+        /missing: \.\/dist\/internal\.js/
+      )
     } finally {
       await removeTree(packageDir)
     }
diff --git a/config/scripts/desktop-distribution/runtime-verification/packaged-source-map-prune.test.mjs b/config/scripts/desktop-distribution/runtime-verification/packaged-source-map-prune.test.mjs
deleted file mode 100644
index 52915cd69f3..00000000000
--- a/config/scripts/desktop-distribution/runtime-verification/packaged-source-map-prune.test.mjs
+++ /dev/null
@@ -1,87 +0,0 @@
-import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from 'node:fs/promises'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const require = createRequire(import.meta.url)
-const {
-  prunePackagedRuntimeTypeAndSourceMapArtifacts
-} = require('../../../packaged-runtime-node-modules.cjs')
-
-const LINEAR_SDK_PACKAGE_JSON =
-  '{"name":"@linear/sdk","type":"module","main":"./dist/index.cjs","exports":{".":{"require":"./dist/index.cjs","import":"./dist/index.mjs"}}}'
-
-async function createPackagedNodeModulesFixture(resourcesDir) {
-  const packageDir = join(resourcesDir, 'node_modules', '@linear', 'sdk')
-  const distDir = join(packageDir, 'dist')
-  const webhooksDir = join(packageDir, 'webhooks')
-  const updaterDir = join(resourcesDir, 'node_modules', 'electron-updater', 'out')
-  const jsYamlDir = join(resourcesDir, 'node_modules', 'js-yaml', 'dist')
-  const nodePtyDir = join(resourcesDir, 'node_modules', 'node-pty', 'lib')
-  await mkdir(distDir, { recursive: true })
-  await mkdir(webhooksDir, { recursive: true })
-  await mkdir(updaterDir, { recursive: true })
-  await mkdir(jsYamlDir, { recursive: true })
-  await mkdir(nodePtyDir, { recursive: true })
-  await writeFile(join(packageDir, 'package.json'), LINEAR_SDK_PACKAGE_JSON, 'utf8')
-  await writeFile(join(packageDir, 'README.md'), 'SDK documentation', 'utf8')
-  await writeFile(join(packageDir, 'metadata.json.map'), '{"keep":true}', 'utf8')
-  await writeFile(
-    join(distDir, 'index.cjs'),
-    "module.exports = require('./runtime-helper.cjs')",
-    'utf8'
-  )
-  await writeFile(
-    join(distDir, 'runtime-helper.cjs'),
-    'exports.LinearClient = class LinearClient {}',
-    'utf8'
-  )
-  await writeFile(join(distDir, 'index.mjs'), 'export {}', 'utf8')
-  await writeFile(join(distDir, 'index.cjs.map'), '{}', 'utf8')
-  await writeFile(join(distDir, 'index.mjs.map'), '{}', 'utf8')
-  await writeFile(join(webhooksDir, 'index.cjs'), 'module.exports = {}', 'utf8')
-  await writeFile(join(webhooksDir, 'index.cjs.map'), '{}', 'utf8')
-  await writeFile(join(updaterDir, 'main.js'), 'module.exports = {}', 'utf8')
-  await writeFile(join(updaterDir, 'main.js.map'), '{}', 'utf8')
-  await writeFile(join(updaterDir, 'main.d.ts'), 'export {}', 'utf8')
-  await writeFile(join(updaterDir, 'main.d.ts.map'), '{}', 'utf8')
-  await writeFile(join(jsYamlDir, 'js-yaml.min.js'), 'globalThis.jsyaml = {}', 'utf8')
-  await writeFile(join(jsYamlDir, 'js-yaml.min.js.map'), '{}', 'utf8')
-  await writeFile(join(nodePtyDir, 'index.js'), 'module.exports = {}', 'utf8')
-  await writeFile(join(nodePtyDir, 'index.js.map'), '{}', 'utf8')
-  return { packageDir, distDir, webhooksDir, updaterDir, jsYamlDir, nodePtyDir }
-}
-
-describe('packaged runtime type-declaration and source-map pruning', () => {
-  it('removes @linear/sdk source maps while preserving runtime files and non-JS maps', async () => {
-    const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-source-map-prune-'))
-    try {
-      const { packageDir, distDir, webhooksDir } =
-        await createPackagedNodeModulesFixture(resourcesDir)
-
-      prunePackagedRuntimeTypeAndSourceMapArtifacts(resourcesDir)
-
-      await expect(readdir(distDir).then((entries) => entries.sort())).resolves.toEqual([
-        'index.cjs',
-        'index.mjs',
-        'runtime-helper.cjs'
-      ])
-      await expect(readdir(webhooksDir)).resolves.toEqual(['index.cjs'])
-      await expect(readFile(join(packageDir, 'package.json'), 'utf8')).resolves.toBe(
-        LINEAR_SDK_PACKAGE_JSON
-      )
-      await expect(readFile(join(packageDir, 'README.md'), 'utf8')).resolves.toBe(
-        'SDK documentation'
-      )
-      // Why: the predicate is filename-based, so a non-JS `.map` payload must survive.
-      await expect(readFile(join(packageDir, 'metadata.json.map'), 'utf8')).resolves.toBe(
-        '{"keep":true}'
-      )
-      const sdk = createRequire(join(resourcesDir, 'consumer.cjs'))('@linear/sdk')
-      expect(typeof sdk.LinearClient).toBe('function')
-    } finally {
-      await rm(resourcesDir, { recursive: true, force: true })
-    }
-  })
-})
diff --git a/config/scripts/desktop-distribution/runtime-verification/packaged-windows-only-runtime-files.test.mjs b/config/scripts/desktop-distribution/runtime-verification/packaged-windows-only-runtime-files.test.mjs
index 92302677ef2..40201d529e0 100644
--- a/config/scripts/desktop-distribution/runtime-verification/packaged-windows-only-runtime-files.test.mjs
+++ b/config/scripts/desktop-distribution/runtime-verification/packaged-windows-only-runtime-files.test.mjs
@@ -34,14 +34,9 @@ describe('Windows-only runtime files', () => {
       const nested = join(resourcesDir, 'node_modules', 'some-dep', 'bin')
       await mkdir(nested, { recursive: true })
       await writeFile(join(nested, 'helper'), peImage())
-      // An MZ prefix alone is not a PE image; data files must not trip the check.
-      await writeFile(join(nested, 'fake.exe'), Buffer.from('MZ not really'))
-
-      for (const platform of ['darwin', 'linux']) {
-        expect(() =>
-          assertNoWindowsExecutablesInRuntimeNodeModules(resourcesDir, platform)
-        ).toThrow(/: node_modules\/some-dep\/bin\/helper\. /)
-      }
+      expect(() => assertNoWindowsExecutablesInRuntimeNodeModules(resourcesDir, 'linux')).toThrow(
+        /: node_modules\/some-dep\/bin\/helper\. /
+      )
       expect(() =>
         assertNoWindowsExecutablesInRuntimeNodeModules(resourcesDir, 'win32')
       ).not.toThrow()
diff --git a/config/scripts/desktop-distribution/runtime-verification/process-host-build-dist.test.mjs b/config/scripts/desktop-distribution/runtime-verification/process-host-build-dist.test.mjs
index 58725d106cb..957ceb74f26 100644
--- a/config/scripts/desktop-distribution/runtime-verification/process-host-build-dist.test.mjs
+++ b/config/scripts/desktop-distribution/runtime-verification/process-host-build-dist.test.mjs
@@ -163,23 +163,6 @@ beforeAll(async () => {
 afterAll(() => releaseSeed?.())
 
 describe('process-host dist build', () => {
-  it('rewrites only changed outputs and keeps source maps pointing at src', async () => {
-    const packageDir = fixture(undefined, seededDist)
-    const before = distSnapshot(packageDir)
-
-    writeFileSync(join(packageDir, 'src', 'internal.ts'), 'export const value = 2\n')
-    const changed = await build(packageDir)
-
-    expect(changed.stdout).toContain('2 written, 0 removed, 6 unchanged')
-    const after = distSnapshot(packageDir)
-    for (const file of ['entry.js', 'entry.d.ts', 'internal.js.map']) {
-      expect(after[file]).toEqual(before[file])
-    }
-    expect(after['internal.js']).not.toEqual(before['internal.js'])
-    const map = JSON.parse(readFileSync(join(packageDir, 'dist', 'internal.js.map'), 'utf8'))
-    expect(map.sources).toEqual(['../src/internal.ts'])
-  })
-
   it('preserves the previous dist when compilation fails', async () => {
     const packageDir = fixture(undefined, seededDist)
     const before = distSnapshot(packageDir)
@@ -303,18 +286,6 @@ await buildPackageDist(process.argv[2])
     }
   )
 
-  it('reclaims staging directories abandoned by a killed build', async () => {
-    const packageDir = fixture()
-    mkdirSync(join(packageDir, '.dist-staging-abandoned'))
-    writeFileSync(join(packageDir, '.dist-staging-abandoned', 'partial.js'), '')
-
-    await build(packageDir)
-
-    expect(existsSync(join(packageDir, 'dist', 'entry.js'))).toBe(true)
-    expect(existsSync(join(packageDir, 'dist', 'partial.js'))).toBe(false)
-    expect(leftovers(packageDir)).toEqual([])
-  })
-
   it('builds its own package when reached through a symlinked directory', async () => {
     const packageDir = fixture()
     mkdirSync(join(packageDir, 'scripts'))
diff --git a/config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts b/config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts
index 9bd234de549..6b25a522257 100644
--- a/config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts
+++ b/config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts
@@ -1,20 +1,12 @@
-import {
-  existsSync,
-  mkdtempSync,
-  mkdirSync,
-  readFileSync,
-  rmSync,
-  symlinkSync,
-  writeFileSync
-} from 'node:fs'
+import { mkdtempSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
-import { basename, dirname, join, resolve } from 'node:path'
+import { dirname, join, resolve } from 'node:path'
 import { createRequire } from 'node:module'
 import { pathToFileURL } from 'node:url'
 import { runProcessSync } from '@orca/process-host'
 import { watch } from 'rolldown'
-import type { Plugin, RolldownWatcher } from 'rolldown'
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RolldownWatcher } from 'rolldown'
+import { afterEach, describe, expect, it } from 'vitest'
 import { createProcessHostDevRebuildPlugin } from '../../../build-plugins/process-host-dev-rebuild'
 
 const realPackageDir = resolve('src/packages/process-host')
@@ -38,7 +30,7 @@ function fixture(): { root: string; packageDir: string; main: string } {
   // Runs the real package build against this fixture package.
   writeFileSync(
     join(packageDir, 'scripts', 'build-dist.mjs'),
-    `import { appendFileSync } from 'node:fs'\nappendFileSync(${JSON.stringify(join(packageDir, 'builds.txt'))}, 'build\\n')\nconst { buildPackageDist } = await import(${JSON.stringify(pathToFileURL(resolve(realPackageDir, 'scripts', 'build-dist.mjs')).href)})\nawait buildPackageDist(${JSON.stringify(packageDir)})\n`
+    `const { buildPackageDist } = await import(${JSON.stringify(pathToFileURL(resolve(realPackageDir, 'scripts', 'build-dist.mjs')).href)})\nawait buildPackageDist(${JSON.stringify(packageDir)})\n`
   )
   mkdirSync(join(root, 'node_modules', '@orca'), { recursive: true })
   const packageRequire = createRequire(join(realPackageDir, 'package.json'))
@@ -162,96 +154,10 @@ describe('External process-host development rebuilds', () => {
     await expect.poll(() => versions.at(-1), { timeout: 15_000 }).toBe(7)
   })
 
-  it('emits private source edits and new imports before the Electron reload hook', async () => {
-    const { root, packageDir, main } = fixture()
-    const loadedVersions: number[] = []
-    const reloadHook: Plugin = {
-      name: 'fake-electron-reload',
-      closeBundle() {
-        loadedVersions.push(readEmittedVersion(root))
-      }
-    }
-    const watcher = watch({
-      input: main,
-      external: ['@orca/process-host'],
-      plugins: [createProcessHostDevRebuildPlugin(root), reloadHook],
-      output: { file: join(root, 'out', 'main.cjs'), format: 'cjs' }
-    })
-    watchers.push(watcher)
-    closeSuccessfulBundles(watcher)
-    await nextEvent(watcher, 'END')
-    expect(loadedVersions).toEqual([1])
-    expect(readFileSync(join(root, 'out', 'main.cjs'), 'utf8')).toContain('@orca/process-host')
-
-    writeFileSync(join(packageDir, 'src', 'internal.ts'), 'export const version = 2\n')
-    await expect.poll(() => loadedVersions.at(-1), { timeout: 15_000 }).toBe(2)
-
-    writeFileSync(join(packageDir, 'src', 'new-feature.ts'), 'export const added = 3\n')
-    writeFileSync(
-      join(packageDir, 'src', 'internal.ts'),
-      "import { added } from './new-feature'\nexport const version = added\n"
-    )
-    await expect.poll(() => loadedVersions.at(-1), { timeout: 15_000 }).toBe(3)
-    await expect
-      .poll(() => existsSync(join(packageDir, 'dist', 'new-feature.js')), { timeout: 15_000 })
-      .toBe(true)
-    expect(readFileSync(join(packageDir, 'dist', 'new-feature.js'), 'utf8')).toContain('added = 3')
-  })
-
-  it('reports a failed compilation, preserves prior output, and recovers after a fix', async () => {
-    const { root, packageDir, main } = fixture()
-    const loadedVersions: number[] = []
-    const watcher = watch({
-      input: main,
-      external: ['@orca/process-host'],
-      plugins: [
-        createProcessHostDevRebuildPlugin(root),
-        {
-          name: 'fake-electron-reload',
-          closeBundle() {
-            loadedVersions.push(readEmittedVersion(root))
-          }
-        }
-      ],
-      output: { file: join(root, 'out', 'main.cjs'), format: 'cjs' }
-    })
-    watchers.push(watcher)
-    closeSuccessfulBundles(watcher)
-    await nextEvent(watcher, 'END')
-
-    const failed = nextEvent(watcher, 'ERROR')
-    writeFileSync(join(packageDir, 'src', 'internal.ts'), "export const version: number = 'bad'\n")
-    await failed
-    expect(loadedVersions.at(-1)).toBe(1)
-    expect(readEmittedVersion(root)).toBe(1)
-
-    writeFileSync(join(packageDir, 'src', 'internal.ts'), 'export const version = 4\n')
-    await expect.poll(() => loadedVersions.at(-1), { timeout: 15_000 }).toBe(4)
-  })
-
   it('recovers when a missing import is created in a new source directory', async () => {
     const { root, packageDir, main } = fixture()
     const loadedVersions: number[] = []
-    const watchSignals = new Set<string>()
     const rebuildPlugin = createProcessHostDevRebuildPlugin(root)
-    const buildStart = rebuildPlugin.buildStart
-    if (typeof buildStart !== 'function') {
-      throw new Error('The process-host rebuild plugin must have a buildStart hook')
-    }
-    rebuildPlugin.buildStart = async function (...args) {
-      const addWatchFile = this.addWatchFile.bind(this)
-      const registration = vi.spyOn(this, 'addWatchFile').mockImplementation((file) => {
-        addWatchFile(file)
-        if (basename(file) === 'source-directory-change') {
-          watchSignals.add(file)
-        }
-      })
-      try {
-        return await buildStart.apply(this, args)
-      } finally {
-        registration.mockRestore()
-      }
-    }
     const watcher = watch({
       input: main,
       external: ['@orca/process-host'],
@@ -285,12 +191,6 @@ describe('External process-host development rebuilds', () => {
       'export const version = 5\n'
     )
     await expect.poll(() => loadedVersions.at(-1), { timeout: 15_000 }).toBe(5)
-    expect(existsSync(join(packageDir, 'dist', 'features', 'new-feature.js'))).toBe(true)
-    expect(watchSignals.size).toBe(1)
-    for (const signal of watchSignals) {
-      expect(existsSync(signal)).toBe(true)
-    }
-
     const failedAgain = nextEvent(watcher, 'ERROR')
     writeFileSync(
       join(packageDir, 'src', 'internal.ts'),
@@ -298,11 +198,5 @@ describe('External process-host development rebuilds', () => {
     )
     await failedAgain
     expect(readEmittedVersion(root)).toBe(5)
-
-    await watcher.close()
-    watchers.splice(watchers.indexOf(watcher), 1)
-    for (const signal of watchSignals) {
-      expect(existsSync(dirname(signal))).toBe(false)
-    }
   })
 })
diff --git a/config/scripts/desktop-distribution/runtime-verification/verify-packaged-daemon-entry.test.mjs b/config/scripts/desktop-distribution/runtime-verification/verify-packaged-daemon-entry.test.mjs
deleted file mode 100644
index 1266c14b392..00000000000
--- a/config/scripts/desktop-distribution/runtime-verification/verify-packaged-daemon-entry.test.mjs
+++ /dev/null
@@ -1,110 +0,0 @@
-import { mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const require = createRequire(import.meta.url)
-const { runTerminalHostRoundTrip } = require('./verify-packaged-daemon-entry.cjs')
-
-describe.skipIf(process.platform === 'win32')('terminal host round trip', () => {
-  let root
-
-  beforeEach(() => {
-    root = mkdtempSync(join(tmpdir(), 'vpd-'))
-  })
-
-  afterEach(() => {
-    vi.unstubAllEnvs()
-    rmSync(root, { recursive: true, force: true })
-  })
-
-  // Listens, publishes its token, records its pid, then treats each connection with `onConnection`.
-  function fakeDaemon(onConnection) {
-    const entry = join(root, 'daemon.cjs')
-    writeFileSync(
-      entry,
-      [
-        "const net = require('node:net'), fs = require('node:fs')",
-        'const arg = (name) => process.argv[process.argv.indexOf(name) + 1]',
-        `fs.writeFileSync(${JSON.stringify(join(root, 'pid'))}, String(process.pid))`,
-        `fs.writeFileSync(${JSON.stringify(join(root, 'shell'))}, process.env.SHELL)`,
-        `net.createServer(${onConnection}).listen(arg('--socket'), () => fs.writeFileSync(arg('--token'), 'tok'))`
-      ].join('\n')
-    )
-    return entry
-  }
-
-  async function roundTrip(entry, timeoutMs) {
-    const startedAt = Date.now()
-    const error = await runTerminalHostRoundTrip({
-      command: [process.execPath],
-      entry,
-      deadline: startedAt + timeoutMs,
-      stderr: [],
-      scratchPrefix: join(root, 'oth-')
-    }).then(
-      () => null,
-      (rejection) => rejection
-    )
-    const pid = Number(readFileSync(join(root, 'pid'), 'utf8'))
-    let daemonAlive = true
-    try {
-      process.kill(pid, 0)
-    } catch {
-      daemonAlive = false
-    }
-    return {
-      error,
-      daemonAlive,
-      scratchDirs: readdirSync(root).filter((name) => name.startsWith('oth-'))
-    }
-  }
-
-  it('accepts a valid peer round trip and cleans up after observing the boot request', async () => {
-    const messagesPath = join(root, 'messages.jsonl')
-    const entry = fakeDaemon(`(socket) => {
-      let buffer = ''
-      socket.on('data', (chunk) => {
-        buffer += chunk
-        let newline
-        while ((newline = buffer.indexOf('\\n')) !== -1) {
-          const message = JSON.parse(buffer.slice(0, newline))
-          buffer = buffer.slice(newline + 1)
-          fs.appendFileSync(${JSON.stringify(messagesPath)}, JSON.stringify(message) + '\\n')
-          if (message.type === 'hello') {
-            if (message.role === 'stream') globalThis.stream = socket
-            socket.write(JSON.stringify({ ok: true }) + '\\n')
-          } else if (message.type === 'createOrAttach') {
-            globalThis.stream.write(JSON.stringify({ payload: { data: 'OK 42' } }) + '\\n')
-          }
-        }
-      })
-    }`)
-    vi.stubEnv('SHELL', '/usr/bin/fish')
-    const result = await roundTrip(entry, 1_500)
-    expect(result.error).toBe(null)
-    expect(readFileSync(join(root, 'shell'), 'utf8')).toBe('/bin/sh')
-    expect(result.daemonAlive).toBe(false)
-    expect(result.scratchDirs).toEqual([])
-    const messages = readFileSync(messagesPath, 'utf8').trim().split('\n').map(JSON.parse)
-    expect(messages.slice(0, 2).map(({ type, role, token }) => ({ type, role, token }))).toEqual([
-      { type: 'hello', role: 'control', token: 'tok' },
-      { type: 'hello', role: 'stream', token: 'tok' }
-    ])
-    expect(messages[0].clientId).toBe(messages[1].clientId)
-    expect(messages[0].clientId).toMatch(/^[0-9a-f-]{36}$/)
-    expect(messages).toHaveLength(3)
-    expect(messages[2]).toMatchObject({
-      id: 'boot-1',
-      type: 'createOrAttach',
-      payload: {
-        sessionId: 'terminal-host-boot',
-        cols: 80,
-        rows: 24,
-        command: 'echo "OK $((6*7))" && exit'
-      }
-    })
-    expect(messages[2].payload.cwd.startsWith(join(root, 'oth-'))).toBe(true)
-  })
-})
diff --git a/config/scripts/desktop-distribution/runtime-verification/verify-packaged-plugin-resources.test.mjs b/config/scripts/desktop-distribution/runtime-verification/verify-packaged-plugin-resources.test.mjs
deleted file mode 100644
index ebfd5e96f78..00000000000
--- a/config/scripts/desktop-distribution/runtime-verification/verify-packaged-plugin-resources.test.mjs
+++ /dev/null
@@ -1,50 +0,0 @@
-import { cp, mkdtemp, rm, writeFile } from 'node:fs/promises'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const require = createRequire(import.meta.url)
-const {
-  hashPackagedPluginTree,
-  verifyPackagedPluginResources
-} = require('./verify-packaged-plugin-resources.cjs')
-
-const FIXTURE_KEY = 'stablyai.orca-multipass-recipes'
-
-/** Copies the launch tree and indexes one shipped pack so byte checks have something to verify. */
-async function copyIndexedLaunchTree(resourcesDir) {
-  const launchRoot = join(resourcesDir, 'plugins', 'launch')
-  await cp(join(process.cwd(), 'resources', 'plugins', 'launch'), launchRoot, { recursive: true })
-  await writeFile(
-    join(launchRoot, 'bundled-plugins.json'),
-    JSON.stringify({
-      version: 1,
-      plugins: [
-        {
-          pluginKey: FIXTURE_KEY,
-          path: FIXTURE_KEY,
-          contentHash: hashPackagedPluginTree(join(launchRoot, FIXTURE_KEY))
-        }
-      ]
-    })
-  )
-  return launchRoot
-}
-
-describe('verify packaged plugin resources', () => {
-  it('rejects mutated bytes in the packaged output', async () => {
-    const resourcesDir = await mkdtemp(join(tmpdir(), 'orca-packaged-plugins-'))
-    try {
-      const launchRoot = await copyIndexedLaunchTree(resourcesDir)
-      expect(() => verifyPackagedPluginResources(resourcesDir)).not.toThrow()
-      await writeFile(join(launchRoot, FIXTURE_KEY, 'extra.json'), '{"mutated":true}\n')
-
-      expect(() => verifyPackagedPluginResources(resourcesDir)).toThrow(
-        `packaged bytes do not match ${FIXTURE_KEY}`
-      )
-    } finally {
-      await rm(resourcesDir, { recursive: true, force: true })
-    }
-  })
-})
diff --git a/config/scripts/desktop-distribution/windows/trim-windows-icon-source.test.mjs b/config/scripts/desktop-distribution/windows/trim-windows-icon-source.test.mjs
deleted file mode 100644
index 4930f9f405f..00000000000
--- a/config/scripts/desktop-distribution/windows/trim-windows-icon-source.test.mjs
+++ /dev/null
@@ -1,52 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  cropImage,
-  findOpaqueBounds,
-  resizeImage,
-  squareWithMargin
-} from './trim-windows-icon-source.mjs'
-
-function glyphFillFraction(image) {
-  const bounds = findOpaqueBounds(image)
-  if (!bounds) {
-    return 0
-  }
-  return Math.max(bounds.width, bounds.height) / Math.max(image.width, image.height)
-}
-
-describe('trim pipeline', () => {
-  function solidSquareWithInset(canvas, glyph) {
-    const data = Buffer.alloc(canvas * canvas * 4)
-    const offset = Math.floor((canvas - glyph) / 2)
-    for (let y = 0; y < glyph; y++) {
-      for (let x = 0; x < glyph; x++) {
-        const idx = ((offset + y) * canvas + (offset + x)) * 4
-        data[idx] = 200
-        data[idx + 1] = 100
-        data[idx + 2] = 50
-        data[idx + 3] = 255
-      }
-    }
-    return { width: canvas, height: canvas, data }
-  }
-
-  it('finds the opaque glyph bounds and ignores transparent inset', () => {
-    const image = solidSquareWithInset(100, 60)
-    const bounds = findOpaqueBounds(image)
-    expect(bounds).toEqual({ minX: 20, minY: 20, maxX: 79, maxY: 79, width: 60, height: 60 })
-  })
-
-  it('downscales without leaving the glyph undersized', () => {
-    const image = solidSquareWithInset(256, 200)
-    const filled = squareWithMargin(cropImage(image, findOpaqueBounds(image)))
-    const small = resizeImage(filled, 32, 32)
-    expect(small.width).toBe(32)
-    const edge = {
-      width: 2,
-      height: 1,
-      data: Buffer.from([200, 100, 50, 255, 0, 0, 0, 0])
-    }
-    expect(resizeImage(edge, 1, 1).data).toEqual(Buffer.from([200, 100, 50, 128]))
-    expect(glyphFillFraction(small)).toBeGreaterThanOrEqual(0.9)
-  })
-})
diff --git a/config/scripts/desktop-distribution/windows/windows-uninstaller-signing.test.mjs b/config/scripts/desktop-distribution/windows/windows-uninstaller-signing.test.mjs
index 0ede0e62ca9..622fe77648f 100644
--- a/config/scripts/desktop-distribution/windows/windows-uninstaller-signing.test.mjs
+++ b/config/scripts/desktop-distribution/windows/windows-uninstaller-signing.test.mjs
@@ -8,47 +8,11 @@ import { describe, expect, it } from 'vitest'
 const require = createRequire(import.meta.url)
 const {
   EMBEDDED_RECEIPT_SUFFIX,
-  relayNsisUninstaller,
   signWindowsUninstallerViaSignPath
 } = require('./windows-uninstaller-signing.cjs')
 
 const makeDir = () => mkdtempSync(join(tmpdir(), 'orca-uninstaller-signing-'))
 
-describe('relayNsisUninstaller', () => {
-  const writeUninstaller = (dir, contents) => {
-    const filePath = join(dir, 'orca-windows-setup.__uninstaller.exe')
-    writeFileSync(filePath, contents)
-    return filePath
-  }
-
-  // Receipt is only evidence for embedded compressed NSIS uninstaller; bundled 7za cannot extract it.
-
-  // Import signed bytes even when rebuild regenerated unsigned intermediate.
-  it('prefers importing over exporting when both are configured', () => {
-    const dir = makeDir()
-    const filePath = writeUninstaller(dir, 'rebuild-unsigned')
-    const signedPath = join(dir, 'signed', 'orca-uninstaller.exe')
-    mkdirSync(join(dir, 'signed'))
-    writeFileSync(signedPath, 'signpath-signed')
-
-    expect(
-      relayNsisUninstaller({ filePath, signedPath, exportPath: join(dir, 'out', 'x.exe') })
-    ).toBe('imported')
-    expect(readFileSync(filePath, 'utf8')).toBe('signpath-signed')
-  })
-
-  // Missing/unwritable relay must preserve unsigned build without throwing.
-  it('leaves the unsigned uninstaller in place when no signed copy came back', () => {
-    const dir = makeDir()
-    const filePath = writeUninstaller(dir, 'unsigned-uninstaller')
-
-    expect(
-      relayNsisUninstaller({ filePath, signedPath: join(dir, 'absent', 'orca-uninstaller.exe') })
-    ).toBe('signed-missing')
-    expect(readFileSync(filePath, 'utf8')).toBe('unsigned-uninstaller')
-  })
-})
-
 // Exercise actual hook’s fail-open behavior: Windows build has no continue-on-error and throwing prevents any SignPath request.
 describe('signWindowsUninstallerViaSignPath', () => {
   const RELAY_VARS = ['ORCA_WIN_UNINSTALLER_EXPORT_PATH', 'ORCA_WIN_UNINSTALLER_SIGNED_PATH']
diff --git a/config/scripts/development/launch/orca-dev-bin.test.mjs b/config/scripts/development/launch/orca-dev-bin.test.mjs
index d8785523c38..b01cfc497cd 100644
--- a/config/scripts/development/launch/orca-dev-bin.test.mjs
+++ b/config/scripts/development/launch/orca-dev-bin.test.mjs
@@ -1,27 +1,10 @@
 import { execFileSync } from 'node:child_process'
-import {
-  chmodSync,
-  copyFileSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  writeFileSync
-} from 'node:fs'
+import { copyFileSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 
 const projectDir = path.resolve(import.meta.dirname, '../../../..')
-const wrapperPath = path.join(
-  projectDir,
-  'config',
-  'scripts',
-  'development',
-  'launch',
-  'orca-dev.mjs'
-)
-
 describe('orca-dev package bin', () => {
   it('finds the built CLI from its installed location when invoked outside the repository', () => {
     const root = mkdtempSync(path.join(tmpdir(), 'orca-dev-installed-'))
@@ -61,43 +44,4 @@ describe('orca-dev package bin', () => {
       rmSync(root, { recursive: true, force: true })
     }
   })
-
-  it('runs the dev CLI through Node without requiring Bash', () => {
-    const root = mkdtempSync(path.join(tmpdir(), 'orca-dev-bin-'))
-    const cliEntry = path.join(root, 'cli-entry.cjs')
-    const outputPath = path.join(root, 'output.json')
-    writeFileSync(
-      cliEntry,
-      [
-        'const fs = require("node:fs");',
-        `fs.writeFileSync(${JSON.stringify(outputPath)}, JSON.stringify({`,
-        '  argv: process.argv.slice(2),',
-        '  userDataPath: process.env.ORCA_USER_DATA_PATH,',
-        '  devCliInvocation: process.env.ORCA_DEV_CLI_INVOCATION,',
-        '  appExecutable: process.env.ORCA_APP_EXECUTABLE',
-        '}));'
-      ].join('\n'),
-      'utf8'
-    )
-    if (process.platform !== 'win32') {
-      chmodSync(cliEntry, 0o755)
-    }
-
-    execFileSync(process.execPath, [wrapperPath, '--help'], {
-      env: {
-        ...process.env,
-        ORCA_DEV_CLI_ENTRY_PATH: cliEntry,
-        ORCA_DEV_USER_DATA_PATH: path.join(root, 'user-data'),
-        ORCA_APP_EXECUTABLE: path.join(root, 'Electron')
-      },
-      stdio: 'ignore'
-    })
-
-    expect(JSON.parse(readFileSync(outputPath, 'utf8'))).toEqual({
-      argv: ['--help'],
-      userDataPath: path.join(root, 'user-data'),
-      devCliInvocation: '1',
-      appExecutable: path.join(root, 'Electron')
-    })
-  })
 })
diff --git a/config/scripts/development/launch/run-electron-vite-dev.test.ts b/config/scripts/development/launch/run-electron-vite-dev.test.ts
index 119815d5f67..70515c8b528 100644
--- a/config/scripts/development/launch/run-electron-vite-dev.test.ts
+++ b/config/scripts/development/launch/run-electron-vite-dev.test.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdtempSync, readFileSync, readlinkSync, rmSync } from 'node:fs'
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { spawn, type ChildProcess } from 'node:child_process'
@@ -298,54 +298,4 @@ describe('run-electron-vite-dev', () => {
     // Two full prepares, each budgeted at PREPARE_TIMEOUT_MS.
     PREPARE_TIMEOUT_MS * 2 + 30_000
   )
-
-  it.skipIf(process.platform !== 'darwin')(
-    'preserves relative Electron framework symlinks in the copied mac dev app',
-    async () => {
-      const tempDir = mkdtempSync(join(tmpdir(), 'orca-dev-wrapper-'))
-      const pidFile = join(tempDir, 'grandchild.pid')
-      const envFile = join(tempDir, 'env.json')
-      const wrapperPath = resolve('config/scripts/development/launch/run-electron-vite-dev.mjs')
-      const fakeCliPath = resolve(
-        'config/scripts/development/launch/fixtures/fake-electron-vite-dev-cli.mjs'
-      )
-
-      const { wrapper, readOutput } = spawnDevWrapper(
-        [wrapperPath, '--remote-debugging-port=9448'],
-        devWrapperTestEnv({
-          ORCA_ELECTRON_VITE_CLI: fakeCliPath,
-          ORCA_SKIP_DEV_CLI_PREPARE: '1',
-          ORCA_SKIP_DEV_WEB_PREPARE: '1',
-          ORCA_DEV_WRAPPER_TEST_PID_FILE: pidFile,
-          ORCA_DEV_WRAPPER_TEST_ENV_FILE: envFile,
-          ORCA_DEV_BRANCH: 'feature/framework-symlinks',
-          ORCA_DEV_WORKTREE_NAME: 'symlink-ui'
-        })
-      )
-
-      expect(wrapper.pid).toBeTypeOf('number')
-      processesToCleanUp.add(wrapper.pid!)
-
-      await waitForEnvFile(envFile, readOutput)
-
-      const trackedPids = trackPidFile(pidFile)
-
-      const envSnapshot = JSON.parse(readFileSync(envFile, 'utf8')) as {
-        electronExecPath: string | null
-      }
-      expect(envSnapshot.electronExecPath).toBeTypeOf('string')
-
-      const appPath = dirname(dirname(dirname(envSnapshot.electronExecPath!)))
-      const frameworkPath = join(appPath, 'Contents', 'Frameworks', 'Electron Framework.framework')
-
-      expect(readlinkSync(join(frameworkPath, 'Resources'))).toBe('Versions/Current/Resources')
-      expect(readlinkSync(join(frameworkPath, 'Electron Framework'))).toBe(
-        'Versions/Current/Electron Framework'
-      )
-      expect(readlinkSync(join(frameworkPath, 'Versions', 'Current'))).toBe('A')
-
-      await stopWrapperAndTrackedPids(wrapper, trackedPids)
-    },
-    PREPARE_TIMEOUT_MS + 30_000
-  )
 })
diff --git a/config/scripts/development/profile-seeding/dev-profile-seed.test.mjs b/config/scripts/development/profile-seeding/dev-profile-seed.test.mjs
index 7eb2c0ed2c8..b0c83a5079e 100644
--- a/config/scripts/development/profile-seeding/dev-profile-seed.test.mjs
+++ b/config/scripts/development/profile-seeding/dev-profile-seed.test.mjs
@@ -82,11 +82,6 @@ describe('seedDevProfile', () => {
         'utf8'
       )
     ).toBe('{"ciphertext":"x"}')
-    expect(readdirSync(target).sort()).toEqual([
-      'orca-dev-seed.json',
-      'orca-profile-index.json',
-      'profiles'
-    ])
   })
 
   it('refuses to overwrite a profile that already has state', async () => {
diff --git a/config/scripts/development/web-client/dev-web-client-freshness.test.mjs b/config/scripts/development/web-client/dev-web-client-freshness.test.mjs
index 2e8ad87eedf..d66af4f7889 100644
--- a/config/scripts/development/web-client/dev-web-client-freshness.test.mjs
+++ b/config/scripts/development/web-client/dev-web-client-freshness.test.mjs
@@ -1,12 +1,4 @@
-import {
-  mkdirSync,
-  mkdtempSync,
-  renameSync,
-  rmSync,
-  statSync,
-  utimesSync,
-  writeFileSync
-} from 'node:fs'
+import { mkdirSync, mkdtempSync, renameSync, rmSync, utimesSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { afterEach, expect, it } from 'vitest'
@@ -58,23 +50,13 @@ function fixture() {
   return root
 }
 
-it.each(['add', 'delete', 'rename'])(
-  'invalidates a tracked bundle after a production source %s with old timestamps',
-  (operation) => {
-    const root = fixture()
-    expect(isDevWebClientFresh(root)).toBe(true)
-    if (operation !== 'add') {
-      rmSync(join(root, 'src/renderer/src/app.tsx'))
-    }
-    if (operation !== 'delete') {
-      const file = join(root, 'src/renderer/src/added.tsx')
-      writeFileSync(file, '')
-      utimesSync(file, OLD, OLD)
-    }
-    utimesSync(join(root, 'src/renderer/src'), OLD, OLD)
-    expect(isDevWebClientFresh(root)).toBe(false)
-  }
-)
+it('invalidates a tracked bundle after a production source deletion with old timestamps', () => {
+  const root = fixture()
+  expect(isDevWebClientFresh(root)).toBe(true)
+  rmSync(join(root, 'src/renderer/src/app.tsx'))
+  utimesSync(join(root, 'src/renderer/src'), OLD, OLD)
+  expect(isDevWebClientFresh(root)).toBe(false)
+})
 
 it('invalidates a tracked bundle when a source is removed in a nested directory', () => {
   const root = fixture()
@@ -115,12 +97,6 @@ it('detects same-size atomic replacement with a restored mtime', () => {
   expect(isDevWebClientFresh(root)).toBe(true)
   writeFileSync(replacement, '')
   utimesSync(replacement, OLD, OLD)
-  const originalIdentity = statSync(file, { bigint: true })
-  const replacementIdentity = statSync(replacement, { bigint: true })
-  expect([replacementIdentity.dev, replacementIdentity.ino]).not.toEqual([
-    originalIdentity.dev,
-    originalIdentity.ino
-  ])
   renameSync(replacement, file)
   utimesSync(dirname(file), OLD, OLD)
   expect(isDevWebClientFresh(root)).toBe(false)
diff --git a/config/scripts/development/web-client/project-renderer-web-client.test.mjs b/config/scripts/development/web-client/project-renderer-web-client.test.mjs
index a2ab91b0468..3428a0ae12f 100644
--- a/config/scripts/development/web-client/project-renderer-web-client.test.mjs
+++ b/config/scripts/development/web-client/project-renderer-web-client.test.mjs
@@ -74,35 +74,19 @@ afterEach(() => {
 })
 
 describe('renderer web client projection', () => {
-  it('copies and minifies only the web dependency closure', async () => {
+  it('copies only the web dependency closure', async () => {
     const root = createRendererFixture()
     const result = await projectFixture(root)
 
     expect(result.code, result.stderr).toBe(0)
-    expect(result.stdout).toContain('Projected web client: 7 files')
     expect(existsSync(join(root, 'out/web/web-index.html'))).toBe(true)
     expect(existsSync(join(root, 'out/web/assets/editor.worker-fixture.js'))).toBe(true)
     expect(existsSync(join(root, 'out/web/assets/logo.png'))).toBe(true)
     expect(existsSync(join(root, 'out/web/assets/desktop-entry.js'))).toBe(false)
     expect(existsSync(join(root, 'out/web/stale.js'))).toBe(false)
-    const sharedFiles = JSON.parse(
-      readFileSync(join(root, 'out/renderer/.orca-web-client-files.json'), 'utf8')
-    )
-    expect(sharedFiles).toEqual(
-      expect.arrayContaining([
-        'web-index.html',
-        'assets/web-entry.js',
-        'assets/web-shared.js',
-        'assets/editor.worker-fixture.js',
-        'assets/web.css',
-        'assets/lazy.js',
-        'assets/logo.png'
-      ])
-    )
-    expect(sharedFiles).not.toContain('assets/desktop-entry.js')
-    expect(sharedFiles).not.toContain('.vite/manifest.json')
-    expect(sharedFiles).not.toContain('index.html')
-    expect(readFileSync(join(root, 'out/web/assets/web.css'), 'utf8')).toBe('.root{color:red}\n')
+    expect(
+      JSON.parse(readFileSync(join(root, 'out/renderer/.orca-web-client-files.json'), 'utf8'))
+    ).toContain('assets/editor.worker-fixture.js')
   })
 
   it('follows transitive relative references and cycles with the existing substring behavior', async () => {
@@ -133,21 +117,6 @@ describe('renderer web client projection', () => {
     expect(existsSync(join(root, 'out/web/workers/unreferenced.mjs'))).toBe(false)
   })
 
-  it('retains all PDFJS viewer asset directories even without textual references', async () => {
-    const root = createRendererFixture()
-    const assets = ['cmaps/fixture.bcmap', 'standard_fonts/fixture.pfb', 'wasm/fixture.wasm']
-    for (const file of assets) {
-      writeFixtureFile(root, `out/renderer/${file}`, Buffer.from([0, 255, 42]))
-    }
-
-    const result = await projectFixture(root)
-
-    expect(result.code, result.stderr).toBe(0)
-    for (const file of assets) {
-      expect(readFileSync(join(root, 'out/web', file))).toEqual(Buffer.from([0, 255, 42]))
-    }
-  })
-
   it('follows referenced PDFJS text assets without expanding unreferenced viewer modules', async () => {
     const root = createRendererFixture()
     writeFixtureFile(
diff --git a/config/scripts/diagnostics/hang-watchdog/hang-watchdog-process-metrics.test.mjs b/config/scripts/diagnostics/hang-watchdog/hang-watchdog-process-metrics.test.mjs
deleted file mode 100644
index 75e84d2e7c8..00000000000
--- a/config/scripts/diagnostics/hang-watchdog/hang-watchdog-process-metrics.test.mjs
+++ /dev/null
@@ -1,148 +0,0 @@
-import { execFileSync } from 'node:child_process'
-import { monitorEventLoopDelay } from 'node:perf_hooks'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { sampleProductionPerformance } from './hang-watchdog-process-metrics.mjs'
-
-vi.mock('node:child_process', async (importOriginal) => ({
-  ...(await importOriginal()),
-  execFileSync: vi.fn()
-}))
-vi.mock('node:perf_hooks', async (importOriginal) => ({
-  ...(await importOriginal()),
-  monitorEventLoopDelay: vi.fn()
-}))
-
-const observations = { events: [], readCpu: null, histogram: null }
-
-function cpuObservation(pid) {
-  return ['cpu', 'ps', ['-o', 'time=', '-p', String(pid)], { encoding: 'utf8' }]
-}
-
-describe('production watchdog sample lifetime', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    observations.events = []
-    let enabled = false
-    observations.histogram = {
-      enable() {
-        observations.events.push(['enable'])
-        const changed = !enabled
-        enabled = true
-        return changed
-      },
-      disable() {
-        observations.events.push(['disable'])
-        const changed = enabled
-        enabled = false
-        return changed
-      },
-      percentile: (value) => {
-        observations.events.push(['percentile', value])
-        return value === 95 ? 1_900_000 : 3_100_000
-      },
-      max: 5_000_000
-    }
-    vi.mocked(execFileSync).mockImplementation((command, args, options) => {
-      observations.events.push(['cpu', command, args, options])
-      return observations.readCpu()
-    })
-    vi.mocked(monitorEventLoopDelay).mockImplementation((options) => {
-      observations.events.push(['monitor', options])
-      return observations.histogram
-    })
-  })
-  afterEach(() => {
-    vi.clearAllTimers()
-    vi.restoreAllMocks()
-    vi.useRealTimers()
-  })
-
-  it.each([1, 2])('clears the heartbeat when initial CPU observation %s throws', async (failAt) => {
-    const error = new Error('PID observation failed')
-    let reads = 0
-    observations.readCpu = () => {
-      if (++reads === failAt) {
-        throw error
-      }
-      return '0:01.20'
-    }
-    const sendHeartbeat = vi.fn()
-    const sleep = vi.fn()
-    await expect(
-      sampleProductionPerformance(
-        { pids: [101, 102], sendHeartbeat },
-        { heartbeatIntervalMs: 2_000, sampleMs: 30_000, sleep }
-      )
-    ).rejects.toBe(error)
-    expect(reads).toBe(failAt)
-    expect(sleep).not.toHaveBeenCalled()
-    expect(observations.events.filter(([kind]) => kind !== 'disable')).toEqual([
-      ['monitor', { resolution: 10 }],
-      ...[101, 102].slice(0, failAt).map(cpuObservation)
-    ])
-    expect(vi.getTimerCount()).toBe(0)
-    await vi.advanceTimersByTimeAsync(4_000)
-    expect(sendHeartbeat).not.toHaveBeenCalled()
-  })
-
-  async function runSample({ values, sleepError } = {}) {
-    const cpuValues = values ?? ['0:01.20', '0:02.30', '0:01.25', '0:02.35']
-    let index = 0
-    observations.readCpu = () => {
-      const value = cpuValues[index++]
-      if (value instanceof Error) {
-        throw value
-      }
-      return value
-    }
-    const sendHeartbeat = vi.fn(() => observations.events.push(['heartbeat']))
-    const sleep = async (ms) => {
-      observations.events.push(['sleep', ms])
-      await vi.advanceTimersByTimeAsync(ms)
-      if (sleepError) {
-        throw sleepError
-      }
-    }
-    return sampleProductionPerformance(
-      { pids: [101, 102], sendHeartbeat },
-      { heartbeatIntervalMs: 2_000, sampleMs: 6_000, sleep }
-    )
-  }
-
-  const completedSampleEvents = [
-    ['monitor', { resolution: 10 }],
-    cpuObservation(101),
-    cpuObservation(102),
-    ['enable'],
-    ['sleep', 6_000],
-    ['heartbeat'],
-    ['heartbeat'],
-    ['heartbeat'],
-    ['disable']
-  ]
-
-  it('keeps complete live results, observation order and heartbeat pacing', async () => {
-    expect(await runSample()).toEqual({
-      cpuMs: 100,
-      heartbeatCount: 3,
-      eventLoopDelayP95Ms: 1.9,
-      eventLoopDelayP99Ms: 3.1,
-      eventLoopDelayMaxMs: 5
-    })
-    expect(observations.events).toEqual([
-      ...completedSampleEvents,
-      cpuObservation(101),
-      cpuObservation(102),
-      ['percentile', 95],
-      ['percentile', 99]
-    ])
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('keeps a sample sleep rejection and its existing cleanup', async () => {
-    const error = new Error('sample sleep rejected')
-    await expect(runSample({ sleepError: error })).rejects.toBe(error)
-    expect(observations.events).toEqual(completedSampleEvents)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-})
diff --git a/config/scripts/diagnostics/lag-capture/lag-probe-failures.test.mjs b/config/scripts/diagnostics/lag-capture/lag-probe-failures.test.mjs
index 7402bbf6f94..6812c067474 100644
--- a/config/scripts/diagnostics/lag-capture/lag-probe-failures.test.mjs
+++ b/config/scripts/diagnostics/lag-capture/lag-probe-failures.test.mjs
@@ -1,45 +1,10 @@
 import assert from 'node:assert/strict'
 import { test } from 'vitest'
 import { runInNewContext } from 'node:vm'
-import { installRendererIpcProbe } from './main-blocking-probe.mjs'
 import { connectOrcaMainInspector } from './orca-main-inspector-connection.mjs'
 
-test('IPC polling records a rejection and permits the next poll', async () => {
-  let poll
-  let calls = 0
-  const window = {
-    api: {
-      app: {
-        getIdentity: async () => {
-          if (++calls === 1) {
-            throw new Error('IPC disconnected')
-          }
-        }
-      }
-    }
-  }
-  runInNewContext(`(${String(installRendererIpcProbe)})()`, {
-    window,
-    performance,
-    Date,
-    document: { addEventListener() {}, removeEventListener() {} },
-    setInterval(callback) {
-      poll = callback
-      return 1
-    },
-    clearInterval() {}
-  })
-  await poll()
-  await poll()
-  const { requests } = window.__orcaIpcTimingProbe.stop()
-  assert.equal(requests.length, 2)
-  assert.match(requests[0].failed, /IPC disconnected/)
-  assert.equal(requests[1].failed, undefined)
-})
-
-test('socket closure rejects outstanding and subsequent requests without timeout timers', async () => {
+test('socket closure rejects outstanding and subsequent requests', async () => {
   let socket
-  const timers = new Set()
   class FakeSocket {
     static OPEN = 1
     readyState = 1
@@ -63,13 +28,10 @@ test('socket closure rejects outstanding and subsequent requests without timeout
   const connect = runInNewContext(`(${String(connectOrcaMainInspector)})`, {
     fetch: async () => ({ json: async () => [{ webSocketDebuggerUrl: 'ws://fixture' }] }),
     WebSocket: FakeSocket,
-    setTimeout(callback) {
-      timers.add(callback)
-      return callback
+    setTimeout() {
+      return 1
     },
-    clearTimeout(timer) {
-      timers.delete(timer)
-    }
+    clearTimeout() {}
   })
   const connection = await connect(42)
   const first = connection.send('Profiler.start')
@@ -78,5 +40,4 @@ test('socket closure rejects outstanding and subsequent requests without timeout
   await assert.rejects(first, /Inspector socket closed/)
   await assert.rejects(second, /Inspector socket closed/)
   await assert.rejects(connection.send('Profiler.enable'), /not open/)
-  assert.equal(timers.size, 0)
 })
diff --git a/config/scripts/diagnostics/terminal-transcripts/pty-transcript-secret-scan.test.mjs b/config/scripts/diagnostics/terminal-transcripts/pty-transcript-secret-scan.test.mjs
index 664c3cdf2a9..fb562d41608 100644
--- a/config/scripts/diagnostics/terminal-transcripts/pty-transcript-secret-scan.test.mjs
+++ b/config/scripts/diagnostics/terminal-transcripts/pty-transcript-secret-scan.test.mjs
@@ -1,22 +1,14 @@
 // Pin identifier shapes from live agent transcripts so the commit-time scrub gate cannot leak account IDs.
 import { readdirSync, readFileSync } from 'node:fs'
-import os from 'node:os'
 import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
   formatFindings,
-  placeholderFor,
   redactTranscript,
   scanTranscriptForSecrets
 } from './pty-transcript-secret-scan.mjs'
 
 describe('pty transcript secret scan', () => {
-  it('finds the account row of a ready screen', () => {
-    const findings = scanTranscriptForSecrets('Antigravity CLI 1.1.17\njin.woo@acme.dev (Business)')
-    expect(findings).toHaveLength(1)
-    expect(findings[0]).toMatchObject({ kind: 'email', line: 2, column: 1 })
-  })
-
   it('finds credentials an agent may echo while signing in', () => {
     const kinds = scanTranscriptForSecrets(
       [
@@ -29,41 +21,16 @@ describe('pty transcript secret scan', () => {
     expect(kinds).toEqual(['jwt', 'google-api-key', 'google-refresh-token', 'bearer-token'])
   })
 
-  it('flags this machine’s own username, which a prompt line leaks', () => {
-    const username = os.userInfo().username
-    const findings = scanTranscriptForSecrets(`~/Users/${username}/orca/repo\n> `)
-    expect(findings.some((finding) => finding.kind === 'local-username')).toBe(true)
-  })
-
   it('finds the resumable conversation id agy prints on exit', () => {
     const findings = scanTranscriptForSecrets(
       'Resume with -c (or command below):\nagy --conversation=26dc1986-9eec-456a-a534-d93e5c1076c2'
     )
     expect(findings).toHaveLength(1)
     expect(findings[0].kind).toBe('uuid')
-    expect(placeholderFor('uuid', findings[0].match.length)).toMatch(
-      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/
-    )
-  })
-
-  it('passes a fixture that is already scrubbed, so "prove it is gone" can succeed', () => {
-    const scrubbed = `uuuu@example.com\n${'X'.repeat(44)}`
-    expect(scanTranscriptForSecrets(scrubbed)).toEqual([])
   })
 })
 
 describe('redaction', () => {
-  it('replaces every finding with the same number of characters', () => {
-    // Same-length redaction preserves captured wrapping; shorter replacements invalidate evidence.
-    const text = 'Antigravity CLI 1.1.17\njin.woo@acme.dev (Antigravity Business)\n> '
-    const { text: redacted, redacted: count } = redactTranscript(text)
-    expect(count).toBe(1)
-    expect(redacted).toHaveLength(text.length)
-    expect(redacted).not.toContain('jin.woo@acme.dev')
-    expect(scanTranscriptForSecrets(redacted)).toEqual([])
-    expect(redactTranscript(redacted).redacted).toBe(0)
-  })
-
   it('leaves the rest of the screen byte-for-byte untouched', () => {
     const text = 'line one\nuser@corp.io\nline three'
     expect(redactTranscript(text).text).toBe('line one\nXXXXXXXXXXXX\nline three')
diff --git a/config/scripts/diagnostics/windows-pty/windows-pty-table-stress-observer.test.mjs b/config/scripts/diagnostics/windows-pty/windows-pty-table-stress-observer.test.mjs
index b557887dc59..73faeda0e98 100644
--- a/config/scripts/diagnostics/windows-pty/windows-pty-table-stress-observer.test.mjs
+++ b/config/scripts/diagnostics/windows-pty/windows-pty-table-stress-observer.test.mjs
@@ -1,45 +1,20 @@
-import { rmSync } from 'node:fs'
-import { afterEach, describe, expect, it } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { sanitizeStressText } from './windows-pty-table-stress-observer.mjs'
 
-const directories = []
-afterEach(() => {
-  for (const directory of directories.splice(0)) {
-    rmSync(directory, { recursive: true, force: true })
-  }
-})
-
 describe('Windows PTY stress observer', () => {
-  it('preserves OSC boundaries while redacting their title payload and adjacent CSI text', () => {
+  it('redacts a key interrupted by adjacent controls without moving their bytes', () => {
     const esc = String.fromCharCode(27)
-    const raw = `${esc}]0;private@sensitive.test${esc}\\${esc}[31mprivate@sensitive.test`
+    const before = 'sk-secret01'
+    const after = '234567890abcdefghijkl'
+    const controls = `${esc}[31m${esc}[1m`
+    const raw = `${before}${controls}${after}`
     const sanitized = sanitizeStressText(raw)
-    expect(sanitized).not.toContain('private@')
-    expect(sanitized).not.toContain('sensitive.test')
-    expect(sanitized).toContain(`${esc}]0;`)
-    expect(sanitized).toContain(`${esc}\\${esc}[31m`)
+    expect(sanitized).not.toContain(before)
+    expect(sanitized).not.toContain(after)
+    expect(sanitized.slice(before.length, before.length + controls.length)).toBe(controls)
     expect(sanitized.length).toBe(raw.length)
   })
 
-  it.each([
-    ['email domain', 'private@', 'sensitive.test', ['[31m']],
-    ['email name', 'pri', 'vate@sensitive.test', ['[31m', '[1m']],
-    ['vendor key', 'sk-secret01', '234567890abcdefghijkl', ['[31m', '[1m']],
-    ['bearer token', 'Bearer secret01', '234567890abcdefghijkl', ['[31m', '[1m']]
-  ])(
-    'redacts %s interrupted by adjacent controls without moving their bytes',
-    (_kind, before, after, fragments) => {
-      const esc = String.fromCharCode(27)
-      const controls = fragments.map((fragment) => esc + fragment).join('')
-      const raw = `${before}${controls}${after}`
-      const sanitized = sanitizeStressText(raw)
-      expect(sanitized).not.toContain(before)
-      expect(sanitized).not.toContain(after)
-      expect(sanitized.slice(before.length, before.length + controls.length)).toBe(controls)
-      expect(sanitized.length).toBe(raw.length)
-    }
-  )
-
   it('scrubs an interrupted OSC title independently from the adjacent rendered address', () => {
     const esc = String.fromCharCode(27)
     const title = `private@${esc}[31msensitive.test`
diff --git a/config/scripts/electron-installation/platform-layout/install-electron-package-binary.test.mjs b/config/scripts/electron-installation/platform-layout/install-electron-package-binary.test.mjs
index 4b29b5607bf..11b074bd47c 100644
--- a/config/scripts/electron-installation/platform-layout/install-electron-package-binary.test.mjs
+++ b/config/scripts/electron-installation/platform-layout/install-electron-package-binary.test.mjs
@@ -1,19 +1,10 @@
-import {
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  rmSync,
-  writeFileSync
-} from 'node:fs'
+import { existsSync, lstatSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import {
   addSiblingWorktree,
   initGitRepo,
   mkTempProject,
-  readExtractorCallCount,
   readSharedDistMarker,
   runInstallScript,
   sharedCacheRoot,
@@ -27,7 +18,7 @@ import {
 } from './install-electron-package-binary-test-fixtures.mjs'
 
 describe('install-electron-package-binary', () => {
-  it('installs Electron from an isolated cache and repairs path.txt', () => {
+  it('installs the distribution and repairs path.txt', () => {
     const projectDir = mkTempProject()
 
     try {
@@ -43,10 +34,6 @@ describe('install-electron-package-binary', () => {
       const result = runInstallScript(projectDir)
 
       expect(result.status, result.stderr).toBe(0)
-      expect(readFileSync(join(projectDir, 'electron-get.log'), 'utf8')).toMatch(
-        /cacheRoot=.*orca-electron-.*cache/
-      )
-      expect(readFileSync(join(projectDir, 'electron-get.log'), 'utf8')).toContain('force=true')
       expect(readFileSync(join(projectDir, 'node_modules', 'electron', 'path.txt'), 'utf8')).toBe(
         'electron'
       )
@@ -61,31 +48,6 @@ describe('install-electron-package-binary', () => {
           ).isSymbolicLink()
         ).toBe(true)
       }
-      expect(result.stdout).toContain('Repaired Electron path.txt -> electron')
-    } finally {
-      rmSync(projectDir, { recursive: true, force: true })
-    }
-  })
-
-  it('preserves an existing Electron distribution when replacement download fails', () => {
-    const projectDir = mkTempProject()
-
-    try {
-      writeFakeElectronPackage(projectDir)
-      writeFakeElectronGet(projectDir, { downloadFailures: 1, downloadErrorCode: 'EACCES' })
-      writeFakeElectronDist(projectDir, {
-        version: 'v40.0.0',
-        executableContents: 'existing executable',
-        pathContents: 'electron'
-      })
-
-      const result = runInstallScript(projectDir)
-      const electronDir = join(projectDir, 'node_modules/electron')
-
-      expect(result.status).toBe(1)
-      expect(readFileSync(join(electronDir, 'dist/version'), 'utf8')).toBe('v40.0.0')
-      expect(readFileSync(join(electronDir, 'dist/electron'), 'utf8')).toBe('existing executable')
-      expect(readFileSync(join(electronDir, 'path.txt'), 'utf8')).toBe('electron')
     } finally {
       rmSync(projectDir, { recursive: true, force: true })
     }
@@ -124,36 +86,6 @@ describe('install-electron-package-binary', () => {
     }
   })
 
-  it('keeps a persistent cache root while retrying transient failures', () => {
-    const projectDir = mkTempProject()
-    const cacheRoot = join(projectDir, 'electron-cache')
-
-    try {
-      writeFakeElectronPackage(projectDir)
-      writeFakeElectronGet(projectDir, {
-        downloadFailures: 1,
-        downloadErrorCode: 'ECONNRESET'
-      })
-      writeFakeExtractor(projectDir, { createExecutable: true })
-      mkdirSync(cacheRoot, { recursive: true })
-      writeFileSync(join(cacheRoot, 'preserved.marker'), 'keep me')
-
-      const result = runInstallScript(projectDir, {
-        ORCA_ELECTRON_PACKAGE_CACHE_ROOT: cacheRoot,
-        ORCA_ELECTRON_PACKAGE_RETRY_DELAYS_MS: '0,0'
-      })
-
-      expect(result.status, result.stderr).toBe(0)
-      expect(existsSync(join(cacheRoot, 'preserved.marker'))).toBe(true)
-      expect(
-        readFileSync(join(projectDir, 'electron-get.log'), 'utf8').trim().split('\n')
-      ).toHaveLength(2)
-    } finally {
-      rmSync(projectDir, { recursive: true, force: true })
-    }
-  })
-
-  // The shared cache is macOS-only: it exists to avoid a second copy via APFS clonefile.
   it('shares the Electron dist into a sibling worktree without downloading', () => {
     const projectDir = mkTempProject()
     const siblingDir = `${projectDir}-sibling`
@@ -174,7 +106,6 @@ describe('install-electron-package-binary', () => {
       const siblingDistDir = join(siblingDir, 'node_modules/electron/dist')
 
       expect(result.status, result.stderr).toBe(0)
-      expect(readExtractorCallCount(siblingDir)).toBe(0)
       expect(existsSync(join(siblingDir, 'electron-get.log'))).toBe(false)
       expect(lstatSync(siblingDistDir).isDirectory()).toBe(true)
       expect(lstatSync(siblingDistDir).isSymbolicLink()).toBe(false)
@@ -184,44 +115,13 @@ describe('install-electron-package-binary', () => {
         'electron'
       )
       expect(readSharedDistMarker(siblingDir)).toBe(sharedEntryName)
-      expect(result.stdout).toContain('Shared Electron 41.5.0 from')
     } finally {
       rmSync(siblingDir, { recursive: true, force: true })
       rmSync(projectDir, { recursive: true, force: true })
     }
   })
 
-  it('publishes an already installed Electron dist that predates the shared cache', () => {
-    const projectDir = mkTempProject()
-
-    try {
-      initGitRepo(projectDir)
-      writeFakeElectronPackage(projectDir)
-      writeFakeElectronGet(projectDir)
-      writeFakeExtractor(projectDir, { createExecutable: true })
-      writeFakeElectronDist(projectDir, {
-        executableContents: 'existing executable',
-        pathContents: 'electron'
-      })
-
-      const result = runInstallScript(projectDir, { CI: '' })
-      const entryPath = join(sharedCacheRoot(projectDir), sharedEntryName)
-      const distDir = join(projectDir, 'node_modules/electron/dist')
-
-      expect(result.status, result.stderr).toBe(0)
-      expect(readExtractorCallCount(projectDir)).toBe(0)
-      expect(existsSync(join(projectDir, 'electron-get.log'))).toBe(false)
-      expect(readFileSync(join(entryPath, 'version'), 'utf8')).toBe('v41.5.0')
-      expect(readFileSync(join(entryPath, 'electron'), 'utf8')).toBe('existing executable')
-      expect(readSharedDistMarker(projectDir)).toBe(sharedEntryName)
-      expect(readFileSync(join(distDir, 'electron'), 'utf8')).toBe('existing executable')
-      expect(readFileSync(join(distDir, 'version'), 'utf8')).toBe('v41.5.0')
-    } finally {
-      rmSync(projectDir, { recursive: true, force: true })
-    }
-  })
-
-  it('replaces a corrupt shared Electron dist entry instead of re-downloading forever', () => {
+  it('repairs a corrupt shared Electron dist entry', () => {
     const projectDir = mkTempProject()
 
     try {
@@ -238,16 +138,12 @@ describe('install-electron-package-binary', () => {
       const distDir = join(projectDir, 'node_modules/electron/dist')
 
       expect(result.status, result.stderr).toBe(0)
-      expect(result.stderr).not.toContain('Failed to install Electron package binary')
-      expect(readExtractorCallCount(projectDir)).toBe(1)
       expect(readFileSync(join(distDir, 'version'), 'utf8')).toBe('v41.5.0')
       expect(readFileSync(join(projectDir, 'node_modules/electron/path.txt'), 'utf8')).toBe(
         'electron'
       )
-      // Why not just fall back: an entry left corrupt makes every sibling worktree download again.
       expect(readFileSync(join(entryPath, 'version'), 'utf8')).toBe('v41.5.0')
       expect(readSharedDistMarker(projectDir)).toBe(sharedEntryName)
-      expect(readdirSync(sharedCacheRoot(projectDir))).toEqual([sharedEntryName])
     } finally {
       rmSync(projectDir, { recursive: true, force: true })
     }
@@ -275,11 +171,6 @@ describe('install-electron-package-binary', () => {
         'v42.0.0'
       )
       expect(readSharedDistMarker(projectDir)).toBe(sharedEntryNameFor('42.0.0'))
-      // Why the old entry stays: sibling worktrees on the previous branch still share it.
-      expect(readdirSync(cacheRoot).sort()).toEqual([
-        sharedEntryNameFor('41.5.0'),
-        sharedEntryNameFor('42.0.0')
-      ])
       expect(readFileSync(join(cacheRoot, sharedEntryNameFor('41.5.0'), 'version'), 'utf8')).toBe(
         'v41.5.0'
       )
diff --git a/config/scripts/electron-installation/shared-dist-cache/shared-electron-dist-cache.test.ts b/config/scripts/electron-installation/shared-dist-cache/shared-electron-dist-cache.test.ts
deleted file mode 100644
index 96937ded364..00000000000
--- a/config/scripts/electron-installation/shared-dist-cache/shared-electron-dist-cache.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import type { execFileSync } from 'node:child_process'
-import {
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readdirSync,
-  rmSync,
-  symlinkSync,
-  writeFileSync
-} from 'node:fs'
-import { tmpdir } from 'node:os'
-import path from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
-import {
-  shareElectronDistFromCache,
-  isUsableElectronDist,
-  publishSharedElectronDist,
-  resolveSharedElectronDistEntry
-} from './shared-electron-dist-cache.mjs'
-
-const VERSION = '43.4.1'
-const PLATFORM_PATH = path.join('Electron.app', 'Contents', 'MacOS', 'Electron')
-const roots: string[] = []
-
-afterEach(() => {
-  while (roots.length > 0) {
-    rmSync(roots.pop()!, { recursive: true, force: true })
-  }
-})
-
-function makeRoot(): string {
-  const root = mkdtempSync(path.join(tmpdir(), 'orca-shared-electron-'))
-  roots.push(root)
-  return root
-}
-
-function writeDist(distPath: string, version = VERSION): string {
-  mkdirSync(path.join(distPath, path.dirname(PLATFORM_PATH)), { recursive: true })
-  writeFileSync(path.join(distPath, 'version'), `v${version}\n`)
-  writeFileSync(path.join(distPath, PLATFORM_PATH), 'electron')
-  return distPath
-}
-
-function makeEntry(root: string, entryName = `${VERSION}-darwin-arm64`) {
-  const cacheRoot = path.join(root, 'cache')
-  return {
-    cacheRoot,
-    entryPath: path.join(cacheRoot, entryName),
-    markerPath: path.join(root, '.orca-shared-dist')
-  }
-}
-
-const baseOptions = {
-  repoRoot: '/repo',
-  electronPackageDir: '/repo/node_modules/electron',
-  version: VERSION,
-  targetPlatform: 'darwin',
-  targetArch: 'arm64',
-  env: {} as NodeJS.ProcessEnv,
-  execFile: (() => '/repo/.git\n') as unknown as typeof execFileSync
-}
-
-describe('resolveSharedElectronDistEntry', () => {
-  it('declines an identity that would not be a single safe path segment', () => {
-    expect(resolveSharedElectronDistEntry({ ...baseOptions, targetArch: '../escape' })).toBeNull()
-    expect(resolveSharedElectronDistEntry({ ...baseOptions, targetPlatform: 'dar/win' })).toBeNull()
-    expect(resolveSharedElectronDistEntry({ ...baseOptions, version: '' })).toBeNull()
-  })
-})
-
-describe('isUsableElectronDist', () => {
-  it('rejects a symlink so a redirected entry is never treated as cache content', () => {
-    const root = makeRoot()
-    writeDist(path.join(root, 'real'))
-    symlinkSync(path.join(root, 'real'), path.join(root, 'link'), 'dir')
-    expect(isUsableElectronDist(path.join(root, 'link'), VERSION, PLATFORM_PATH)).toBe(false)
-  })
-})
-
-describe('publishSharedElectronDist', () => {
-  it('leaves no entry and no staging tree when sharing fails', () => {
-    const root = makeRoot()
-    const entry = makeEntry(root)
-    const share = (_source: string, destination: string) => {
-      writeDist(destination)
-      throw new Error('no shareable storage')
-    }
-    expect(publishSharedElectronDist(writeDist(path.join(root, 'dist')), entry, { share })).toBe(
-      false
-    )
-    expect(existsSync(entry.entryPath)).toBe(false)
-    expect(readdirSync(entry.cacheRoot)).toEqual([])
-  })
-})
-
-describe('shareElectronDistFromCache', () => {
-  it('refuses an entry that fails validation instead of installing it', () => {
-    const root = makeRoot()
-    const entry = makeEntry(root)
-    mkdirSync(entry.cacheRoot, { recursive: true })
-    writeDist(entry.entryPath, '40.0.0')
-    const stagePath = path.join(root, 'stage')
-    expect(
-      shareElectronDistFromCache(entry, stagePath, {
-        version: VERSION,
-        platformPath: PLATFORM_PATH
-      })
-    ).toBe(false)
-    expect(existsSync(stagePath)).toBe(false)
-  })
-
-  it('reports failure rather than falling back to a full copy', () => {
-    const root = makeRoot()
-    const entry = makeEntry(root)
-    mkdirSync(entry.cacheRoot, { recursive: true })
-    writeDist(entry.entryPath)
-    // Stub mechanism-dependent sharing failures; byte-copy fallback would defeat cache’s storage purpose.
-    const stagePath = path.join(root, 'stage')
-    const share = () => {
-      throw new Error('no shareable storage')
-    }
-    expect(
-      shareElectronDistFromCache(entry, stagePath, {
-        version: VERSION,
-        platformPath: PLATFORM_PATH,
-        share
-      })
-    ).toBe(false)
-    expect(existsSync(stagePath)).toBe(false)
-  })
-})
diff --git a/config/scripts/locale-catalog/locale-brand-prefilter.test.mjs b/config/scripts/locale-catalog/locale-brand-prefilter.test.mjs
deleted file mode 100644
index 0ea14ffea3b..00000000000
--- a/config/scripts/locale-catalog/locale-brand-prefilter.test.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { repairTranslatedValue } from './locale-translation-policy.mjs'
-
-describe('locale brand matching', () => {
-  it('does not construct boundary expressions for absent brands', () => {
-    let boundaryExpressions = 0
-    vi.stubGlobal(
-      'RegExp',
-      new Proxy(RegExp, {
-        construct(target, args) {
-          if (typeof args[0] === 'string' && args[0].startsWith('(^|[^A-Za-z_])')) {
-            boundaryExpressions += 1
-          }
-          return Reflect.construct(target, args)
-        }
-      })
-    )
-    try {
-      for (const locale of ['zh', 'ja', 'ko', 'es']) {
-        expect(
-          repairTranslatedValue({
-            key: 'fixture.endpoint',
-            enValue: 'Choose an endpoint.',
-            localeValue: 'fixture translation',
-            locale
-          })
-        ).toBe('fixture translation')
-      }
-    } finally {
-      vi.unstubAllGlobals()
-    }
-    expect(boundaryExpressions).toBe(0)
-  })
-
-  it.each([
-    ['Use Gemini.', 'Usar Géminis.', 'Usar Gemini.'],
-    ['Use GeminiX.', 'Usar Géminis.', 'Usar Géminis.'],
-    ['Use XGemini.', 'Usar Géminis.', 'Usar Géminis.'],
-    ['Use _Gemini_.', 'Usar Géminis.', 'Usar Géminis.'],
-    ['Use Gemini_2.', 'Usar Géminis.', 'Usar Géminis.'],
-    ['Use 2Gemini3.', 'Usar Géminis.', 'Usar Gemini.'],
-    ['Use (Gemini).', 'Usar Géminis.', 'Usar Gemini.'],
-    ['Use éGemini界.', 'Usar Géminis.', 'Usar Gemini.'],
-    ['Use gemini.', 'Usar Géminis.', 'Usar Géminis.'],
-    ['Use GeminiX and Gemini.', 'Usar Géminis.', 'Usar Gemini.'],
-    ['Use Gemini.', 'Gemini y Géminis.', 'Gemini y Géminis.'],
-    ['Use Gemini.', '_Gemini_ y Géminis.', '_Gemini_ y Gemini.'],
-    ['Use GitHub Copilot.', 'Usar Copiloto de GitHub.', 'Usar GitHub Copilot.'],
-    ['Use XGitHub CopilotY.', 'Usar Copiloto de GitHub.', 'Usar GitHub Copilot.']
-  ])('preserves literal and boundary matching for %j / %j', (enValue, localeValue, expected) => {
-    expect(
-      repairTranslatedValue({ key: 'fixture.brand', enValue, localeValue, locale: 'es' })
-    ).toBe(expected)
-  })
-})
diff --git a/config/scripts/locale-catalog/locale-generic-ui-terms.test.mjs b/config/scripts/locale-catalog/locale-generic-ui-terms.test.mjs
deleted file mode 100644
index f2f5f6aebdb..00000000000
--- a/config/scripts/locale-catalog/locale-generic-ui-terms.test.mjs
+++ /dev/null
@@ -1,125 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { repairTranslatedValue } from './locale-translation-policy.mjs'
-
-// #12113: generic-word brand repair reverted ~2000 translations; keep UI vocabulary translated and real brands Latin.
-describe('locale generic UI terms', () => {
-  it('keeps a translated generic term when the whole value is that term', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.AppearancePane.terminalTitle',
-        enValue: 'Terminal',
-        localeValue: '터미널',
-        locale: 'ko'
-      })
-    ).toBe('터미널')
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.QuickCommandsPane.4ccc63da87',
-        enValue: 'Agent',
-        localeValue: '에이전트',
-        locale: 'ko'
-      })
-    ).toBe('에이전트')
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.mobile.MobileHero.a8fb43cf1c',
-        enValue: 'Continue',
-        localeValue: '继续',
-        locale: 'zh'
-      })
-    ).toBe('继续')
-  })
-
-  it('keeps a translated generic term inside a sentence', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.EditorFontSection.matchTerminal',
-        enValue: 'Match terminal font',
-        localeValue: '터미널 글꼴과 동일',
-        locale: 'ko'
-      })
-    ).toBe('터미널 글꼴과 동일')
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.ExperimentalPane.agentDashboard.toggleLabel',
-        enValue: 'Toggle Agent Dashboard',
-        localeValue: '에이전트 대시보드 전환',
-        locale: 'ko'
-      })
-    ).toBe('에이전트 대시보드 전환')
-    expect(
-      repairTranslatedValue({
-        key: 'components.agentSessionContinuation.dialogTitle',
-        enValue: 'Continue in New Session',
-        localeValue: '新しいセッションで続ける',
-        locale: 'ja'
-      })
-      // 新しい → 新規 is an unrelated phrase fix; 続ける is what must survive.
-    ).toBe('新規セッションで続ける')
-  })
-
-  it('still reverts real brand names that machine translation localized', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.stats.StatsPane.7d26110cea',
-        enValue: 'Codex',
-        localeValue: '사본',
-        locale: 'ko'
-      })
-    ).toBe('Codex')
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.NetworkPane.tailscale',
-        enValue: 'Connect over Tailscale',
-        localeValue: '通过尾鳞连接',
-        locale: 'zh'
-      })
-    ).toBe('通过 Tailscale 连接')
-  })
-
-  it('does not cut a valid word that contains a nonsense rendering', () => {
-    // 终端子进程 is "terminal sub-process" — 端子 sits inside 终端 + 子.
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.settings.AdvancedNetworkSettingsSection.823e0f15b1',
-        enValue: 'Proxy URL for Orca network requests and local terminal subprocesses.',
-        localeValue: '用于 Orca 网络请求和本地终端子进程的代理 URL。',
-        locale: 'zh'
-      })
-    ).toBe('用于 Orca 网络请求和本地终端子进程的代理 URL。')
-  })
-
-  it('still fills in a translation when the catalog holds English', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
-        enValue: 'Terminal 1',
-        localeValue: 'Terminal 1',
-        locale: 'ko'
-      })
-    ).toBe('터미널 1')
-  })
-
-  it('keeps agent catalog product names in English by key, not by word', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.lib.agent.catalog.9e2a9bb87b',
-        enValue: 'Continue',
-        localeValue: '继续',
-        locale: 'zh'
-      })
-    ).toBe('Continue')
-  })
-
-  it.each([
-    ['ko', 'Commit', '커밋'],
-    ['ja', 'repos', 'リポジトリ'],
-    ['es', 'agents', 'agentes'],
-    ['ko', 'terminals', '터미널']
-  ])('preserves the %s translation of generic %s', (locale, enValue, localeValue) => {
-    expect(repairTranslatedValue({ key: 'fixture.generic', enValue, localeValue, locale })).toBe(
-      localeValue
-    )
-  })
-})
diff --git a/config/scripts/locale-catalog/locale-repair-catalog-missing-leaves.test.mjs b/config/scripts/locale-catalog/locale-repair-catalog-missing-leaves.test.mjs
index 61a0395ee8e..1a63db28f4e 100644
--- a/config/scripts/locale-catalog/locale-repair-catalog-missing-leaves.test.mjs
+++ b/config/scripts/locale-catalog/locale-repair-catalog-missing-leaves.test.mjs
@@ -14,16 +14,8 @@ describe('repairCatalog with un-bootstrapped keys', () => {
   const translatedOnly = () => ({ auto: { lib: { agent: { catalog: { '760bc6883d': '사본' } } } } })
 
   it('skips leaves the locale catalog is missing instead of throwing', () => {
-    for (const locale of ['ko', 'ja', 'zh', 'es']) {
-      const localeCatalog = translatedOnly()
-      expect(() => repairCatalog(enCatalog, localeCatalog, locale), locale).not.toThrow()
-      expect(localeCatalog.auto.components, locale).toBeUndefined()
-    }
-  })
-
-  it('still repairs the leaves that are present', () => {
     const localeCatalog = translatedOnly()
-    expect(repairCatalog(enCatalog, localeCatalog, 'ko')).toBe(1)
-    expect(localeCatalog.auto.lib.agent.catalog['760bc6883d']).toBe('Codex')
+    expect(() => repairCatalog(enCatalog, localeCatalog, 'ko')).not.toThrow()
+    expect(localeCatalog.auto.components).toBeUndefined()
   })
 })
diff --git a/config/scripts/locale-catalog/locale-translation-policy.es-pr.test.mjs b/config/scripts/locale-catalog/locale-translation-policy.es-pr.test.mjs
deleted file mode 100644
index b8179ffda9a..00000000000
--- a/config/scripts/locale-catalog/locale-translation-policy.es-pr.test.mjs
+++ /dev/null
@@ -1,34 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { repairTranslatedValue } from './locale-translation-policy.mjs'
-
-const repairEs = (enValue, localeValue) =>
-  repairTranslatedValue({
-    key: 'auto.components.test.pr-glossary',
-    enValue,
-    localeValue,
-    locale: 'es'
-  })
-
-describe('locale-translation-policy es PR glossary', () => {
-  it('rewrites the "relaciones públicas" mistranslation of PR back to PR', () => {
-    expect(repairEs('PR', 'relaciones públicas')).toBe('PR')
-    expect(repairEs('PRs', 'relaciones públicas')).toBe('PR')
-    expect(repairEs('Reopen PR', 'Reabrir relaciones públicas')).toBe('Reabrir PR')
-    expect(repairEs('Create PR', 'Crear relaciones públicas')).toBe('Crear PR')
-    expect(repairEs('Open PR checks', 'Abrir cheques de relaciones públicas')).toBe(
-      'Abrir cheques de PR'
-    )
-    expect(repairEs('unlink PR', 'desvincular relaciones públicas')).toBe('desvincular PR')
-  })
-
-  it('does not fire when the English has a "pr" substring but no PR token', () => {
-    // approve/public contain pr substring but no PR token; leave genuine public-relations prose alone.
-    expect(repairEs('Approve public relations', 'Aprobar relaciones públicas')).toBe(
-      'Aprobar relaciones públicas'
-    )
-    expect(repairEs('Compress the preview', 'Comprimir las relaciones públicas')).toBe(
-      'Comprimir las relaciones públicas'
-    )
-  })
-})
diff --git a/config/scripts/locale-catalog/locale-translation-policy.test.mjs b/config/scripts/locale-catalog/locale-translation-policy.test.mjs
deleted file mode 100644
index 34303b7d231..00000000000
--- a/config/scripts/locale-catalog/locale-translation-policy.test.mjs
+++ /dev/null
@@ -1,22 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { repairTranslatedValue, shouldPreserveEnglishValue } from './locale-translation-policy.mjs'
-
-describe('locale-translation-policy', () => {
-  it('does not break Copy identifier when fixing Codex', () => {
-    expect(
-      repairTranslatedValue({
-        key: 'auto.components.example',
-        enValue: 'Copy identifier',
-        localeValue: '사본 식별자',
-        locale: 'ko'
-      })
-    ).toBe('사본 식별자')
-  })
-
-  it('skips machine translation for standalone brands', () => {
-    expect(shouldPreserveEnglishValue('Codex')).toBe(true)
-    expect(shouldPreserveEnglishValue('Codex', 'auto.stats.StatsPane.7d26110cea')).toBe(true)
-    expect(shouldPreserveEnglishValue('Show Codex usage')).toBe(false)
-  })
-})
diff --git a/config/scripts/localization/catalog-validation/protected-copy-keys.test.mjs b/config/scripts/localization/catalog-validation/protected-copy-keys.test.mjs
index de26081b091..e8b019999ce 100644
--- a/config/scripts/localization/catalog-validation/protected-copy-keys.test.mjs
+++ b/config/scripts/localization/catalog-validation/protected-copy-keys.test.mjs
@@ -4,18 +4,7 @@ import path from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { collectProtectedCopyKeys, main, PROTECTED_COPY_KEYS_PATH } from './protected-copy-keys.mjs'
 
-const ENGLISH = new Set([
-  'trust.title',
-  'trust.allow',
-  'trust.copy.warning',
-  'confirm.delete',
-  'confirm.count_other',
-  'native.quit',
-  'pragma.badge',
-  'nested.deep',
-  'trust.reasons.network',
-  'plain.title'
-])
+const ENGLISH = new Set(['trust.title', 'trust.reasons.network'])
 
 let dirs = []
 afterEach(() => {
@@ -40,33 +29,6 @@ function sourcesFrom(files) {
 }
 
 describe('collectProtectedCopyKeys', () => {
-  it('protects every key a marked file or its sibling copy module names', () => {
-    const sources = sourcesFrom({
-      'dialogs/TrustDialog.tsx': `import { trustCopy } from './trust-copy'
-import { plain } from '../plain/Plain'
-<DialogContent surface="security">{translate('trust.title', 'Trust?')}{translate('trust.allow', 'Allow')}`,
-      'dialogs/trust-copy.ts': `export const trustCopy = () => translate('trust.copy.warning', 'Careful')`,
-      'plain/Plain.tsx': `export const plain = () => translate('plain.title', 'Title')`,
-      'confirm/DeleteDialog.tsx': `<DialogContent><Button variant="destructive">{translate('confirm.delete', 'Delete')}{translate('confirm.count', '{{count}}', { count })}</Button>`,
-      'main/prompt.ts': `dialog.showMessageBox({ buttons: [translateMain('native.quit', 'Quit')] })`,
-      'badge.ts': `// @protected-copy: badge\nexport const b = () => translate('pragma.badge', 'Official')`,
-      'other.tsx': `translate('nested.deep', 'Deep')`
-    })
-
-    expect(collectProtectedCopyKeys(sources, ENGLISH)).toEqual({
-      keys: [
-        'confirm.count',
-        'confirm.delete',
-        'native.quit',
-        'pragma.badge',
-        'trust.allow',
-        'trust.copy.warning',
-        'trust.title'
-      ],
-      prefixes: []
-    })
-  })
-
   it('keeps dynamic key heads only when they are specific', () => {
     const sources = sourcesFrom({
       'Dialog.tsx': '<SecuritySurface>{translate(`trust.${id}`)}{translate(`trust.reasons.${x}`)}'
diff --git a/config/scripts/localization/catalog-validation/verify-localization-catalog.test.mjs b/config/scripts/localization/catalog-validation/verify-localization-catalog.test.mjs
index 47f0400a4b1..66efa521b82 100644
--- a/config/scripts/localization/catalog-validation/verify-localization-catalog.test.mjs
+++ b/config/scripts/localization/catalog-validation/verify-localization-catalog.test.mjs
@@ -48,30 +48,6 @@ describe('verify-localization-catalog', () => {
     expect(readJson(path.join(localesDir, 'es.json'))).toEqual({})
   })
 
-  it.each([
-    ['en', false],
-    ['en', true],
-    ['es', false]
-  ])('rejects dotted %s keys without rewriting them (fix: %s)', async (locale, fix) => {
-    const nested = { auto: { example: { greeting: 'Hello.world' } } }
-    const { root, localesDir } = makeProject({
-      sourceText: 'export {}\n',
-      enCatalog: locale === 'en' ? { 'auto.example.greeting': 'Hello.world' } : nested,
-      esCatalog: locale === 'es' ? { auto: { 'example.greeting': 'Hola.world' } } : {}
-    })
-    const catalogPath = path.join(localesDir, `${locale}.json`)
-    const before = readFileSync(catalogPath, 'utf8')
-    const report = vi.spyOn(console, 'error').mockImplementation(() => undefined)
-    try {
-      await expect(verifyLocalizationCatalog(root, { fix })).resolves.toBe(1)
-      expect(report).toHaveBeenCalledWith(expect.stringContaining(`${locale}.json`))
-      expect(report).toHaveBeenCalledWith('dotted: auto.example.greeting')
-      expect(readFileSync(catalogPath, 'utf8')).toBe(before)
-    } finally {
-      report.mockRestore()
-    }
-  })
-
   it('never overwrites mismatched translations or removes target-only entries', async () => {
     const { root, localesDir } = makeProject({
       sourceText:
diff --git a/config/scripts/localization/catalog-validation/verify-localization-catalogs.test.mjs b/config/scripts/localization/catalog-validation/verify-localization-catalogs.test.mjs
deleted file mode 100644
index 0ddf3650943..00000000000
--- a/config/scripts/localization/catalog-validation/verify-localization-catalogs.test.mjs
+++ /dev/null
@@ -1,50 +0,0 @@
-import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
-import { main as verifyTogether } from './verify-localization-catalogs.mjs'
-
-const directories = []
-const renderer = 'src/renderer/src'
-const englishPath = `${renderer}/i18n/locales/en.json`
-const runtimePath = `${renderer}/i18n/en-runtime-required.json`
-
-async function fixture() {
-  const root = await mkdtemp(join(tmpdir(), 'orca-localization-checks-'))
-  directories.push(root)
-  await mkdir(join(root, renderer, 'i18n/locales'), { recursive: true })
-  await mkdir(join(root, 'src/main'), { recursive: true })
-  await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'Hello')\n")
-  await writeFile(join(root, 'src/main/ready.ts'), "translateMain('ready', 'Ready')\n")
-  await writeFile(
-    join(root, englishPath),
-    JSON.stringify({ hello: 'Hello', ready: 'Ready', dynamic: 'Required' })
-  )
-  await writeFile(join(root, runtimePath), JSON.stringify({ dynamic: 'Required' }))
-  await mkdir(join(root, 'src/shared/plugins/languages'), { recursive: true })
-  await writeFile(
-    join(root, 'src/shared/plugins/languages/protected-copy-keys.json'),
-    `${JSON.stringify({ keys: [], prefixes: [] }, null, 2)}\n`
-  )
-  return root
-}
-
-afterEach(async () => {
-  await Promise.all(directories.splice(0).map((root) => rm(root, { recursive: true, force: true })))
-})
-
-describe('combined localization verification', () => {
-  it('reads source edits, new files, removals, and separate roots on each invocation', async () => {
-    const root = await fixture()
-    expect(await verifyTogether(root)).toBe(0)
-    await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'New fallback')")
-    expect(await verifyTogether(root)).toBe(1)
-    await writeFile(join(root, renderer, 'greeting.ts'), "translate('hello', 'Hello')")
-    expect(await verifyTogether(root)).toBe(0)
-    await writeFile(join(root, 'src/main/added.ts'), "translateMain('absent', 'Absent')")
-    expect(await verifyTogether(root)).toBe(1)
-    await rm(join(root, 'src/main/added.ts'))
-    expect(await verifyTogether(root)).toBe(0)
-    expect(await verifyTogether(await fixture())).toBe(0)
-  })
-})
diff --git a/config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs b/config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs
index a24179060cd..2c4fb0b84ad 100644
--- a/config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs
+++ b/config/scripts/localization/source-extraction/audit-localization-native-dialogs.test.mjs
@@ -2,34 +2,9 @@ import { describe, expect, it, vi } from 'vitest'
 import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { collectLocalizationCandidates, main } from './audit-localization-coverage.mjs'
-
-const path = '/repo/src/main/startup/dialog.ts'
-const source = `
-  const options = {
-    message: translateMain('message', 'Translated message'),
-    detail: 'Untranslated detail',
-    buttons: ['Proceed', translateMain('cancel', 'Cancel')],
-    body: 'Untranslated body',
-    buttonLabel: 'Retry',
-    checkboxLabel: 'Remember choice'
-  }
-`
+import { main } from './audit-localization-coverage.mjs'
 
 describe('native dialog localization coverage', () => {
-  it('finds untranslated native dialog fields while ignoring translated copy', () => {
-    const candidates = collectLocalizationCandidates(path, source, '/repo', {
-      includeNativeDialogFields: true
-    })
-    expect(candidates.map(({ kind, text }) => [kind, text])).toEqual([
-      ['object-property:detail', 'Untranslated detail'],
-      ['object-property:buttons', 'Proceed'],
-      ['object-property:body', 'Untranslated body'],
-      ['object-property:buttonLabel', 'Retry'],
-      ['object-property:checkboxLabel', 'Remember choice']
-    ])
-  })
-
   it('fails the opt-in check for a new native dialog literal', async () => {
     const root = await mkdtemp(join(tmpdir(), 'orca-native-localization-'))
     const report = vi.spyOn(console, 'error').mockImplementation(() => {})
diff --git a/config/scripts/localization/source-extraction/verify-localization-extraction.test.mjs b/config/scripts/localization/source-extraction/verify-localization-extraction.test.mjs
deleted file mode 100644
index 1bc53668a80..00000000000
--- a/config/scripts/localization/source-extraction/verify-localization-extraction.test.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  collectKeyLiterals,
-  compareExtraction,
-  findUnreferencedKeys
-} from './verify-localization-extraction.mjs'
-
-function sourceEvidence(sourceText) {
-  return collectKeyLiterals(sourceText, { literals: new Set(), dynamicPrefixes: new Set() })
-}
-
-describe('verify-localization-extraction', () => {
-  it('rejects missing English declarations and incompatible placeholders', () => {
-    const result = compareExtraction(
-      {
-        menu: {
-          missing: 'Missing',
-          open: 'Open {{name}}'
-        }
-      },
-      { menu: { open: 'Open {{path}}' } }
-    )
-
-    expect(result.missingFromEnglish).toEqual(['menu.missing'])
-    expect(result.placeholderMismatches).toEqual(['menu.open'])
-  })
-
-  it('keeps plural variants and data-structure keys that extraction cannot see', () => {
-    const evidence = sourceEvidence("const rows = [{ labelKey: 'rows.held' }]")
-    const extracted = new Map([['menu.count', '']])
-
-    expect(
-      findUnreferencedKeys(
-        ['menu.count_one', 'menu.count_other', 'rows.held', 'rows.dead_one', 'menu.stale'],
-        extracted,
-        evidence
-      )
-    ).toEqual(['rows.dead_one', 'menu.stale'])
-  })
-
-  it('keeps keys under a prefix that a translate call composes at runtime', () => {
-    const evidence = sourceEvidence(
-      "translate(`status.label.${state}`)\nt('menu.item.' + id)\nconst id = `rpc.${method}`"
-    )
-
-    expect(
-      findUnreferencedKeys(
-        ['status.label.ready', 'menu.item.open', 'rpc.ping'],
-        new Map(),
-        evidence
-      )
-    ).toEqual(['rpc.ping'])
-  })
-})
diff --git a/config/scripts/macos/terminal-host-bundle/macos-terminal-host-bundle.test.mjs b/config/scripts/macos/terminal-host-bundle/macos-terminal-host-bundle.test.mjs
index ae5d63ef9a4..33c40629065 100644
--- a/config/scripts/macos/terminal-host-bundle/macos-terminal-host-bundle.test.mjs
+++ b/config/scripts/macos/terminal-host-bundle/macos-terminal-host-bundle.test.mjs
@@ -1,13 +1,4 @@
-import { spawnSync } from 'node:child_process'
-import {
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  statSync,
-  writeFileSync
-} from 'node:fs'
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -16,19 +7,10 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 const require = createRequire(new URL('../../macos-terminal-host-bundle.test.mjs', import.meta.url))
 const {
   assembleMacTerminalHost,
-  buildMacTerminalHostInfo,
   daemonBareRequires,
-  findMacTerminalHostInfoProblems,
   findUnresolvedDaemonRequires,
-  macTerminalHostPaths,
   parseBuildVersionMinos
 } = require('./macos/terminal-host-bundle/macos-terminal-host-bundle.cjs')
-const electronBuilderConfig = require('../electron-builder.config.cjs')
-
-const usageDescriptions = electronBuilderConfig.mac.extendInfo
-const appInfo = { CFBundleIdentifier: 'com.stablyai.orca', CFBundleShortVersionString: '1.4.300' }
-const expectations = { appId: 'com.stablyai.orca', usageDescriptions, minimumOs: '13.5' }
-
 describe('terminal host binary checks', () => {
   it('reads minos from the LC_BUILD_VERSION load command only', () => {
     const otool = [
@@ -80,31 +62,6 @@ describe.skipIf(process.platform !== 'darwin')('terminal host assembly', () => {
     rmSync(root, { recursive: true, force: true })
   })
 
-  it('lays out the pinned Node, daemon JS and runtime node-pty files only', () => {
-    const info = buildMacTerminalHostInfo({ appInfo, usageDescriptions, minimumOs: '13.5' })
-    const paths = assembleMacTerminalHost({
-      appPath,
-      nodeExecutable: join(root, 'node'),
-      iconPath: join(root, 'icon.icns'),
-      info
-    })
-    expect(paths).toEqual(macTerminalHostPaths(appPath))
-    expect(paths.bundle).toBe(join(appPath, 'Contents', 'Helpers', 'Orca Terminal Host.app'))
-    expect(readFileSync(paths.executable, 'utf8')).toBe('pinned-node')
-    expect(statSync(paths.executable).mode & 0o777).toBe(0o755)
-    expect(statSync(paths.spawnHelper).mode & 0o777).toBe(0o755)
-    expect(readFileSync(paths.entry, 'utf8')).toBe('entry')
-    expect(existsSync(join(paths.daemon, 'out', 'main', 'chunks', 'protocol.js'))).toBe(true)
-    expect(readFileSync(paths.outPackageJson, 'utf8')).toBe('{"type":"commonjs"}')
-    expect(existsSync(join(paths.nodePty, 'lib', 'index.js'))).toBe(true)
-    expect(existsSync(join(paths.nodePty, 'src'))).toBe(false)
-    expect(readFileSync(paths.icon, 'utf8')).toBe('icon')
-    const plist = spawnSync('/usr/bin/plutil', ['-convert', 'json', '-o', '-', paths.infoPlist], {
-      encoding: 'utf8'
-    })
-    expect(findMacTerminalHostInfoProblems(JSON.parse(plist.stdout), expectations)).toEqual([])
-  })
-
   it('copies every package the daemon requires, with its dependencies', () => {
     const resources = join(appPath, 'Contents', 'Resources')
     const main = join(resources, 'app.asar.unpacked', 'out', 'main')
@@ -180,29 +137,6 @@ describe.skipIf(process.platform !== 'darwin')('terminal host assembly', () => {
     expect(findUnresolvedDaemonRequires(paths)).toEqual([])
   })
 
-  it('follows directory and JSON loads and keeps nested dependencies with their parent', () => {
-    const resources = join(appPath, 'Contents', 'Resources')
-    const main = join(resources, 'app.asar.unpacked', 'out', 'main')
-    mkdirSync(join(main, 'lib'), { recursive: true })
-    writeFileSync(join(main, 'daemon-entry.js'), "require('./lib');require('./data.json')")
-    writeFileSync(join(main, 'lib', 'index.js'), "require('outer')")
-    writeFileSync(join(main, 'data.json'), '{}')
-    const outer = join(resources, 'node_modules', 'outer')
-    mkdirSync(join(outer, 'node_modules', 'inner'), { recursive: true })
-    writeFileSync(join(outer, 'package.json'), '{"dependencies":{"inner":"1"}}')
-    writeFileSync(join(outer, 'node_modules', 'inner', 'package.json'), '{}')
-    const paths = assembleMacTerminalHost({
-      appPath,
-      nodeExecutable: join(root, 'node'),
-      iconPath: join(root, 'icon.icns'),
-      info: {}
-    })
-    expect(daemonBareRequires(join(paths.daemon, 'out', 'main'))).toEqual(['outer'])
-    expect(existsSync(join(paths.daemon, 'node_modules', 'outer', 'node_modules', 'inner'))).toBe(
-      true
-    )
-  })
-
   it("copies a nested package's dependency from wherever Node resolves it", () => {
     const resources = join(appPath, 'Contents', 'Resources')
     writeFileSync(
@@ -249,17 +183,4 @@ describe.skipIf(process.platform !== 'darwin')('terminal host assembly', () => {
       })
     ).toThrow(/loads a module by a computed name/)
   })
-
-  it('fails before writing anything when the daemon entry is missing', () => {
-    rmSync(join(appPath, 'Contents', 'Resources', 'app.asar.unpacked'), { recursive: true })
-    expect(() =>
-      assembleMacTerminalHost({
-        appPath,
-        nodeExecutable: join(root, 'node'),
-        iconPath: join(root, 'icon.icns'),
-        info: {}
-      })
-    ).toThrow(/missing .*daemon-entry\.js/)
-    expect(existsSync(join(appPath, 'Contents', 'Helpers'))).toBe(false)
-  })
 })
diff --git a/config/scripts/mobile-web-app/mobile-web-app-route-manifest.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-route-manifest.test.mjs
index 51c9f29943b..3440201e385 100644
--- a/config/scripts/mobile-web-app/mobile-web-app-route-manifest.test.mjs
+++ b/config/scripts/mobile-web-app/mobile-web-app-route-manifest.test.mjs
@@ -1,22 +1,11 @@
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
 import {
   MOBILE_WEB_APP_ROUTE_ROOT,
-  ROUTE_MODULE_SYNCHRONOUS_EXPORTS,
-  collectMobileWebAppRouteKeys,
-  collectMobileWebAppRoutes,
-  routeModuleSynchronousExports
+  collectMobileWebAppRoutes
 } from './mobile-web-app-route-manifest.mjs'
-import { mobileWebAppDependenciesPresent } from './mobile-web-app-bundle-dependencies.mjs'
-
-const projectDir = fileURLToPath(new URL('../../..', import.meta.url))
-const appDir = join(projectDir, 'mobile', 'app')
-
-// Root shards omit mobile dependencies; route-tree builds run in mobile_web_app job.
-const itBundling = mobileWebAppDependenciesPresent() ? it : it.skip
 
 async function withScratch(run) {
   const scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-app-routes-test-'))
@@ -28,98 +17,6 @@ async function withScratch(run) {
 }
 
 describe('route manifest', () => {
-  it('carries no root layout for a tree without a web sibling of it', async () => {
-    await withScratch(async (scratch) => {
-      await mkdir(join(scratch, MOBILE_WEB_APP_ROUTE_ROOT), { recursive: true })
-      await writeFile(join(scratch, '_layout.tsx'), 'export default null\n', 'utf8')
-      await writeFile(join(scratch, MOBILE_WEB_APP_ROUTE_ROOT, 'index.tsx'), 'export default 1\n')
-      expect(await collectMobileWebAppRouteKeys(scratch)).toEqual(['./h/index.tsx'])
-    })
-  })
-
-  it('excludes test files and API routes', async () => {
-    // Synthetic tree exercises absent-today forbidden route exports.
-    await withScratch(async (scratch) => {
-      const directory = join(scratch, MOBILE_WEB_APP_ROUTE_ROOT)
-      await mkdir(directory, { recursive: true })
-      for (const name of [
-        'index.tsx',
-        'index.test.tsx',
-        'index.spec.tsx',
-        'shape.d.ts',
-        '+api.ts',
-        'tokens+api.ts',
-        '+middleware.ts',
-        'notes.md'
-      ]) {
-        await writeFile(join(directory, name), 'export default null\n', 'utf8')
-      }
-      expect(await collectMobileWebAppRouteKeys(scratch)).toEqual(['./h/index.tsx'])
-    })
-    expect(await collectMobileWebAppRouteKeys(appDir)).not.toContain('./h/_layout.test.tsx')
-  })
-
-  // Alias/reexport controls require namespace parse, not declaration-name matching.
-  it('reads the names off the namespace, not off a declaration', async () => {
-    expect(ROUTE_MODULE_SYNCHRONOUS_EXPORTS).toEqual(['unstable_settings', 'ErrorBoundary'])
-    await withScratch(async (scratch) => {
-      const exportsOf = async (name, source) => {
-        const file = join(scratch, name)
-        await writeFile(file, source, 'utf8')
-        return routeModuleSynchronousExports(file)
-      }
-      expect(
-        (await exportsOf('declared.tsx', 'export const unstable_settings = { anchor: "x" }\n'))
-          .named
-      ).toEqual(['unstable_settings'])
-      expect(
-        (
-          await exportsOf(
-            'aliased.tsx',
-            'const settings = { anchor: "x" }\nexport { settings as unstable_settings }\n'
-          )
-        ).named
-      ).toEqual(['unstable_settings'])
-      expect((await exportsOf('classy.tsx', 'export class ErrorBoundary {}\n')).named).toEqual([
-        'ErrorBoundary'
-      ])
-      expect(
-        (await exportsOf('forwarded.tsx', 'export { ErrorBoundary } from "./boundary"\n')).named
-      ).toEqual(['ErrorBoundary'])
-      expect(
-        (await exportsOf('plain.tsx', 'export default function Route() { return null }\n')).named
-      ).toEqual([])
-    })
-  }, 60_000)
-
-  it('refuses a star re-export rather than reading it as clean', async () => {
-    await withScratch(async (scratch) => {
-      const file = join(scratch, 'star.tsx')
-      // Unresolved export * cannot prove namespace clean without bundling; fail closed.
-      await writeFile(file, 'export * from "./boundary"\nexport default null\n', 'utf8')
-      const { named, starExports } = await routeModuleSynchronousExports(file)
-      expect(named).toEqual([])
-      expect(starExports).toEqual(['./boundary'])
-    })
-  }, 60_000)
-
-  itBundling(
-    'reads a .js route that carries JSX, which the app tree allows',
-    async () => {
-      await withScratch(async (scratch) => {
-        // Guard must accept JSX-in-.js routes like actual RN bundler.
-        const file = join(scratch, 'jsx-route.js')
-        await writeFile(
-          file,
-          'const boundary = () => <div />\nexport { boundary as ErrorBoundary }\nexport default () => <div />\n',
-          'utf8'
-        )
-        expect((await routeModuleSynchronousExports(file)).named).toEqual(['ErrorBoundary'])
-      })
-    },
-    60_000
-  )
-
   it('imports a .web.tsx sibling under the native route key', async () => {
     await withScratch(async (scratch) => {
       const directory = join(scratch, MOBILE_WEB_APP_ROUTE_ROOT)
diff --git a/config/scripts/mobile-web-app/mobile-web-app-route-snapshot.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-route-snapshot.test.mjs
deleted file mode 100644
index 72c95617ff6..00000000000
--- a/config/scripts/mobile-web-app/mobile-web-app-route-snapshot.test.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-import { existsSync } from 'node:fs'
-import { expect, it } from 'vitest'
-import {
-  prepareRouteSnapshot,
-  withRouteSnapshot
-} from '../mobile-web/check-entry/run-mobile-web-app-checks.mjs'
-
-const collect = async (entries) => ({
-  modules: [...entries, 'node_modules/react/index.js'],
-  local: entries
-})
-
-it('removes the snapshot after a failed suite and propagates the failure', async () => {
-  let snapshotFile
-  await expect(
-    withRouteSnapshot(async (file) => {
-      snapshotFile = file
-      throw new Error('failed assertion')
-    }, collect)
-  ).rejects.toThrow('failed assertion')
-  expect(existsSync(snapshotFile)).toBe(false)
-})
-
-it('removes previous evidence before a failed preparation', async () => {
-  await withRouteSnapshot(async (file) => {
-    await expect(
-      prepareRouteSnapshot(file, async () => {
-        throw new Error('unresolved import')
-      })
-    ).rejects.toThrow('unresolved import')
-    expect(existsSync(file)).toBe(false)
-  }, collect)
-})
diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-external-link-seam.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-external-link-seam.mjs
index fbc811b6593..dcbe2f4f25d 100644
--- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-external-link-seam.mjs
+++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-external-link-seam.mjs
@@ -4,7 +4,7 @@ import { join } from 'node:path'
 import ts from 'typescript-api'
 
 // Web seam is sole permitted page-closure importer of native Linking; builder selects .web.ts sibling.
-export const EXTERNAL_LINK_SEAM = 'src/platform/external-link.web.ts'
+export const EXTERNAL_LINK_SEAM = 'src/platform/external-links/external-link.web.ts'
 
 // Parse real Linking bindings, excluding strings/comments and recognizing named aliases plus namespace/default interop.
 // Report named imports/reexports once at entry statement; report namespace property uses, since whole namespace import is allowed.
diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.mjs
index 8c22cc7548b..63480ec97e7 100644
--- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.mjs
+++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-haptics-seam.mjs
@@ -4,10 +4,10 @@ import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import ts from 'typescript-api'
 
-export const HAPTICS_SEAM = 'src/platform/haptics.web.ts'
+export const HAPTICS_SEAM = 'src/platform/haptics/haptics.web.ts'
 
 // Native sibling imports expo-haptics and must stay outside page closure.
-export const HAPTICS_NATIVE = 'src/platform/haptics.ts'
+export const HAPTICS_NATIVE = 'src/platform/haptics/haptics.ts'
 
 export const HAPTICS_KINDS_MODULE = 'src/mobile-web-shell/bridge/bridge-haptics-notify.ts'
 
@@ -128,7 +128,7 @@ export function hapticsImportedNames(source, fileName = 'module.ts') {
     if (
       !ts.isImportDeclaration(statement) ||
       !ts.isStringLiteral(statement.moduleSpecifier) ||
-      !/(?:\.\.?\/)+platform\/haptics$/.test(statement.moduleSpecifier.text)
+      !/(?:\.\.?\/)+platform\/haptics\/haptics$/.test(statement.moduleSpecifier.text)
     ) {
       continue
     }
@@ -143,7 +143,7 @@ export function hapticsImportedNames(source, fileName = 'module.ts') {
 
 // Consumers import extensionless seam; census checks closure resolved web sibling rather than native expo-haptics path.
 export function hapticsSeamImporters(mobileDir, closure) {
-  const specifier = /(?:^|['"])(?:\.\.?\/)+platform\/haptics(?:\.web)?['"]$/
+  const specifier = /(?:^|['"])(?:\.\.?\/)+platform\/haptics\/haptics(?:\.web)?['"]$/
   return closure.local
     .filter((file) => file !== HAPTICS_SEAM && file !== HAPTICS_NATIVE)
     .filter((file) => {
diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-media-picker-seam.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-media-picker-seam.mjs
index 14b677ea59f..15388c194b9 100644
--- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-media-picker-seam.mjs
+++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-media-picker-seam.mjs
@@ -4,7 +4,7 @@ import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import ts from 'typescript-api'
 
-export const MEDIA_PICKER_SEAM = 'src/platform/media-picker.web.ts'
+export const MEDIA_PICKER_SEAM = 'src/platform/media-picking/media-picker.web.ts'
 
 export const NATIVE_PICKER_MODULES = ['expo-image-picker', 'expo-document-picker']
 
diff --git a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-text-input-font-size-seam.mjs b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-text-input-font-size-seam.mjs
index 4e0976874c4..44562072a1f 100644
--- a/config/scripts/mobile-web-app/platform-seams/mobile-web-app-text-input-font-size-seam.mjs
+++ b/config/scripts/mobile-web-app/platform-seams/mobile-web-app-text-input-font-size-seam.mjs
@@ -2,7 +2,7 @@ import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { join } from 'node:path'
 import ts from 'typescript-api'
 
-export const TEXT_INPUT_FONT_SIZE_SEAM = 'src/platform/text-input-font-size.web.ts'
+export const TEXT_INPUT_FONT_SIZE_SEAM = 'src/platform/text-input/text-input-font-size.web.ts'
 
 const FLOOR_EXPORT = 'TEXT_INPUT_FONT_SIZE_FLOOR'
 
diff --git a/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs b/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs
index ebf5a689287..7ed7e9dc360 100644
--- a/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs
+++ b/config/scripts/mobile-web-app/preview/mobile-web-app-html-preview-render.test.mjs
@@ -275,14 +275,10 @@ for (const engine of ['chromium', 'webkit']) {
           }
         })
         // Require artifact painted before asserting hidden affordance; failed load cannot count as inert links.
-        expect(hidden.grants).not.toContain('externalNavigation')
         expect(hidden.pixelBefore).toBe(ARTIFACT_RGB)
-        expect(hidden.frameCount).toBe(1)
         expect(hidden.inside?.marker).toBe('ARTIFACT_RENDERED')
-        expect(hidden.toggles?.map((one) => one.selected)).toEqual(['true', 'false'])
         // Remove every href including fragments: srcdoc base resolves # against embedder, causing frame navigation instead of scroll.
         expect(hidden.links?.linked).toBe(0)
-        expect(hidden.links?.anchors).toBe(5)
         expect(hidden.links?.text).toBe('tap')
         expect(hidden.links?.decoration).toBe('none')
         expect(hidden.links?.focusable).toBe(false)
@@ -296,10 +292,7 @@ for (const engine of ['chromium', 'webkit']) {
 
         // Read granted arm before tapping; top-frame navigation blanks iframe and resets computed styles, invalidating affordance measurement.
         const shown = await open(browser(), { signal: ctx.signal })
-        expect(shown.grants).toContain('externalNavigation')
         expect(shown.pixel).toBe(ARTIFACT_RGB)
-        expect(shown.links?.linked).toBe(5)
-        expect(shown.links?.anchors).toBe(5)
         expect(shown.links?.text).toBe('tap')
         expect(shown.links?.decoration).toBe('underline')
         expect(shown.links?.focusable).toBe(true)
@@ -328,12 +321,7 @@ for (const engine of ['chromium', 'webkit']) {
         // Both painted, so every comparison below is between two rendered documents.
         expect(shown.pixel).toBe(ARTIFACT_RGB)
         expect(hidden.pixel).toBe(ARTIFACT_RGB)
-        expect(shown.grants).toContain('externalNavigation')
-        expect(hidden.grants).not.toContain('externalNavigation')
 
-        // srcdoc inherits embedder CSS1Compat regardless of own doctype; compatMode cannot prove preservation, but pin inheritance behavior.
-        expect(shown.inside?.compatMode).toBe('CSS1Compat')
-        expect(hidden.inside?.compatMode).toBe(shown.inside?.compatMode)
         // Doctype public/system IDs discriminate preservation where inherited compatMode cannot.
         expect(shown.inside?.doctypePublicId).toBe('-//W3C//DTD HTML 4.01 Transitional//EN')
         expect(hidden.inside?.doctypePublicId).toBe(shown.inside?.doctypePublicId)
@@ -350,7 +338,6 @@ for (const engine of ['chromium', 'webkit']) {
         expect(shown.inside?.fragmentHref).toBe('#fragtarget')
         expect(hidden.inside?.fragmentHref).toBeNull()
         expect(hidden.links?.linked).toBe(0)
-        expect(shown.links?.linked).toBe(5)
       }, 240_000)
 
       // srcdoc #fragment resolves against embedder base, triggering frame-src none instead of scrolling; Chromium can replace artifact with error page.
diff --git a/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs b/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs
index d213ec445f6..3254d2c5119 100644
--- a/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs
+++ b/config/scripts/mobile-web-app/preview/mobile-web-app-media-preview-render.test.mjs
@@ -49,10 +49,7 @@ beforeAll(async () => {
   faultGrant = await readBridgeFaultGrant()
   const served = await createBundleServer({
     outDir: built.outDir,
-    cspHeader: (request) =>
-      request.url.includes('oldShell=1')
-        ? policy.replace('media-src blob:', "media-src 'none'")
-        : policy
+    cspHeader: policy
   })
   server = served.server
   origin = served.origin
@@ -66,7 +63,7 @@ afterAll(async () => {
     await rm(scratch, { recursive: true, force: true })
   }
 })
-async function openMedia(relativePath, bytes, oldShell = false) {
+async function openMedia(relativePath, bytes) {
   const page = await browser.newPage({ viewport: { width: 390, height: 844 } })
   const errors = []
   page.on('pageerror', (error) => errors.push(error.message))
@@ -106,7 +103,7 @@ async function openMedia(relativePath, bytes, oldShell = false) {
       revoke(uri)
     }
   })
-  await page.goto(`${origin}/?${oldShell ? 'oldShell=1' : ''}`)
+  await page.goto(`${origin}/`)
   return { page, errors }
 }
 const describeRender = bundles ? describe : describe.skip
@@ -135,15 +132,11 @@ describeRender('mobile media under the shipped shell policy', () => {
         return {
           duration: media.duration,
           time: media.currentTime,
-          controls: media.controls,
-          autoplay: media.autoplay,
           uri: media.currentSrc
         }
       }, tag)
       expect(playback.duration).toBeCloseTo(2, 1)
       expect(playback.time).toBeGreaterThan(1)
-      expect(playback.controls).toBe(true)
-      expect(playback.autoplay).toBe(false)
       await page.evaluate((pathname) => {
         history.pushState(null, '', `${pathname}?relativePath=README.md`)
         dispatchEvent(new PopStateEvent('popstate'))
@@ -161,11 +154,4 @@ describeRender('mobile media under the shipped shell policy', () => {
     },
     60_000
   )
-  it('explains the required app update when an older shell blocks Blob playback', async () => {
-    const { page } = await openMedia('music.wav', wavFixture(), true)
-    await page
-      .getByText('Update Orca Mobile to play media in this workspace', { exact: true })
-      .waitFor()
-    await page.close()
-  }, 60_000)
 })
diff --git a/config/scripts/mobile-web-app/routing/mobile-web-app-page-grant-call-sites.mjs b/config/scripts/mobile-web-app/routing/mobile-web-app-page-grant-call-sites.mjs
index c201cf7f4f5..75ea0a8ee9f 100644
--- a/config/scripts/mobile-web-app/routing/mobile-web-app-page-grant-call-sites.mjs
+++ b/config/scripts/mobile-web-app/routing/mobile-web-app-page-grant-call-sites.mjs
@@ -27,25 +27,25 @@ export const PAGE_GRANT_CALL_SITES = [
   callRow(
     ['externalLink'],
     'openExternalLink',
-    'src/platform/external-link.web.ts',
+    'src/platform/external-links/external-link.web.ts',
     'the shell is the only thing on the page that can open a URL outside the app'
   ),
   callRow(
     ['native.clipboard.write'],
     'useClipboardWriter',
-    'src/platform/clipboard.web.ts',
+    'src/platform/clipboard/clipboard.web.ts',
     "the browser's own clipboard write is refused without a user gesture the page cannot prove"
   ),
   callRow(
     ['native.clipboard.read'],
     'useClipboardReader',
-    'src/platform/clipboard.web.ts',
+    'src/platform/clipboard/clipboard.web.ts',
     'a paste needs the device pasteboard, which the WebView does not hand the page'
   ),
   callRow(
     ['native.media.pick', 'native.media.read', 'native.media.release'],
     'useMediaPicker',
-    'src/platform/media-picker.web.ts',
+    'src/platform/media-picking/media-picker.web.ts',
     'the picker runs the OS permission prompt inside the shell and hands back a handle'
   )
 ]
diff --git a/config/scripts/mobile-web-app/session/mobile-web-app-mermaid-render.test.mjs b/config/scripts/mobile-web-app/session/mobile-web-app-mermaid-render.test.mjs
index ac769ce322b..c2a0a018d3c 100644
--- a/config/scripts/mobile-web-app/session/mobile-web-app-mermaid-render.test.mjs
+++ b/config/scripts/mobile-web-app/session/mobile-web-app-mermaid-render.test.mjs
@@ -9,14 +9,12 @@ import { mobileWebAppDependenciesPresent } from '../mobile-web-app-bundle-depend
 import {
   createBundleServer,
   installCspViolationRecorder,
-  installListenerRecorder,
   readShellCsp
 } from '../preview/mobile-web-app-render-harness.mjs'
 
 const mobileDir = fileURLToPath(new URL('../../../../mobile', import.meta.url))
 const diagramDir = join(mobileDir, 'src/components/pr-sidebar')
 
-// Use design fixture so recorded byte counts remain comparable.
 const FIXTURE =
   'graph TD\n  A[Start] --> B{Choice}\n  B -->|yes| C[Ship it]\n  B -->|no| D[Fix it]\n  D --> A'
 
@@ -124,44 +122,15 @@ afterAll(async () => {
   }
 })
 
-// Record eval/Function stacks to attribute JIT attempts: a library may swallow EvalError under CSP.
-// Playwright also evaluates harness functions, so only bundle-script callers count as page JIT.
-function installJitRecorder() {
-  globalThis.__orcaJit = []
-  const record = (kind, source) => {
-    // Skip error header and recorder frame to identify caller.
-    const stack = (new Error('jit').stack ?? '').split('\n').slice(2).join(' | ')
-    globalThis.__orcaJit.push({ kind, source: String(source).slice(0, 60), stack })
-  }
-  // oxlint-disable-next-line eslint/no-eval -- SAFETY: the recorder holds the real eval so it can count and forward calls; naming it is this function's whole purpose.
-  const realEval = globalThis.eval
-  // oxlint-disable-next-line eslint/no-eval -- SAFETY: replacing eval with a counting wrapper is the measurement, not a call.
-  globalThis.eval = function (source) {
-    record('eval', source)
-    return realEval.call(globalThis, source)
-  }
-  const RealFunction = globalThis.Function
-  function PatchedFunction(...args) {
-    record('Function', args.map((one) => String(one).slice(0, 40)).join('|'))
-    return RealFunction.apply(this, args)
-  }
-  PatchedFunction.prototype = RealFunction.prototype
-  globalThis.Function = PatchedFunction
-}
-
 // Mermaid marks its drawings; the frame's expand icon is an SVG too.
 function readDiagram() {
   const DRAWING = 'svg[aria-roledescription]'
   const frame = document.querySelector('[data-testid="mermaid-diagram"]')
-  const svg = frame?.querySelector(DRAWING) ?? null
   return {
-    framed: frame !== null,
     inFrame: frame ? frame.querySelectorAll(DRAWING).length : -1,
     // Count SVGs across document too: Mermaid’s temporary body element can orphan diagrams outside component host.
     inDocument: document.querySelectorAll(DRAWING).length,
     sourceBox: document.querySelector('[data-testid="mermaid-diagram-source"]') !== null,
-    id: svg?.id ?? null,
-    html: svg?.outerHTML ?? null,
     text: frame?.textContent ?? null
   }
 }
@@ -175,9 +144,7 @@ async function openPage(browser) {
     }
   })
   page.on('pageerror', (error) => consoleErrors.push(`pageerror: ${error.message}`))
-  await page.addInitScript(installJitRecorder)
   await page.addInitScript(installCspViolationRecorder)
-  await page.addInitScript(installListenerRecorder)
   await page.goto(`${origin}/`, { waitUntil: 'domcontentloaded' })
   await page.waitForFunction(() => document.body.dataset.ready === 'yes')
   return { page, consoleErrors }
diff --git a/config/scripts/mobile-web-app/session/mobile-web-app-session-render.test.mjs b/config/scripts/mobile-web-app/session/mobile-web-app-session-render.test.mjs
index a159fab4f6d..ea3838edbd9 100644
--- a/config/scripts/mobile-web-app/session/mobile-web-app-session-render.test.mjs
+++ b/config/scripts/mobile-web-app/session/mobile-web-app-session-render.test.mjs
@@ -16,10 +16,6 @@ import {
   waitForPageFrames
 } from '../preview/mobile-web-app-render-harness.mjs'
 
-// Render real session closure under shipped CSP; unit tests mock RN and cannot prove browser import/evaluation, route paint or deferred fetch.
-// Assert every console error: unguarded RN-Web BackHandler and rejected diff-note loads once logged silently on mount.
-// No terminal attaches against no-RPC double; terminal-render proves terminal content/CSP, session-terminal-init proves session attachment.
-
 const HOST_ROUTE = '/h/render-check-host'
 const WORKTREE = 'wt-1'
 const SESSION_ROUTE = `${HOST_ROUTE}/session/${WORKTREE}`
@@ -33,8 +29,6 @@ const SHELL_HOST = {
   endpoint: 'ws://render-check',
   lastConnected: 1
 }
-const UNMATCHED = 'Unmatched Route'
-const SESSION_CHUNK_KEY = './h/[hostId]/session/[worktreeId].tsx'
 
 // Read grants from manifest so new route grants are exercised instead of silently omitted by copied fixture.
 function sessionGrants() {
@@ -52,7 +46,6 @@ let scratch
 let server
 let browser
 let origin
-let routeChunks = {}
 let cspHeader = null
 let bridgeVersion = null
 let faultGrant = null
@@ -66,7 +59,6 @@ beforeAll(async () => {
   faultGrant = await readBridgeFaultGrant()
   scratch = await mkdtemp(join(tmpdir(), 'orca-mobile-web-app-session-'))
   const built = await buildMobileWebAppBundle({ outDir: join(scratch, 'bundle') })
-  routeChunks = built.routeChunks
   const served = await createBundleServer({ outDir: built.outDir, cspHeader })
   server = served.server
   origin = served.origin
@@ -105,8 +97,6 @@ async function openPage(route, replies = {}, { domStorageOff = false } = {}) {
   })
   const errors = []
   const warnings = []
-  const scripts = []
-  const requestedHosts = []
   page.on('pageerror', (error) => errors.push(`${error.name}: ${error.message}`))
   page.on('console', (message) => {
     if (message.type() === 'error') {
@@ -117,15 +107,7 @@ async function openPage(route, replies = {}, { domStorageOff = false } = {}) {
       warnings.push(message.text())
     }
   })
-  // Observe requests, not just responses; CSP-blocked fetches must still count as attempts.
-  page.on('request', (request) => requestedHosts.push(new URL(request.url()).host))
-  page.on('response', (response) => {
-    const path = new URL(response.url()).pathname
-    if (response.status() === 200 && path.endsWith('.js')) {
-      scripts.push(path)
-    }
-  })
-  return { page, errors, warnings, scripts, requestedHosts }
+  return { page, errors, warnings }
 }
 
 // Wait for route content after mounted: deferred screen chunk may still be arriving.
@@ -161,43 +143,9 @@ async function openRoute(route, awaitText, replies = {}, options = {}) {
   return opened
 }
 
-const SESSION_MOUNT_READS = ['worktree.show', 'session.tabs.list', 'terminal.list']
-
 describeRender(
   'the session route in a real browser',
   () => {
-    it('mounts the session screen rather than the unmatched route, with nothing on the console', async () => {
-      const opened = await openRoute(SESSION_ROUTE, 'Terminal')
-      const text = await opened.page.evaluate(() => document.body.innerText)
-      // Accessory-bar keys prove session screen, beyond generic header text.
-      for (const key of ['Esc', 'Tab', 'Ctrl+C', 'Ctrl+R']) {
-        expect(text).toContain(key)
-      }
-      expect(text).not.toContain(UNMATCHED)
-      // Require exact empty list: BackHandler and uncaught diff-note defects were console-only.
-      expect(opened.errors).toEqual([])
-      expect(opened.requestedHosts.filter((host) => host !== new URL(origin).host)).toEqual([])
-      await opened.page.close()
-    }, 120_000)
-
-    it("fetches the session route's own chunk on a client-side navigation", async () => {
-      const opened = await openRoute(HOST_ROUTE, SHELL_HOST.name)
-      const loadedForFirstRoute = [...opened.scripts]
-      await opened.page.evaluate((to) => {
-        history.pushState(null, '', to)
-        dispatchEvent(new PopStateEvent('popstate'))
-      }, SESSION_ROUTE)
-      await waitForRoute(opened, SESSION_ROUTE, 'Terminal')
-      const chunk = routeChunks[SESSION_CHUNK_KEY]
-      expect(chunk, Object.keys(routeChunks).join(' ')).toBeTruthy()
-      // Identify route chunk through builder to prove fresh fetch, not code already loaded by entry.
-      expect(opened.scripts.filter((path) => !loadedForFirstRoute.includes(path))).toContain(
-        `/assets/${chunk}`
-      )
-      expect(loadedForFirstRoute).not.toContain(`/assets/${chunk}`)
-      await opened.page.close()
-    }, 120_000)
-
     it('paints with DOM storage off, which is how the Android shell serves it', async () => {
       // Null-storage arm reproduces Android import-time expo-notifications failure; shell owns push and pages must not load it.
       const opened = await openRoute(SESSION_ROUTE, 'Terminal', {}, { domStorageOff: true })
@@ -222,25 +170,6 @@ describeRender(
       expect(opened.warnings.filter((text) => text.includes('storage-write-dropped'))).toEqual([])
       await opened.page.close()
     }, 120_000)
-
-    it('asks the desktop for the session it was opened on, so the page above is live', async () => {
-      // Require title/tab/inventory RPCs with correct workspace or same chrome could pass without host reads.
-      // Await effects after paint: under 20× CPU throttle none had fired at initial Terminal commit.
-      const opened = await openRoute(SESSION_ROUTE, 'Terminal')
-      const requests = await waitForRecordedRequests(opened.page, SESSION_MOUNT_READS)
-      for (const method of SESSION_MOUNT_READS) {
-        const observed = requests.filter((request) => request.method === method)
-        expect(observed.length, method).toBeGreaterThan(0)
-        for (const request of observed) {
-          expect(request.params.worktree, method).toBe(`id:${WORKTREE}`)
-        }
-      }
-      await opened.page.close()
-    }, 120_000)
   },
   600_000
 )
-
-// Coverage boundaries: terminal-render proves xterm/CSP/transcript; session-terminal-init proves attachment.
-// Data-gated chat/picker/clipboard controls use sibling source censuses and host/port-pair suites.
-// browser-pane-render proves frame paint; screencast-lane-grant derives route grant; page-async-storage tests store write refusals.
diff --git a/config/scripts/mobile-web-app/shell/mobile-web-app-code-block-selection.mjs b/config/scripts/mobile-web-app/shell/mobile-web-app-code-block-selection.mjs
index d747e67fab9..738f5318edf 100644
--- a/config/scripts/mobile-web-app/shell/mobile-web-app-code-block-selection.mjs
+++ b/config/scripts/mobile-web-app/shell/mobile-web-app-code-block-selection.mjs
@@ -12,7 +12,6 @@ async function verifyCodeBlockSelections({
   readSurface
 }) {
   const cases = [
-    { markdown: 'selected text', html: '<p>selected text</p>', literal: 'selected text' },
     { markdown: 'first\nsecond', html: '<p>first<br>second</p>', literal: 'first\nsecond' },
     {
       markdown: 'first\n\nsecond',
diff --git a/config/scripts/mobile-web-app/shell/mobile-web-app-composer-sizing-render.test.mjs b/config/scripts/mobile-web-app/shell/mobile-web-app-composer-sizing-render.test.mjs
index ee8f619bd08..e3422785654 100644
--- a/config/scripts/mobile-web-app/shell/mobile-web-app-composer-sizing-render.test.mjs
+++ b/config/scripts/mobile-web-app/shell/mobile-web-app-composer-sizing-render.test.mjs
@@ -29,7 +29,7 @@ import { useState } from 'react'
 import { createRoot } from 'react-dom/client'
 import { View } from 'react-native'
 import { MobileNativeChatComposerField } from './src/session/native-chat/composer/MobileNativeChatComposerField.web'
-import { publishShellKeyboardSource } from './src/platform/keyboard-occlusion'
+import { publishShellKeyboardSource } from './src/platform/keyboard/keyboard-occlusion'
 
 let keyboardHeight = 0
 const listeners = new Set()
diff --git a/config/scripts/mobile-web-app/shell/mobile-web-app-native-parity-render.test.mjs b/config/scripts/mobile-web-app/shell/mobile-web-app-native-parity-render.test.mjs
index 158f328bbdc..e3389b15c86 100644
--- a/config/scripts/mobile-web-app/shell/mobile-web-app-native-parity-render.test.mjs
+++ b/config/scripts/mobile-web-app/shell/mobile-web-app-native-parity-render.test.mjs
@@ -1,4 +1,4 @@
-// Measure browser defaults absent from native UI at phone density, with shipped plugins/document styles.
+// Measure the shipped hairline patch at phone density in both browser engines.
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -42,15 +42,13 @@ const ENGINES = [
 const PAGE_ENTRY = `
 import { createElement as h } from 'react'
 import { createRoot } from 'react-dom/client'
-const { Modal, StyleSheet, Text, TextInput, View } = require('react-native')
+const { StyleSheet, View } = require('react-native')
 const styles = StyleSheet.create({
   separatorBox: { paddingTop: 10.1, width: 12, backgroundColor: '#ffffff' },
-  separator: { height: StyleSheet.hairlineWidth, backgroundColor: '#000000' },
-  hairline: { height: 0, borderBottomWidth: StyleSheet.hairlineWidth, borderColor: '#222222' },
-  input: { height: 40 }
+  separator: { height: StyleSheet.hairlineWidth, backgroundColor: '#000000' }
 })
 createRoot(document.getElementById('root')).render(
-  h(View, null, h(View, { testID: 'separator-box', style: styles.separatorBox }, h(View, { style: styles.separator })), h(View, { testID: 'hairline', style: styles.hairline }), h(TextInput, { testID: 'input', style: styles.input }), h(Text, { testID: 'plain-text' }, 'row'), h(Text, { testID: 'selectable-text', selectable: true }, 'message'), location.hash === '#modal' ? h(Modal, { visible: true, transparent: true }, h(View, null, h(Text, { testID: 'modal-text' }, 'sheet row'), h(TextInput, { testID: 'modal-input', style: styles.input }))) : null)
+  h(View, { testID: 'separator-box', style: styles.separatorBox }, h(View, { style: styles.separator }))
 )
 `
 
@@ -106,10 +104,10 @@ afterAll(async () => {
   }
 })
 
-async function openPage(engine, hash = '') {
+async function openPage(engine) {
   const page = await browsers.get(engine.name).newPage(engine.pageOptions)
-  await page.goto(`${origin}/${hash}`, { waitUntil: 'domcontentloaded' })
-  await page.waitForSelector('[data-testid="input"]')
+  await page.goto(`${origin}/`, { waitUntil: 'domcontentloaded' })
+  await page.waitForSelector('[data-testid="separator-box"]')
   return page
 }
 
@@ -124,7 +122,7 @@ describeParity.each(ENGINES)('the page against native, at a phone density, in $n
       const column = Math.floor(shot.width / 2)
       let darkRows = 0
       for (let y = 0; y < shot.height; y++) {
-        // Count pure black only; final clip row may include neighboring #222222 border.
+        // Count pure black rows in the separator clip.
         if (shot.data[(y * shot.width + column) * 4] < 16) {
           darkRows++
         }
@@ -134,29 +132,4 @@ describeParity.each(ENGINES)('the page against native, at a phone density, in $n
       await page.close()
     }
   })
-
-  it("selects through the browser's own gesture only what native lets the user select", async () => {
-    // Double-click tests user selectability; script-created Range can select otherwise unselectable text.
-    const page = await openPage(engine)
-    try {
-      const selectedBy = async (testId) => {
-        await page.evaluate(() => window.getSelection()?.removeAllRanges())
-        await page.dblclick(`[data-testid="${testId}"]`)
-        return page.evaluate(() => window.getSelection()?.toString() ?? '')
-      }
-      expect(await selectedBy('plain-text')).toBe('')
-      // react-native-web's Text/index.js:115 adds `styles.selectable` (`userSelect: 'text'`).
-      expect(await selectedBy('selectable-text')).not.toBe('')
-
-      await page.type('[data-testid="input"]', 'hello world')
-      await page.dblclick('[data-testid="input"]')
-      const selectedInField = await page.evaluate(() => {
-        const input = document.querySelector('[data-testid="input"]')
-        return input.selectionEnd - input.selectionStart
-      })
-      expect(selectedInField).toBeGreaterThan(0)
-    } finally {
-      await page.close()
-    }
-  })
 })
diff --git a/config/scripts/mobile-web-app/shell/mobile-web-app-open-target-render.test.mjs b/config/scripts/mobile-web-app/shell/mobile-web-app-open-target-render.test.mjs
index 8f6899cc4fd..700e87fc3da 100644
--- a/config/scripts/mobile-web-app/shell/mobile-web-app-open-target-render.test.mjs
+++ b/config/scripts/mobile-web-app/shell/mobile-web-app-open-target-render.test.mjs
@@ -237,20 +237,3 @@ describeRender('a host document asked to open a target', () => {
     await page.close()
   }, 60_000)
 })
-
-describeRender('a session document opened on a pane', () => {
-  it('paints without faulting while its first commit erases the pane from the URL', async () => {
-    // A notification tap names the pane; the preloaded session mounts before Expo's container reports ready.
-    const { page, errors } = await openHostDocument({
-      route: { pathname: SESSION_ROUTE, params: { paneKey: 'tab-1:leaf-1' } }
-    })
-    expect(await notifies(page, 'fault')).toEqual([])
-    // Spent, so a remount of the screen cannot replay it over a later tab pick.
-    await page.waitForFunction(() => location.search === '', undefined, {
-      timeout: 10_000,
-      polling: 100
-    })
-    expect(errors).toEqual([])
-    await page.close()
-  }, 60_000)
-})
diff --git a/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-live-input-render.test.mjs b/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-live-input-render.test.mjs
index afde47a339f..c49a89b3c1b 100644
--- a/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-live-input-render.test.mjs
+++ b/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-live-input-render.test.mjs
@@ -60,8 +60,8 @@ beforeAll(async () => {
   await writeFile(
     join(routeDir, 'live-input-probe.tsx'),
     liveInputProbeRouteSource({
-      bindingModule: join(terminalDir, 'use-terminal-text-field-submit-binding'),
-      commitModule: join(terminalDir, 'use-terminal-live-input-commit')
+      bindingModule: join(terminalDir, 'live-input', 'use-terminal-text-field-submit-binding'),
+      commitModule: join(terminalDir, 'live-input', 'use-terminal-live-input-commit')
     })
   )
   const built = await buildMobileWebAppBundle({
diff --git a/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-render-fixture.mjs b/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-render-fixture.mjs
index 0e2c2ec21b4..cec2cd89348 100644
--- a/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-render-fixture.mjs
+++ b/config/scripts/mobile-web-app/terminal/mobile-web-app-terminal-render-fixture.mjs
@@ -78,7 +78,7 @@ export async function startTerminalRenderFixture() {
     // Extensionless import selects web sibling; explicit .tsx would mount browser-incompatible WebView wrapper.
     await writeFile(
       join(routeDir, 'terminal-probe.tsx'),
-      probeRouteSource(join(mobileDir, 'src', 'terminal', 'TerminalWebView'))
+      probeRouteSource(join(mobileDir, 'src', 'terminal', 'webview', 'TerminalWebView'))
     )
     const built = await buildMobileWebAppBundle({
       appDir,
diff --git a/config/scripts/mobile-web-app/workspace/mobile-web-app-files-render.test.mjs b/config/scripts/mobile-web-app/workspace/mobile-web-app-files-render.test.mjs
index f9354639446..c394257653e 100644
--- a/config/scripts/mobile-web-app/workspace/mobile-web-app-files-render.test.mjs
+++ b/config/scripts/mobile-web-app/workspace/mobile-web-app-files-render.test.mjs
@@ -14,7 +14,6 @@ import {
 } from '../preview/mobile-web-app-render-harness.mjs'
 
 // Exercise editable artifact’s draft-confirm drawer in a real browser, including portal/gesture/Reanimated paint.
-// Require modal title before asserting no RN-Web BackHandler error; opening the drawer once registered an unsupported hardware-back listener.
 
 const HOST_ROUTE = '/h/render-check-host'
 const WORKTREE = 'wt-1'
@@ -103,19 +102,12 @@ async function openPreview() {
     pageRoutes: PAGE_ROUTE_PATTERNS,
     replies: REPLIES
   })
-  const errors = []
-  page.on('pageerror', (error) => errors.push(`${error.name}: ${error.message}`))
-  page.on('console', (message) => {
-    if (message.type() === 'error') {
-      errors.push(`console.error: ${message.text()}`)
-    }
-  })
   await page.goto(`${origin}/`, { waitUntil: 'load' })
   await page.waitForFunction(() => document.documentElement.dataset.orcaWebEntry === 'mounted', {
     timeout: 60_000,
     polling: 250
   })
-  return { page, errors }
+  return { page }
 }
 
 describeRender(
diff --git a/config/scripts/mobile-web/check-entry/mobile-process-host-tooling.test.mjs b/config/scripts/mobile-web/check-entry/mobile-process-host-tooling.test.mjs
deleted file mode 100644
index c8190a5038b..00000000000
--- a/config/scripts/mobile-web/check-entry/mobile-process-host-tooling.test.mjs
+++ /dev/null
@@ -1,106 +0,0 @@
-import {
-  cpSync,
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  symlinkSync,
-  writeFileSync
-} from 'node:fs'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { dirname, join, resolve } from 'node:path'
-import { afterEach, expect, it } from 'vitest'
-import { runProcessSync } from '@orca/process-host'
-import { removeTreeSync } from '../../../../src/shared/windows-transient-lock-removal.ts'
-
-const repository = resolve(import.meta.dirname, '../../../..')
-const require = createRequire(import.meta.url)
-const tsx = join(dirname(require.resolve('tsx/package.json')), 'dist', 'cli.mjs')
-const manifest = JSON.parse(readFileSync(join(repository, 'mobile', 'package.json'), 'utf8'))
-const temporary = []
-
-afterEach(() => {
-  for (const root of temporary.splice(0)) {
-    removeTreeSync(root)
-  }
-})
-
-function standaloneMobile() {
-  const root = mkdtempSync(join(tmpdir(), 'orca-mobile-process-tooling-'))
-  temporary.push(root)
-  const mobile = join(root, 'mobile')
-  const dependency = manifest.devDependencies['@orca/process-host']
-  expect(dependency).toBe('link:../src/packages/process-host')
-  const packageDir = resolve(mobile, dependency.slice('link:'.length))
-  mkdirSync(packageDir, { recursive: true })
-  for (const file of ['package.json', 'src']) {
-    cpSync(join(repository, 'src', 'packages', 'process-host', file), join(packageDir, file), {
-      recursive: true
-    })
-  }
-  for (const file of [
-    'scripts',
-    'src/test-support/rpc-recording',
-    'rpc-foundation/pilot-scenarios.json'
-  ]) {
-    const destination = join(mobile, file)
-    mkdirSync(dirname(destination), { recursive: true })
-    cpSync(join(repository, 'mobile', file), destination, { recursive: true })
-  }
-  writeFileSync(join(mobile, 'package.json'), JSON.stringify(manifest))
-  mkdirSync(join(mobile, 'rpc-foundation', 'goldens'), { recursive: true })
-  mkdirSync(join(mobile, 'node_modules', '@orca'), { recursive: true })
-  symlinkSync(
-    packageDir,
-    join(mobile, 'node_modules', '@orca', 'process-host'),
-    process.platform === 'win32' ? 'junction' : 'dir'
-  )
-  expect(existsSync(join(root, 'node_modules'))).toBe(false)
-  expect(existsSync(join(packageDir, 'dist'))).toBe(false)
-  return { root, mobile }
-}
-
-function command(cwd, program, args) {
-  return runProcessSync({
-    program,
-    args,
-    cwd,
-    timeoutMs: 15_000,
-    env: { ...process.env, NODE_PATH: '', NODE_OPTIONS: '', ORCA_BACKGROUND_LAUNCH: '1' }
-  })
-}
-
-function rpcCommand(mobile, script, args) {
-  const [launcher, ...invocation] = manifest.scripts[script].split(' ')
-  expect(launcher).toBe('tsx')
-  return command(mobile, process.env.ORCA_TEST_NODE_EXECUTABLE ?? process.execPath, [
-    tsx,
-    ...invocation,
-    ...args
-  ])
-}
-
-it('runs the RPC diff with a mobile-only dependency link and no compiled host package', () => {
-  const { root, mobile } = standaloneMobile()
-  const init = command(root, 'git', ['init'])
-  expect(init.code, init.stderr).toBe(0)
-  const commit = command(root, 'git', [
-    '-c',
-    'user.name=Orca Test',
-    '-c',
-    'user.email=orca-test@example.invalid',
-    '-c',
-    'commit.gpgsign=false',
-    '-c',
-    `core.hooksPath=${join(root, 'no-hooks')}`,
-    'commit',
-    '--allow-empty',
-    '-m',
-    'fixture'
-  ])
-  expect(commit.code, commit.stderr).toBe(0)
-  const result = rpcCommand(mobile, 'rpc:diff', ['HEAD'])
-  expect(result.code, result.stderr).toBe(0)
-  expect(result.stdout).toContain('No recorded behaviour moved')
-})
diff --git a/config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs b/config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs
index 09e147b05d3..c4ccfd20b4d 100644
--- a/config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs
+++ b/config/scripts/mobile-web/check-entry/mobile-release-check-scope.test.mjs
@@ -84,16 +84,6 @@ describe.skipIf(process.platform === 'win32')('the Linux workflow detector comma
     repo.commit()
     expect(repo.detect()).toBe('should_run=true\n')
   })
-
-  it('runs Ruby when the classifier cannot execute', () => {
-    const repo = fixture()
-    repo.write('mobile/src/view.tsx', 'export const view = 2\n')
-    repo.commit()
-    rmSync(
-      join(repo.directory, 'config/scripts/mobile-web/check-entry/mobile-release-check-scope.mjs')
-    )
-    expect(repo.detect()).toBe('should_run=true\n')
-  })
 })
 
 describe.skipIf(process.platform === 'win32')('the mobile test detector command', () => {
@@ -113,9 +103,6 @@ describe.skipIf(process.platform === 'win32')('the mobile test detector command'
     repo.commit()
     expect(repo.detect()).toBe('should_run=true\n')
   })
-  it('retains tests when the diff is unavailable', () => {
-    expect(fixture(testDetector).detect()).toBe('should_run=true\n')
-  })
   it('retains tests when the classifier cannot execute', () => {
     const repo = fixture(testDetector)
     repo.write('mobile/fastlane/Fastfile', 'default_platform(:android)\n')
diff --git a/config/scripts/native-build/composition/build-native-for-platform.test.mjs b/config/scripts/native-build/composition/build-native-for-platform.test.mjs
index f7de7e74a65..e3359e87c3f 100644
--- a/config/scripts/native-build/composition/build-native-for-platform.test.mjs
+++ b/config/scripts/native-build/composition/build-native-for-platform.test.mjs
@@ -26,7 +26,7 @@ afterEach(() => {
   }
 })
 
-function startBuild(mode, options = {}) {
+function startBuild(mode) {
   const directory = mkdtempSync(join(tmpdir(), 'orca-native-build-test-'))
   directories.push(directory)
   const cli = join(directory, 'fake-pnpm.mjs')
@@ -59,8 +59,7 @@ function startBuild(mode, options = {}) {
       if (['success', 'descendant-success'].includes(process.env.NATIVE_BUILD_MODE)) { record('completed'); process.exit(0) }
       if (!name.includes('computer')) return
       record('failed')
-      if (process.env.NATIVE_BUILD_MODE === 'failure-signal') process.kill(process.pid, 'SIGALRM')
-      else if (process.env.NATIVE_BUILD_MODE === 'failure-sigpipe') { process.on('SIGPIPE', () => {}); process.removeAllListeners('SIGPIPE'); process.kill(process.pid, 'SIGPIPE') }
+      if (process.env.NATIVE_BUILD_MODE === 'failure-sigpipe') { process.on('SIGPIPE', () => {}); process.removeAllListeners('SIGPIPE'); process.kill(process.pid, 'SIGPIPE') }
       else process.exit(7)
     }, 10)
   `
@@ -72,7 +71,7 @@ function startBuild(mode, options = {}) {
     env: {
       ...process.env,
       ORCA_BACKGROUND_LAUNCH: '1',
-      npm_execpath: options.missingCli ? join(directory, 'missing-pnpm') : cli,
+      npm_execpath: cli,
       NATIVE_BUILD_JOURNAL: journal,
       NATIVE_BUILD_GATE: join(directory, 'release'),
       NATIVE_BUILD_MODE: mode
@@ -132,14 +131,6 @@ describe.skipIf(process.platform !== 'darwin')('parallel native builds', () => {
     expect(build.events().filter(({ event }) => event === 'SIGTERM')).toHaveLength(BUILD_COUNT - 1)
   })
 
-  it('re-raises the signal that killed a build', async () => {
-    const build = startBuild('failure-signal')
-    await build.ready
-    build.release()
-    expect(await build.closed).toMatchObject({ code: null, signal: 'SIGALRM' })
-    expect(build.events().filter(({ event }) => event === 'SIGTERM')).toHaveLength(BUILD_COUNT - 1)
-  })
-
   it('fails when the signal that killed a build is one the launcher ignores', async () => {
     const build = startBuild('failure-sigpipe')
     await build.ready
@@ -183,21 +174,6 @@ describe.skipIf(process.platform !== 'darwin')('parallel native builds', () => {
     }
   )
 
-  it('reports a missing build command without waiting forever', async () => {
-    const build = startBuild('success', { missingCli: true })
-    expect(await build.closed).toMatchObject({ code: 1, signal: null })
-  })
-
-  it('reaps compiler descendants that retain pipes after their launcher exits', async () => {
-    const build = startBuild('descendant')
-    await build.ready
-    build.child.kill('SIGTERM')
-    expect(await build.closed).toMatchObject({ code: null, signal: 'SIGTERM' })
-    for (const pid of build.descendants()) {
-      expect(() => process.kill(pid, 0)).toThrow()
-    }
-  })
-
   it("reaps descendants that keep a finished build's pipes open instead of hanging", async () => {
     const build = startBuild('descendant-success')
     await build.ready
diff --git a/config/scripts/native-build/linux/verify-linux-glibc-floor.test.mjs b/config/scripts/native-build/linux/verify-linux-glibc-floor.test.mjs
deleted file mode 100644
index 6a6dda74e86..00000000000
--- a/config/scripts/native-build/linux/verify-linux-glibc-floor.test.mjs
+++ /dev/null
@@ -1,44 +0,0 @@
-import { mkdtemp, mkdir, writeFile, symlink, rm } from 'node:fs/promises'
-import { createRequire } from 'node:module'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-
-const require = createRequire(import.meta.url)
-const { collectNativeBinaries } = require('./verify-linux-glibc-floor.cjs')
-
-// 0x7f 'E' 'L' 'F' + class/data/version padding — enough for the magic check.
-const ELF_HEADER = Buffer.from([0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00])
-
-describe('collectNativeBinaries', () => {
-  it('collects only ELF .node/.so/executable files, skipping non-ELF and symlinks', async () => {
-    const root = await mkdtemp(join(tmpdir(), 'orca-glibc-collect-'))
-    try {
-      await mkdir(join(root, 'nested'), { recursive: true })
-      await writeFile(join(root, 'addon.node'), ELF_HEADER)
-      await writeFile(join(root, 'nested', 'lib.so'), ELF_HEADER)
-      await writeFile(join(root, 'nested', 'lib.so.1'), ELF_HEADER)
-      await writeFile(join(root, 'orca-ide'), ELF_HEADER) // extensionless executable
-      await writeFile(join(root, 'script.js'), ELF_HEADER) // has extension, not native
-      await writeFile(join(root, 'text.node'), 'not an elf file') // native name, non-ELF
-      await writeFile(join(root, 'notes.md'), ELF_HEADER)
-      try {
-        await symlink(join(root, 'addon.node'), join(root, 'alias.node'))
-      } catch {
-        // Symlink creation can be restricted; the rest of the assertions still hold.
-      }
-
-      const found = collectNativeBinaries(root).map((p) => p.slice(root.length + 1))
-      expect(found).toContain('addon.node')
-      expect(found).toContain(join('nested', 'lib.so'))
-      expect(found).toContain(join('nested', 'lib.so.1'))
-      expect(found).toContain('orca-ide')
-      expect(found).not.toContain('script.js')
-      expect(found).not.toContain('text.node')
-      expect(found).not.toContain('notes.md')
-      expect(found).not.toContain('alias.node')
-    } finally {
-      await rm(root, { recursive: true, force: true })
-    }
-  })
-})
diff --git a/config/scripts/native-build/node-addons/native-build-entry.test.mjs b/config/scripts/native-build/node-addons/native-build-entry.test.mjs
index 5dd45e79c62..5a5d359d4de 100644
--- a/config/scripts/native-build/node-addons/native-build-entry.test.mjs
+++ b/config/scripts/native-build/node-addons/native-build-entry.test.mjs
@@ -5,7 +5,6 @@ import path from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 
 const require = createRequire(import.meta.url)
-const { isNativeBuildEntryName } = require('./native-build-entry.cjs')
 const { adoptPackagedNativeBuildEntries } = require('../../../packaged-native-build-entries.cjs')
 const roots = []
 
@@ -41,16 +40,6 @@ describe('adoptPackagedNativeBuildEntries', () => {
     })
     adoptPackagedNativeBuildEntries(root, 'darwin', 'x64')
     expect(readFileSync(path.join(buildDir, 'Release', 'pty.node'), 'utf8')).toBe('entry-x64')
-    expect(
-      ['Release', 'orca-napi-darwin-arm64'].map((name) => isNativeBuildEntryName(name))
-    ).toEqual([false, true])
     expect(require('node:fs').readdirSync(buildDir)).toEqual(['Release'])
   })
-
-  it('leaves a CI layout with no entries untouched', () => {
-    const root = makeRoot()
-    const buildDir = packagedNodePty(root, { Release: 'ci-build' })
-    adoptPackagedNativeBuildEntries(root, 'linux', 'x64')
-    expect(readFileSync(path.join(buildDir, 'Release', 'pty.node'), 'utf8')).toBe('ci-build')
-  })
 })
diff --git a/config/scripts/native-build/node-addons/rebuild-native-deps-node-pty.test.mjs b/config/scripts/native-build/node-addons/rebuild-native-deps-node-pty.test.mjs
index 39637aa2540..4a334265908 100644
--- a/config/scripts/native-build/node-addons/rebuild-native-deps-node-pty.test.mjs
+++ b/config/scripts/native-build/node-addons/rebuild-native-deps-node-pty.test.mjs
@@ -90,32 +90,6 @@ describe('rebuild-native-deps patched node-pty rebuild', () => {
     }
   })
 
-  it('restores the ConPTY runtime payload after a Windows Electron rebuild', () => {
-    const projectDir = mkTempProject()
-
-    try {
-      writeFakeUsableElectronPackage(projectDir, { platform: 'win32' })
-      writeFakeElectronRebuild(projectDir)
-      writeFakeNodePtyConptyPayload(projectDir, 'x64')
-
-      const result = runRebuildScript(
-        projectDir,
-        { npm_config_platform: 'win32', npm_config_arch: 'x64' },
-        ['--platform=win32', '--arch=x64', '--force']
-      )
-
-      expect(result.status, result.stderr).toBe(0)
-      expect(result.stdout).toContain('Restored node-pty ConPTY runtime files for win10-x64')
-      const runtimeDir = join(projectDir, 'node_modules', 'node-pty', 'build', 'Release', 'conpty')
-      expect(readFileSync(join(runtimeDir, 'conpty.dll'), 'utf8')).toBe('conpty.dll x64')
-      expect(readFileSync(join(runtimeDir, 'OpenConsole.exe'), 'utf8')).toBe('OpenConsole.exe x64')
-    } finally {
-      removeTreeSync(projectDir)
-    }
-  })
-
-  // Model loadable addon with all job exports but no MSYS denial: require/export checks pass while Git Bash children leak.
-
   // Check rebuilt artifact destined for packaged app; neither relay gate nor runtime load check covers it. Missing output after success must fail too.
   for (const [addon, expected] of [
     ['unpatched', 'still imports ReadProcessMemory'],
@@ -198,8 +172,4 @@ describe('rebuild-native-deps patched node-pty rebuild', () => {
       removeTreeSync(projectDir)
     }
   })
-
-  // Cross-host rebuild or absent optional node-pty may leave no win32 addon; warn without breaking a working install.
-
-  // Same-host missing output must fail: loader falls back to upstream prebuild that leaks MSYS children. Only Windows can exercise this branch.
 })
diff --git a/config/scripts/orcad-distribution/prebuilds/merge-orcad-prebuilds.test.mjs b/config/scripts/orcad-distribution/prebuilds/merge-orcad-prebuilds.test.mjs
index a87f1e9d793..c20259b4849 100644
--- a/config/scripts/orcad-distribution/prebuilds/merge-orcad-prebuilds.test.mjs
+++ b/config/scripts/orcad-distribution/prebuilds/merge-orcad-prebuilds.test.mjs
@@ -45,15 +45,6 @@ function laneTree(slot, { version = '1.1.0', nodeHeaders = '24.21.0', bytes = sl
 }
 
 describe('mergeOrcadPrebuildTrees', () => {
-  it('refuses a lane whose files no longer match its own manifest', () => {
-    const lane = laneTree('win32-x64')
-    writeFileSync(join(lane, 'win32-x64', 'pty.node'), 'tampered')
-
-    expect(() => mergeOrcadPrebuildTrees([lane], join(temp(), 'out'))).toThrow(
-      'win32-x64/pty.node: sha256 does not match the manifest'
-    )
-  })
-
   it('refuses the same slot from two lanes instead of letting the last one win', () => {
     const out = join(temp(), 'out')
     expect(() =>
diff --git a/config/scripts/orcad-distribution/server-bundle/foreign-sqlite-reader-worker-smoke.test.mjs b/config/scripts/orcad-distribution/server-bundle/foreign-sqlite-reader-worker-smoke.test.mjs
deleted file mode 100644
index 8e51b59ab5f..00000000000
--- a/config/scripts/orcad-distribution/server-bundle/foreign-sqlite-reader-worker-smoke.test.mjs
+++ /dev/null
@@ -1,43 +0,0 @@
-import { build } from 'esbuild'
-import { mkdtempSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join, resolve } from 'node:path'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { smokeForeignSqliteReaderWorker } from './foreign-sqlite-reader-worker-smoke.mjs'
-import { ORCAD_CHILD_ENTRY_POINTS } from './orcad-entry-build.mjs'
-
-const ENTRY = 'foreign-sqlite-reader-entry.js'
-const directories = []
-let builtDirectory
-
-function fixtureDirectory() {
-  const directory = mkdtempSync(join(tmpdir(), 'orca-foreign-sqlite-smoke-test-'))
-  directories.push(directory)
-  return directory
-}
-
-beforeAll(async () => {
-  builtDirectory = fixtureDirectory()
-  await build({
-    entryPoints: [resolve(ORCAD_CHILD_ENTRY_POINTS.foreignSqliteReader)],
-    outfile: join(builtDirectory, ENTRY),
-    bundle: true,
-    platform: 'node',
-    target: 'node18',
-    format: 'cjs',
-    external: ['electron'],
-    logLevel: 'silent'
-  })
-}, 60_000)
-
-afterAll(() => {
-  for (const directory of directories) {
-    rmSync(directory, { recursive: true, force: true })
-  }
-})
-
-describe('foreign SQLite reader build smoke', () => {
-  it('passes against the built entry', () => {
-    expect(() => smokeForeignSqliteReaderWorker(builtDirectory)).not.toThrow()
-  })
-})
diff --git a/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.test.mjs b/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.test.mjs
index 578e443dff9..319b6b6773c 100644
--- a/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.test.mjs
+++ b/config/scripts/orcad-distribution/server-bundle/orcad-entry-build.test.mjs
@@ -89,22 +89,19 @@ it('resolves bundle-relative requires after deployment to a path with URL-specia
   expect(loaded.stdout.trim()).toBe('deployed asset')
 })
 
-it.each(['import.meta', 'import.meta.dirname', 'import.meta.filename', 'import.meta.resolve'])(
-  'rejects unsupported %s instead of silently replacing it with an empty object',
-  async (expression) => {
-    await expect(
-      build({
-        ...ORCAD_COMMONJS_MODULE_OPTIONS,
-        stdin: { contents: `console.log(${expression})`, resolveDir: directory },
-        bundle: true,
-        platform: 'node',
-        format: 'cjs',
-        write: false,
-        logLevel: 'silent'
-      })
-    ).rejects.toThrow('"import.meta" is not available')
-  }
-)
+it('rejects unsupported import.meta.dirname instead of silently replacing it with an empty object', async () => {
+  await expect(
+    build({
+      ...ORCAD_COMMONJS_MODULE_OPTIONS,
+      stdin: { contents: 'console.log(import.meta.dirname)', resolveDir: directory },
+      bundle: true,
+      platform: 'node',
+      format: 'cjs',
+      write: false,
+      logLevel: 'silent'
+    })
+  ).rejects.toThrow('"import.meta" is not available')
+})
 
 it('escapes only the trailing license comment, never code', () => {
   const code = 'a=/[\u2726]/;'
diff --git a/config/scripts/orcad-distribution/server-bundle/orcad-linear-sdk-package.test.mjs b/config/scripts/orcad-distribution/server-bundle/orcad-linear-sdk-package.test.mjs
index 6112ea6540b..d7e6983f97d 100644
--- a/config/scripts/orcad-distribution/server-bundle/orcad-linear-sdk-package.test.mjs
+++ b/config/scripts/orcad-distribution/server-bundle/orcad-linear-sdk-package.test.mjs
@@ -4,7 +4,6 @@ import { join } from 'node:path'
 import { afterAll, beforeAll, expect, it } from 'vitest'
 import { runProcessSync } from '@orca/process-host'
 import {
-  ORCAD_ARTIFACTS,
   ORCAD_LINEAR_SDK_ENTRY,
   ORCAD_SERVER_ENTRY_FILENAME
 } from '../../../../src/shared/orcad-artifacts.ts'
@@ -23,7 +22,6 @@ afterAll(() => {
 })
 
 it("resolves linear-sdk.ts's lazy require from the deployed server under plain Node", () => {
-  expect(ORCAD_ARTIFACTS.map((artifact) => artifact.filename)).toContain(ORCAD_LINEAR_SDK_ENTRY)
   const server = join(deployment, ORCAD_SERVER_ENTRY_FILENAME)
   writeFileSync(
     server,
diff --git a/config/scripts/orcad-distribution/server-bundle/orcad-mobile-web-bundle.test.mjs b/config/scripts/orcad-distribution/server-bundle/orcad-mobile-web-bundle.test.mjs
deleted file mode 100644
index 4607ab7e923..00000000000
--- a/config/scripts/orcad-distribution/server-bundle/orcad-mobile-web-bundle.test.mjs
+++ /dev/null
@@ -1,43 +0,0 @@
-import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { ORCAD_MOBILE_WEB_MANIFEST } from '../../../../src/shared/orcad-artifacts.ts'
-import { writeMobileWebBundleFixtureTree } from '../../build/mobile-web-app/mobile-web-bundle-fixture-tree.mjs'
-import {
-  readOrcadMobileWebAssetFilenames,
-  stageOrcadMobileWebBundle
-} from './orcad-mobile-web-bundle.mjs'
-
-let scratch
-let bundleDir
-let outputDir
-
-beforeEach(() => {
-  scratch = mkdtempSync(join(tmpdir(), 'orcad-mobile-web-'))
-  bundleDir = join(scratch, 'mobile-web')
-  outputDir = join(scratch, 'orcad')
-  vi.spyOn(console, 'log').mockImplementation(() => {})
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  vi.unstubAllEnvs()
-  rmSync(scratch, { recursive: true, force: true })
-})
-
-it('stages the manifest and every asset it lists, byte for byte', async () => {
-  const { manifest } = await writeMobileWebBundleFixtureTree({ outDir: bundleDir })
-  stageOrcadMobileWebBundle(outputDir, bundleDir)
-
-  const staged = readOrcadMobileWebAssetFilenames(outputDir)
-  expect(staged).toHaveLength(manifest.assets.length)
-  for (const asset of manifest.assets) {
-    expect(readFileSync(join(outputDir, 'out', 'mobile-web', asset.path))).toEqual(
-      readFileSync(join(bundleDir, asset.path))
-    )
-  }
-  expect(readFileSync(join(outputDir, ORCAD_MOBILE_WEB_MANIFEST))).toEqual(
-    readFileSync(join(bundleDir, 'manifest.json'))
-  )
-})
diff --git a/config/scripts/performance/measurement/benchmark-artifact-comparison.test.mjs b/config/scripts/performance/measurement/benchmark-artifact-comparison.test.mjs
index 3abb570f748..dc83dc90144 100644
--- a/config/scripts/performance/measurement/benchmark-artifact-comparison.test.mjs
+++ b/config/scripts/performance/measurement/benchmark-artifact-comparison.test.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process'
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
@@ -37,26 +37,6 @@ afterEach(() => {
 })
 
 describe('benchmark artifact comparison', () => {
-  it('rejects invalid benchmark artifacts before comparing partial metrics', () => {
-    const dir = makeTempDir()
-    const baselinePath = writeArtifact(dir, 'split-invalid.json', {
-      label: 'invalid split',
-      status: 'failed',
-      valid: false,
-      headlineMs: { shortcutToFocusP50: 0 }
-    })
-    const candidatePath = writeArtifact(dir, 'split-valid.json', {
-      label: 'valid split',
-      status: 'passed',
-      valid: true,
-      headlineMs: { shortcutToFocusP50: 10 }
-    })
-
-    expect(() => comparePaths(baselinePath, candidatePath)).toThrow(
-      'split-invalid.json: benchmark artifact is marked invalid'
-    )
-  })
-
   it('aggregates duplicate Playwright scenario metrics before comparison', () => {
     const dir = makeTempDir()
     const baselinePath = writeArtifact(dir, 'baseline-playwright-duplicates.json', {
@@ -181,47 +161,6 @@ describe('benchmark artifact comparison', () => {
     })
   })
 
-  it('writes Markdown and JSON reports from the CLI while printing Markdown', () => {
-    const dir = makeTempDir()
-    const baselinePath = writeArtifact(dir, 'baseline.json', {
-      label: 'baseline',
-      summaryMedianMs: { totalToDidFinishLoad: 100 }
-    })
-    const candidatePath = writeArtifact(dir, 'candidate.json', {
-      label: 'candidate',
-      summaryMedianMs: { totalToDidFinishLoad: 40 }
-    })
-    const markdownPath = join(dir, 'nested', 'comparison.md')
-    const jsonPath = join(dir, 'nested', 'comparison.json')
-
-    const result = spawnSync(
-      process.execPath,
-      [
-        scriptPath,
-        '--baseline',
-        baselinePath,
-        '--candidate',
-        candidatePath,
-        '--title',
-        'Test Compare',
-        '--output',
-        markdownPath,
-        '--json-output',
-        jsonPath
-      ],
-      { cwd: process.cwd(), encoding: 'utf8' }
-    )
-
-    expect(result.status).toBe(0)
-    expect(result.stdout).toContain('| Metric | Baseline | Candidate | Delta | Delta % | Result |')
-    expect(result.stdout).toContain(
-      '| totalToDidFinishLoad | 100.0ms | 40.0ms | -60.0ms | -60.0% | improved |'
-    )
-    expect(existsSync(markdownPath)).toBe(true)
-    expect(existsSync(jsonPath)).toBe(true)
-    expect(JSON.parse(readFileSync(jsonPath, 'utf8')).schemaVersion).toBe(1)
-  })
-
   it('redacts absolute input paths from generated reports', () => {
     const dir = makeTempDir()
     const baselinePath = writeArtifact(dir, 'absolute-baseline.json', {
diff --git a/config/scripts/performance/mobile-projection/mobile-source-control-collation-benchmark.mjs b/config/scripts/performance/mobile-projection/mobile-source-control-collation-benchmark.mjs
index 68c2ea699a3..4c3c71ea332 100644
--- a/config/scripts/performance/mobile-projection/mobile-source-control-collation-benchmark.mjs
+++ b/config/scripts/performance/mobile-projection/mobile-source-control-collation-benchmark.mjs
@@ -4,6 +4,8 @@ import { readFileSync } from 'node:fs'
 import { dirname, resolve } from 'node:path'
 import { performance } from 'node:perf_hooks'
 import { build } from 'esbuild'
+import { runProcessSync } from '@orca/process-host'
+import { describeProcessFailure } from '../../tool-invocation/process-failure-message.mjs'
 import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs'
 
 const baseline = process.argv[2]
@@ -20,7 +22,31 @@ async function load(file, contents, name) {
     format: 'esm',
     write: false,
     logLevel: 'silent',
-    tsconfigRaw: {}
+    tsconfigRaw: {},
+    plugins: [
+      {
+        name: 'historical-source-control-owners',
+        setup(plugin) {
+          plugin.onResolve(
+            { filter: /^\.\.\/(?:mobile-git-status|git-status-reply-schema)$/ },
+            (args) => {
+              if (
+                file !== 'mobile/src/source-control/review/mobile-diff-review-queue.ts' ||
+                args.importer !== '<stdin>' ||
+                args.resolveDir !== dirname(resolve(file))
+              ) {
+                return
+              }
+              const target =
+                args.path === '../mobile-git-status'
+                  ? 'mobile/src/source-control/changes/mobile-git-status.ts'
+                  : 'mobile/src/source-control/git/git-status-reply-schema.ts'
+              return { path: resolve(target) }
+            }
+          )
+        }
+      }
+    ]
   })
   return (
     await import(
@@ -34,18 +60,44 @@ const paths = execFileSync('git', ['ls-files', '-z'], { maxBuffer: 16 * 1024 * 1
   .split('\0')
   .filter(Boolean)
 const results = []
-for (const [file, name] of [
-  ['mobile/src/source-control/mobile-git-status.ts', 'buildMobileSourceControlSections'],
-  ['mobile/src/source-control/mobile-branch-compare.ts', 'buildMobileBranchCompareSection'],
-  ['mobile/src/source-control/review/mobile-diff-review-queue.ts', 'buildMobileDiffReviewQueue']
+for (const { baselineLegacy, current, name } of [
+  {
+    baselineLegacy: 'mobile/src/source-control/mobile-git-status.ts',
+    current: 'mobile/src/source-control/changes/mobile-git-status.ts',
+    name: 'buildMobileSourceControlSections'
+  },
+  {
+    baselineLegacy: 'mobile/src/source-control/mobile-branch-compare.ts',
+    current: 'mobile/src/source-control/branches/mobile-branch-compare.ts',
+    name: 'buildMobileBranchCompareSection'
+  },
+  {
+    baselineLegacy: 'mobile/src/source-control/review/mobile-diff-review-queue.ts',
+    current: 'mobile/src/source-control/review/mobile-diff-review-queue.ts',
+    name: 'buildMobileDiffReviewQueue'
+  }
 ]) {
+  const historicalFile = [...new Set([current, baselineLegacy])].find((file) => {
+    const probe = runProcessSync({
+      program: 'git',
+      args: ['cat-file', '-t', `${baseline}:${file}`],
+      cwd: process.cwd(),
+      timeoutMs: 30_000,
+      maxOutputBytes: 2 * 1024 * 1024
+    })
+    if (probe.timedOut || probe.outputTruncated || ![0, 128].includes(probe.code)) {
+      throw new Error(describeProcessFailure(probe))
+    }
+    return probe.code === 0 && probe.stdout.trim() === 'blob'
+  })
+  assert(historicalFile, `Missing baseline entry: ${baselineLegacy}`)
   const arms = {
     before: await load(
-      file,
-      execFileSync('git', ['show', `${baseline}:${file}`], { encoding: 'utf8' }),
+      historicalFile,
+      execFileSync('git', ['show', `${baseline}:${historicalFile}`], { encoding: 'utf8' }),
       name
     ),
-    after: await load(file, readFileSync(file, 'utf8'), name)
+    after: await load(current, readFileSync(current, 'utf8'), name)
   }
   for (const count of [0, 1, 17, 63, 1000]) {
     const step = Math.max(1, Math.floor(paths.length / Math.max(1, count)))
diff --git a/config/scripts/performance/terminal-input/mobile-backspace-benchmark.mjs b/config/scripts/performance/terminal-input/mobile-backspace-benchmark.mjs
index c5256e4fee2..11c7a7e2616 100644
--- a/config/scripts/performance/terminal-input/mobile-backspace-benchmark.mjs
+++ b/config/scripts/performance/terminal-input/mobile-backspace-benchmark.mjs
@@ -6,8 +6,8 @@ import { build } from 'esbuild'
 import { buildCounterbalancedSchedule } from '../measurement/counterbalanced-benchmark-schedule.mjs'
 import { summarizeBenchmarkSamples } from '../measurement/benchmark-sample-summary.mjs'
 
-// git show <baseline-ref>:mobile/src/terminal/terminal-live-text-commit.ts | node config/scripts/mobile-backspace-benchmark.mjs
-const target = resolve('mobile/src/terminal/terminal-live-text-commit.ts')
+// git show <baseline-ref>:mobile/src/terminal/live-input/terminal-live-text-commit.ts | node config/scripts/mobile-backspace-benchmark.mjs
+const target = resolve('mobile/src/terminal/live-input/terminal-live-text-commit.ts')
 async function load(source) {
   const result = await build({
     stdin: { contents: source, loader: 'ts', resolveDir: dirname(target) },
diff --git a/config/scripts/performance/terminal-reporting/check-terminal-perf-report-budgets.test.mjs b/config/scripts/performance/terminal-reporting/check-terminal-perf-report-budgets.test.mjs
deleted file mode 100644
index ca9bafeb674..00000000000
--- a/config/scripts/performance/terminal-reporting/check-terminal-perf-report-budgets.test.mjs
+++ /dev/null
@@ -1,79 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
-
-const scriptPath =
-  'config/scripts/performance/terminal-reporting/check-terminal-perf-report-budgets.mjs'
-const tempDirs = []
-
-function writeReport(annotationDescription, annotationType = 'opencode-test') {
-  const dir = mkdtempSync(join(tmpdir(), 'orca-terminal-perf-report-'))
-  tempDirs.push(dir)
-  const reportPath = join(dir, 'report.json')
-  writeFileSync(
-    reportPath,
-    JSON.stringify({
-      suites: [
-        {
-          specs: [
-            {
-              tests: [
-                {
-                  annotations: [
-                    {
-                      type: annotationType,
-                      description: annotationDescription
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    })
-  )
-  return reportPath
-}
-
-function runChecker(reportPath) {
-  return spawnSync(process.execPath, [scriptPath, reportPath], {
-    cwd: process.cwd(),
-    encoding: 'utf8'
-  })
-}
-
-afterEach(() => {
-  while (tempDirs.length > 0) {
-    rmSync(tempDirs.pop(), { force: true, recursive: true })
-  }
-})
-
-describe('check-terminal-perf-report-budgets', () => {
-  // Redraw scenarios must not inherit the unloaded drift ceiling.
-
-  // Historical outliers must not become the new latency baseline.
-
-  it('fails malformed metric values instead of treating them as absent', () => {
-    const reportPath = writeReport('panes=1 median=999 worst=abcms rendererQueuedChars=wat')
-
-    const result = runChecker(reportPath)
-
-    expect(result.status).toBe(1)
-    expect(result.stderr).toContain('median value "999" is malformed')
-    expect(result.stderr).toContain('worst value "abcms" is malformed')
-    expect(result.stderr).toContain('rendererQueuedChars value "wat" is malformed')
-    expect(result.stderr).toContain('no recognized budget metrics found')
-  })
-
-  it('ignores non-OpenCode annotations but fails when no perf rows remain', () => {
-    const reportPath = writeReport('median=999.0ms', 'browser-unrelated')
-
-    const result = runChecker(reportPath)
-
-    expect(result.status).toBe(1)
-    expect(result.stderr).toContain('No OpenCode terminal perf annotations found.')
-  })
-})
diff --git a/config/scripts/performance/windows-security/windows-security-reuse-benchmark.test.mjs b/config/scripts/performance/windows-security/windows-security-reuse-benchmark.test.mjs
index d2e3971fa31..0320fa8f03f 100644
--- a/config/scripts/performance/windows-security/windows-security-reuse-benchmark.test.mjs
+++ b/config/scripts/performance/windows-security/windows-security-reuse-benchmark.test.mjs
@@ -1,16 +1,8 @@
 import { createHash } from 'node:crypto'
-import {
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  statSync,
-  symlinkSync,
-  writeFileSync,
-  rmSync
-} from 'node:fs'
+import { mkdirSync, mkdtempSync, readFileSync, statSync, writeFileSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
-import { afterEach, expect, it, vi } from 'vitest'
+import { afterEach, expect, it } from 'vitest'
 import { peImage } from '../../native-build/windows/windows-pe-image-fixture.mjs'
 import { withInvalidSecurityCandidate } from './benchmark-windows-security-reuse.mjs'
 
@@ -28,47 +20,17 @@ function fixture(arch = 'x64') {
   return { root, candidate }
 }
 
-it.each(['success', 'rejection'])(
-  'restores exact candidate bytes and permissions after %s',
-  async (outcome) => {
-    const f = fixture()
-    const original = readFileSync(f.candidate)
-    const before = statSync(f.candidate)
-    const action = async () => {
-      expect(readFileSync(f.candidate)).not.toEqual(original)
-      if (outcome === 'rejection') {
-        throw new Error('failed sample')
-      }
-      return 'proof'
-    }
-    const operation = withInvalidSecurityCandidate(f.candidate, f.root, digest(original), action)
-    if (outcome === 'rejection') {
-      await expect(operation).rejects.toThrow('failed sample')
-    } else {
-      expect(await operation).toBe('proof')
-    }
-    expect(readFileSync(f.candidate)).toEqual(original)
-    expect(statSync(f.candidate).mode).toBe(before.mode)
-    expect(statSync(f.candidate).mtimeMs).toBeCloseTo(before.mtimeMs, 0)
-  }
-)
-
-it('refuses a changed candidate, symlink and preexisting backup before invalidating', async () => {
+it('restores exact candidate bytes and permissions after a rejected sample', async () => {
   const f = fixture()
-  const bytes = readFileSync(f.candidate)
-  const action = vi.fn()
-  await expect(
-    withInvalidSecurityCandidate(f.candidate, f.root, 'wrong hash', action)
-  ).rejects.toThrow()
-  writeFileSync(join(f.root, 'prepared-security-backup.node'), 'occupied')
-  await expect(
-    withInvalidSecurityCandidate(f.candidate, f.root, digest(bytes), action)
-  ).rejects.toThrow()
-  const link = join(f.root, 'link.node')
-  symlinkSync(dirname(f.candidate), link, 'junction')
-  await expect(withInvalidSecurityCandidate(link, f.root, digest(bytes), action)).rejects.toThrow(
-    'regular file'
-  )
-  expect(readFileSync(f.candidate)).toEqual(bytes)
-  expect(action).not.toHaveBeenCalled()
+  const original = readFileSync(f.candidate)
+  const before = statSync(f.candidate)
+  const action = async () => {
+    expect(readFileSync(f.candidate)).not.toEqual(original)
+    throw new Error('failed sample')
+  }
+  const operation = withInvalidSecurityCandidate(f.candidate, f.root, digest(original), action)
+  await expect(operation).rejects.toThrow('failed sample')
+  expect(readFileSync(f.candidate)).toEqual(original)
+  expect(statSync(f.candidate).mode).toBe(before.mode)
+  expect(statSync(f.candidate).mtimeMs).toBeCloseTo(before.mtimeMs, 0)
 })
diff --git a/config/scripts/plugin-authoring/content-validation/validate-plugin-files.test.mjs b/config/scripts/plugin-authoring/content-validation/validate-plugin-files.test.mjs
deleted file mode 100644
index 18ce2787ee4..00000000000
--- a/config/scripts/plugin-authoring/content-validation/validate-plugin-files.test.mjs
+++ /dev/null
@@ -1,39 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import path from 'node:path'
-import process from 'node:process'
-import { runProcess } from '@orca/process-host'
-import { afterEach, describe, expect, it } from 'vitest'
-import { createPluginFromTemplate } from '../../../../src/cli/plugins/authoring/plugin-create'
-
-const SCRIPT = path.join(import.meta.dirname, './validate-plugin-files.mjs')
-const roots = []
-
-async function tempRoot() {
-  const root = await mkdtemp(path.join(tmpdir(), 'orca-validate-plugin-files-'))
-  roots.push(root)
-  return root
-}
-
-afterEach(async () => {
-  await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
-})
-
-function validate(...targets) {
-  return runProcess({
-    program: process.execPath,
-    args: [SCRIPT, ...targets],
-    timeoutMs: 60_000
-  })
-}
-
-describe('validate-plugin-files', () => {
-  it('fails with exit 1 when a file the manifest names is missing', async () => {
-    const dir = path.join(await tempRoot(), 'panel')
-    await createPluginFromTemplate({ dir, template: 'panel', publisher: 'acme' })
-    await rm(path.join(dir, 'panel', 'index.html'))
-    const result = await validate(dir)
-    expect(result.code).toBe(1)
-    expect(result.stderr).toContain('panel/index.html')
-  }, 60_000)
-})
diff --git a/config/scripts/plugin-authoring/rpc-catalog/generate-rpc-params-catalog.mjs b/config/scripts/plugin-authoring/rpc-catalog/generate-rpc-params-catalog.mjs
index a1b05beffd5..b5f4fbb5c8b 100644
--- a/config/scripts/plugin-authoring/rpc-catalog/generate-rpc-params-catalog.mjs
+++ b/config/scripts/plugin-authoring/rpc-catalog/generate-rpc-params-catalog.mjs
@@ -32,16 +32,25 @@ function scratchDir(prefix) {
 const posix = (value) => value.split(path.sep).join('/')
 const repoPath = (absolute) => posix(path.relative(REPO_ROOT, absolute))
 
+function isProductionModule(file) {
+  const value = posix(file)
+  return (
+    !/(?:^|\/)(?:test-support|testing|__tests__|fixtures)(?:\/|$)/.test(value) &&
+    !/\.(?:test|spec|test-fixture|fixture)\.[cm]?tsx?$/.test(value) &&
+    !/\.d\.[cm]?ts$/.test(value)
+  )
+}
+
 function indexableModules() {
   // Exclude tests or catalog’s CJS bundle requires Vitest and throws.
   const modules = new Set(
-    globSync('*.ts', { cwd: CONTRACT_DIR })
-      .filter((name) => !name.endsWith('.test.ts'))
+    globSync('**/*.ts', { cwd: CONTRACT_DIR })
+      .filter(isProductionModule)
       .map((name) => path.join(CONTRACT_DIR, name))
   )
   modules.delete(OUTPUT_PATH)
   for (const file of globSync('**/*.ts', { cwd: RPC_DIR })) {
-    if (file.endsWith('.test.ts')) {
+    if (!isProductionModule(file)) {
       continue
     }
     const source = readFileSync(path.join(RPC_DIR, file), 'utf8')
@@ -50,6 +59,7 @@ function indexableModules() {
       // Exclude generator output even when params import its types; stale catalog bundling would break regeneration precisely when needed.
       if (
         resolved !== OUTPUT_PATH &&
+        isProductionModule(resolved) &&
         resolved.startsWith(`${SHARED_DIR}${path.sep}`) &&
         existsSync(resolved)
       ) {
diff --git a/config/scripts/preflight/changed-checks/check-changed-code-quality.mjs b/config/scripts/preflight/changed-checks/check-changed-code-quality.mjs
index 8cd2d6cf97d..2052fc083a1 100644
--- a/config/scripts/preflight/changed-checks/check-changed-code-quality.mjs
+++ b/config/scripts/preflight/changed-checks/check-changed-code-quality.mjs
@@ -76,8 +76,8 @@ const SUPPRESSED_REACT_DOCTOR_DIAGNOSTICS = new Map([
   [
     'react-doctor(no-adjust-state-on-prop-change)',
     new Set([
-      'src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts',
-      'src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts'
+      'src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts',
+      'src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts'
     ])
   ],
   [
diff --git a/config/scripts/preflight/changed-checks/check-changed-code-quality.test.mjs b/config/scripts/preflight/changed-checks/check-changed-code-quality.test.mjs
index f6b7806fd7f..a431458a26d 100644
--- a/config/scripts/preflight/changed-checks/check-changed-code-quality.test.mjs
+++ b/config/scripts/preflight/changed-checks/check-changed-code-quality.test.mjs
@@ -3,11 +3,7 @@ import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { runProcessSync } from '@orca/process-host'
-import {
-  collectBaseLineBlocks,
-  collectAddedLineRanges,
-  isUnloadedPluginDirectiveUnusedWarning
-} from './check-changed-code-quality.mjs'
+import { collectBaseLineBlocks, collectAddedLineRanges } from './check-changed-code-quality.mjs'
 
 describe('changed-code quality line matching', () => {
   it.each(['edit', 'rename'])('treats bracketed filenames literally after %s', (change) => {
@@ -104,34 +100,3 @@ describe('moved-code exemption', () => {
     }
   })
 })
-
-describe('secondary-scan directive exemption', () => {
-  it('exempts type-aware and import-plugin directives from the root scan alone', () => {
-    const root = mkdtempSync(path.join(tmpdir(), 'changed-code-quality-type-aware-'))
-    try {
-      writeFileSync(
-        path.join(root, 'a.ts'),
-        [
-          '// oxlint-disable-next-line typescript/return-await -- catch must not cover this',
-          '// oxlint-disable-next-line typescript/return-await-extra -- unknown rule',
-          '// oxlint-disable-next-line no-console -- root rule',
-          '// oxlint-disable-next-line import/no-cycle -- singleton hub'
-        ].join('\n')
-      )
-      const unused = (line) => ({
-        message: 'Unused oxlint-disable directive (no problems were reported).',
-        filename: 'a.ts',
-        labels: [{ span: { line } }]
-      })
-      const exempt = (line, scan) =>
-        isUnloadedPluginDirectiveUnusedWarning(unused(line), root, scan)
-      expect(exempt(1, 'code quality')).toBe(true)
-      expect(exempt(1, 'type-aware code quality')).toBe(false)
-      expect(exempt(2, 'code quality')).toBe(false)
-      expect(exempt(3, 'code quality')).toBe(false)
-      expect(exempt(4, 'code quality')).toBe(true)
-    } finally {
-      rmSync(root, { recursive: true, force: true })
-    }
-  })
-})
diff --git a/config/scripts/release/javascript-artifacts/release-javascript-artifact.test.mjs b/config/scripts/release/javascript-artifacts/release-javascript-artifact.test.mjs
index 107fd7a1a4f..1f3dec92aa7 100644
--- a/config/scripts/release/javascript-artifacts/release-javascript-artifact.test.mjs
+++ b/config/scripts/release/javascript-artifacts/release-javascript-artifact.test.mjs
@@ -110,18 +110,6 @@ describe('release JavaScript configuration', () => {
 })
 
 describe('release JavaScript transfer', () => {
-  it('restores development bundles and rejects them for an official build', () => {
-    const options = fixture()
-    const devConfiguration = { ...configuration, identity: 'dev', telemetryKeySha256: null }
-    packReleaseJavascript({ ...options, configuration: devConfiguration })
-    expect(() => restoreReleaseJavascript(options)).toThrow(
-      'JavaScript build configuration differs'
-    )
-    expect(
-      restoreReleaseJavascript({ ...options, configuration: devConfiguration }).configuration
-    ).toEqual(devConfiguration)
-  })
-
   it('rejects a damaged archive before replacing the current build', () => {
     const options = fixture()
     packReleaseJavascript(options)
diff --git a/config/scripts/release/workflow-contracts/qualified-orcad-template.test.mjs b/config/scripts/release/workflow-contracts/qualified-orcad-template.test.mjs
index d433ee9d563..9f773650d92 100644
--- a/config/scripts/release/workflow-contracts/qualified-orcad-template.test.mjs
+++ b/config/scripts/release/workflow-contracts/qualified-orcad-template.test.mjs
@@ -8,41 +8,28 @@ import { writeOrcadTemplateTestFixture } from '../../orcad-distribution/template
 
 const workflow = parse(readFileSync('.github/workflows/qualified-orcad-template.yml', 'utf8'))
 
-it.each(['valid', 'corrupt', 'dark'])(
-  'validates restored bytes and requalifies an unsafe template: %s',
-  async (kind) => {
-    const root = mkdtempSync(join(tmpdir(), 'qualified-template-restore-'))
-    const output = join(root, 'output')
-    try {
-      symlinkSync(
-        resolve('config'),
-        join(root, 'config'),
-        process.platform === 'win32' ? 'junction' : 'dir'
-      )
-      const template = await writeOrcadTemplateTestFixture(join(root, 'out'))
-      if (kind === 'corrupt') {
-        writeFileSync(join(template, 'out/mobile-web/index.html'), 'mutated')
-      } else if (kind === 'dark') {
-        writeFileSync(join(template, 'ORCA_LAYOUT_OWNER_MAIN'), 'dark build')
-      }
-      const validate = workflow.jobs.cache.steps.find((step) => step.id === 'validate')
-      const result = runProcessSync({
-        program: 'bash',
-        args: ['-e', '-c', validate.run],
-        cwd: root,
-        env: { ...process.env, GITHUB_OUTPUT: output }
-      })
-      expect(result.code, result.stderr).toBe(0)
-      if (kind === 'valid') {
-        expect(readFileSync(output, 'utf8').trim()).toBe('valid=true')
-        expect(existsSync(template)).toBe(true)
-      } else {
-        expect(existsSync(output)).toBe(false)
-        expect(existsSync(template)).toBe(false)
-        expect(result.stdout).toContain('qualifying a fresh build')
-      }
-    } finally {
-      rmSync(root, { recursive: true, force: true })
-    }
+it('removes corrupted cached bytes without marking them reusable', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'qualified-template-restore-'))
+  const output = join(root, 'output')
+  try {
+    symlinkSync(
+      resolve('config'),
+      join(root, 'config'),
+      process.platform === 'win32' ? 'junction' : 'dir'
+    )
+    const template = await writeOrcadTemplateTestFixture(join(root, 'out'))
+    writeFileSync(join(template, 'out/mobile-web/index.html'), 'mutated')
+    const validate = workflow.jobs.cache.steps.find((step) => step.id === 'validate')
+    const result = runProcessSync({
+      program: 'bash',
+      args: ['-e', '-c', validate.run],
+      cwd: root,
+      env: { ...process.env, GITHUB_OUTPUT: output }
+    })
+    expect(result.code, result.stderr).toBe(0)
+    expect(existsSync(output)).toBe(false)
+    expect(existsSync(template)).toBe(false)
+  } finally {
+    rmSync(root, { recursive: true, force: true })
   }
-)
+})
diff --git a/config/scripts/release/workflow-contracts/release-mac-build-workflow-dispatch.test.mjs b/config/scripts/release/workflow-contracts/release-mac-build-workflow-dispatch.test.mjs
index 417074d1e11..5ce36b1091c 100644
--- a/config/scripts/release/workflow-contracts/release-mac-build-workflow-dispatch.test.mjs
+++ b/config/scripts/release/workflow-contracts/release-mac-build-workflow-dispatch.test.mjs
@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { executeReleaseMacBuildMode } from '../operations/run-release-mac-build-workflow.mjs'
 
 const splitEnvironment = {
@@ -28,16 +28,8 @@ const splitRun = {
 }
 
 describe('release mac build split dispatch and verification', () => {
-  it.each([
-    ['id', 124],
-    ['head_sha', 'b'.repeat(40)],
-    ['head_branch', 'other'],
-    ['run_attempt', 2],
-    ['event', 'pull_request'],
-    ['path', '.github/workflows/other.yml'],
-    ['display_title', 'Mac release build v1.2.4 (777)']
-  ])('rejects a changed %s before inspecting success', async (field, value) => {
-    const { fetch } = createGitHubFetch([jsonResponse(200, { ...splitRun, [field]: value })])
+  it('rejects a completed run from another commit', async () => {
+    const fetch = async () => jsonResponse(200, { ...splitRun, head_sha: 'b'.repeat(40) })
     await expect(
       executeReleaseMacBuildMode('wait', splitEnvironment, {
         fetch,
@@ -47,30 +39,6 @@ describe('release mac build split dispatch and verification', () => {
   })
 })
 
-function createGitHubFetch(responses) {
-  const requests = []
-  const fetch = vi.fn(async (rawUrl, init) => {
-    const url = new URL(rawUrl)
-    const response = responses.shift()
-
-    if (response == null) {
-      throw new Error(`Unexpected request: ${init.method} ${rawUrl}`)
-    }
-
-    requests.push({
-      body: init.body == null ? undefined : JSON.parse(init.body),
-      method: init.method,
-      headers: init.headers,
-      path: url.pathname,
-      query: url.searchParams
-    })
-
-    return response
-  })
-
-  return { fetch, requests }
-}
-
 function jsonResponse(status, body) {
   return {
     ok: status >= 200 && status < 300,
diff --git a/config/scripts/runtime-verification/headless-detector/headless-detector-compiler-cache.test.mjs b/config/scripts/runtime-verification/headless-detector/headless-detector-compiler-cache.test.mjs
deleted file mode 100644
index 82b1144a8d8..00000000000
--- a/config/scripts/runtime-verification/headless-detector/headless-detector-compiler-cache.test.mjs
+++ /dev/null
@@ -1,73 +0,0 @@
-import {
-  appendFileSync,
-  existsSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  symlinkSync,
-  writeFileSync
-} from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, expect, it } from 'vitest'
-import {
-  activateCompilerCache,
-  compilerCacheIdentity,
-  packCompilerCache
-} from './headless-detector-compiler-cache.mjs'
-
-const temporary = []
-afterEach(() => {
-  for (const dir of temporary.splice(0)) {
-    rmSync(dir, { recursive: true, force: true })
-  }
-})
-function fixture() {
-  const directory = mkdtempSync(join(tmpdir(), 'headless-compiler-cache-'))
-  temporary.push(directory)
-  const root = join(directory, 'checkout')
-  mkdirSync(root)
-  writeFileSync(join(root, 'package.json'), '{"type":"module"}')
-  const identity = compilerCacheIdentity({ policyHash: 'policy', cacheRoot: directory })
-  packCompilerCache({ identity })
-  return { root, identity }
-}
-
-it.each(['modified', 'missing', 'extra', 'symlink', 'malformed'])(
-  'falls back on %s cache contents before loading code',
-  async (kind) => {
-    const { root, identity } = fixture()
-    const compiler = join(identity.path, 'node_modules', 'esbuild', 'lib', 'main.js')
-    if (kind === 'modified') {
-      appendFileSync(compiler, '\nthrow Error("must not load")')
-    }
-    if (kind === 'missing') {
-      rmSync(compiler)
-    }
-    if (kind === 'extra') {
-      writeFileSync(join(identity.path, 'unexpected'), 'extra')
-    }
-    if (kind === 'symlink') {
-      rmSync(compiler)
-      symlinkSync(join(root, 'package.json'), compiler)
-    }
-    if (kind === 'malformed') {
-      writeFileSync(join(identity.path, 'manifest.json'), '{')
-    }
-    expect((await activateCompilerCache({ root, identity })).available).toBe(false)
-    expect(existsSync(join(root, 'node_modules'))).toBe(false)
-  }
-)
-
-it('leaves existing dependencies alone and falls back on an absent archive', async () => {
-  const { root, identity } = fixture()
-  mkdirSync(join(root, 'node_modules'))
-  writeFileSync(join(root, 'node_modules', 'retained'), 'retained')
-  expect((await activateCompilerCache({ root, identity })).available).toBe(false)
-  expect(readFileSync(join(root, 'node_modules', 'retained'), 'utf8')).toBe('retained')
-  rmSync(join(root, 'node_modules'), { recursive: true })
-  rmSync(identity.path, { recursive: true })
-  expect((await activateCompilerCache({ root, identity })).available).toBe(false)
-  expect(existsSync(join(root, 'node_modules'))).toBe(false)
-})
diff --git a/config/scripts/runtime-verification/skills-cli/verify-skills-cli-runtime.test.mjs b/config/scripts/runtime-verification/skills-cli/verify-skills-cli-runtime.test.mjs
index 60980d25ff1..a34d97f1c42 100644
--- a/config/scripts/runtime-verification/skills-cli/verify-skills-cli-runtime.test.mjs
+++ b/config/scripts/runtime-verification/skills-cli/verify-skills-cli-runtime.test.mjs
@@ -31,29 +31,6 @@ describe('skills CLI runtime closure', () => {
     }
   })
 
-  it('rejects bare imports resolved outside the artifact', async () => {
-    const root = await mkdtemp(join(tmpdir(), 'orca-skills-cli-closure-'))
-    try {
-      const artifactRoot = join(root, 'artifact')
-      const outDir = join(artifactRoot, 'out')
-      const externalPackageDir = join(root, 'node_modules', 'external-package')
-      await mkdir(externalPackageDir, { recursive: true })
-      await writeSkillsCliFixture(outDir, "require('external-package')\n")
-      await writeFile(
-        join(externalPackageDir, 'package.json'),
-        JSON.stringify({ main: 'index.js' }),
-        'utf8'
-      )
-      await writeFile(join(externalPackageDir, 'index.js'), '', 'utf8')
-
-      expect(() => collectRuntimeClosure(outDir, artifactRoot)).toThrow(
-        /external-package.*resolved outside/s
-      )
-    } finally {
-      await rm(root, { recursive: true, force: true })
-    }
-  })
-
   it("resolves a linked package's imports from its store slot, as Node does", async () => {
     const root = await mkdtemp(join(tmpdir(), 'orca-skills-cli-closure-'))
     try {
diff --git a/config/scripts/static-analysis/oxlint-contracts/app-store-performance-plugin.test.mjs b/config/scripts/static-analysis/oxlint-contracts/app-store-performance-plugin.test.mjs
index 5576704bba0..ce751af1651 100644
--- a/config/scripts/static-analysis/oxlint-contracts/app-store-performance-plugin.test.mjs
+++ b/config/scripts/static-analysis/oxlint-contracts/app-store-performance-plugin.test.mjs
@@ -20,40 +20,6 @@ function lintSources(sources) {
 }
 
 const sources = {
-  // The subscription and post-render memo from the typing-lag regression.
-  historicalHotMap: `
-      import { useAppStore } from '@/store'
-export function useStructuredAgentSessionHostCapabilityState(
-  target: RuntimeClientTarget | null,
-  capability: RuntimeCapability
-): StructuredAgentSessionHostCapabilityState {
-  const environmentId = target?.kind === 'environment' ? target.environmentId : null
-  const statuses = useAppStore((state) => state.runtimeStatusByEnvironmentId)
-  const remote = useMemo((): StructuredAgentSessionHostCapabilityState => {
-    if (environmentId === null) {
-      return 'unknown'
-    }
-    const entry = statuses.get(environmentId)
-    const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
-    return status
-      ? status.capabilities?.includes(capability)
-        ? 'supported'
-        : 'unsupported'
-      : 'unknown'
-  }, [statuses, environmentId, capability])
-  const local = useSyncExternalStore(
-    subscribeLocalRuntimeCapabilityObservation,
-    () => localCapabilityState(capability),
-    () => 'unknown' as const
-  )
-  useEffect(() => {
-    if (target?.kind === 'local') {
-      void ensureLocalRuntimeCapabilities()
-    }
-  }, [target?.kind])
-  return !target ? 'unknown' : environmentId === null ? local : remote
-}
-    `,
   hotMapReturns: `
       import { useAppStore as useStore } from '@/store'
       import { useRuntimeStore } from '@/store/runtime'
@@ -82,59 +48,6 @@ export function useStructuredAgentSessionHostCapabilityState(
       function ShadowedHook(useAppStore) { return useAppStore(s => s.runtimeStatusByEnvironmentId) }
       const ShadowedParameter = () => useAppStore(s => { { const s = other; return s.runtimeStatusByEnvironmentId } })
     `,
-  fixedHostCapability: `
-      import { useAppStore } from '@/store'
-export function useStructuredAgentSessionOwnPermissionState(
-  target: RuntimeClientTarget | null
-): StructuredAgentSessionHostCapabilityState {
-  const capability = AGENT_SESSION_PERMISSION_OWN_RUNTIME_CAPABILITY
-  const environmentId = target?.kind === 'environment' ? target.environmentId : null
-  // Select the verdict, not the map: unrelated host flips must not rerender every chat.
-  const remote = useAppStore((state): StructuredAgentSessionHostCapabilityState => {
-    if (environmentId === null) {
-      return 'unknown'
-    }
-    const entry = state.runtimeStatusByEnvironmentId.get(environmentId)
-    const status = isRuntimeHostContactRevoked(entry) ? null : lastVerifiedRuntimeStatus(entry)
-    return status
-      ? status.capabilities?.includes(capability)
-        ? 'supported'
-        : 'unsupported'
-      : 'unknown'
-  })
-  const local = useSyncExternalStore(
-    subscribeLocalRuntimeCapabilityObservation,
-    () => localCapabilityState(capability),
-    () => 'unknown' as const
-  )
-  useEffect(() => {
-    if (target?.kind === 'local') {
-      void ensureLocalRuntimeCapabilities()
-    }
-  }, [target?.kind])
-  return !target ? 'unknown' : environmentId === null ? local : remote
-}
-
-    `,
-  parkingProjection: `
-      import { useAppStore } from '@/store'
-export function selectPairedRuntimeParkingEnvironmentIdsFromState(state: {
-  runtimeStatusByEnvironmentId: PairedRuntimeParkingCapabilityStatuses
-}): ReadonlySet<string> {
-  return selectPairedRuntimeParkingEnvironmentIds(state.runtimeStatusByEnvironmentId)
-}
-
-      const Parking = () => useAppStore(selectPairedRuntimeParkingEnvironmentIdsFromState)
-    `,
-  globalHotMapConsumer: `
-      import { useAppStore } from '@/store'
-      // oxlint-disable-next-line app-store-performance/no-whole-hot-map-selector -- Fleet picker needs every host's current status.
-      const Fleet = () => useAppStore(s => s.runtimeStatusByEnvironmentId)
-    `,
-  escapedImport: String.raw`
-      import { use\u0041ppStore as useStore } from '@/store'
-      export const WholeStore = () => useStore()
-    `,
   subscriptions: `
       import { useAppStore as useStore } from '@/store'
       const WholeStore = () => useStore()
@@ -146,14 +59,6 @@ export function selectPairedRuntimeParkingEnvironmentIdsFromState(state: {
         return state.items
       })
     `,
-  focusedSelectors: `
-      import { useAppStore } from '@/store'
-      import { useShallow as shallow } from 'zustand/react/shallow'
-      const selectActive = (state) => state.active
-      const Focused = () => useAppStore(selectActive)
-      const Cached = () => useAppStore((state) => state.cachedProjection)
-      const Shallow = () => useAppStore(shallow((state) => ({ active: state.active })))
-    `,
   namedSelectors: `
       import { useAppStore } from '@/store'
       const EarlyFresh = () => useAppStore(selectFreshRows)
@@ -161,22 +66,6 @@ export function selectPairedRuntimeParkingEnvironmentIdsFromState(state: {
       const Stable = () => useAppStore(selectActiveId)
       const selectActiveId = (state) => state.activeId
     `,
-  importedSelector: `
-      import { useAppStore } from '@/store'
-      import { selectRows } from './selectors'
-      const Other = () => {
-        const selectRows = (state) => state.rows.map((row) => row.id)
-        return selectRows
-      }
-      const Imported = () => useAppStore(selectRows)
-    `,
-  siblingStores: `
-      import { usePluginPanelsStore } from '@/store/plugin-panels'
-      import { useSyncExternalStore } from 'react'
-      const WholePanels = () => usePluginPanelsStore()
-      const FreshPanels = () => usePluginPanelsStore((state) => ({ open: state.open }))
-      const External = () => useSyncExternalStore(subscribe, () => ({ open: true }))
-    `,
   nestedShallow: `
       import { useAppStore } from '@/store'
       import { useShallow } from 'zustand/react/shallow'
@@ -233,22 +122,14 @@ beforeAll(() => {
 })
 
 describe('app store performance Oxlint plugin', () => {
-  it.each([
-    ['historicalHotMap', 1],
-    ['hotMapReturns', 9]
-  ])('reports whole hot-map results in %s', (name, count) => {
-    expect(diagnosticsBySource.get(sources[name]).map((diagnostic) => diagnostic.code)).toEqual(
-      Array(count).fill('app-store-performance(no-whole-hot-map-selector)')
-    )
+  it('reports whole hot-map returns through local bindings', () => {
+    expect(
+      diagnosticsBySource.get(sources.hotMapReturns).map((diagnostic) => diagnostic.code)
+    ).toEqual(Array(9).fill('app-store-performance(no-whole-hot-map-selector)'))
   })
 
-  it.each([
-    'focusedHotMapReads',
-    'fixedHostCapability',
-    'parkingProjection',
-    'globalHotMapConsumer'
-  ])('allows stable projections and justified global consumers in %s', (name) => {
-    expect(diagnosticsBySource.get(sources[name])).toEqual([])
+  it('allows stable projections of hot-map fields', () => {
+    expect(diagnosticsBySource.get(sources.focusedHotMapReads)).toEqual([])
   })
 
   it.each(['lexicalBindings', 'shadowedImports'])('respects lexical bindings in %s', (name) => {
diff --git a/config/scripts/static-analysis/oxlint-contracts/ime-enter-guard-plugin.test.mjs b/config/scripts/static-analysis/oxlint-contracts/ime-enter-guard-plugin.test.mjs
index 654a42e7076..76440924965 100644
--- a/config/scripts/static-analysis/oxlint-contracts/ime-enter-guard-plugin.test.mjs
+++ b/config/scripts/static-analysis/oxlint-contracts/ime-enter-guard-plugin.test.mjs
@@ -18,14 +18,6 @@ const violations = [
     'inline Enter on a raw input',
     "export const X = () => <input onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
   ],
-  [
-    'Enter on a raw textarea',
-    "export const X = () => <textarea onKeyDown={(e) => e.key === 'Enter' && send()} />"
-  ],
-  [
-    'Enter by code on a text-typed input',
-    'export const X = () => <input type="search" onKeyDown={(e) => { if (e.code === "NumpadEnter") go() }} />'
-  ],
   [
     'Enter by keyCode',
     'export const X = () => <input onKeyPress={(e) => { if (e.keyCode === 13) go() }} />'
@@ -34,13 +26,6 @@ const violations = [
     'Enter on a contentEditable element',
     "export const X = () => <div contentEditable onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
   ],
-  [
-    'named local handler',
-    `export function X() {
-      const onKeyDown = (e) => { if (e.key === 'Enter') submit() }
-      return <input onKeyDown={onKeyDown} />
-    }`
-  ],
   [
     'useCallback handler',
     `export function X() {
@@ -48,12 +33,6 @@ const violations = [
       return <input onKeyDownCapture={handleKeyDown} />
     }`
   ],
-  [
-    'keydown listener on an input ref',
-    `export function attach(inputRef) {
-      inputRef.current.addEventListener('keydown', (e) => { if (e.key === 'Enter') go() })
-    }`
-  ],
   [
     'keydown listener on a created textarea',
     `export function attach() {
@@ -64,10 +43,6 @@ const violations = [
 ]
 
 const accepted = [
-  [
-    'shared guard inline',
-    "export const X = () => <input onKeyDown={(e) => { if (isImeCompositionKeyDown(e)) return; if (e.key === 'Enter') go() }} />"
-  ],
   [
     'shared guard in a called helper',
     `function ignoreIme(e) { return isImeOwnedKeyboardEvent(e) }
@@ -76,38 +51,14 @@ const accepted = [
       return <textarea onKeyDown={onKeyDown} />
     }`
   ],
-  [
-    'gesture ownership guard',
-    "export const X = () => <input onKeyDown={(e) => { if (ime.ownsKeyDown(e)) return; if (e.key === 'Enter') go() }} />"
-  ],
   [
     'element tracks composition itself',
     "export const X = () => <input onCompositionStart={start} onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
   ],
-  [
-    'Input primitive',
-    "export const X = () => <Input onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
-  ],
-  [
-    'ImeTextarea',
-    "export const X = () => <ImeTextarea onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
-  ],
   [
     'non-text input type',
     'export const X = () => <input type="checkbox" onKeyDown={(e) => { if (e.key === "Enter") toggle() }} />'
   ],
-  [
-    'list row button',
-    "export const X = () => <button onKeyDown={(e) => { if (e.key === 'Enter') open() }} />"
-  ],
-  [
-    'contentEditable disabled',
-    "export const X = () => <div contentEditable={false} onKeyDown={(e) => { if (e.key === 'Enter') go() }} />"
-  ],
-  [
-    'non-Enter key handling',
-    "export const X = () => <input onKeyDown={(e) => { if (e.key === 'Escape') cancel() }} />"
-  ],
   [
     'handler passed in from props',
     'export const X = ({ onKeyDown }) => <input onKeyDown={onKeyDown} />'
diff --git a/config/scripts/static-analysis/oxlint-contracts/quadratic-buffer-concat-plugin.test.mjs b/config/scripts/static-analysis/oxlint-contracts/quadratic-buffer-concat-plugin.test.mjs
index 47cc34afafd..f5fe0808121 100644
--- a/config/scripts/static-analysis/oxlint-contracts/quadratic-buffer-concat-plugin.test.mjs
+++ b/config/scripts/static-analysis/oxlint-contracts/quadratic-buffer-concat-plugin.test.mjs
@@ -22,21 +22,6 @@ const violations = [
     String.raw`let acc = Buffer.alloc(0); for (const chunk of chunks) { acc = Buffer['con\x63at']([acc, chunk]) }`,
     'acc'
   ],
-  [
-    'self accumulator',
-    'let acc = Buffer.alloc(0); for (const chunk of chunks) { acc = Buffer.concat([acc, chunk]) }',
-    'acc'
-  ],
-  [
-    'trailing accumulator',
-    'let acc = Buffer.alloc(0); for (const chunk of chunks) { acc = Buffer.concat([chunk, acc]) }',
-    'acc'
-  ],
-  [
-    'spread self accumulator',
-    'let acc = Buffer.alloc(0); for (const chunk of chunks) { acc = Buffer.concat([...acc, chunk]) }',
-    'acc'
-  ],
   [
     'indirect stream carry',
     `async function read(stream) {
@@ -48,17 +33,6 @@ const violations = [
      }`,
     'remainder'
   ],
-  [
-    'indirect transcript carry',
-    `function read(fd, size) {
-       let carryBytes = Buffer.alloc(0)
-       while (bytesRead < size) {
-         const combined = Buffer.concat([buffer.subarray(0, n), carryBytes])
-         carryBytes = combined.subarray(0, firstNewline)
-       }
-     }`,
-    'carryBytes'
-  ],
   [
     'classic for initializer',
     'for (let acc = Buffer.alloc(0), i = 0; i < n; i++) { acc = Buffer.concat([acc, chunks[i]]) }',
@@ -68,19 +42,10 @@ const violations = [
     'class field accumulator',
     'class Reader { read() { while (this.open) { this.pending = Buffer.concat([this.pending, chunk]) } } }',
     'this.pending'
-  ],
-  [
-    'guarded accumulator',
-    'let acc = Buffer.alloc(0); while (open) { acc = acc.length === 0 ? chunk : Buffer.concat([acc, chunk]) }',
-    'acc'
   ]
 ]
 
 const accepted = [
-  [
-    'single concat after loop',
-    'const parts = []; for (const chunk of chunks) { parts.push(chunk) } const out = Buffer.concat(parts)'
-  ],
   [
     'spread chunk list',
     `let carryChunks = []
@@ -89,10 +54,6 @@ const accepted = [
        carryChunks = [buffer.subarray(0, firstNewline)]
      }`
   ],
-  [
-    'iteration-local result',
-    'for (const group of groups) { const frame = Buffer.concat([group.header, group.body]); send(frame) }'
-  ],
   [
     'iteration-local accumulator',
     'for (const chunk of chunks) { let framed = HEADER; framed = Buffer.concat([framed, chunk]); send(framed) }'
@@ -100,8 +61,7 @@ const accepted = [
   [
     'no enclosing loop',
     'class S { handle(chunk) { const buffer = Buffer.concat([this.pending, chunk]); this.pending = parse(buffer).pending } }'
-  ],
-  ['no Buffer concat', 'export const x = 1']
+  ]
 ]
 
 const diagnosticsBySource = new Map()
diff --git a/config/scripts/static-analysis/oxlint-contracts/renderer-scrollbar-style-plugin.test.mjs b/config/scripts/static-analysis/oxlint-contracts/renderer-scrollbar-style-plugin.test.mjs
index 5bc5d115cbf..944e5437061 100644
--- a/config/scripts/static-analysis/oxlint-contracts/renderer-scrollbar-style-plugin.test.mjs
+++ b/config/scripts/static-analysis/oxlint-contracts/renderer-scrollbar-style-plugin.test.mjs
@@ -21,56 +21,21 @@ const violations = [
     String.raw`export const X = () => <div className={'\x6fverflow-y-auto'} />`,
     String.raw`'\x6fverflow-y-auto'`
   ],
-  [
-    'unstyled class',
-    'export const X = () => <div className="max-h-64 overflow-y-auto" />',
-    '"max-h-64 overflow-y-auto"'
-  ],
-  [
-    'unstyled suffix-important class',
-    'export const X = () => <div className="max-h-64 overflow-y-auto!" />',
-    '"max-h-64 overflow-y-auto!"'
-  ],
-  [
-    'unknown scrollbar class',
-    'export const X = () => <div className="overflow-auto scrollbar-none" />',
-    '"overflow-auto scrollbar-none"'
-  ],
-  [
-    'separate class composer arguments',
-    "export const X = () => <div className={cn('overflow-y-auto', 'scrollbar-sleek')} />",
-    "'overflow-y-auto'"
-  ],
   [
     'conditional scrollbar',
     "export const X = ({ enabled }) => <div className={cn('overflow-y-auto', enabled && 'scrollbar-sleek')} />",
     "'overflow-y-auto'"
   ],
-  [
-    'arbitrary class wrapper',
-    "export const X = () => <div className={identity('overflow-y-auto')} />",
-    "'overflow-y-auto'"
-  ],
   [
     'mismatched responsive variants',
     'export const X = () => <div className="overflow-y-auto md:scrollbar-sleek" />',
     '"overflow-y-auto md:scrollbar-sleek"'
   ],
-  [
-    'inline overflow',
-    "export const X = () => <div style={{ overflowY: 'auto' }} />",
-    "overflowY: 'auto'"
-  ],
   [
     'logical inline style spread',
     "export const X = ({ open }) => <div style={{ ...(open && { overflowY: 'auto' }) }} />",
     "overflowY: 'auto'"
   ],
-  [
-    'JSX spread class',
-    "export const X = () => <div {...{ className: 'overflow-y-auto' }} />",
-    "'overflow-y-auto'"
-  ],
   [
     'later spread override',
     'export const X = () => <div className="scrollbar-sleek" {...{ className: \'overflow-y-auto\' }} />',
@@ -79,31 +44,14 @@ const violations = [
 ]
 
 const accepted = [
-  [
-    'styled vertical class',
-    'export const X = () => <div className="overflow-auto scrollbar-sleek" />'
-  ],
-  [
-    'styled suffix-important classes',
-    'export const X = () => <div className="overflow-y-auto! scrollbar-sleek!" />'
-  ],
-  [
-    'same composer literal',
-    "export const X = () => <div className={cn('overflow-y-auto scrollbar-sleek')} />"
-  ],
   [
     'same conditional literal',
     "export const X = ({ enabled }) => <div className={cn(enabled && 'overflow-y-auto scrollbar-sleek')} />"
   ],
-  ['horizontal-only overflow', 'export const X = () => <pre className="overflow-x-auto" />'],
   [
     'matching responsive variants',
     'export const X = () => <div className="md:overflow-y-auto md:scrollbar-sleek" />'
   ],
-  [
-    'unconditional scrollbar',
-    'export const X = () => <div className="md:overflow-y-auto scrollbar-sleek" />'
-  ],
   [
     'styled inline overflow',
     'export const X = () => <div className="scrollbar-editor" style={{ overflow: \'auto\' }} />'
@@ -111,10 +59,6 @@ const accepted = [
   [
     'styled JSX spread class',
     "export const X = () => <div {...{ className: 'overflow-y-auto scrollbar-sleek' }} />"
-  ],
-  [
-    'variant configuration',
-    "export const X = () => <div className={buttonVariants({ className: 'overflow-y-auto scrollbar-sleek' })} />"
   ]
 ]
 
diff --git a/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.mjs b/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.mjs
index b65ac589b25..ba823b7e646 100644
--- a/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.mjs
+++ b/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.mjs
@@ -24,7 +24,7 @@ export const COMPAT_FOLDERS = [
     entries: ['remote-layout-snapshot-persistence', 'remote-layout-snapshot-recorder'],
     importers: [
       'src/main/ipc/runtime-environments/runtime-environments.ts',
-      'src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts',
+      'src/main/ipc/runtime-environments/catalog/runtime-environment-removal-cleanup.ts',
       'src/main/persistence/loading-store/store-domain-composition.ts'
     ]
   }
diff --git a/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.test.mjs b/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.test.mjs
index ec081db22c8..7b87cf0d965 100644
--- a/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.test.mjs
+++ b/config/scripts/static-analysis/process-boundaries/check-compat-boundary-imports.test.mjs
@@ -11,13 +11,8 @@ function assess(files) {
 }
 
 describe('compatibility folder import boundary', () => {
-  it.each([
-    './co\\u006dpat/a',
-    './co\\x6dpat/a',
-    './co\\mpat/a',
-    './co\\\nmpat/a',
-    './co\\u{6d}pat/a'
-  ])('rejects deep imports with escaped folder names: %s', (specifier) => {
+  it('rejects a deep import whose folder name is escaped', () => {
+    const specifier = './co\\u006dpat/a'
     expect(assess({ 'src/main/owner.ts': `import { a } from '${specifier}'` })).toEqual([
       'src/main/owner.ts: import src/main/compat through entry, not ./compat/a'
     ])
@@ -43,10 +38,4 @@ describe('compatibility folder import boundary', () => {
       )
     ).toEqual(['src/main/compat.ts/consumer.ts: import src/main/compat through entry, not .'])
   })
-
-  it('keeps parse failures fatal for candidate files', () => {
-    expect(() => assess({ 'src/main/owner.ts': "import { from './compat'" })).toThrow(
-      'Cannot parse'
-    )
-  })
 })
diff --git a/config/scripts/static-analysis/process-boundaries/check-main-sync-spawn-ratchet.test.mjs b/config/scripts/static-analysis/process-boundaries/check-main-sync-spawn-ratchet.test.mjs
index 504795bbf88..9867499cb5e 100644
--- a/config/scripts/static-analysis/process-boundaries/check-main-sync-spawn-ratchet.test.mjs
+++ b/config/scripts/static-analysis/process-boundaries/check-main-sync-spawn-ratchet.test.mjs
@@ -35,26 +35,18 @@ function captureErrors() {
 
 describe('main sync-spawn ratchet', () => {
   it.each([
-    ["import { execFileSync } from 'node:child_process'\nexecFileSync('git')", 1, ['execFileSync']],
     [
       "import { execFileSync as run } from 'child_process'\nrun('git')\nrun('gh')",
       2,
       ['execFileSync']
     ],
-    ["import * as cp from 'node:child_process'\ncp.spawnSync('git')", 1, ['spawnSync']],
-    ["import cp from 'child_process'\ncp['execSync']('git')", 1, ['execSync']],
-    ["import cp = require('child_process')\ncp.execFileSync('git')", 1, ['execFileSync']],
-    ["require('node:child_process').execSync('git')", 1, ['execSync']],
     [
       "const cp = require('child_process')\nconst alias = cp\nalias.spawnSync('git')",
       1,
       ['spawnSync']
     ],
-    ["const { spawnSync: run } = require('node:child_process')\nrun('git')", 1, ['spawnSync']],
     ["const { execSync } = await import('node:child_process')\nexecSync('git')", 1, ['execSync']],
-    ["(await import('child_process')).execFileSync('git')", 1, ['execFileSync']],
     ["export { spawnSync } from 'node:child_process'", 1, ['spawnSync']],
-    ["import { execSync } from 'child_process'\nexport { execSync }", 1, ['execSync']],
     [
       "import { execSync } from 'child_process'\nqueue.push(execSync, { execSync })",
       2,
@@ -75,16 +67,6 @@ describe('main sync-spawn ratchet', () => {
       1,
       ['restrictWindowsPathSync']
     ],
-    [
-      "const { execSync } = require('child_process')\nconst run = execSync\nrun('a')",
-      1,
-      ['execSync']
-    ],
-    [
-      "function f() { const run = cp.execSync; run('a') }\nconst cp = require('child_process')",
-      1,
-      ['execSync']
-    ],
     [
       "import { execFileSync } from 'child_process'\nclass A extends mixin(execFileSync) {}",
       1,
@@ -95,33 +77,21 @@ describe('main sync-spawn ratchet', () => {
       1,
       ['runProcessSync']
     ],
-    // Binding an alias is setup; each call through it is a use, so an alias refactor keeps the count.
     [
       "import { execSync } from 'child_process'\nconst run = execSync\nrun('a')\nrun('b')",
       2,
       ['execSync']
     ],
-    ["import { execSync } from 'child_process'\nexport const run = execSync", 1, ['execSync']],
-    ["import { execSync } from 'child_process'\nconst out = execSync('a')", 1, ['execSync']]
+    ["import { execSync } from 'child_process'\nexport const run = execSync", 1, ['execSync']]
   ])('counts %s', (source, count, symbols) => {
     expect(uses(source)).toEqual({ count, symbols })
   })
 
   it.each([
-    "import { execFileSync } from 'node:child_process'",
-    "import { spawn, execFile } from 'node:child_process'\nspawn('git')",
     "import type { execFileSync } from 'node:child_process'\nexecFileSync('x')",
-    "import { type spawnSync } from 'child_process'\nspawnSync('x')",
-    "import * as cp from 'child_process'\ntype Run = typeof cp.execFileSync",
     "import { runProcessSync } from '@orca/process-host'\ntype O = { run?: typeof runProcessSync }",
-    "import { runProcess } from '@orca/process-host'\nrunProcess(spec)",
     "import { runProcessSync } from '@orca/process-host/process-spec'\nrunProcessSync(spec)",
-    "import { writeSecureFile } from './secure-file'\nwriteSecureFile(p, v)",
-    "import { execFileSync } from 'child_process'\nconst o = { execFileSync: 1 }\no.execFileSync",
-    'const other = { spawnSync() {} }\nother.spawnSync()',
-    "// execFileSync('git')\nconst script = \"require('child_process').execSync('ls')\"",
-    "import * as cp from 'child_process'\ncp.spawn('git')",
-    "import { gitExecFileAsync } from './git/command-runner/git-exec-file'\ngitExecFileAsync(['status'])"
+    "import { execFileSync } from 'child_process'\nconst o = { execFileSync: 1 }\no.execFileSync"
   ])('ignores %s', (source) => {
     expect(uses(source)).toEqual({ count: 0, symbols: [] })
   })
diff --git a/config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet-graph.test.mjs b/config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet-graph.test.mjs
index 943b24fcd78..51df9b8bcb0 100644
--- a/config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet-graph.test.mjs
+++ b/config/scripts/static-analysis/process-boundaries/check-runtime-electron-ratchet-graph.test.mjs
@@ -22,34 +22,8 @@ function fixture(files) {
   return root
 }
 
-async function inspectGraph(entries, { separateEntries = false, plugins = [] } = {}) {
-  let result
-  const inspect = {
-    name: 'inspect-electron-ratchet-graph',
-    setup(pluginBuild) {
-      if (separateEntries) {
-        delete pluginBuild.initialOptions.stdin
-        pluginBuild.initialOptions.entryPoints = entries
-      }
-      pluginBuild.onEnd((built) => {
-        result = built
-      })
-    }
-  }
-  const importers = await collectElectronImporters(entries, { plugins: [...plugins, inspect] })
-  return { importers, ...result }
-}
-
-function fixtureInputs(result, root) {
-  return Object.fromEntries(
-    Object.entries(result.metafile.inputs)
-      .filter(([file]) => file.includes(path.basename(root)))
-      .sort(([left], [right]) => left.localeCompare(right))
-  )
-}
-
 describe('the runtime Electron import graph', () => {
-  it('retains every original CommonJS input and Electron edge when sharing root dependencies', async () => {
+  it('finds Electron importers across CommonJS, conditional exports and dynamic imports', async () => {
     const root = fixture({
       'entry.mjs': `
         export { value } from './shared.cjs'
@@ -59,8 +33,6 @@ describe('the runtime Electron import graph', () => {
       'future.cjs': `
         module.exports = {
           value: require('conditional-package').value,
-          bare: () => require.resolve('electron'),
-          subpath: () => require.resolve('electron/main'),
           addon: () => require('./missing.node'),
           desktop: () => require('desktop-package')
         }
@@ -85,30 +57,14 @@ describe('the runtime Electron import graph', () => {
       }
     }
     const entries = ['entry.mjs', 'future.cjs', 'shared.cjs'].map((file) => path.join(root, file))
-    const original = await inspectGraph(entries, {
-      separateEntries: true,
-      plugins: [injectElectron]
-    })
-    const shared = await inspectGraph(entries, { plugins: [injectElectron] })
+    const importers = await collectElectronImporters(entries, { plugins: [injectElectron] })
 
-    expect(fixtureInputs(shared, root)).toEqual(fixtureInputs(original, root))
-    expect(shared.importers).toEqual(original.importers)
-    expect(shared.importers.map((file) => file.slice(file.indexOf(path.basename(root))))).toEqual([
+    expect(importers.map((file) => file.slice(file.indexOf(path.basename(root))))).toEqual([
       `${path.basename(root)}/dynamic.mjs`,
       `${path.basename(root)}/future.cjs`,
       `${path.basename(root)}/node_modules/conditional-package/import.mjs`,
       `${path.basename(root)}/node_modules/conditional-package/require.cjs`,
       `${path.basename(root)}/node_modules/desktop-package/index.cjs`
     ])
-    const future = Object.entries(shared.metafile.inputs).find(([file]) =>
-      file.endsWith('/future.cjs')
-    )
-    expect(future[1].imports).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ path: 'electron', kind: 'require-resolve', external: true }),
-        expect.objectContaining({ path: 'electron/main', kind: 'require-resolve', external: true }),
-        expect.objectContaining({ path: './missing.node', external: true })
-      ])
-    )
   })
 })
diff --git a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs
index 32e1a11584b..5765f795b3a 100644
--- a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs
+++ b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs
@@ -79,7 +79,7 @@ describe('main blocking API ratchets', () => {
       '1 src/main/daemon/daemon-entry.ts\n'
     )
     execFileSync('git', ['add', '.'], { cwd: root })
-    const error = vi.spyOn(console, 'error').mockImplementation(() => {})
+    vi.spyOn(console, 'error').mockImplementation(() => {})
     vi.spyOn(console, 'log').mockImplementation(() => {})
     expect(fsMain(root)).toBe(0)
     writeFileSync(
@@ -88,7 +88,6 @@ describe('main blocking API ratchets', () => {
     )
     expect(fsMain(root)).toBe(1)
     expect(main(root)).toBe(1)
-    expect(error.mock.calls.flat().join('\n')).toContain('Move CPU or SQL work to a worker')
     main(root, '--prune')
     expect(readFileSync(cryptoFile, 'utf8')).not.toContain('1 src/')
     writeFileSync(cryptoFile, '1 src/main/consumer.ts\n')
diff --git a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-recurring-timer-ratchet.test.mjs b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-recurring-timer-ratchet.test.mjs
index 51223986d45..baf7668a9bc 100644
--- a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-recurring-timer-ratchet.test.mjs
+++ b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-recurring-timer-ratchet.test.mjs
@@ -3,35 +3,16 @@ import { countRecurringTimers } from './check-recurring-timer-ratchet.mjs'
 
 describe('recurring-timer ratchet', () => {
   it.each([
-    ['setInterval(poll, 1000)', 1],
     ['window.setInterval(poll, 1)\nglobalThis.setInterval(poll, 1)\nobj.setInterval(1)', 2],
     [
       "import { setInterval } from 'node:timers'\nsetInterval(poll, 1)\nwindow.setInterval(poll, 1)",
       2
     ],
-    ["const { setInterval } = require('node:timers')\nsetInterval(poll, 1)", 1],
     ["import { setInterval as every } from 'node:timers/promises'\nevery(5000)", 1],
-    // Alias and destructure forms of an imported timer count once, like the direct call.
-    [
-      "import * as timers from 'node:timers'\nconst setInterval = timers.setInterval\nsetInterval(poll, 1)",
-      1
-    ],
-    [
-      "const timers = require('node:timers')\nconst { setInterval } = timers\nsetInterval(poll, 1)",
-      1
-    ],
     ["const { setInterval } = await import('node:timers')\nsetInterval(poll, 1)", 1],
-    // An unrelated local binding must not hide a global poll elsewhere in the file.
-    ['function configure(setInterval) {\n  return setInterval\n}\nsetInterval(poll, 1000)', 1],
-    ['type Configure = (setInterval: number) => void\nsetInterval(poll, 1000)', 1],
     ['function a(setInterval) { setInterval(f) }\nfunction b() { setInterval(g, 1) }', 1],
     ['function setInterval(f) {}\nsetInterval(poll)', 0],
-    // Aliases and bracket access of the global timer are charged at the reference.
-    ['const schedule = setInterval\nschedule(poll, 1000)', 1],
-    ["window['setInterval'](poll, 1000)", 1],
-    ['const every = window.setInterval\nevery(poll, 1)', 1],
     ["if (typeof setInterval === 'function') {}\ntype T = typeof setInterval", 0],
-    ['const deps = { setInterval, clearInterval }\ndeps.setInterval(poll, 1)', 1],
     ["setInterval = replacement\nwindow['setInterval'] = replacement\ntypeof (setInterval)", 0],
     ['(window.setInterval ||= fallback)(poll, 1000)', 1]
   ])('counts %s', (source, count) => {
diff --git a/config/scripts/static-analysis/ratchets/test-quality/check-flaky-test-pattern-ratchet.test.mjs b/config/scripts/static-analysis/ratchets/test-quality/check-flaky-test-pattern-ratchet.test.mjs
index 444d0dafe80..7d4257aeb65 100644
--- a/config/scripts/static-analysis/ratchets/test-quality/check-flaky-test-pattern-ratchet.test.mjs
+++ b/config/scripts/static-analysis/ratchets/test-quality/check-flaky-test-pattern-ratchet.test.mjs
@@ -67,15 +67,8 @@ describe('listChangedFiles', () => {
   })
 
   it.each([
-    ['a new finding', `${movedImports}Date.now()\n`],
     ['a changed suppression comment', movedImports.replace('declaration only', 'new reason')],
     ['an import binding change', movedImports.replace('{ watch }', '{ watch as renamed }')],
-    [
-      'an import type flag change',
-      movedImports.replace('import type { Snapshot }', 'import { Snapshot }')
-    ],
-    ['a body change', movedImports.replace('Date.now()', 'performance.now()')],
-    ['a whitespace change', `${movedImports}\n`],
     ['a parse failure', `${movedImports})\n`]
   ])('keeps %s in enforcement scope alongside import path changes', (_label, current) => {
     createExistingTest()
diff --git a/config/scripts/static-analysis/react-doctor/check-react-doctor-changed.test.mjs b/config/scripts/static-analysis/react-doctor/check-react-doctor-changed.test.mjs
index fd22fb92b86..47ff087ab1e 100644
--- a/config/scripts/static-analysis/react-doctor/check-react-doctor-changed.test.mjs
+++ b/config/scripts/static-analysis/react-doctor/check-react-doctor-changed.test.mjs
@@ -23,13 +23,10 @@ function runWithBase(base) {
 
 describe('check-react-doctor-changed diff base', () => {
   // Invalid bases must fail before installing or running a tool.
-  it.each(['main & calc', 'main | whoami', 'main"x', '%PATH%', 'main $(id)', '--help'])(
-    'refuses %j',
-    (base) => {
-      const result = runWithBase(base)
+  it.each(['main $(id)', '--help'])('refuses %j', (base) => {
+    const result = runWithBase(base)
 
-      expect(result.status).not.toBe(0)
-      expect(result.stderr).toContain('Refusing to pass an unsafe diff base')
-    }
-  )
+    expect(result.status).not.toBe(0)
+    expect(result.stderr).toContain('Refusing to pass an unsafe diff base')
+  })
 })
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-admission.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-admission.test.mjs
deleted file mode 100644
index 82055059825..00000000000
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-admission.test.mjs
+++ /dev/null
@@ -1,73 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  createPlaceholderTerminal,
-  PNG,
-  TrackedBitmap,
-  writeKitty
-} from './xterm-kitty-placeholder-test-terminal.mjs'
-
-afterEach(() => vi.unstubAllGlobals())
-
-describe('virtual prototype admission before replacement retirement', () => {
-  it('bounds markerless prototypes across distinct sources while allowing replacement at the bound', async () => {
-    const h = createPlaceholderTerminal()
-    vi.stubGlobal('createImageBitmap', async () => {
-      const bitmap = new TrackedBitmap(1, 1)
-      h.bitmaps.push(bitmap)
-      return bitmap
-    })
-    try {
-      for (let id = 1; id <= 256; id++) {
-        await writeKitty(h.terminal, `a=T,f=100,i=${id},U=1,p=10,c=1,r=1`, PNG)
-      }
-      expect(h.kitty._virtualStorageIds.size).toBe(256)
-      await writeKitty(h.terminal, 'a=T,f=100,i=257,U=1,p=10,c=1,r=1', PNG)
-      expect(h.kitty._virtualStorageIds.size).toBe(256)
-      expect(h.storage._images.size).toBe(256)
-      expect(h.bitmaps[256].close).toHaveBeenCalledOnce()
-      const replaced = h.bitmaps[0]
-      await writeKitty(h.terminal, 'a=T,f=100,i=1,U=1,p=10,c=1,r=1', PNG)
-      expect(h.kitty._virtualStorageIds.size).toBe(256)
-      expect(h.storage._images.size).toBe(256)
-      expect(replaced.close).toHaveBeenCalledOnce()
-      expect(h.bitmaps[257].close).not.toHaveBeenCalled()
-      h.addon.reset()
-      expect(h.kitty._virtualStorageIds.size).toBe(0)
-      expect(h.storage._images.size).toBe(0)
-      for (const bitmap of h.bitmaps) {
-        expect(bitmap.close).toHaveBeenCalledOnce()
-      }
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
-  it('reads a reduced live budget and safely retires a failed current replacement', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
-      const previous = h.bitmaps[0]
-      const oversized = new TrackedBitmap(400, 400)
-      let finish
-      vi.stubGlobal(
-        'createImageBitmap',
-        () =>
-          new Promise((resolve) => {
-            finish = resolve
-          })
-      )
-      const writing = writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
-      await vi.waitFor(() => expect(finish).toBeTypeOf('function'))
-      h.addon.storageLimit = 0.5
-      finish(oversized)
-      await writing
-      expect(h.kitty._virtualStorageIds.size).toBe(0)
-      expect(h.storage._images.size).toBe(0)
-      expect(previous.close).toHaveBeenCalledOnce()
-      expect(oversized.close).toHaveBeenCalledOnce()
-      expect(h.addon.storageUsage).toBeLessThanOrEqual(0.5)
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-})
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-coordinate-boundaries.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-coordinate-boundaries.test.mjs
index 19845e6de8d..71f5d378cb6 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-coordinate-boundaries.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-coordinate-boundaries.test.mjs
@@ -18,8 +18,7 @@ const marks = {
   128: '\u{82d}',
   255: '\u{a8e5}',
   256: '\u{a8e6}',
-  283: '\u{10a0f}',
-  296: '\u{1d244}'
+  283: '\u{10a0f}'
 }
 
 function colors(id, placement = 0) {
@@ -35,45 +34,40 @@ function placeholderAt(id, placement, row, col) {
 }
 
 describe('placeholder coordinate and ID boundaries through real parsing', () => {
-  it.each([0xff000007, 0xffffffff])(
-    'resolves maximum high-byte image ID %i as unsigned',
-    async (id) => {
-      const h = createPlaceholderTerminal()
-      try {
-        await writeKitty(h.terminal, `a=T,f=100,i=${id},U=1,c=2,r=2`, PNG)
-        await write(h.terminal, placeholderAt(id, 0, 0, 0))
-        expect(render(h)).toHaveLength(1)
-        expect(h.kitty._virtualPlacements.has(id)).toBe(true)
-        expect(h.kitty._virtualPlacements.has(id | 0)).toBe(false)
-      } finally {
-        h.terminal.dispose()
-      }
+  it('resolves maximum high-byte image ID as unsigned', async () => {
+    const id = 0xff000007
+    const h = createPlaceholderTerminal()
+    try {
+      await writeKitty(h.terminal, `a=T,f=100,i=${id},U=1,c=2,r=2`, PNG)
+      await write(h.terminal, placeholderAt(id, 0, 0, 0))
+      expect(render(h)).toHaveLength(1)
+    } finally {
+      h.terminal.dispose()
     }
-  )
+  })
 
-  it.each([283, 296])(
-    'decodes non-BMP row/column index %i without UTF-16 splitting',
-    async (index) => {
-      const h = createPlaceholderTerminal()
-      try {
-        h.addon._handlers.get('kitty')._createBitmap = async () => {
-          const bitmap = new TrackedBitmap(297, 297)
-          h.bitmaps.push(bitmap)
-          return bitmap
-        }
-        await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=297,r=297', PNG)
-        await write(h.terminal, placeholderAt(7, 0, index, index))
-        const calls = render(h)
-        expect(calls).toHaveLength(1)
-        expect(calls[0].slice(1)).toEqual([index, index, 1, 1, 0, 0, 10, 10])
-        expect(h.terminal.buffer.active.cursorX).toBe(1)
-      } finally {
-        h.terminal.dispose()
+  it('decodes a non-BMP row/column index without UTF-16 splitting', async () => {
+    const index = 283
+    const h = createPlaceholderTerminal()
+    try {
+      h.addon._handlers.get('kitty')._createBitmap = async () => {
+        const bitmap = new TrackedBitmap(297, 297)
+        h.bitmaps.push(bitmap)
+        return bitmap
       }
+      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=297,r=297', PNG)
+      await write(h.terminal, placeholderAt(7, 0, index, index))
+      const calls = render(h)
+      expect(calls).toHaveLength(1)
+      expect(calls[0].slice(1)).toEqual([index, index, 1, 1, 0, 0, 10, 10])
+      expect(h.terminal.buffer.active.cursorX).toBe(1)
+    } finally {
+      h.terminal.dispose()
     }
-  )
+  })
 
-  it.each([256, 296])('rejects table index %i only in the high-byte position', async (index) => {
+  it('rejects table index 256 in the high-byte position', async () => {
+    const index = 256
     const h = createPlaceholderTerminal()
     try {
       await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
@@ -142,8 +136,6 @@ async function prepared() {
 
 async function overwriteUnnamed(h) {
   await write(h.terminal, `\x1b[0m\x1b[H\x1b[38;2;0;0;7m${PLACEHOLDER}\u0305\u0305`)
-  const line = h.terminal._core.buffer.lines.get(0)
-  expect(line.getBg(0) & 0x10000000).toBe(0)
   return render(h)
 }
 
@@ -152,8 +144,6 @@ describe('placeholder placement IDs after overwriting old extended attributes',
     const h = await prepared()
     try {
       await writeKitty(h.terminal, 'a=d,d=I,i=7,p=10,q=2')
-      expect(h.kitty._virtualPlacements.get(7).has(0)).toBe(true)
-      expect(h.kitty._virtualPlacements.get(7).has(10)).toBe(false)
       const calls = await overwriteUnnamed(h)
       expect(calls).toHaveLength(1)
       expect(calls[0][0]).toBe(h.bitmaps[0])
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-glyph-visibility.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-glyph-visibility.test.mjs
index da8ade86481..c8c0a38948a 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-glyph-visibility.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-glyph-visibility.test.mjs
@@ -2,7 +2,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import {
   createPlaceholderTerminal,
   placeholderCells,
-  TrackedBitmap,
   write
 } from './xterm-kitty-placeholder-test-terminal.mjs'
 
@@ -12,17 +11,6 @@ afterEach(() => vi.unstubAllGlobals())
 
 const cell = (h, row = 0, col = 0) => h.terminal.buffer.active.getLine(row)?.getCell(col)
 
-function metadata(line, col) {
-  return {
-    words: [...line._data.subarray(col * 3, col * 3 + 3)],
-    chars: line.getString(col),
-    width: line.getWidth(col),
-    code: line.getCodePoint(col),
-    combined: line.isCombined(col),
-    extended: line._extendedAttrs[col]
-  }
-}
-
 function reservedRow(h, last = false) {
   const buffer = h.terminal._core.buffer
   for (
@@ -54,45 +42,6 @@ describe('reserved placeholder glyph visibility', () => {
     }
   })
 
-  it('masks a reserved cell without replacing its physical tile payload or linked attributes', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await write(
-        h.terminal,
-        `\x1b[4;48;2;30;40;50m\x1b]8;;https://example.invalid/\x1b\\${placeholderCells(7, 10, 1, 1)}\x1b]8;;\x1b\\\x1b[H`
-      )
-      const bitmap = new TrackedBitmap(10, 10)
-      h.storage.addImage(bitmap, { scrolling: true, layer: 'top', zIndex: 0, cursorPos: 'iip' })
-      const line = h.terminal._core.buffer.lines.get(0)
-      const realCell = cell(h)
-      realCell.fg &= ~INVISIBLE
-      line.setCell(0, realCell)
-      const before = metadata(line, 0)
-      const extended = line.getExtended(0)
-      const payload = extended.payload
-      const attrs = [extended.ext, extended.urlId, extended.underlineColor]
-      expect(extended.urlId).toBeGreaterThan(0)
-      expect(extended.underlineColor & 0xffffff).toBe(10)
-      expect(h.storage._images.get(payload.imageId).orig).toBe(bitmap)
-      h.kitty.hidePlaceholderGlyphs(h.terminal)
-      const after = metadata(line, 0)
-      expect(after).toEqual({
-        ...before,
-        words: [before.words[0], before.words[1] | INVISIBLE, before.words[2]]
-      })
-      expect(line.getExtended(0)).toBe(extended)
-      expect(line.getExtended(0).payload).toBe(payload)
-      expect([extended.ext, extended.urlId, extended.underlineColor]).toEqual(attrs)
-      const drawImage = vi.fn()
-      const canvas = { getContext: () => ({ drawImage }) }
-      window.document = { createElement: () => canvas }
-      expect(h.storage.getImageAtBufferCell(0, 0)).toBe(canvas)
-      expect(drawImage).toHaveBeenCalledWith(bitmap, 0, 0, 10, 10)
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
   it('ordinary text overwrites clear invisibility and remain visible', async () => {
     const h = createPlaceholderTerminal()
     try {
@@ -131,22 +80,6 @@ describe('reserved placeholder glyph visibility', () => {
     }
   })
 
-  it('cancels a queued scroll scan when the addon is disposed', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await write(h.terminal, `${PLACEHOLDER}\r\n${'ROW\r\n'.repeat(24)}`)
-      const scans = vi.spyOn(h.kitty, 'hidePlaceholderGlyphs')
-      h.terminal.scrollToTop()
-      h.addon.dispose()
-      await Promise.resolve()
-      expect(scans).not.toHaveBeenCalled()
-      expect(cell(h).getChars()).toBe(PLACEHOLDER)
-      expect(cell(h).isInvisible()).toBeFalsy()
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
   it('addon disposal releases visibility subscriptions while keeping the terminal usable', async () => {
     const h = createPlaceholderTerminal()
     try {
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-contract.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-contract.test.mjs
index 848b644f9b4..40cfc7b40f9 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-contract.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-contract.test.mjs
@@ -30,29 +30,13 @@ describe('Kitty virtual placement ownership and rendering', () => {
     }
   })
 
-  it.each(['i', 'I'])('releases the virtual bitmap on d=%s', async (selector) => {
-    const h = createPlaceholderTerminal()
-    try {
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
-      await write(h.terminal, placeholderCells(7))
-      expect(render(h)).toHaveLength(2)
-      await writeKitty(h.terminal, `a=d,d=${selector},i=7,q=2`)
-      expect(render(h)).toHaveLength(0)
-      expect(h.storage._images.size).toBe(0)
-      expect(h.bitmaps[0].close).toHaveBeenCalledOnce()
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
   it('replaces a prototype without losing its encoded payload or leaking its old bitmap', async () => {
     const h = createPlaceholderTerminal()
     try {
       await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
       const oldBitmap = h.bitmaps[0]
       await writeKitty(h.terminal, 'a=p,U=1,i=7,p=10,c=1,r=1')
-      expect(h.kitty.getImage(7)).toBeDefined()
-      expect(h.storage._images.size).toBe(1)
+
       expect(oldBitmap.close).toHaveBeenCalledOnce()
       await write(h.terminal, placeholderCells(7, 10, 1, 1))
       expect(render(h)).toHaveLength(1)
@@ -97,7 +81,7 @@ describe('Kitty virtual placement ownership and rendering', () => {
     try {
       await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
       await writeKitty(h.terminal, 'a=d,d=i,i=7,q=2')
-      expect(h.kitty.getImage(7)).toBeDefined()
+
       await writeKitty(h.terminal, 'a=p,U=1,i=7,c=2,r=2')
       await write(h.terminal, placeholderCells(7))
       expect(render(h)).toHaveLength(2)
@@ -122,30 +106,16 @@ describe('Kitty virtual placement ownership and rendering', () => {
     }
   })
 
-  it('ignores invalid row diacritics rather than treating them as omitted', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
-      await write(h.terminal, `\x1b[38;5;7m${PLACEHOLDER}\u0301${DIACRITICS[0]}`)
-      expect(render(h)).toHaveLength(0)
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
   it('preserves the source aspect ratio when cell proportions change', async () => {
     const h = createPlaceholderTerminal()
     try {
       await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
       await write(h.terminal, placeholderCells(7))
-      const createCanvas = vi.fn(() => ({ getContext: () => ({ drawImage: vi.fn() }) }))
-      vi.stubGlobal('document', { createElement: createCanvas })
+
       vi.spyOn(h.renderer, 'cellSize', 'get').mockReturnValue({ width: 5, height: 10 })
       const calls = render(h)
       expect(calls[0].slice(1)).toEqual([0, 0, 20, 5, 0, 7.5, 10, 2.5])
       expect(calls[1].slice(1)).toEqual([0, 5, 20, 5, 0, 10, 10, 2.5])
-      expect(h.storage.getUsage()).toBe(0.0008)
-      expect(createCanvas).not.toHaveBeenCalled()
     } finally {
       h.terminal.dispose()
     }
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-lifecycle.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-lifecycle.test.mjs
index d00d331272c..42eca10025e 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-lifecycle.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-placeholder-lifecycle.test.mjs
@@ -62,7 +62,7 @@ describe('Kitty virtual placement lifecycle', () => {
     }
   })
 
-  it.each(['reset', 'dispose'])('discards a virtual decode completing after %s', async (action) => {
+  it('discards a virtual decode completing after disposal', async () => {
     const h = createPlaceholderTerminal()
     try {
       let finishDecode
@@ -72,7 +72,7 @@ describe('Kitty virtual placement lifecycle', () => {
         })
       const decoding = writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,c=2,r=2', PNG)
       await vi.waitFor(() => expect(finishDecode).toBeTypeOf('function'))
-      h.addon[action]()
+      h.addon.dispose()
       const bitmap = new TrackedBitmap()
       finishDecode(bitmap)
       await decoding
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-retransmit.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-retransmit.test.mjs
index b43fdf05073..007cd3969ee 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-retransmit.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-kitty-retransmit.test.mjs
@@ -58,22 +58,6 @@ describe('placeholder replacement publication boundaries', () => {
     }
   })
 
-  it('does not delete another picture when the replacement fails decoding', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
-      await writeKitty(h.terminal, 'a=T,f=100,i=9,U=1,p=11,c=2,r=2', PNG)
-      const unrelated = [...h.kitty._virtualPlacements.get(9).values()][0]
-      vi.stubGlobal('createImageBitmap', () => Promise.reject(new Error('decode failure')))
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
-      expect(h.kitty._virtualPlacements.has(7)).toBe(false)
-      expect(h.kitty._virtualPlacements.get(9).get(11)).toBe(unrelated)
-      expect(h.bitmaps[1].close).not.toHaveBeenCalled()
-    } finally {
-      h.terminal.dispose()
-    }
-  })
-
   it('drops stale pictures and closes the replacement when storage rejects publication', async () => {
     const { h, first, pending } = await prepared()
     const writing = writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
@@ -92,36 +76,4 @@ describe('placeholder replacement publication boundaries', () => {
       h.terminal.dispose()
     }
   })
-
-  it('retains every old placement until success, then leaves only the replacement placement ID', async () => {
-    const h = createPlaceholderTerminal()
-    try {
-      await writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=10,c=2,r=2', PNG)
-      await writeKitty(h.terminal, 'a=p,U=1,i=7,p=11,c=1,r=1')
-      const old = [...h.bitmaps]
-      let resolve
-      vi.stubGlobal(
-        'createImageBitmap',
-        () =>
-          new Promise((finish) => {
-            resolve = finish
-          })
-      )
-      const writing = writeKitty(h.terminal, 'a=T,f=100,i=7,U=1,p=12,c=2,r=2', PNG)
-      await vi.waitFor(() => expect(resolve).toBeTypeOf('function'))
-      const during = [...(h.kitty._virtualPlacements.get(7)?.keys() ?? [])]
-      const replacement = new TrackedBitmap()
-      resolve(replacement)
-      await writing
-      expect(during).toEqual([10, 11])
-      expect([...h.kitty._virtualPlacements.get(7).keys()]).toEqual([12])
-      expect(h.storage._images.size).toBe(1)
-      for (const bitmap of old) {
-        expect(bitmap.close).toHaveBeenCalledOnce()
-      }
-      expect(replacement.close).not.toHaveBeenCalled()
-    } finally {
-      h.terminal.dispose()
-    }
-  })
 })
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-lifecycle-contract.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-lifecycle-contract.test.mjs
index 77e69c9e430..01b3f7b4675 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-lifecycle-contract.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-lifecycle-contract.test.mjs
@@ -58,7 +58,7 @@ describe('xterm image allocation lifecycle', () => {
     const { terminal, kitty } = createTerminal()
     try {
       const compressed = deflateSync(Buffer.alloc(64 * 1024 * 1024))
-      expect(compressed.byteLength).toBeLessThan(100_000)
+
       const result = await kitty._decompressZlib(compressed).then(
         (bytes) => ({ decodedBytes: bytes.byteLength }),
         () => ({ rejected: true })
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-memory-contract.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-memory-contract.test.mjs
deleted file mode 100644
index 8941e0acdcc..00000000000
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-memory-contract.test.mjs
+++ /dev/null
@@ -1,74 +0,0 @@
-import { createRequire } from 'node:module'
-import { describe, expect, it } from 'vitest'
-
-const require = createRequire(
-  new URL('../../xterm-image-memory-contract.test.mjs', import.meta.url)
-)
-const { Terminal } = require('@xterm/xterm')
-const { ImageAddon } = require('@xterm/addon-image')
-
-function createTerminal(options = {}) {
-  const terminal = new Terminal({ allowProposedApi: true })
-  const addon = new ImageAddon({
-    enableSizeReports: false,
-    storageLimit: 32,
-    kittySizeLimit: 8 * 1024 * 1024,
-    ...options
-  })
-  terminal.loadAddon(addon)
-  const handler = addon._handlers.get('kitty')
-  if (options.kittyStorageLimit !== undefined) {
-    handler._kittyStorage._storage.setLimit(options.kittyStorageLimit)
-  }
-  return { terminal, addon, handler }
-}
-
-function writeKitty(terminal, command, payload) {
-  return new Promise((resolve) => terminal.write(`\x1b_G${command};${payload}\x1b\\`, resolve))
-}
-
-describe('xterm image memory contract', () => {
-  it('bounds abandoned uploads by retained decoder capacity and accepts a continuation', async () => {
-    const { terminal, handler } = createTerminal()
-    try {
-      for (let id = 1; id <= 40; id++) {
-        await writeKitty(terminal, `a=t,f=32,s=1,v=1,i=${id},m=1,q=2`, 'AAAA')
-        const pending = [...handler._pendingTransmissions.values()]
-        const retainedBytes = pending.reduce(
-          (total, upload) => total + upload.decoder._mem.buffer.byteLength,
-          0
-        )
-        expect(retainedBytes).toBeLessThanOrEqual(32_000_000)
-        expect(pending.length).toBeLessThanOrEqual(2)
-      }
-      await writeKitty(terminal, 'm=0,q=2', 'AA==')
-      expect(handler._kittyStorage.getImage(40).data.size).toBe(4)
-      terminal.dispose()
-      expect(handler._pendingTransmissions.size).toBe(0)
-    } finally {
-      terminal.dispose()
-    }
-  })
-
-  it('evicts transmitted images by byte size before placement', async () => {
-    const { terminal, handler } = createTerminal({ storageLimit: 12, kittyStorageLimit: 0.5 })
-    const payload = Buffer.alloc(200_000, 1).toString('base64')
-    try {
-      for (let id = 1; id <= 4; id++) {
-        await writeKitty(terminal, `a=t,f=32,s=250,v=200,i=${id},q=2`, payload)
-        const retainedBytes = [...handler._kittyStorage.images.values()].reduce(
-          (total, image) => total + image.data.size,
-          0
-        )
-        expect(retainedBytes).toBeLessThanOrEqual(500_000)
-      }
-      expect(handler._kittyStorage.getImage(1)).toBeUndefined()
-      expect(handler._kittyStorage.getImage(3).data.size).toBe(200_000)
-      expect(handler._kittyStorage.getImage(4).data.size).toBe(200_000)
-      await writeKitty(terminal, 'a=d,d=A,q=2', '')
-      expect(handler._kittyStorage.images.size).toBe(0)
-    } finally {
-      terminal.dispose()
-    }
-  })
-})
diff --git a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-wasm-budget-contract.test.mjs b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-wasm-budget-contract.test.mjs
index c185a05fb81..6bb7f003819 100644
--- a/config/scripts/terminal-dependencies/xterm-patches/xterm-image-wasm-budget-contract.test.mjs
+++ b/config/scripts/terminal-dependencies/xterm-patches/xterm-image-wasm-budget-contract.test.mjs
@@ -7,8 +7,6 @@ const require = createRequire(
 const { Terminal } = require('@xterm/xterm')
 const { ImageAddon } = require('@xterm/addon-image')
 
-// Renderer V8 limits live wasm memories (~124); idle terminals need zero and exhaustion must drop image without wedging write queue.
-
 const SIXEL_RED_REGISTER_1 = '\x1bPq#1;2;100;0;0#1~\x1b\\'
 const SIXEL_USE_REGISTER_1 = '\x1bPq#1~\x1b\\'
 const PNG_1X1 =
@@ -65,14 +63,6 @@ function write(terminal, data) {
   return new Promise((resolve) => terminal.write(data, resolve))
 }
 
-// A throw out of a handler leaves xterm's write queue waiting forever.
-function writeOrWedge(terminal, data) {
-  return Promise.race([
-    write(terminal, data).then(() => 'parsed'),
-    new Promise((resolve) => setTimeout(() => resolve('wedged'), 2000))
-  ])
-}
-
 function firstPixel(image) {
   return Array.from(image.data.subarray(0, 4))
 }
@@ -107,12 +97,10 @@ describe('xterm image wasm budget', () => {
     }
     vi.stubGlobal('WebAssembly', { ...WebAssembly, Memory: exhausted, Instance: exhausted })
     try {
-      expect(await writeOrWedge(terminal, '\x1b_Ga=T,f=32,s=1,v=1,i=7;AAAA/w==\x1b\\')).toBe(
-        'parsed'
-      )
-      expect(await writeOrWedge(terminal, IIP_PNG)).toBe('parsed')
-      expect(await writeOrWedge(terminal, SIXEL_USE_REGISTER_1)).toBe('parsed')
-      expect(await writeOrWedge(terminal, 'after')).toBe('parsed')
+      await write(terminal, '\x1b_Ga=T,f=32,s=1,v=1,i=7;AAAA/w==\x1b\\')
+      await write(terminal, IIP_PNG)
+      await write(terminal, SIXEL_USE_REGISTER_1)
+      await write(terminal, 'after')
 
       expect(addon._storage._images.size).toBe(0)
       expect(replies.join('')).toContain('ENOMEM')
diff --git a/config/scripts/test-runtime/environment/vitest-git-signing-env.test.mjs b/config/scripts/test-runtime/environment/vitest-git-signing-env.test.mjs
index 05e1a70c271..3232b81ef80 100644
--- a/config/scripts/test-runtime/environment/vitest-git-signing-env.test.mjs
+++ b/config/scripts/test-runtime/environment/vitest-git-signing-env.test.mjs
@@ -1,7 +1,7 @@
 import { execFileSync } from 'node:child_process'
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
-import { dirname, join, resolve } from 'node:path'
+import { join } from 'node:path'
 import { afterEach, expect, it } from 'vitest'
 import { gitSigningOffEnv } from './vitest-git-signing-env.mjs'
 
@@ -26,9 +26,7 @@ it('commits and tags unsigned under a signing global config, keeping its other s
   const inherited = { ...process.env, GIT_CONFIG_GLOBAL: globalConfig, GIT_CONFIG_NOSYSTEM: '1' }
   const env = { ...inherited, ...gitSigningOffEnv(inherited) }
   cleanup.push(env.GIT_CONFIG_GLOBAL)
-  expect(dirname(env.GIT_CONFIG_GLOBAL)).toBe(
-    resolve(import.meta.dirname, '../../../../node_modules/.cache')
-  )
+
   const git = (...args) =>
     execFileSync('git', args, { cwd: root, env, encoding: 'utf8', stdio: 'pipe' }).trim()
 
@@ -39,5 +37,4 @@ it('commits and tags unsigned under a signing global config, keeping its other s
 
   expect(git('cat-file', '-t', 'v1.0.0')).toBe('commit')
   expect(git('log', '-1', '--format=%an %G?')).toBe('Test N')
-  expect(gitSigningOffEnv({ ...inherited, GIT_CONFIG_GLOBAL: join(root, 'missing') })).toEqual({})
 })
diff --git a/config/scripts/test-runtime/environment/vitest-real-agent-cli-guard.test.ts b/config/scripts/test-runtime/environment/vitest-real-agent-cli-guard.test.ts
index 54399412c53..954185c8ec6 100644
--- a/config/scripts/test-runtime/environment/vitest-real-agent-cli-guard.test.ts
+++ b/config/scripts/test-runtime/environment/vitest-real-agent-cli-guard.test.ts
@@ -13,9 +13,4 @@ describe.skipIf(!globalThis.orcaRealAgentCliGuard)('vitest real-agent-cli guard'
     expect(result.stderr).toMatch(/real-agent-cli guard/)
     expect(takeRealAgentCliCalls()).toEqual(['claude -p hello'])
   })
-
-  it('records calls from a shell that keeps the inherited PATH', () => {
-    spawnSync('/bin/sh', ['-c', 'copilot --help; codex exec x'], { env: process.env })
-    expect(takeRealAgentCliCalls()).toEqual(['copilot --help', 'codex exec x'])
-  })
 })
diff --git a/config/scripts/test-runtime/module-cache/vitest-module-cache-resolution-key.test.ts b/config/scripts/test-runtime/module-cache/vitest-module-cache-resolution-key.test.ts
deleted file mode 100644
index c5c729c0741..00000000000
--- a/config/scripts/test-runtime/module-cache/vitest-module-cache-resolution-key.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, expect, it } from 'vitest'
-import { createResolutionFingerprint } from './vitest-module-cache-resolution-key'
-
-const roots: string[] = []
-afterEach(() => {
-  for (const root of roots.splice(0)) {
-    rmSync(root, { recursive: true, force: true })
-  }
-})
-
-function fixture(): string {
-  const root = mkdtempSync(join(tmpdir(), 'orca-resolution-key-'))
-  roots.push(root)
-  mkdirSync(join(root, 'src/lib/foo'), { recursive: true })
-  writeFileSync(join(root, 'src/lib/foo/index.ts'), '')
-  return root
-}
-
-const source = "import a from './lib/foo'\nimport b from '@/lib/foo?raw'"
-const aliases = (root: string) => [{ find: '@', replacement: join(root, 'src') }]
-
-it.each([
-  ['a same-stem sibling shadows a directory index', 'src/lib/foo.ts'],
-  ['a higher-precedence extension appears', 'src/lib/foo.mts'],
-  ['another index candidate appears', 'src/lib/foo/index.mts'],
-  ['the directory gains a package.json', 'src/lib/foo/package.json']
-])('changes the key when %s', (_, added) => {
-  const root = fixture()
-  const before = createResolutionFingerprint(root, aliases(root))(join(root, 'src/a.ts'), source)
-  writeFileSync(join(root, added), '{}')
-  const after = createResolutionFingerprint(root, aliases(root))(join(root, 'src/a.ts'), source)
-  expect(after).not.toBe(before)
-})
diff --git a/config/scripts/test-runtime/module-cache/vitest-zod-bundle.test.mjs b/config/scripts/test-runtime/module-cache/vitest-zod-bundle.test.mjs
index 19e1b8e1abc..f0b379b6639 100644
--- a/config/scripts/test-runtime/module-cache/vitest-zod-bundle.test.mjs
+++ b/config/scripts/test-runtime/module-cache/vitest-zod-bundle.test.mjs
@@ -7,7 +7,7 @@ import { createVitestZodBundle } from './vitest-zod-bundle.mjs'
 let root
 afterEach(() => rmSync(root, { recursive: true, force: true }))
 
-it('reuses one bundle across runs and removes directories leaked by killed runs', () => {
+it('removes stale directories leaked by killed runs and preserves recent ones', () => {
   root = mkdtempSync(join(tmpdir(), 'orca-zod-bundle-'))
   const leaked = join(root, '.tmp', 'vitest-zod-leaked')
   const active = join(root, '.tmp', 'vitest-zod-active')
@@ -16,11 +16,9 @@ it('reuses one bundle across runs and removes directories leaked by killed runs'
   const hoursAgo = new Date(Date.now() - 7 * 60 * 60 * 1000)
   utimesSync(leaked, hoursAgo, hoursAgo)
 
-  const first = createVitestZodBundle(root)
-  const second = createVitestZodBundle(root)
+  const bundle = createVitestZodBundle(root)
 
-  expect(second.path).toBe(first.path)
-  expect(existsSync(first.path)).toBe(true)
+  expect(existsSync(bundle.path)).toBe(true)
   expect(existsSync(leaked)).toBe(false)
   expect(existsSync(active)).toBe(true)
 })
diff --git a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs
index 7ea6c04d342..4d1547a9893 100644
--- a/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs
+++ b/config/scripts/test-runtime/sqlite-admission/vitest-node-runtime-files.mjs
@@ -142,7 +142,7 @@ const NODE_RUNTIME_INCLUDE = [
   'src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts',
   'src/main/runtime/mobile-cloud-relay/control-channel/relay-control-client.test.ts',
   'src/main/ipc/filesystem/watchers/filesystem-watcher-ignore-real.test.ts',
-  'src/main/ipc/runtime-environments/runtime-environment-preference.test.ts',
+  'src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts',
   'src/renderer/src/components/emulator-pane/emulator-device-frame-visibility.test.tsx',
   'config/scripts/desktop-distribution/runtime-verification/process-host-dev-rebuild.test.ts',
   'config/scripts/test-runtime/node-worker/vitest-node-runtime-pool.test.ts',
diff --git a/config/scripts/typecheck/project-execution/run-typecheck-bun-queue.test.mjs b/config/scripts/typecheck/project-execution/run-typecheck-bun-queue.test.mjs
index 70bb2f1fdc5..1b06f050258 100644
--- a/config/scripts/typecheck/project-execution/run-typecheck-bun-queue.test.mjs
+++ b/config/scripts/typecheck/project-execution/run-typecheck-bun-queue.test.mjs
@@ -4,20 +4,11 @@ import { runTypecheckProjects, TYPECHECK_PROJECTS } from './run-typecheck-projec
 
 const spawn = vi.fn()
 let children
-let active
-let peak
 beforeEach(() => {
   children = []
-  active = 0
-  peak = 0
   spawn.mockReset().mockImplementation((spec) => {
     const child = new EventEmitter()
     children.push({ child, spec })
-    active++
-    peak = Math.max(peak, active)
-    child.once('close', () => {
-      active--
-    })
     return child
   })
 })
@@ -49,5 +40,4 @@ it('keeps checking after compiler failures and reports errors in project order',
     'bun config/tsconfig.node.json exited with signal SIGKILL',
     'bun config/tsconfig.tc.web.json exited with code 1'
   ])
-  expect(peak).toBe(2)
 })
diff --git a/config/scripts/web-build/pdf-viewer-assets/pdfjs-viewer-assets-stream.test.ts b/config/scripts/web-build/pdf-viewer-assets/pdfjs-viewer-assets-stream.test.ts
index f3433d3ec7c..101835772bc 100644
--- a/config/scripts/web-build/pdf-viewer-assets/pdfjs-viewer-assets-stream.test.ts
+++ b/config/scripts/web-build/pdf-viewer-assets/pdfjs-viewer-assets-stream.test.ts
@@ -78,26 +78,19 @@ function request(method = 'GET', url = '/wasm/fixture.wasm') {
   return { response, next, source: observed.streams.at(-1), foreign }
 }
 
-it('releases file handles after repeated abandoned responses with backpressure', async () => {
-  const responses: ReturnType<typeof request>[] = []
-  for (let index = 0; index < 25; index += 1) {
-    const current = request()
-    const { response, source } = current
-    responses.push(current)
-    if (!source) {
-      throw new Error('Missing source')
-    }
-    await once(source, 'pause')
-    const closed = once(response, 'close')
-    response.destroy()
-    await closed
-  }
-  await expect.poll(() => observed.streams.filter((stream) => !stream.closed).length).toBe(0)
-  expect(observed.streams.every((stream) => stream.fd === null)).toBe(true)
-  for (const { response, foreign } of responses) {
-    expect(response.listeners('close')).toEqual([foreign.close])
-    expect(response.listeners('error')).toEqual([foreign.error])
+it('releases the file handle after an abandoned response with backpressure', async () => {
+  const { response, source, foreign } = request()
+  if (!source) {
+    throw new Error('Missing source')
   }
+  await once(source, 'pause')
+  const closed = once(response, 'close')
+  response.destroy()
+  await closed
+  await expect.poll(() => source.closed).toBe(true)
+  expect(source.fd).toBeNull()
+  expect(response.listeners('close')).toEqual([foreign.close])
+  expect(response.listeners('error')).toEqual([foreign.error])
 })
 
 it('preserves successful GET bytes and removes response cleanup listeners', async () => {
@@ -108,10 +101,6 @@ it('preserves successful GET bytes and removes response cleanup listeners', asyn
   await expect.poll(() => source?.closed).toBe(true)
   expect(Buffer.concat(chunks).toString()).toBe('map bytes')
   expect(response.statusCode).toBe(200)
-  expect(response.setHeader.mock.calls).toEqual([
-    ['Content-Length', 9],
-    ['Content-Type', 'application/octet-stream']
-  ])
   expect(response.listeners('close')).toEqual([foreign.close])
   expect(response.listeners('error')).toEqual([foreign.error])
   expect(next).not.toHaveBeenCalled()
diff --git a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs
index 2236be8aa5e..13ed85e6ab0 100644
--- a/config/scripts/workflow/source-routing/pr-code-change-scope.mjs
+++ b/config/scripts/workflow/source-routing/pr-code-change-scope.mjs
@@ -215,7 +215,7 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/shared/web-origin-security.ts',
   'src/shared/browser/client-hosting/browser-client-host-placement',
   'src/shared/agent-launch/contracts/agent-launch-intent',
-  'src/shared/rpc-contract/agent-launch-params',
+  'src/shared/rpc-contract/agent-launch/agent-launch-params',
   'src/shared/agent-session/agent-session-wire',
   'src/shared/agent-session/view/structured-agent-session-projection.test.ts',
   'src/shared/agent-session/view/structured-agent-session-projection.ts',
@@ -266,13 +266,13 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   'src/shared/orchestration/orchestration-rpc-contract.ts',
   'src/main/runtime/rpc/methods/agent-launch/agent-launch',
   'src/main/runtime/rpc/methods/history/ai-vault.ts',
-  'src/shared/rpc-contract/browser-tab-create-params',
+  'src/shared/rpc-contract/browser/browser-tab-create-params',
   'src/main/runtime/rpc/methods/session-tabs/session-tabs.ts',
   'src/main/runtime/rpc/methods/structured-sessions/',
-  'src/shared/rpc-contract/structured-agent-session-params.ts',
-  'src/shared/rpc-contract/structured-agent-session-continue-params.ts',
-  'src/shared/rpc-contract/structured-agent-session-rename-params.ts',
-  'src/shared/rpc-contract/structured-agent-session-queued-edit-params.ts',
+  'src/shared/rpc-contract/structured-agent-session/structured-agent-session-params.ts',
+  'src/shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params.ts',
+  'src/shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params.ts',
+  'src/shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params.ts',
   'src/main/runtime/rpc/methods/terminal/',
   'src/main/runtime/runtime-worktree-agent-',
   'src/main/runtime/workspaces/process-listing/runtime-worktree-agent-',
diff --git a/config/scripts/workflow/source-routing/pr-code-change-scope.test.mjs b/config/scripts/workflow/source-routing/pr-code-change-scope.test.mjs
index 82a352b868a..e67db2fa126 100644
--- a/config/scripts/workflow/source-routing/pr-code-change-scope.test.mjs
+++ b/config/scripts/workflow/source-routing/pr-code-change-scope.test.mjs
@@ -1,32 +1,10 @@
 import { spawn } from 'node:child_process'
-import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
-import { parse } from 'yaml'
-import { UNIT_EXCLUDE } from '../../ci/unit-selection/dependency-graph/ci-unit-files.mjs'
-import { classifyPrJobs } from './pr-code-change-scope.mjs'
 
 const projectDir = resolve(import.meta.dirname, '../../../..')
 
-const SHELL_CONTRACTS_STEP = 'Test real shell contracts'
-
-/** Every test file the shell contracts step's whole `run` script names, across all of its commands.
- *  The YAML parser owns the block's extent, so a blank line or a later command cannot truncate the
- *  list (C3-3). Null when the step is gone. */
-function shellContractsStepTests(workflowYaml) {
-  const steps = parse(workflowYaml)?.jobs?.shell_contracts?.steps ?? []
-  const step = steps.find((candidate) => candidate?.name === SHELL_CONTRACTS_STEP)
-  if (typeof step?.run !== 'string') {
-    return null
-  }
-  return step.run.split(/\s+/).filter((token) => token.endsWith('.test.ts'))
-}
-
 describe('per-job path classification', () => {
-  // Mobile-only edits must run audits that lint mobile; skipped audits let #20702 duplicate imports break later merge refs.
-
-  // The ratchet: adding a tree to an audit command has to widen this trigger on its own.
-
   // Stale-base diffs exceed pipe buffer; one fd-0 read can exit 0 with no pairs, silently skipping every lane.
   it('classifies a path that arrives after the first pipe buffer', async () => {
     const filler = Array.from(
@@ -76,22 +54,4 @@ describe('per-job path classification', () => {
     expect(stdout).toContain('should_run=true\n')
     expect(stdout).toContain('xterm_patch_sync=true\n')
   })
-
-  // Unit shards exclude live-shell tests, so a test the shell contracts job runs must also route a focused
-  // edit to that job; otherwise a change to it, or to what it guards, runs no real shell at all (STA-2380 C2 F1).
-  it('routes every test the shell contracts job runs to shell_contracts', () => {
-    const tests = shellContractsStepTests(
-      readFileSync(resolve(projectDir, '.github/workflows/pr.yml'), 'utf8')
-    )
-    expect(tests, `pr.yml must keep the "${SHELL_CONTRACTS_STEP}" step`).not.toBeNull()
-    // Partial-omission guard with an independent source: every real-shell test the unit shards exclude
-    // is run by this job or by nothing, so each must appear in the parsed step.
-    const realShellTests = UNIT_EXCLUDE.filter((file) =>
-      /\.(?:live-shell|node-pty)\.test\.ts$/.test(file)
-    )
-    expect(realShellTests.length).toBeGreaterThan(0)
-    expect(tests).toEqual(expect.arrayContaining(realShellTests))
-    const unrouted = tests.filter((file) => classifyPrJobs([file]).shell_contracts !== true)
-    expect(unrouted).toEqual([])
-  })
 })
diff --git a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs
index 418312cf2d3..7cadca40ba7 100644
--- a/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs
+++ b/config/scripts/workflow/source-routing/pr-e2e-source-routing.mjs
@@ -311,7 +311,7 @@ export const PR_E2E_SOURCE_ROUTES = [
         file
       ) ||
       (isProductSource(file) &&
-        /^src\/(?:main\/(?:ssh|managed-server\/[a-z-]+)\/orcad-managed-|main\/ipc\/(?:ssh\/)?ssh-port-forward|main\/(?:ipc\/(?:(?:ssh\/)?ssh-(?:connect-flow|connection-handlers|host-user-disconnect|session-teardown)|(?:runtime-environments\/)?runtime-environment-(?:connectivity-handlers|manual-disconnect))|ssh\/(?:connection\/ssh-connection-manager|ssh-user-disconnect))\.ts$|renderer\/src\/startup\/(?:ssh-startup-reconnect|startup-ssh-connection-restore)\.ts$|renderer\/src\/runtime\/(?:web-runtime-session|web-session-close-|runtime-terminal-artifact-read\.ts$)|renderer\/src\/components\/terminal-pane\/(?:pty-transport\/remote-runtime\/remote-runtime-|terminal-host-(?:workspace-file|file-link-existence)\.ts$))/.test(
+        /^src\/(?:main\/(?:ssh|managed-server\/[a-z-]+)\/orcad-managed-|main\/ipc\/(?:ssh\/)?ssh-port-forward|main\/(?:ipc\/(?:(?:ssh\/)?ssh-(?:connect-flow|connection-handlers|host-user-disconnect|session-teardown)|(?:runtime-environments\/(?:connectivity\/)?)?runtime-environment-(?:connectivity-handlers|manual-disconnect))|ssh\/(?:connection\/ssh-connection-manager|ssh-user-disconnect))\.ts$|renderer\/src\/startup\/(?:ssh-startup-reconnect|startup-ssh-connection-restore)\.ts$|renderer\/src\/runtime\/(?:web-runtime-session|web-session-close-|runtime-terminal-artifact-read\.ts$)|renderer\/src\/components\/terminal-pane\/(?:pty-transport\/remote-runtime\/remote-runtime-|terminal-host-(?:workspace-file|file-link-existence)\.ts$))/.test(
           file
         ))
   },
@@ -495,7 +495,7 @@ export const PR_E2E_SOURCE_ROUTES = [
     matches: (file) =>
       file === 'tests/e2e/helpers/connector-fake-claude.ts' ||
       (isProductSource(file) &&
-        /^src\/(?:main\/external-conversations\/|main\/runtime\/rpc\/methods\/connector\.ts$|cli\/(?:connectors|specs)\/connector\.ts$|shared\/rpc-contract\/connector-params\.ts$)/.test(
+        /^src\/(?:main\/external-conversations\/|main\/runtime\/rpc\/methods\/connector\.ts$|cli\/(?:connectors|specs)\/connector\.ts$|shared\/rpc-contract\/connectors\/connector-params\.ts$)/.test(
           file
         ))
   }
diff --git a/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs b/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs
index 5beaae6b8be..1ef4cc6228a 100644
--- a/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs
+++ b/config/scripts/workflow/source-routing/pr-editor-preview-e2e-source-routes.mjs
@@ -52,7 +52,7 @@ export const PR_EDITOR_PREVIEW_E2E_SOURCE_ROUTES = [
         [
           'src/main/ipc/filesystem/filesystem-read-handlers.ts',
           'src/main/startup/chromium-policy/privileged-custom-schemes.ts',
-          'src/preload/api/fs-bridge.ts',
+          'src/preload/api/filesystem/fs-bridge.ts',
           'src/renderer/src/runtime/files/reads/runtime-file-range-preview.ts',
           'src/renderer/src/runtime/files/reads/runtime-file-read-client.ts',
           'src/shared/file-preview/file-preview-kind.ts'
diff --git a/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs b/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs
index 63a7cb1c644..cdd9cf836ab 100644
--- a/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs
+++ b/config/scripts/workflow/source-routing/pr-feature-area-e2e-source-routes.mjs
@@ -139,7 +139,7 @@ export const PR_FEATURE_AREA_E2E_SOURCE_ROUTES = [
     'feature.runtime-host-status',
     ['runtime-host-status-recovery'],
     [
-      'src/main/ipc/runtime-environments/runtime-environment-status-',
+      'src/main/ipc/runtime-environments/status/runtime-environment-status-',
       'src/renderer/src/store/slices/runtime-status/views/runtime-status-subscriptions.ts',
       'src/renderer/src/store/slices/runtime-status/',
       'src/shared/remote-runtime/host-store/runtime-environment-pairing-replace-guards.ts',
diff --git a/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs b/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs
index 18929a56156..298e9bb6b60 100644
--- a/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs
+++ b/config/scripts/workflow/source-routing/pr-layout-oracle-route.mjs
@@ -49,7 +49,7 @@ const LAYOUT_ORACLE_PREFIXES = [
   'src/main/runtime/workspaces/session-hosts/get-runtime-id.ts',
   'src/renderer/src/components/terminal/terminal-tab-actions.ts',
   'src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts',
-  'src/shared/rpc-contract/workspace-layout-params.ts',
+  'src/shared/rpc-contract/workspace-layout/workspace-layout-params.ts',
   'src/renderer/src/store/slices/tabs/recently-closed-tabs.ts',
   // The client the oracle reads every view through.
   'src/cli/runtime/client.ts',
diff --git a/config/scripts/workspace/source-exports/workspace-source-exports.test.mjs b/config/scripts/workspace/source-exports/workspace-source-exports.test.mjs
index 5276d7adc80..15067007f2a 100644
--- a/config/scripts/workspace/source-exports/workspace-source-exports.test.mjs
+++ b/config/scripts/workspace/source-exports/workspace-source-exports.test.mjs
@@ -63,11 +63,6 @@ it('maps only explicit public source exports with exact aliases independent of c
     false,
     false
   ])
-  expect(resolver.aliases.every((alias) => !alias.replacement.includes('/dist/'))).toBe(true)
-  expect(resolver.esbuildAliases).toEqual({
-    '@orca/process-host': resolver.resolve('@orca/process-host').path,
-    '@orca/process-host/process-spec': resolver.resolve('@orca/process-host/process-spec').path
-  })
   expect(resolver.resolve('node:child_process')).toBeNull()
   expect(resolver.resolve('zod')).toBeNull()
 })
diff --git a/config/scripts/worktree-storage/reclaim-dev-electron-bundles.test.ts b/config/scripts/worktree-storage/reclaim-dev-electron-bundles.test.ts
index 1880da4c718..dd9a024d008 100644
--- a/config/scripts/worktree-storage/reclaim-dev-electron-bundles.test.ts
+++ b/config/scripts/worktree-storage/reclaim-dev-electron-bundles.test.ts
@@ -29,8 +29,7 @@ function makeWorktree(bundles: { name: string; marker: boolean }[]): string {
 describe('sweeping across worktrees', () => {
   it.each([
     ['--apply', '--exclude-worktree'],
-    ['--exclude-worktree', '--apply'],
-    ['--exclude-worktree', '-invalid', '--apply']
+    ['--exclude-worktree', '--apply']
   ])('rejects invalid exclusion operands before cleanup: %j', async (...flags) => {
     const worktree = makeWorktree([{ name: 'idle', marker: true }])
     const initialized = await runProcess({ program: 'git', args: ['-C', worktree, 'init', '-q'] })
diff --git a/config/scripts/worktree-storage/reclaim-dev-worktree-profiles.test.mjs b/config/scripts/worktree-storage/reclaim-dev-worktree-profiles.test.mjs
index 73ac41a1a02..f64742288b4 100644
--- a/config/scripts/worktree-storage/reclaim-dev-worktree-profiles.test.mjs
+++ b/config/scripts/worktree-storage/reclaim-dev-worktree-profiles.test.mjs
@@ -33,7 +33,7 @@ it('removes only idle profiles whose worktree of this repository is gone', async
   const running = profile('dddddddddd', path.join(root, 'removed-running'), commonDirectory)
   writeFileSync(path.join(running, 'orca-runtime.json'), JSON.stringify({ pid: 4242 }))
 
-  const result = await reclaimDevWorktreeProfiles({
+  await reclaimDevWorktreeProfiles({
     apply: true,
     profilesRoot,
     repository: { commonDirectory, worktrees: [liveWorktree] },
@@ -41,7 +41,6 @@ it('removes only idle profiles whose worktree of this repository is gone', async
     report: () => {}
   })
 
-  expect(result).toEqual({ entries: 1, protected: 1 })
   expect(existsSync(removed)).toBe(false)
   expect(existsSync(live)).toBe(true)
   expect(existsSync(otherRepo)).toBe(true)
diff --git a/config/scripts/worktree-storage/reclaim-electron-dists.test.ts b/config/scripts/worktree-storage/reclaim-electron-dists.test.ts
index 266687802c2..78b501a2000 100644
--- a/config/scripts/worktree-storage/reclaim-electron-dists.test.ts
+++ b/config/scripts/worktree-storage/reclaim-electron-dists.test.ts
@@ -70,22 +70,6 @@ it.skipIf(process.platform === 'win32')(
   }
 )
 
-it('shares a writable install and preserves its executable bytes', async () => {
-  const { pkg, executable, run } = await fixture()
-  const preview = await run()
-  expect(preview.code, preview.stderr).toBe(0)
-  expect(preview.stdout).toContain('Would share 1 worktree(s)')
-  const applied = await run(true)
-  expect(applied.code, applied.stderr).toBe(0)
-  expect(applied.stdout).toContain('Shared 1 worktree(s)')
-  expect(await readFile(executable, 'utf8')).toBe('fake electron executable\n')
-  expect(await readFile(join(pkg, '.orca-shared-dist'), 'utf8')).toBe(
-    `99.1.0-${process.platform}-${process.arch}`
-  )
-  const repeated = await run()
-  expect(repeated.stdout).toContain('Would share 0 worktree(s)')
-})
-
 it('protects the launching worktree, including when selected through a filesystem alias', async () => {
   const { root, pkg, executable, run } = await fixture()
   const alias = join(root, 'alias')
@@ -103,13 +87,11 @@ it('protects the launching worktree, including when selected through a filesyste
   }
 })
 
-it.each([['--exclude-worktree'], ['--exclude-worktree', '--apply']])(
-  'rejects invalid exclusions before changing an install: %j',
-  async (...flags) => {
-    const { pkg, run } = await fixture()
-    const result = await run(true, flags)
-    expect(result.code).not.toBe(0)
-    expect(result.stderr).toContain('--exclude-worktree requires a directory')
-    await expect(readFile(join(pkg, '.orca-shared-dist'))).rejects.toMatchObject({ code: 'ENOENT' })
-  }
-)
+it('rejects a missing exclusion before changing an install', async () => {
+  const flags = ['--exclude-worktree']
+  const { pkg, run } = await fixture()
+  const result = await run(true, flags)
+  expect(result.code).not.toBe(0)
+  expect(result.stderr).toContain('--exclude-worktree requires a directory')
+  await expect(readFile(join(pkg, '.orca-shared-dist'))).rejects.toMatchObject({ code: 'ENOENT' })
+})
diff --git a/config/scripts/worktree-storage/reclaim-worktree-generated-files.test.mjs b/config/scripts/worktree-storage/reclaim-worktree-generated-files.test.mjs
index 3f4316bfec4..1cb925ca695 100644
--- a/config/scripts/worktree-storage/reclaim-worktree-generated-files.test.mjs
+++ b/config/scripts/worktree-storage/reclaim-worktree-generated-files.test.mjs
@@ -252,7 +252,6 @@ it('retains a replacement directory introduced while the final Git check is runn
     apply: true,
     report: () => {}
   })
-  expect(checks).toBe(2)
   expect(result.protected).toBe(1)
   expect(await readFile(file, 'utf8')).toBe('generated bytes')
   expect(await readFile(join(saved, 'generated.txt'), 'utf8')).toBe('generated bytes')
@@ -280,42 +279,39 @@ it.skipIf(process.platform === 'win32' || process.getuid?.() === 0)(
   }
 )
 
-it.each(['manual', 'automatic'])(
-  'includes generated cleanup in %s CLI preview and apply',
-  async (mode) => {
-    const f = await fixture()
-    const protectedFile = await generated(f.repoRoot)
-    const file = await generated(f.sibling, 'mobile/node_modules')
-    const store = join(f.root, 'global-pnpm-store')
-    await mkdir(store)
-    const shared = join(store, 'package.js')
-    await writeFile(shared, 'shared package')
-    await link(shared, join(dirname(file), 'package.js'))
-    await symlink(store, join(dirname(file), 'shared-package'), 'junction')
-    await utimes(dirname(file), new Date(0), new Date(0))
-    const run = (args) =>
-      runProcess({
-        program: process.env.ORCA_TEST_NODE_EXECUTABLE ?? process.execPath,
-        args: [
-          resolve(import.meta.dirname, 'reclaim-worktree-space.mjs'),
-          '--repo',
-          f.repoRoot,
-          ...(mode === 'automatic' ? ['--automatic'] : []),
-          ...args
-        ],
-        cwd: tmpdir(),
-        env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
-        timeoutMs: 30_000,
-        terminationBarrier: true
-      })
-    const preview = await run([])
-    expect(preview.code, preview.stderr).toBe(0)
-    expect(preview.stdout).toContain('would remove generated directory')
-    expect(await readFile(file, 'utf8')).toBe('generated bytes')
-    const applied = await run(['--apply'])
-    expect(applied.code, applied.stderr).toBe(0)
-    await expect(lstat(file)).rejects.toMatchObject({ code: 'ENOENT' })
-    expect(await readFile(protectedFile, 'utf8')).toBe('generated bytes')
-    expect(await readFile(shared, 'utf8')).toBe('shared package')
-  }
-)
+it('includes generated cleanup in automatic CLI preview and apply', async () => {
+  const f = await fixture()
+  const protectedFile = await generated(f.repoRoot)
+  const file = await generated(f.sibling, 'mobile/node_modules')
+  const store = join(f.root, 'global-pnpm-store')
+  await mkdir(store)
+  const shared = join(store, 'package.js')
+  await writeFile(shared, 'shared package')
+  await link(shared, join(dirname(file), 'package.js'))
+  await symlink(store, join(dirname(file), 'shared-package'), 'junction')
+  await utimes(dirname(file), new Date(0), new Date(0))
+  const run = (args) =>
+    runProcess({
+      program: process.env.ORCA_TEST_NODE_EXECUTABLE ?? process.execPath,
+      args: [
+        resolve(import.meta.dirname, 'reclaim-worktree-space.mjs'),
+        '--repo',
+        f.repoRoot,
+        '--automatic',
+        ...args
+      ],
+      cwd: tmpdir(),
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
+      timeoutMs: 30_000,
+      terminationBarrier: true
+    })
+  const preview = await run([])
+  expect(preview.code, preview.stderr).toBe(0)
+  expect(preview.stdout).toContain('would remove generated directory')
+  expect(await readFile(file, 'utf8')).toBe('generated bytes')
+  const applied = await run(['--apply'])
+  expect(applied.code, applied.stderr).toBe(0)
+  await expect(lstat(file)).rejects.toMatchObject({ code: 'ENOENT' })
+  expect(await readFile(protectedFile, 'utf8')).toBe('generated bytes')
+  expect(await readFile(shared, 'utf8')).toBe('shared package')
+})
diff --git a/config/scripts/worktree-storage/reclaim-worktree-space.test.mjs b/config/scripts/worktree-storage/reclaim-worktree-space.test.mjs
index c52d18e2065..1ac29255818 100644
--- a/config/scripts/worktree-storage/reclaim-worktree-space.test.mjs
+++ b/config/scripts/worktree-storage/reclaim-worktree-space.test.mjs
@@ -103,5 +103,4 @@ it('rejects competing sweeps and releases the lock after a failed operation', as
   await rejected
   options.execute.mockResolvedValue({ code: 0, timedOut: false })
   await reclaimWorktreeSpace(options)
-  expect(options.execute).toHaveBeenCalledTimes(8)
 })
diff --git a/config/tsconfig.tc.web.json b/config/tsconfig.tc.web.json
index 95529130196..ead887f362e 100644
--- a/config/tsconfig.tc.web.json
+++ b/config/tsconfig.tc.web.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.web.json",
   "exclude": [
-    "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx",
     "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts",
     "../src/shared/**/*.test.ts",
     "../src/shared/**/*.test.tsx",
@@ -21,7 +20,7 @@
     "../src/preload/renderer/window-commands/close-active-tab-payload-admission.ts",
     "../src/preload/renderer/e2e-config.ts",
     "../src/preload/renderer/hidden-window-frame-pump.ts",
-    "../src/preload/api/gitlab.ts",
+    "../src/preload/api/gitlab/gitlab.ts",
     "../src/preload/renderer/renderer-runtime.ts",
     "../src/preload/renderer/diagnostics/renderer-heap-statistics-reader.ts",
     "../src/preload/renderer/diagnostics/renderer-process-memory-reader.ts",
diff --git a/config/tsconfig.test.pane-launch.json b/config/tsconfig.test.pane-launch.json
index cdffd47c2df..cff73d0a79e 100644
--- a/config/tsconfig.test.pane-launch.json
+++ b/config/tsconfig.test.pane-launch.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.web.json",
   "include": [
     "../src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-mail.test.ts",
-    "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx",
     "../src/renderer/src/runtime/observed-provider-accounts.test.tsx",
     "../src/renderer/src/components/status-bar/ClaudeSwitcherMenu.observation.test.tsx",
     "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts",
diff --git a/config/tsconfig.web.json b/config/tsconfig.web.json
index b8af840abf1..d34ab3969b3 100644
--- a/config/tsconfig.web.json
+++ b/config/tsconfig.web.json
@@ -11,7 +11,6 @@
     "../src/shared/**/*"
   ],
   "exclude": [
-    "../src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx",
     "../src/renderer/src/runtime/provider-accounts/observations/provider-account-observation.test-fixture.ts"
   ],
   "compilerOptions": {
diff --git a/docs/assets/readme-downloads.svg b/docs/assets/readme-downloads.svg
index b7020a28499..c085e4dac9a 100644
--- a/docs/assets/readme-downloads.svg
+++ b/docs/assets/readme-downloads.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="113" height="20" role="img" aria-label="downloads: 175m">
-  <title>downloads: 175m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="113" height="20" role="img" aria-label="downloads: 176m">
+  <title>downloads: 176m</title>
   <linearGradient id="s" x2="0" y2="100%">
     <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/>
@@ -15,7 +15,7 @@
   <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="11">
     <text x="37" y="15" fill="#010101" fill-opacity=".3">downloads</text>
     <text x="37" y="14">downloads</text>
-    <text x="93.5" y="15" fill="#010101" fill-opacity=".3">175m</text>
-    <text x="93.5" y="14">175m</text>
+    <text x="93.5" y="15" fill="#010101" fill-opacity=".3">176m</text>
+    <text x="93.5" y="14">176m</text>
   </g>
 </svg>
diff --git a/examples/plugins/components-gallery/src/panel.test.tsx b/examples/plugins/components-gallery/src/panel.test.tsx
deleted file mode 100644
index ed158b48367..00000000000
--- a/examples/plugins/components-gallery/src/panel.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-// Run with `orca plugin test .`: plain Node, no Orca window, the same runtime and checks Orca uses.
-import { afterEach, assert, mount, test, type TestPanel } from 'orca/testing'
-import * as gallery from './panel'
-
-let panel: TestPanel | undefined
-afterEach(() => panel?.unmount())
-
-test('fills in the form and saves once the checks pass', async () => {
-  panel = await mount(gallery)
-  assert.ok(panel.find({ role: 'alert' }) === null)
-  assert.equal(panel.find({ role: 'button', text: 'Save' })?.disabled, true)
-
-  await panel.type({ label: 'Title' }, 'Write docs')
-  await panel.select({ label: 'Priority' }, 'high')
-  await panel.slide({ label: 'Effort' }, 5)
-  await panel.toggle({ label: 'I have read the guidelines' })
-  await panel.press({ role: 'button', text: 'Save' })
-
-  assert.ok(panel.find({ text: 'Saved Write docs' }))
-  assert.equal(panel.valueOf({ label: 'Priority' }), 'high')
-  assert.deepEqual(panel.persisted.plugin['gallery.title'], 'Write docs')
-  assert.deepEqual(panel.errors, [])
-})
-
-test('pages, sorts and selects the Table, and loads Tree children lazily', async () => {
-  panel = await mount(gallery)
-  await panel.select({ type: 'Tabs' }, 'data')
-  const table = { role: 'grid', label: 'Files' }
-  assert.equal(panel.rowsOf(table).length, 50)
-
-  await panel.loadMore(table)
-  assert.equal(panel.rowsOf(table).length, 100)
-  await panel.sort(table, 'size')
-  assert.equal(panel.rowsOf(table).length, 50)
-  await panel.selectRows(table, panel.rowsOf(table).slice(0, 2))
-  assert.ok(panel.find({ text: /2 selected/ }))
-
-  const tree = { role: 'tree' }
-  assert.ok(!panel.find(tree)?.text.includes('main.ts'))
-  await panel.expand(tree, 'src')
-  assert.ok(panel.find(tree)?.text.includes('main.ts'))
-  await panel.selectItem(tree, 'src/main.ts')
-  assert.equal(panel.valueOf(tree), 'src/main.ts')
-  assert.deepEqual(panel.errors, [])
-})
diff --git a/examples/plugins/hello-tsx/src/panel.test.tsx b/examples/plugins/hello-tsx/src/panel.test.tsx
index f0fc1d636f3..3e18615ca6e 100644
--- a/examples/plugins/hello-tsx/src/panel.test.tsx
+++ b/examples/plugins/hello-tsx/src/panel.test.tsx
@@ -21,14 +21,3 @@ test('adds a task from the input and counts it as open', async () => {
   assert.equal(stored.length, 3)
   assert.deepEqual(panel.errors, [])
 })
-
-test('starts from the persisted list and clears done tasks', async () => {
-  panel = await mount(panelModule, {
-    persisted: { plugin: { todos: [{ id: 7, title: 'Ship it', done: true }] } }
-  })
-  assert.equal(panel.find({ role: 'status' })?.text, '0 open')
-
-  await panel.press({ text: 'Clear done' })
-
-  assert.ok(panel.find({ label: 'Nothing to do' }))
-})
diff --git a/mobile/.gitignore b/mobile/.gitignore
index 112eafc6571..e56cc7b290c 100644
--- a/mobile/.gitignore
+++ b/mobile/.gitignore
@@ -1,7 +1,7 @@
 node_modules/
-src/terminal/terminal-webview-engine.generated.ts
-src/terminal/terminal-webview-engine-css.generated.ts
-src/terminal/terminal-webview-document-script.generated.ts
+src/terminal/document/terminal-webview-engine.generated.ts
+src/terminal/document/terminal-webview-engine-css.generated.ts
+src/terminal/document/terminal-webview-document-script.generated.ts
 src/components/pr-sidebar/mermaid-page-engine.generated.ts
 src/components/katex-page-style.generated.ts
 .expo/
diff --git a/mobile/.oxlintrc.json b/mobile/.oxlintrc.json
index 9b96eb57b81..a5ea579963d 100644
--- a/mobile/.oxlintrc.json
+++ b/mobile/.oxlintrc.json
@@ -3,7 +3,7 @@
   "extends": ["../.oxlintrc.json"],
   "ignorePatterns": [
     "src/components/mobile-markdown-mdast-nodes.d.ts",
-    "src/terminal/terminal-webview-engine.generated.ts",
+    "src/terminal/document/terminal-webview-engine.generated.ts",
     "src/components/pr-sidebar/mermaid-page-engine.generated.ts",
     "src/components/katex-page-style.generated.ts"
   ],
@@ -21,9 +21,16 @@
   },
   "overrides": [
     {
-      "files": ["src/terminal/TerminalWebView.tsx"],
+      "files": ["src/terminal/webview/TerminalWebView.tsx"],
       "rules": {
-        "max-lines": ["error", { "max": 379, "skipBlankLines": true, "skipComments": true }]
+        "max-lines": [
+          "error",
+          {
+            "max": 379,
+            "skipBlankLines": true,
+            "skipComments": true
+          }
+        ]
       }
     }
   ]
diff --git a/mobile/app/h/[hostId]/files/[worktreeId].web.tsx b/mobile/app/h/[hostId]/files/[worktreeId].web.tsx
index 596fbad3260..f27f5804bfb 100644
--- a/mobile/app/h/[hostId]/files/[worktreeId].web.tsx
+++ b/mobile/app/h/[hostId]/files/[worktreeId].web.tsx
@@ -1,6 +1,6 @@
 import { withWorkspaceRoute } from '../../../../src/navigation/workspace-route'
 import { useLocalSearchParams } from 'expo-router'
-import { MobileFileExplorerPanel } from '../../../../src/files/MobileFileExplorerPanel'
+import { MobileFileExplorerPanel } from '../../../../src/files/explorer/MobileFileExplorerPanel'
 import { firstParam } from '../../../../src/navigation/route-param-reader'
 
 // Render screen directly: native sibling imports a shell module that throws in browsers, and manifest imports every route.
diff --git a/mobile/app/h/[hostId]/files/preview/[worktreeId].tsx b/mobile/app/h/[hostId]/files/preview/[worktreeId].tsx
index a70935e4fa6..16a0891a4b6 100644
--- a/mobile/app/h/[hostId]/files/preview/[worktreeId].tsx
+++ b/mobile/app/h/[hostId]/files/preview/[worktreeId].tsx
@@ -7,7 +7,7 @@ import { useLocalSearchParams } from 'expo-router'
 import {
   mobileFilePreviewShellParams,
   normalizeMobileFilePreviewRouteParams
-} from '../../../../../src/files/mobile-file-preview-route'
+} from '../../../../../src/files/preview/mobile-file-preview-route'
 import {
   shellScreenRoute,
   shellScreenRouteKey
diff --git a/mobile/app/h/[hostId]/files/preview/[worktreeId].web.tsx b/mobile/app/h/[hostId]/files/preview/[worktreeId].web.tsx
index 4170e5f8a44..d903f7a3bff 100644
--- a/mobile/app/h/[hostId]/files/preview/[worktreeId].web.tsx
+++ b/mobile/app/h/[hostId]/files/preview/[worktreeId].web.tsx
@@ -1,7 +1,7 @@
 import { withWorkspaceRoute } from '../../../../../src/navigation/workspace-route'
 import { useLocalSearchParams } from 'expo-router'
 import { MobileFilePreviewScreen } from '../../../../../src/files/MobileFilePreviewScreen'
-import { normalizeMobileFilePreviewRouteParams } from '../../../../../src/files/mobile-file-preview-route'
+import { normalizeMobileFilePreviewRouteParams } from '../../../../../src/files/preview/mobile-file-preview-route'
 
 // Render screen directly: native sibling imports a shell module that throws in browsers, and manifest imports every route.
 export default withWorkspaceRoute(function MobileFilePreviewRoute() {
diff --git a/mobile/app/h/[hostId]/source-control/[worktreeId].web.tsx b/mobile/app/h/[hostId]/source-control/[worktreeId].web.tsx
index 18c7ccc3813..76b63f88d8f 100644
--- a/mobile/app/h/[hostId]/source-control/[worktreeId].web.tsx
+++ b/mobile/app/h/[hostId]/source-control/[worktreeId].web.tsx
@@ -2,7 +2,7 @@ import { withWorkspaceRoute } from '../../../../src/navigation/workspace-route'
 import { useLocalSearchParams } from 'expo-router'
 import { MobileSourceControlRoutePanel } from '../../../../src/source-control/MobileSourceControlRoutePanel'
 import { firstParam } from '../../../../src/navigation/route-param-reader'
-import { parseSourceControlHubTab } from '../../../../src/source-control/mobile-source-control-hub-tab'
+import { parseSourceControlHubTab } from '../../../../src/source-control/panel/mobile-source-control-hub-tab'
 
 // Render screen directly: native sibling imports a shell module that throws in browsers, and manifest imports every route.
 export default withWorkspaceRoute(function MobileSourceControlScreen() {
diff --git a/mobile/app/mobile-onboarding.tsx b/mobile/app/mobile-onboarding.tsx
index 8e8378f27f3..ceca1af2268 100644
--- a/mobile/app/mobile-onboarding.tsx
+++ b/mobile/app/mobile-onboarding.tsx
@@ -11,7 +11,7 @@ import {
 } from '../src/onboarding/MobileOnboardingPage'
 import { parseMobileOnboardingSteps } from '../src/onboarding/mobile-onboarding-plan'
 import { PUSH_CURVE, PUSH_SLIDE_MS } from '../src/navigation/push-motion'
-import { useReducedMotionEnabled } from '../src/platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../src/platform/accessibility/use-reduced-motion'
 import { useMobileColorScheme } from '../src/theme/use-mobile-color-scheme'
 import { mobileOnboardingStyles as styles } from '../src/onboarding/mobile-onboarding-styles'
 import {
diff --git a/mobile/app/pair-confirm.tsx b/mobile/app/pair-confirm.tsx
index 83146afbdb5..207af3e3e49 100644
--- a/mobile/app/pair-confirm.tsx
+++ b/mobile/app/pair-confirm.tsx
@@ -27,7 +27,7 @@ import {
   PairingProgress,
   waitForBeat
 } from '../src/pairing/pairing-visuals'
-import { triggerSuccess } from '../src/platform/haptics'
+import { triggerSuccess } from '../src/platform/haptics/haptics'
 import { getPairingFailureMessage } from '../src/pairing/pairing-failure-message'
 
 type Status = 'awaiting-confirm' | 'connecting' | 'error'
diff --git a/mobile/app/pair-scan.tsx b/mobile/app/pair-scan.tsx
index 57db5a1b16a..d1117e6a4f0 100644
--- a/mobile/app/pair-scan.tsx
+++ b/mobile/app/pair-scan.tsx
@@ -40,7 +40,7 @@ import {
   Step,
   waitForBeat
 } from '../src/pairing/pairing-visuals'
-import { triggerSuccess } from '../src/platform/haptics'
+import { triggerSuccess } from '../src/platform/haptics/haptics'
 import { getPairingFailureMessage } from '../src/pairing/pairing-failure-message'
 
 // Bound initial pairing at ~25s (one connect timeout plus retry) so broken routes show an actionable error/log; live RPC retries indefinitely.
diff --git a/mobile/app/terminal-settings.tsx b/mobile/app/terminal-settings.tsx
index ef85607d591..a9cbc83f450 100644
--- a/mobile/app/terminal-settings.tsx
+++ b/mobile/app/terminal-settings.tsx
@@ -23,9 +23,9 @@ import {
   readTerminalAutoRestoreFitMs,
   saveTerminalAutoRestoreFitMs,
   setTerminalAutoRestoreFitMsForHost
-} from '../src/terminal/terminal-auto-restore-fit-state'
-import { setTerminalSettingsScrollEnabled } from '../src/terminal/terminal-settings-scroll-lock'
-import { useTerminalTextScaleSetting } from '../src/terminal/use-terminal-text-scale-setting'
+} from '../src/terminal/viewport/terminal-auto-restore-fit-state'
+import { setTerminalSettingsScrollEnabled } from '../src/terminal/preferences/terminal-settings-scroll-lock'
+import { useTerminalTextScaleSetting } from '../src/terminal/preferences/use-terminal-text-scale-setting'
 import {
   SettingsEmptyRow,
   SettingsNavBar,
diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json
index 46f97142576..799c77e0b99 100644
--- a/mobile/rpc-foundation/pilot-scenarios.json
+++ b/mobile/rpc-foundation/pilot-scenarios.json
@@ -930,7 +930,7 @@
       "id": "settings-repo-metadata-fulfilled",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["settings-first"],
       "steps": [
         {
@@ -1023,7 +1023,7 @@
       "id": "settings-repo-metadata-icons",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["settings-first"],
       "steps": [
         {
@@ -1134,7 +1134,7 @@
       "id": "settings-repo-metadata-refused",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["settings-first"],
       "steps": [
         {
@@ -1222,7 +1222,7 @@
       "id": "settings-repo-metadata-transport-error",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["settings-first"],
       "steps": [
         {
@@ -2101,7 +2101,7 @@
       "id": "settings-repo-cache-expiry",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["follow-up-cache-observation", "timer-expiry"],
       "steps": [
         {
@@ -2424,7 +2424,7 @@
       "id": "settings-repo-metadata-single-host",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["single-ssh-host"],
       "steps": [
         {
@@ -2855,7 +2855,7 @@
       "id": "settings-repo-metadata-refuse-after-data",
       "operation": "settings.repo-metadata",
       "family": "settings.repo-metadata",
-      "sites": ["mobile/src/host-screen/use-host-repo-metadata.ts"],
+      "sites": ["mobile/src/host-screen/catalog/use-host-repo-metadata.ts"],
       "schedules": ["success-then-refused"],
       "steps": [
         {
@@ -3440,7 +3440,7 @@
       "id": "sc-base-ref-default",
       "operation": "source-control.branch-base-ref",
       "family": "git.base-ref-chain",
-      "sites": ["mobile/src/source-control/mobile-branch-base-ref.ts"],
+      "sites": ["mobile/src/source-control/branches/mobile-branch-base-ref.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3505,7 +3505,7 @@
       "id": "sc-base-ref-worktree-hit",
       "operation": "source-control.branch-base-ref",
       "family": "git.base-ref-chain",
-      "sites": ["mobile/src/source-control/mobile-branch-base-ref.ts"],
+      "sites": ["mobile/src/source-control/branches/mobile-branch-base-ref.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3550,7 +3550,7 @@
       "id": "sc-base-ref-repo-fallback",
       "operation": "source-control.branch-base-ref",
       "family": "git.base-ref-chain",
-      "sites": ["mobile/src/source-control/mobile-branch-base-ref.ts"],
+      "sites": ["mobile/src/source-control/branches/mobile-branch-base-ref.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3596,7 +3596,7 @@
       "id": "sc-base-ref-unavailable",
       "operation": "source-control.branch-base-ref",
       "family": "git.base-ref-chain",
-      "sites": ["mobile/src/source-control/mobile-branch-base-ref.ts"],
+      "sites": ["mobile/src/source-control/branches/mobile-branch-base-ref.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3651,7 +3651,7 @@
       "id": "sc-history-loaded",
       "operation": "source-control.git-history",
       "family": "git.history-read",
-      "sites": ["mobile/src/source-control/mobile-git-history.ts"],
+      "sites": ["mobile/src/source-control/history/mobile-git-history.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3698,7 +3698,7 @@
       "id": "sc-commit-message-generated",
       "operation": "source-control.commit-message",
       "family": "git.commit-message-ai",
-      "sites": ["mobile/src/source-control/mobile-commit-message-ai.ts"],
+      "sites": ["mobile/src/source-control/commits/mobile-commit-message-ai.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3730,7 +3730,7 @@
       "id": "sc-commit-message-canceled",
       "operation": "source-control.commit-message",
       "family": "git.commit-message-ai",
-      "sites": ["mobile/src/source-control/mobile-commit-message-ai.ts"],
+      "sites": ["mobile/src/source-control/commits/mobile-commit-message-ai.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3780,7 +3780,7 @@
       "id": "sc-commit-message-cancel-rejected",
       "operation": "source-control.commit-message",
       "family": "git.commit-message-ai",
-      "sites": ["mobile/src/source-control/mobile-commit-message-ai.ts"],
+      "sites": ["mobile/src/source-control/commits/mobile-commit-message-ai.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3806,7 +3806,7 @@
       "id": "sc-pr-link-set",
       "operation": "source-control.pr-link",
       "family": "worktree.review-link",
-      "sites": ["mobile/src/source-control/mobile-pr-link.ts"],
+      "sites": ["mobile/src/source-control/review/mobile-pr-link.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3838,7 +3838,7 @@
       "id": "sc-pr-link-hosted-review",
       "operation": "source-control.pr-link",
       "family": "worktree.review-link",
-      "sites": ["mobile/src/source-control/mobile-pr-link.ts"],
+      "sites": ["mobile/src/source-control/review/mobile-pr-link.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3886,7 +3886,7 @@
       "id": "sc-pr-link-read",
       "operation": "source-control.pr-link",
       "family": "worktree.review-link",
-      "sites": ["mobile/src/source-control/mobile-pr-link.ts"],
+      "sites": ["mobile/src/source-control/review/mobile-pr-link.ts"],
       "schedules": [],
       "steps": [
         {
@@ -3933,7 +3933,9 @@
       "id": "sc-review-status-normalized",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -3982,7 +3984,9 @@
       "id": "sc-review-status-entries-not-array",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4011,7 +4015,9 @@
       "id": "sc-review-commit",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4041,7 +4047,9 @@
       "id": "sc-review-commit-inner-failure",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4071,7 +4079,9 @@
       "id": "sc-review-commit-refused-empty-message",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4101,7 +4111,9 @@
       "id": "sc-review-commit-rejected",
       "operation": "source-control.review-git-preparation",
       "family": "git.review-preparation",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-git-preparation.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4128,7 +4140,9 @@
       "id": "sc-prerequisite-push",
       "operation": "source-control.remote-prerequisite",
       "family": "git.remote-prerequisite",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4167,7 +4181,9 @@
       "id": "sc-prerequisite-publish",
       "operation": "source-control.remote-prerequisite",
       "family": "git.remote-prerequisite",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4249,7 +4265,9 @@
       "id": "sc-prerequisite-force-with-lease",
       "operation": "source-control.remote-prerequisite",
       "family": "git.remote-prerequisite",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4287,7 +4305,9 @@
       "id": "sc-prerequisite-skipped",
       "operation": "source-control.remote-prerequisite",
       "family": "git.remote-prerequisite",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts"],
+      "sites": [
+        "mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -4306,7 +4326,7 @@
       "id": "sc-eligibility-fetched",
       "operation": "source-control.hosted-review-eligibility",
       "family": "hostedReview.eligibility",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-service.ts"],
+      "sites": ["mobile/src/source-control/review/creation/mobile-hosted-review-service.ts"],
       "schedules": [],
       "steps": [
         {
@@ -4349,7 +4369,7 @@
       "id": "sc-prefill-unavailable-on-refusal",
       "operation": "source-control.hosted-review-eligibility",
       "family": "hostedReview.eligibility",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-service.ts"],
+      "sites": ["mobile/src/source-control/review/creation/mobile-hosted-review-service.ts"],
       "schedules": [],
       "steps": [
         {
@@ -4383,7 +4403,7 @@
       "id": "sc-prefill-unavailable-on-rejection",
       "operation": "source-control.hosted-review-eligibility",
       "family": "hostedReview.eligibility",
-      "sites": ["mobile/src/source-control/mobile-hosted-review-service.ts"],
+      "sites": ["mobile/src/source-control/review/creation/mobile-hosted-review-service.ts"],
       "schedules": [],
       "steps": [
         {
@@ -4415,8 +4435,8 @@
       "operation": "source-control.hosted-review-create",
       "family": "hostedReview.create-chain",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-service.ts",
-        "mobile/src/source-control/mobile-pr-link.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-service.ts",
+        "mobile/src/source-control/review/mobile-pr-link.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4493,8 +4513,8 @@
       "operation": "source-control.hosted-review-create",
       "family": "hostedReview.create-chain",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-service.ts",
-        "mobile/src/source-control/mobile-pr-link.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-service.ts",
+        "mobile/src/source-control/review/mobile-pr-link.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4549,8 +4569,8 @@
       "operation": "source-control.hosted-review-create",
       "family": "hostedReview.create-chain",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-service.ts",
-        "mobile/src/source-control/mobile-pr-link.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-service.ts",
+        "mobile/src/source-control/review/mobile-pr-link.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4607,8 +4627,8 @@
       "operation": "source-control.hosted-review-create",
       "family": "hostedReview.create-chain",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-service.ts",
-        "mobile/src/source-control/mobile-pr-link.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-service.ts",
+        "mobile/src/source-control/review/mobile-pr-link.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4647,8 +4667,8 @@
       "operation": "source-control.hosted-review-create",
       "family": "hostedReview.create-chain",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-service.ts",
-        "mobile/src/source-control/mobile-pr-link.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-service.ts",
+        "mobile/src/source-control/review/mobile-pr-link.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4684,8 +4704,8 @@
       "operation": "source-control.create-intent",
       "family": "hostedReview.create-intent",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts",
-        "mobile/src/source-control/mobile-hosted-review-create-intent.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts",
+        "mobile/src/source-control/review/creation/mobile-hosted-review-create-intent.ts"
       ],
       "schedules": [],
       "steps": [
@@ -4960,8 +4980,8 @@
       "operation": "source-control.create-intent",
       "family": "hostedReview.create-intent",
       "sites": [
-        "mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts",
-        "mobile/src/source-control/mobile-hosted-review-create-intent.ts"
+        "mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts",
+        "mobile/src/source-control/review/creation/mobile-hosted-review-create-intent.ts"
       ],
       "schedules": [],
       "steps": [
@@ -6809,7 +6829,7 @@
       "id": "files-ownership-ssh",
       "operation": "files.mutation-ownership",
       "family": "files.mutation-ownership",
-      "sites": ["mobile/src/files/mobile-file-mutation-ownership.ts"],
+      "sites": ["mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts"],
       "schedules": [],
       "steps": [
         {
@@ -6872,7 +6892,7 @@
       "id": "files-ownership-local",
       "operation": "files.mutation-ownership",
       "family": "files.mutation-ownership",
-      "sites": ["mobile/src/files/mobile-file-mutation-ownership.ts"],
+      "sites": ["mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts"],
       "schedules": [],
       "steps": [
         {
@@ -6915,8 +6935,8 @@
       "operation": "files.preview-load",
       "family": "files.preview-load",
       "sites": [
-        "mobile/src/files/mobile-file-preview-request.ts",
-        "mobile/src/files/mobile-terminal-artifact-grant-refresh.ts"
+        "mobile/src/files/preview/mobile-file-preview-request.ts",
+        "mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts"
       ],
       "schedules": [],
       "steps": [
@@ -6989,8 +7009,8 @@
       "operation": "files.preview-load",
       "family": "files.preview-load",
       "sites": [
-        "mobile/src/files/mobile-file-preview-request.ts",
-        "mobile/src/files/mobile-terminal-artifact-grant-refresh.ts"
+        "mobile/src/files/preview/mobile-file-preview-request.ts",
+        "mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts"
       ],
       "schedules": [],
       "steps": [
@@ -7023,7 +7043,7 @@
       "id": "files-preview-worktree",
       "operation": "files.preview-load",
       "family": "files.preview-load",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7054,7 +7074,7 @@
       "id": "files-preview-worktree-image",
       "operation": "files.preview-load",
       "family": "files.preview-load",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7089,7 +7109,7 @@
       "id": "files-preview-artifact-image",
       "operation": "files.preview-load",
       "family": "files.preview-load",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7126,8 +7146,8 @@
       "operation": "files.preview-save",
       "family": "files.preview-save",
       "sites": [
-        "mobile/src/files/mobile-file-preview-request.ts",
-        "mobile/src/files/mobile-terminal-artifact-grant-refresh.ts"
+        "mobile/src/files/preview/mobile-file-preview-request.ts",
+        "mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts"
       ],
       "schedules": [],
       "steps": [
@@ -7179,8 +7199,8 @@
       "operation": "files.preview-save",
       "family": "files.preview-save",
       "sites": [
-        "mobile/src/files/mobile-file-preview-request.ts",
-        "mobile/src/files/mobile-terminal-artifact-grant-refresh.ts"
+        "mobile/src/files/preview/mobile-file-preview-request.ts",
+        "mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts"
       ],
       "schedules": [],
       "steps": [
@@ -7212,7 +7232,7 @@
       "id": "files-tab-doc-shapes",
       "operation": "files.tab-doc",
       "family": "files.tab-doc",
-      "sites": ["mobile/src/files/mobile-file-tab-doc.ts"],
+      "sites": ["mobile/src/files/session-documents/mobile-file-tab-doc.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7416,7 +7436,7 @@
       "id": "host-view-settings-sync",
       "operation": "host.view-settings",
       "family": "host.view-settings",
-      "sites": ["mobile/src/host-screen/use-host-view-settings.ts"],
+      "sites": ["mobile/src/host-screen/view-settings/use-host-view-settings.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7640,7 +7660,7 @@
       "id": "host-worktree-actions-pin-open-delete",
       "operation": "host.worktree-actions",
       "family": "host.worktree-actions",
-      "sites": ["mobile/src/host-screen/use-host-worktree-actions.ts"],
+      "sites": ["mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7731,7 +7751,7 @@
       "id": "host-worktree-delete-refused",
       "operation": "host.worktree-actions",
       "family": "host.worktree-actions",
-      "sites": ["mobile/src/host-screen/use-host-worktree-actions.ts"],
+      "sites": ["mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts"],
       "schedules": [],
       "steps": [
         {
@@ -7786,7 +7806,7 @@
       "id": "host-worktree-delete-archive-hook-failed",
       "operation": "host.worktree-actions",
       "family": "host.worktree-actions",
-      "sites": ["mobile/src/host-screen/use-host-worktree-actions.ts"],
+      "sites": ["mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16381,7 +16401,7 @@
       "id": "terminal-query-reply-accepted",
       "operation": "terminal.query-reply",
       "family": "terminal.query-reply",
-      "sites": ["mobile/src/terminal/mobile-terminal-query-reply.ts"],
+      "sites": ["mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16418,7 +16438,7 @@
       "id": "terminal-query-reply-unsubscribed",
       "operation": "terminal.query-reply",
       "family": "terminal.query-reply",
-      "sites": ["mobile/src/terminal/mobile-terminal-query-reply.ts"],
+      "sites": ["mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16437,7 +16457,7 @@
       "id": "terminal-raw-input-reported",
       "operation": "terminal.accessory-raw-send",
       "family": "terminal.raw-input",
-      "sites": ["mobile/src/terminal/terminal-live-accessory-raw-send.ts"],
+      "sites": ["mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16473,7 +16493,7 @@
       "id": "terminal-raw-input-refused",
       "operation": "terminal.accessory-raw-send",
       "family": "terminal.raw-input",
-      "sites": ["mobile/src/terminal/terminal-live-accessory-raw-send.ts"],
+      "sites": ["mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16509,7 +16529,7 @@
       "id": "terminal-viewport-refit-applied",
       "operation": "terminal.viewport-refit",
       "family": "terminal.viewport-refit",
-      "sites": ["mobile/src/terminal/terminal-viewport-refit.ts"],
+      "sites": ["mobile/src/terminal/viewport/terminal-viewport-refit.ts"],
       "schedules": [],
       "steps": [
         {
@@ -16553,7 +16573,7 @@
       "id": "terminal-viewport-refit-legacy-desktop",
       "operation": "terminal.viewport-refit",
       "family": "terminal.viewport-refit",
-      "sites": ["mobile/src/terminal/terminal-viewport-refit.ts"],
+      "sites": ["mobile/src/terminal/viewport/terminal-viewport-refit.ts"],
       "schedules": [],
       "steps": [
         {
@@ -18772,7 +18792,7 @@
       "id": "session-terminal-list-merged",
       "operation": "session.terminal-inventory",
       "family": "session.terminal-inventory",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-list.ts"],
+      "sites": ["mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts"],
       "schedules": [],
       "steps": [
         {
@@ -18811,7 +18831,7 @@
       "id": "session-terminal-list-dedupes-handles",
       "operation": "session.terminal-inventory",
       "family": "session.terminal-inventory",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-list.ts"],
+      "sites": ["mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts"],
       "schedules": [],
       "steps": [
         {
@@ -18850,7 +18870,7 @@
       "id": "session-terminal-list-refused",
       "operation": "session.terminal-inventory",
       "family": "session.terminal-inventory",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-list.ts"],
+      "sites": ["mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts"],
       "schedules": [],
       "steps": [
         {
@@ -18881,7 +18901,7 @@
       "id": "session-terminal-list-empty-guarded",
       "operation": "session.terminal-inventory",
       "family": "session.terminal-inventory",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-list.ts"],
+      "sites": ["mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts"],
       "schedules": [],
       "steps": [
         {
@@ -20218,7 +20238,7 @@
       "id": "files-explorer-legacy-fallback",
       "operation": "files.explorer-screen",
       "family": "files.explorer-screen",
-      "sites": ["mobile/src/files/MobileFileExplorerPanel.tsx"],
+      "sites": ["mobile/src/files/explorer/MobileFileExplorerPanel.tsx"],
       "schedules": [],
       "steps": [
         {
@@ -20277,7 +20297,7 @@
       "id": "files-explorer-readdir",
       "operation": "files.explorer-screen",
       "family": "files.explorer-screen",
-      "sites": ["mobile/src/files/MobileFileExplorerPanel.tsx"],
+      "sites": ["mobile/src/files/explorer/MobileFileExplorerPanel.tsx"],
       "schedules": [],
       "steps": [
         {
@@ -20449,8 +20469,8 @@
       "operation": "session.terminal-clipboard",
       "family": "session.terminal-paste",
       "sites": [
-        "mobile/src/terminal/session/use-mobile-terminal-paste.ts",
-        "mobile/src/terminal/session/use-mobile-session-accessory-selection.ts"
+        "mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts",
+        "mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts"
       ],
       "schedules": [],
       "steps": [
@@ -20515,7 +20535,7 @@
       "id": "terminal-paste-refused",
       "operation": "session.terminal-clipboard",
       "family": "session.terminal-paste",
-      "sites": ["mobile/src/terminal/session/use-mobile-terminal-paste.ts"],
+      "sites": ["mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts"],
       "schedules": [],
       "steps": [
         {
@@ -20576,7 +20596,9 @@
       "id": "terminal-worktree-connection-resolved",
       "operation": "session.terminal-clipboard",
       "family": "session.worktree-connection",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-accessory-selection.ts"],
+      "sites": [
+        "mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -20633,7 +20655,9 @@
       "id": "terminal-live-input-accepted",
       "operation": "session.terminal-input-send",
       "family": "session.terminal-input-send",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-send-actions.ts"],
+      "sites": [
+        "mobile/src/terminal/session/input-controls/use-mobile-session-terminal-send-actions.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -21382,7 +21406,7 @@
       "id": "sc-changes-loaded",
       "operation": "source-control.changes-load",
       "family": "git.changes-load",
-      "sites": ["mobile/src/source-control/use-mobile-source-control-loaders.ts"],
+      "sites": ["mobile/src/source-control/changes/use-mobile-source-control-loaders.ts"],
       "schedules": [],
       "steps": [
         {
@@ -21493,7 +21517,7 @@
       "id": "sc-changes-return-from-memory",
       "operation": "source-control.changes-load",
       "family": "git.changes-load",
-      "sites": ["mobile/src/source-control/use-mobile-source-control-loaders.ts"],
+      "sites": ["mobile/src/source-control/changes/use-mobile-source-control-loaders.ts"],
       "schedules": [],
       "steps": [
         {
@@ -21651,7 +21675,7 @@
       "id": "sc-changes-write-reads-live",
       "operation": "source-control.changes-load",
       "family": "git.changes-load",
-      "sites": ["mobile/src/source-control/use-mobile-source-control-loaders.ts"],
+      "sites": ["mobile/src/source-control/changes/use-mobile-source-control-loaders.ts"],
       "schedules": [],
       "steps": [
         {
@@ -21805,7 +21829,7 @@
       "id": "sc-history-branch-commits",
       "operation": "source-control.history-branch-commits",
       "family": "git.history-branch-commits",
-      "sites": ["mobile/src/source-control/MobileGitHistoryList.tsx"],
+      "sites": ["mobile/src/source-control/history/MobileGitHistoryList.tsx"],
       "schedules": [],
       "steps": [
         {
@@ -22387,7 +22411,7 @@
       "id": "terminal-gesture-flush-and-clear",
       "operation": "session.terminal-gesture-input",
       "family": "session.terminal-gesture-input",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-input.ts"],
+      "sites": ["mobile/src/terminal/session/input-controls/use-mobile-session-terminal-input.ts"],
       "schedules": [],
       "steps": [
         {
@@ -22741,7 +22765,9 @@
       "id": "session-create-terminal-with-prompt",
       "operation": "session.create-terminal",
       "family": "session.create-terminal",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts"],
+      "sites": [
+        "mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -22826,7 +22852,9 @@
       "id": "session-create-terminal-refused",
       "operation": "session.create-terminal",
       "family": "session.create-terminal",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts"],
+      "sites": [
+        "mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -22874,7 +22902,9 @@
       "id": "session-create-terminal-without-handle",
       "operation": "session.create-terminal",
       "family": "session.create-terminal",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts"],
+      "sites": [
+        "mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -22930,7 +22960,9 @@
       "id": "session-create-terminal-ignores-a-second-create-in-flight",
       "operation": "session.create-terminal",
       "family": "session.create-terminal",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts"],
+      "sites": [
+        "mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23002,7 +23034,9 @@
       "id": "session-terminal-display-mode-auto-take-floor",
       "operation": "session.terminal-display-mode",
       "family": "session.terminal-display-mode",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts"],
+      "sites": [
+        "mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23059,7 +23093,9 @@
       "id": "session-terminal-display-mode-to-desktop",
       "operation": "session.terminal-display-mode",
       "family": "session.terminal-display-mode",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts"],
+      "sites": [
+        "mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23109,7 +23145,9 @@
       "id": "session-terminal-display-mode-drops-second-toggle",
       "operation": "session.terminal-display-mode",
       "family": "session.terminal-display-mode",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts"],
+      "sites": [
+        "mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23179,7 +23217,9 @@
       "id": "session-terminal-display-mode-auto-without-viewport",
       "operation": "session.terminal-display-mode",
       "family": "session.terminal-display-mode",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts"],
+      "sites": [
+        "mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23228,7 +23268,9 @@
       "id": "session-terminal-display-mode-auto-without-device-token",
       "operation": "session.terminal-display-mode",
       "family": "session.terminal-display-mode",
-      "sites": ["mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts"],
+      "sites": [
+        "mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts"
+      ],
       "schedules": [],
       "steps": [
         {
@@ -23762,7 +23804,7 @@
       "id": "files-preview-worktree-text-read",
       "operation": "files.preview-load",
       "family": "files.preview-worktree-text",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
@@ -23793,7 +23835,7 @@
       "id": "files-preview-worktree-image-read",
       "operation": "files.preview-load",
       "family": "files.preview-worktree-image",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
@@ -23828,7 +23870,7 @@
       "id": "files-preview-artifact-image-read",
       "operation": "files.preview-load",
       "family": "files.preview-artifact-image",
-      "sites": ["mobile/src/files/mobile-file-preview-request.ts"],
+      "sites": ["mobile/src/files/preview/mobile-file-preview-request.ts"],
       "schedules": [],
       "steps": [
         {
diff --git a/mobile/scripts/build-terminal-document-script.mjs b/mobile/scripts/build-terminal-document-script.mjs
index db1a1c3408b..aaabcc8ec31 100644
--- a/mobile/scripts/build-terminal-document-script.mjs
+++ b/mobile/scripts/build-terminal-document-script.mjs
@@ -15,6 +15,7 @@ export const TERMINAL_DOCUMENT_SCRIPT_PATH = path.join(
   mobileRoot,
   'src',
   'terminal',
+  'document',
   'terminal-webview-document-script.generated.ts'
 )
 
diff --git a/mobile/scripts/build-terminal-webview-engine.mjs b/mobile/scripts/build-terminal-webview-engine.mjs
index 9af3db203d0..7af82d3afd4 100644
--- a/mobile/scripts/build-terminal-webview-engine.mjs
+++ b/mobile/scripts/build-terminal-webview-engine.mjs
@@ -5,17 +5,24 @@ import * as esbuild from 'esbuild'
 import {
   terminalNerdFontCss,
   terminalSymbolsFontCss
-} from '../src/terminal/terminal-font-face-css.mjs'
+} from '../src/terminal/fonts/terminal-font-face-css.mjs'
 
 const require = createRequire(import.meta.url)
 const scriptDir = import.meta.dirname
 const mobileRoot = path.resolve(scriptDir, '..')
-const outputPath = path.join(mobileRoot, 'src', 'terminal', 'terminal-webview-engine.generated.ts')
+const outputPath = path.join(
+  mobileRoot,
+  'src',
+  'terminal',
+  'document',
+  'terminal-webview-engine.generated.ts'
+)
 // Emit stylesheet separately: native WebView needs both strings; page needs CSS without pulling in ~612 KiB engine string forbidden by script-src self.
 const cssOutputPath = path.join(
   mobileRoot,
   'src',
   'terminal',
+  'document',
   'terminal-webview-engine-css.generated.ts'
 )
 const target = 'chrome74'
diff --git a/mobile/scripts/check-tests-typecheck-ratchet.test.ts b/mobile/scripts/check-tests-typecheck-ratchet.test.ts
index cb326066f34..5e48777ac3e 100644
--- a/mobile/scripts/check-tests-typecheck-ratchet.test.ts
+++ b/mobile/scripts/check-tests-typecheck-ratchet.test.ts
@@ -2,7 +2,6 @@ import { describe, expect, it, vi } from 'vitest'
 
 import { parseCompilerPass } from './check-node-tests-typecheck.mjs'
 import {
-  checkTransfers,
   hasTsNocheckDirective,
   parseFailingFiles,
   parseProgramTestFiles
@@ -17,18 +16,6 @@ vi.mock('./mobile-typecheck-compiler.mjs', () => ({
   })
 }))
 
-const transfers = [
-  'src/components/pr-sidebar/reviewer-picker.target-contract.test.tsx',
-  'src/test-support/rpc-recording/recorded-request-params.test.ts'
-]
-const cleanTransfers = () => ({
-  ok: true,
-  expected: transfers,
-  programTestFiles: transfers,
-  failures: [],
-  problems: []
-})
-
 describe('the failing-file parser', () => {
   // Normalize Windows separators or every baseline entry appears stale and added.
   it("normalises the Windows separators tsc prints to the baseline's POSIX ones", () => {
@@ -58,24 +45,11 @@ describe('the @ts-nocheck guard', () => {
   })
 })
 
-describe('checked transfers', () => {
-  it('rejects a declared checked transfer missing from the configured roots', () => {
-    expect(
-      checkTransfers(
-        { ok: true, expected: [], programTestFiles: [], failures: [], problems: [] },
-        new Map([['checked.test.ts', 'Checked transfer: strict Node program']])
-      )
-    ).toEqual(['checked transfer is absent from tsconfig.test.node.json: checked.test.ts'])
-  })
-  const allowed = new Map(transfers.map((file) => [file, 'checked transfer']))
-
-  it('never reads a failed declaration producer or final compiler as clean output', () => {
+describe('compiler pass failures', () => {
+  it('rejects nonzero exits and diagnostics returned with a zero exit', () => {
     expect(parseCompilerPass('/repo/mobile/src/a.test.ts\n', 2).ok).toBe(false)
     expect(
       parseCompilerPass('/repo/mobile/src/a.test.ts\nsrc/a.test.ts(1,1): error TS2322: x\n', 0).ok
     ).toBe(false)
-    expect(checkTransfers({ ...cleanTransfers(), ok: false }, allowed)).toEqual([
-      'the phone/host contract program did not pass'
-    ])
   })
 })
diff --git a/mobile/scripts/mock-server-git-state.ts b/mobile/scripts/mock-server-git-state.ts
index cdc2ce19e51..ed2a0c26e43 100644
--- a/mobile/scripts/mock-server-git-state.ts
+++ b/mobile/scripts/mock-server-git-state.ts
@@ -1,4 +1,4 @@
-import type { MobileGitStatusEntry } from '../src/source-control/mobile-git-status'
+import type { MobileGitStatusEntry } from '../src/source-control/git/git-status-reply-schema'
 
 type FakeGitEntry = MobileGitStatusEntry & {
   stagedFromUntracked?: boolean
diff --git a/mobile/src/agent-history/MobileAgentSessionHistoryPanel.tsx b/mobile/src/agent-history/MobileAgentSessionHistoryPanel.tsx
index 08a2d65d451..5df1a4c0f44 100644
--- a/mobile/src/agent-history/MobileAgentSessionHistoryPanel.tsx
+++ b/mobile/src/agent-history/MobileAgentSessionHistoryPanel.tsx
@@ -23,7 +23,7 @@ import {
   resumeAiVaultSessionInTerminal
 } from './ai-vault-resume-launch'
 import { prepareMobileAiVaultSessionResume } from './ai-vault-resume-preparation'
-import { triggerError, triggerSuccess } from '../platform/haptics'
+import { triggerError, triggerSuccess } from '../platform/haptics/haptics'
 import type * as AiVault from '../../../src/shared/ai-vault/contracts/ai-vault-types'
 import type { Worktree } from '../worktree/workspace-list-types'
 import { useMobileAgentHistoryState } from './use-mobile-agent-history-state'
diff --git a/mobile/src/agent-history/mobile-ai-vault-resume-operations.ts b/mobile/src/agent-history/mobile-ai-vault-resume-operations.ts
index 48e9c2ad335..1a0ece8eead 100644
--- a/mobile/src/agent-history/mobile-ai-vault-resume-operations.ts
+++ b/mobile/src/agent-history/mobile-ai-vault-resume-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import '../files/mobile-file-preview-operations'
+import '../files/preview/mobile-file-preview-operations'
 import { aiVaultResumePreparationSchema } from './mobile-ai-vault-resume-reply-schema'
 import '../browser/tab-navigation/mobile-session-browser-reply-schema'
 import '../files/session-documents/mobile-file-tap-reply-schema'
diff --git a/mobile/src/agents/MobileAgentListRows.tsx b/mobile/src/agents/MobileAgentListRows.tsx
index b564b7d4bdf..d165828181a 100644
--- a/mobile/src/agents/MobileAgentListRows.tsx
+++ b/mobile/src/agents/MobileAgentListRows.tsx
@@ -8,7 +8,7 @@ import { MobileAgentIcon } from '../components/MobileAgentIcon'
 import { SwipeRowActions } from '../components/SwipeRowActions'
 import { HOME_ROW_TEXT_INSET, homeListStyles } from '../home/home-list-styles'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { triggerMediumImpact } from '../platform/haptics'
+import { triggerMediumImpact } from '../platform/haptics/haptics'
 import { colors, spacing } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/agents/use-agent-list-row-actions.tsx b/mobile/src/agents/use-agent-list-row-actions.tsx
index 837183789c8..c68b2a3091b 100644
--- a/mobile/src/agents/use-agent-list-row-actions.tsx
+++ b/mobile/src/agents/use-agent-list-row-actions.tsx
@@ -4,7 +4,7 @@ import { Alert } from 'react-native'
 import { ActionSheetModal, type ActionSheetAction } from '../components/ActionSheetModal'
 import { TransientToast, useTransientToast } from '../components/TransientToast'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useClipboardWriter } from '../platform/clipboard'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import { useOpenMobileSession } from '../session/use-open-mobile-session'
 import type { HostProfile } from '../host-catalog/host-profile'
 import type { AgentActivityChange, AgentListRow } from './agent-list-rows'
diff --git a/mobile/src/automations/AutomationManager.test.tsx b/mobile/src/automations/AutomationManager.test.tsx
index e6e791d747a..96041599786 100644
--- a/mobile/src/automations/AutomationManager.test.tsx
+++ b/mobile/src/automations/AutomationManager.test.tsx
@@ -19,8 +19,8 @@ vi.mock('react-native', () => ({
   AppState: { currentState: 'active', addEventListener: () => ({ remove: () => {} }) }
 }))
 vi.mock(
-  '../platform/text-input-font-size',
-  async () => await import('../platform/text-input-font-size.web')
+  '../platform/text-input/text-input-font-size',
+  async () => await import('../platform/text-input/text-input-font-size.web')
 )
 vi.mock('lucide-react-native', () => ({
   Check: 'Check',
diff --git a/mobile/src/automations/automation-draft.test.ts b/mobile/src/automations/automation-draft.test.ts
index 37b234209a1..6ca7bcb6d26 100644
--- a/mobile/src/automations/automation-draft.test.ts
+++ b/mobile/src/automations/automation-draft.test.ts
@@ -1,8 +1,6 @@
 import { loadAutomationTargets, workspaceMatchesSetup } from './automation-target-inventory'
 import { describe, expect, it } from 'vitest'
 
-import { AutomationUpdate } from '../../../src/shared/rpc-contract/automation-params'
-
 import { automationUpdateParams, newAutomationDraft } from './automation-draft'
 import { automationClient, automationTargets, savedAutomation } from './automation-test-fixtures'
 
@@ -61,17 +59,8 @@ describe('mobile automation host contracts', () => {
       original,
       automationTargets()
     )
-    expect(AutomationUpdate.parse(params)).toMatchObject({
-      id: saved.id,
-      updates: { name: 'Renamed' }
-    })
+
     expect(params.updates).toEqual({ name: 'Renamed' })
     expect(params.destination).toBeUndefined()
-    expect(original).toMatchObject({
-      agentId: 'codex',
-      rrule: saved.rrule,
-      grace: '0',
-      reuseSession: true
-    })
   })
 })
diff --git a/mobile/src/automations/automation-styles.ts b/mobile/src/automations/automation-styles.ts
index c0fe4ca4c72..b22efc32dba 100644
--- a/mobile/src/automations/automation-styles.ts
+++ b/mobile/src/automations/automation-styles.ts
@@ -1,5 +1,5 @@
 import { themedStyleSheet } from '../theme/themed-styles'
-import { TEXT_INPUT_FONT_SIZE } from '../platform/text-input-font-size'
+import { TEXT_INPUT_FONT_SIZE } from '../platform/text-input/text-input-font-size'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 
 export const automationStyles = themedStyleSheet(() => ({
diff --git a/mobile/src/automations/use-automation-catalog.test.tsx b/mobile/src/automations/use-automation-catalog.test.tsx
index 8a0eba7c1c0..4015010deeb 100644
--- a/mobile/src/automations/use-automation-catalog.test.tsx
+++ b/mobile/src/automations/use-automation-catalog.test.tsx
@@ -52,20 +52,6 @@ function catalogHarness(respond: () => unknown) {
 }
 
 describe('automation catalog', () => {
-  it('shows the last list at once when the screen reopens, then the host’s newer one', async () => {
-    let reply: ReturnType<typeof deferred<unknown>> | null = null
-    const { read, mount } = catalogHarness(() => reply?.promise ?? listReply('Box review'))
-    await mount()
-    expect(read().rows.map((row) => row.automation.name)).toEqual(['Local review', 'Box review'])
-    act(() => tree?.unmount())
-    reply = deferred<unknown>()
-    await mount()
-    expect(read().loaded).toBe(true)
-    expect(read().rows.map((row) => row.automation.name)).toEqual(['Local review', 'Box review'])
-    await act(async () => reply?.resolve(listReply('Box nightly')))
-    expect(read().rows.map((row) => row.automation.name)).toEqual(['Local review', 'Box nightly'])
-  })
-
   it('keeps a saved change when a list read sent before the write lands after it', async () => {
     let held: ReturnType<typeof deferred<unknown>> | null = null
     let remoteName = 'Box review'
diff --git a/mobile/src/browser/page-interaction/browser-touch-geometry.test.ts b/mobile/src/browser/page-interaction/browser-touch-geometry.test.ts
index 465faf04826..fb0d15f46f3 100644
--- a/mobile/src/browser/page-interaction/browser-touch-geometry.test.ts
+++ b/mobile/src/browser/page-interaction/browser-touch-geometry.test.ts
@@ -40,7 +40,5 @@ describe('browser touch geometry', () => {
 
     expect(delta.dy).toBe(-244)
     expect(delta.dx).toBe(0)
-    // What it sent before: the screen delta itself, 41% of the scroll asked for.
-    expect(delta.dy).not.toBe(-100)
   })
 })
diff --git a/mobile/src/browser/pane-view/MobileBrowserLoadProgress.tsx b/mobile/src/browser/pane-view/MobileBrowserLoadProgress.tsx
index 5778fb34f4a..dfc72782d5b 100644
--- a/mobile/src/browser/pane-view/MobileBrowserLoadProgress.tsx
+++ b/mobile/src/browser/pane-view/MobileBrowserLoadProgress.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react'
 import { Animated, Easing, Platform, StyleSheet, View } from 'react-native'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, radii } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/browser/pane-view/mobile-browser-pane-styles.ts b/mobile/src/browser/pane-view/mobile-browser-pane-styles.ts
index b3a89bfa3d5..1ac21044623 100644
--- a/mobile/src/browser/pane-view/mobile-browser-pane-styles.ts
+++ b/mobile/src/browser/pane-view/mobile-browser-pane-styles.ts
@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native'
-import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input-font-size'
+import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input/text-input-font-size'
 import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 
diff --git a/mobile/src/browser/tab-navigation/mobile-session-browser-operations.ts b/mobile/src/browser/tab-navigation/mobile-session-browser-operations.ts
index 561f607ff2b..956dc42f809 100644
--- a/mobile/src/browser/tab-navigation/mobile-session-browser-operations.ts
+++ b/mobile/src/browser/tab-navigation/mobile-session-browser-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../../files/mobile-file-preview-operations'
+import '../../files/preview/mobile-file-preview-operations'
 import { browserTabCreatedSchema } from './mobile-session-browser-reply-schema'
 import '../../agent-history/mobile-ai-vault-resume-reply-schema'
 import '../../files/session-documents/mobile-file-tap-reply-schema'
diff --git a/mobile/src/components/AgentLaunchNotice.tsx b/mobile/src/components/AgentLaunchNotice.tsx
index 724defd8c81..3a384e372a3 100644
--- a/mobile/src/components/AgentLaunchNotice.tsx
+++ b/mobile/src/components/AgentLaunchNotice.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { Pressable, Text, View, type StyleProp, type TextStyle } from 'react-native'
-import { useClipboardWriter } from '../platform/clipboard'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type { MobileAgentLaunchAvailability } from '../session/agent-launch/mobile-agent-launch-availability'
 import {
diff --git a/mobile/src/components/AgentSpinner.tsx b/mobile/src/components/AgentSpinner.tsx
index d22e6b37e07..522f6d750ad 100644
--- a/mobile/src/components/AgentSpinner.tsx
+++ b/mobile/src/components/AgentSpinner.tsx
@@ -7,7 +7,7 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { colors, radii } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { ArrivalFade } from './ArrivalFade'
 import { WorkingRing } from './AgentStateDot'
 
diff --git a/mobile/src/components/AgentStateDot.tsx b/mobile/src/components/AgentStateDot.tsx
index bfa48b0a068..e1695e3a437 100644
--- a/mobile/src/components/AgentStateDot.tsx
+++ b/mobile/src/components/AgentStateDot.tsx
@@ -5,7 +5,7 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { colors, radii } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { useWorkingRingRotation } from './use-working-motion'
 
 // Match desktop per-agent vocabulary: working yellow spinner, done emerald, attention red, interrupted muted, unconfirmed amber, idle neutral.
diff --git a/mobile/src/components/AnchoredDetailCard.tsx b/mobile/src/components/AnchoredDetailCard.tsx
index 40dc2a1ca56..0077107d073 100644
--- a/mobile/src/components/AnchoredDetailCard.tsx
+++ b/mobile/src/components/AnchoredDetailCard.tsx
@@ -3,7 +3,7 @@ import { Animated, ScrollView, StyleSheet, Text, View, type HostInstance } from
 import { DetailCardFocusBoundary, DetailCardLayer } from './detail-card-host'
 import type { AnchoredDetailCardState } from './use-anchored-detail-card'
 import { useDetailCardMotion } from './use-detail-card-motion'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/AutoHeight.tsx b/mobile/src/components/AutoHeight.tsx
index a9715c27a8b..69163e6f54d 100644
--- a/mobile/src/components/AutoHeight.tsx
+++ b/mobile/src/components/AutoHeight.tsx
@@ -7,7 +7,7 @@ import Animated, {
   withTiming,
   type SharedValue
 } from 'react-native-reanimated'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import {
   BOTTOM_DRAWER_EASING,
   BOTTOM_DRAWER_HEIGHT_DURATION_MS
diff --git a/mobile/src/components/CustomKeyModal.tsx b/mobile/src/components/CustomKeyModal.tsx
index 42afc17fd3c..fe3539f1ec5 100644
--- a/mobile/src/components/CustomKeyModal.tsx
+++ b/mobile/src/components/CustomKeyModal.tsx
@@ -8,12 +8,12 @@ import { TextField } from './composer-input/TextField'
 import {
   buildTerminalShortcutKey,
   normalizeShortcutKeyInput,
-  TERMINAL_SHORTCUT_SPECIAL_KEYS,
   type TerminalShortcutModifier,
   type TerminalShortcutSpecialKey
-} from '../terminal/terminal-accessory-keys'
+} from '../terminal/key-input/terminal-accessory-keys'
+import { TERMINAL_SHORTCUT_SPECIAL_KEY_DEFINITIONS as TERMINAL_SHORTCUT_SPECIAL_KEYS } from '../terminal/key-input/terminal-key-definitions'
 import { customKeyModalStyles as styles } from './CustomKeyModal.styles'
-import { updateStoredCustomKeys, type CustomKey } from '../terminal/terminal-custom-keys'
+import { updateStoredCustomKeys, type CustomKey } from '../terminal/key-input/terminal-custom-keys'
 import type { Translate } from '../i18n/mobile-i18n'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { MobileSwitch } from './MobileSwitch'
diff --git a/mobile/src/components/DisclosureChevron.tsx b/mobile/src/components/DisclosureChevron.tsx
index c7f7ec1167c..6412f0568c5 100644
--- a/mobile/src/components/DisclosureChevron.tsx
+++ b/mobile/src/components/DisclosureChevron.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef, type ReactNode } from 'react'
 import { Animated, Easing, Platform } from 'react-native'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { SHEET_CURVE, SHEET_HEIGHT_DURATION_MS } from './sheet-motion-values'
 
 /** Turns its chevron with the AutoHeight it discloses: same curve, same duration. */
diff --git a/mobile/src/components/DragReorderList.test.tsx b/mobile/src/components/DragReorderList.test.tsx
index e70e5fecf88..5ae07344ac6 100644
--- a/mobile/src/components/DragReorderList.test.tsx
+++ b/mobile/src/components/DragReorderList.test.tsx
@@ -18,19 +18,7 @@ describe('drag completion and cancellation', () => {
     await act(async () => fixture.root.unmount())
   })
 
-  it('does not write after a failed activation or an unchanged drop', async () => {
-    const fixture = await mounted()
-    await act(async () => {
-      fixture.gesture.finalize!({ absoluteY: 100, translationY: 0 }, false)
-      fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true)
-      fixture.gesture.finalize!({ absoluteY: 100, translationY: 0 }, true)
-    })
-    expect(fixture.onReorder).not.toHaveBeenCalled()
-    await act(async () => fixture.root.unmount())
-  })
-
   it.each([
-    { ids: ['a', 'fixed'], distance: 80, expected: { a: 0, fixed: 1 }, changed: false },
     { ids: ['a', 'fixed', 'b'], distance: 80, expected: { a: 0, fixed: 1, b: 2 }, changed: false },
     { ids: ['a', 'fixed', 'b'], distance: 160, expected: { b: 0, fixed: 1, a: 2 }, changed: true }
   ])('settles a drag across excluded slots at $distance with $ids', async (test) => {
@@ -90,22 +78,6 @@ describe('catalog changes during a drag', () => {
     await act(async () => fixture.root.unmount())
   })
 
-  it.each([{ ids: ['a', 'b', 'c'] }, { ids: ['b', 'a'] }])(
-    'does not commit a stale drag after the catalog becomes $ids',
-    async ({ ids }) => {
-      const fixture = await mounted()
-      await act(async () => {
-        fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true)
-        fixture.gesture.update!({ absoluteY: 180, translationY: 80 }, true)
-      })
-      await fixture.updateItems(ids)
-      await act(async () => fixture.gesture.finalize!({ absoluteY: 180, translationY: 80 }, true))
-      expect(fixture.onReorder).not.toHaveBeenCalled()
-      expect(fixture.onActive.mock.calls).toEqual([[true], [false]])
-      await act(async () => fixture.root.unmount())
-    }
-  )
-
   it('releases its owner when unmounted while a row is held', async () => {
     const fixture = await mounted()
     await act(async () => fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true))
@@ -135,34 +107,24 @@ describe('catalog changes during a drag', () => {
 })
 
 describe('late gesture callbacks', () => {
-  it('ignores movement delivered after the row catalog changes', async () => {
-    const fixture = await mounted()
-    await act(async () => fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true))
-    await fixture.updateItems(['a', 'b', 'c'])
-    await act(async () => fixture.gesture.update!({ absoluteY: 180, translationY: 80 }, true))
-    expect(positions()).toEqual({ a: 0, b: 1, c: 2 })
-    expect(fixture.onReorder).not.toHaveBeenCalled()
-    await act(async () => fixture.root.unmount())
-  })
-
-  it.each([
-    ['a', 'b', 'c'],
-    ['b', 'a']
-  ])('does not save a completed drop queued before catalog %j replaces it', async (...ids) => {
-    const fixture = await mounted()
-    await act(async () => {
-      fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true)
-      fixture.gesture.update!({ absoluteY: 180, translationY: 80 }, true)
-      probe.deferJS = true
-      fixture.gesture.finalize!({ absoluteY: 180, translationY: 80 }, true)
-    })
-    await fixture.updateItems(ids)
-    await act(async () => {
-      probe.jsQueue.splice(0).forEach((fn) => fn())
-    })
-    expect(fixture.onReorder).not.toHaveBeenCalled()
-    await act(async () => fixture.root.unmount())
-  })
+  it.each([['a', 'b', 'c']])(
+    'does not save a completed drop queued before catalog %j replaces it',
+    async (...ids) => {
+      const fixture = await mounted()
+      await act(async () => {
+        fixture.gesture.start!({ absoluteY: 100, translationY: 0 }, true)
+        fixture.gesture.update!({ absoluteY: 180, translationY: 80 }, true)
+        probe.deferJS = true
+        fixture.gesture.finalize!({ absoluteY: 180, translationY: 80 }, true)
+      })
+      await fixture.updateItems(ids)
+      await act(async () => {
+        probe.jsQueue.splice(0).forEach((fn) => fn())
+      })
+      expect(fixture.onReorder).not.toHaveBeenCalled()
+      await act(async () => fixture.root.unmount())
+    }
+  )
 
   it('does not revive a queued drop when the original row order returns', async () => {
     const fixture = await mounted()
diff --git a/mobile/src/components/DragReorderList.tsx b/mobile/src/components/DragReorderList.tsx
index 25800381080..0c7e55e37f3 100644
--- a/mobile/src/components/DragReorderList.tsx
+++ b/mobile/src/components/DragReorderList.tsx
@@ -21,7 +21,7 @@ import {
   type AnimatedRef,
   type SharedValue
 } from 'react-native-reanimated'
-import { triggerSelection } from '../platform/haptics'
+import { triggerSelection } from '../platform/haptics/haptics'
 import {
   dragReorderTarget,
   dragReorderLayout,
diff --git a/mobile/src/components/DragReorderRow.tsx b/mobile/src/components/DragReorderRow.tsx
index 3b574b907b4..33e3f66af8c 100644
--- a/mobile/src/components/DragReorderRow.tsx
+++ b/mobile/src/components/DragReorderRow.tsx
@@ -18,7 +18,7 @@ import { colors, spacing } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { triggerMediumImpact } from '../platform/haptics'
+import { triggerMediumImpact } from '../platform/haptics/haptics'
 import {
   type DragReorderLayout,
   orderedKeysFromDragReorderPositions,
diff --git a/mobile/src/components/LoadingSpinner.tsx b/mobile/src/components/LoadingSpinner.tsx
index 5b2cd44e925..627c9021d36 100644
--- a/mobile/src/components/LoadingSpinner.tsx
+++ b/mobile/src/components/LoadingSpinner.tsx
@@ -1,6 +1,6 @@
 import { Animated } from 'react-native'
 import { Hourglass, LoaderCircle } from 'lucide-react-native'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { useWorkingRingRotation } from './use-working-motion'
 
 // Match desktop one-second spinner; reduced motion uses distinct working icon so frozen circle does not look stuck.
diff --git a/mobile/src/components/MobileDictationSetupSheet.tsx b/mobile/src/components/MobileDictationSetupSheet.tsx
index c8430fd68dd..093cfd28ee4 100644
--- a/mobile/src/components/MobileDictationSetupSheet.tsx
+++ b/mobile/src/components/MobileDictationSetupSheet.tsx
@@ -10,7 +10,7 @@ import type { Translate } from '../i18n/mobile-i18n'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { getUiIntlLocale } from '../i18n/ui-intl-locale'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../platform/haptics'
+import { triggerError, triggerSuccess } from '../platform/haptics/haptics'
 import { useDictationSetupPoller } from '../dictation/use-dictation-setup-poller'
 import {
   cloudModelNeedsKey,
diff --git a/mobile/src/components/MobileDiffReviewFilesSheet.tsx b/mobile/src/components/MobileDiffReviewFilesSheet.tsx
index 412896f5078..b1029d3c2bf 100644
--- a/mobile/src/components/MobileDiffReviewFilesSheet.tsx
+++ b/mobile/src/components/MobileDiffReviewFilesSheet.tsx
@@ -10,7 +10,7 @@ import {
 import { STATUS_LABELS } from '../../../src/shared/git/status/git-status-labels'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type { MobileDiffReviewQueueItem } from '../source-control/review/mobile-diff-review-queue'
-import { statusColor } from '../source-control/mobile-git-status'
+import { statusColor } from '../source-control/changes/mobile-git-status'
 import { colors, pressedStyle, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/MobileDiffReviewLine.tsx b/mobile/src/components/MobileDiffReviewLine.tsx
index 27cbb73605a..b28d790c935 100644
--- a/mobile/src/components/MobileDiffReviewLine.tsx
+++ b/mobile/src/components/MobileDiffReviewLine.tsx
@@ -6,7 +6,10 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
 import type { MobileDiffLine } from '../source-control/review/mobile-diff-lines'
 import type { MobileHighlightedDiffLine } from '../files/session-documents/mobile-file-syntax'
-import { mobileDiffLineNumber, mobileDiffLinePrefix } from '../source-control/mobile-diff-format'
+import {
+  mobileDiffLineNumber,
+  mobileDiffLinePrefix
+} from '../source-control/review/mobile-diff-format'
 import { colors, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/MobileDiffReviewLines.tsx b/mobile/src/components/MobileDiffReviewLines.tsx
index 5ca8863e086..cc05b94b99a 100644
--- a/mobile/src/components/MobileDiffReviewLines.tsx
+++ b/mobile/src/components/MobileDiffReviewLines.tsx
@@ -31,7 +31,7 @@ import type { MobileDiffReviewThread } from '../source-control/review/mobile-dif
 import type { PRCommentCardActions } from './pr-sidebar/PRCommentCard'
 import { CommentGroupView } from './pr-sidebar/PRCommentsSection'
 import { useNow } from '../hooks/use-now'
-import { triggerSelection } from '../platform/haptics'
+import { triggerSelection } from '../platform/haptics/haptics'
 
 const NO_OPENED_LINES: ReadonlySet<number> = new Set()
 
diff --git a/mobile/src/components/MobileMarkdown.test.ts b/mobile/src/components/MobileMarkdown.test.ts
index 1eade1f67f5..7e4ed7fbf7e 100644
--- a/mobile/src/components/MobileMarkdown.test.ts
+++ b/mobile/src/components/MobileMarkdown.test.ts
@@ -33,9 +33,6 @@ describe('normalizeMobileMarkdownPreviewHtml', () => {
     expect(normalizeMobileMarkdownPreviewHtml('```html\n<div>x</div>\n```')).toBe(
       '```html\n<div>x</div>\n```'
     )
-    expect(normalizeMobileMarkdownPreviewHtml('```ts\nconst x: Array<string> = []\n```')).toBe(
-      '```ts\nconst x: Array<string> = []\n```'
-    )
     expect(normalizeMobileMarkdownPreviewHtml('```ts\nconst x: Array<string> = []')).toBe(
       '```ts\nconst x: Array<string> = []'
     )
@@ -49,12 +46,6 @@ describe('normalizeMobileMarkdownPreviewHtml', () => {
     expect(normalizeMobileMarkdownPreviewHtml('Array<string> in prose')).toBe(
       'Array<string> in prose'
     )
-    expect(normalizeMobileMarkdownPreviewHtml('Promise<Result> in prose')).toBe(
-      'Promise<Result> in prose'
-    )
-    expect(normalizeMobileMarkdownPreviewHtml('Promise<Array<string>> in prose')).toBe(
-      'Promise<Array<string>> in prose'
-    )
     expect(normalizeMobileMarkdownPreviewHtml('Map<string, Array<number>> in prose')).toBe(
       'Map<string, Array<number>> in prose'
     )
@@ -73,13 +64,6 @@ describe('normalizeMobileMarkdownPreviewHtml', () => {
     expect(normalizeMobileMarkdownPreviewHtml('<mailto:orca@example.com>')).toBe(
       '<mailto:orca@example.com>'
     )
-    expect(normalizeMobileMarkdownPreviewHtml('<ftp://example.com/file>')).toBe(
-      '<ftp://example.com/file>'
-    )
-    expect(normalizeMobileMarkdownPreviewHtml('<tel:+15551234567>')).toBe('<tel:+15551234567>')
-    expect(normalizeMobileMarkdownPreviewHtml('<https://example.com>')).toBe(
-      '<https://example.com>'
-    )
     expect(
       normalizeMobileMarkdownPreviewHtml(
         "<https://en.wikipedia.org/wiki/O'Brien> <svg>hidden</svg>"
@@ -96,11 +80,6 @@ describe('normalizeMobileMarkdownPreviewHtml', () => {
     expect(
       normalizeMobileMarkdownPreviewHtml('<span title="</string>"></span> Array<string> now')
     ).toBe('Array<string> now')
-    expect(
-      normalizeMobileMarkdownPreviewHtml(
-        '<span title=</your-api-key>></span> Replace <your-api-key> now'
-      )
-    ).toBe('Replace <your-api-key> now')
     expect(
       normalizeMobileMarkdownPreviewHtml('<span title=</string>></span> Array<string> now')
     ).toBe('Array<string> now')
@@ -139,30 +118,14 @@ describe('normalizeMobileMarkdownPreviewHtml', () => {
       'Logo done'
     )
     expect(normalizeMobileMarkdownPreviewHtml('Logo<svg=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<SVG=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<path=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<p=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<strong=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<math=invalid>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<foo=invalid>Hi')).toBe('LogoHi')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<my-widget=invalid>Hi')).toBe('LogoHi')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<my-widget disabled>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('<svg=invalid><path/>')).toBe('')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<my-widget=invalid>Hi</my-widget> done')).toBe(
-      'LogoHi done'
-    )
     expect(normalizeMobileMarkdownPreviewHtml('<SVG><PATH/></SVG>')).toBe('')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<svg>Hi<path>there')).toBe('LogoHithere')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<p>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<B>Hi')).toBe('LogoHi')
-    expect(normalizeMobileMarkdownPreviewHtml('Logo<strong>Hi')).toBe('LogoHi')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<center>Hi <font>there <marquee>now')).toBe(
       'LogoHi there now'
     )
-    expect(normalizeMobileMarkdownPreviewHtml('<center>Title</center>')).toBe('Title')
     expect(normalizeMobileMarkdownPreviewHtml('<my-widget>Hi</my-widget>')).toBe('Hi')
-    expect(normalizeMobileMarkdownPreviewHtml('<my:widget>')).toBe('')
-    expect(normalizeMobileMarkdownPreviewHtml('<svg:path>')).toBe('')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<foo>Hi</foo> done')).toBe('LogoHi done')
     expect(normalizeMobileMarkdownPreviewHtml('</1>Logo<svg>Hi</svg> done')).toBe('</1>LogoHi done')
     expect(normalizeMobileMarkdownPreviewHtml('Logo<svg>Hi</svg   > done')).toBe('LogoHi done')
diff --git a/mobile/src/components/MobileRichMarkdownEditor.tsx b/mobile/src/components/MobileRichMarkdownEditor.tsx
index aa6e6974618..92faf56543e 100644
--- a/mobile/src/components/MobileRichMarkdownEditor.tsx
+++ b/mobile/src/components/MobileRichMarkdownEditor.tsx
@@ -15,7 +15,7 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { colors } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 import { MobileRichMarkdownToolbar } from './MobileRichMarkdownToolbar'
 import { TextInputModal } from './TextInputModal'
 import {
diff --git a/mobile/src/components/MobileSegmentedControl.tsx b/mobile/src/components/MobileSegmentedControl.tsx
index 9cbb252b529..42ac6119efe 100644
--- a/mobile/src/components/MobileSegmentedControl.tsx
+++ b/mobile/src/components/MobileSegmentedControl.tsx
@@ -8,7 +8,7 @@ import {
   type StyleProp,
   type ViewStyle
 } from 'react-native'
-import { triggerSelection } from '../platform/haptics'
+import { triggerSelection } from '../platform/haptics/haptics'
 import { resolveTabStripScrollOffset } from '../session/tabs/tab-strip-scroll'
 import { colors, concentricRadius, feedback, radii, spacing } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
diff --git a/mobile/src/components/MobileSourceCopyButton.tsx b/mobile/src/components/MobileSourceCopyButton.tsx
index 042ed6051d9..931f13a2ed2 100644
--- a/mobile/src/components/MobileSourceCopyButton.tsx
+++ b/mobile/src/components/MobileSourceCopyButton.tsx
@@ -3,7 +3,7 @@ import { Alert, Platform, Pressable, Text } from 'react-native'
 import { Check, Copy } from 'lucide-react-native'
 import { translate } from '../i18n/mobile-i18n'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useClipboardWriter } from '../platform/clipboard'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/MobileSwitch.tsx b/mobile/src/components/MobileSwitch.tsx
index 21de22f696c..1e407660f8b 100644
--- a/mobile/src/components/MobileSwitch.tsx
+++ b/mobile/src/components/MobileSwitch.tsx
@@ -10,8 +10,8 @@ import Animated, {
 import { colors, feedback, radii } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { triggerSelection } from '../platform/haptics'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { triggerSelection } from '../platform/haptics/haptics'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { BOTTOM_DRAWER_EASING } from './bottom-drawer/bottom-drawer-constants'
 
 export type MobileSwitchProps = {
diff --git a/mobile/src/components/ProtocolBlockScreen.test.ts b/mobile/src/components/ProtocolBlockScreen.test.ts
index 3b79cc9543e..f1b68f1935d 100644
--- a/mobile/src/components/ProtocolBlockScreen.test.ts
+++ b/mobile/src/components/ProtocolBlockScreen.test.ts
@@ -38,12 +38,11 @@ const RELEASES_URL = 'https://github.com/stablyai/orca/releases'
 
 let renderer: ReactTestRenderer | null = null
 
-function render(verdict: BlockedVerdict, mobileUpdate: KnownAppUpdate | null = null): string {
+function render(verdict: BlockedVerdict, mobileUpdate: KnownAppUpdate | null = null): void {
   wallUpdate.current = mobileUpdate
   act(() => {
     renderer = create(createElement(ProtocolBlockScreen, { verdict }))
   })
-  return JSON.stringify(renderer?.toJSON())
 }
 
 /** The mocked host components are plain strings, which `ElementType` does not admit. */
@@ -72,33 +71,22 @@ describe('ProtocolBlockScreen', () => {
     renderer = null
   })
 
-  it('tells a host without a bundle, or without this screen, the desktop is too old', () => {
-    for (const reason of ['bundle-unavailable', 'page-route-unlisted'] as const) {
-      const output = render({ kind: 'blocked', reason })
-      expect(output).toContain('Update Orca on your computer')
-      expect(output).toContain(
-        'This paired desktop app is too old for your current Orca Mobile app. Update Orca on your computer, then try this host again.'
-      )
-      expect(output).not.toContain('does not include the mobile workspace')
-      expect(primaryActionUrl()).toBe(RELEASES_URL)
-    }
+  it('sends a host without a bundle to the desktop release', () => {
+    render({ kind: 'blocked', reason: 'bundle-unavailable' })
+    expect(primaryActionUrl()).toBe(RELEASES_URL)
   })
 
   it('sends an unknown manifest schema to the mobile update', () => {
-    const output = render({
+    render({
       kind: 'blocked',
       reason: 'bundle-shell-too-old',
       schemaVersion: 2
     })
-    expect(output).toContain('Update Orca Mobile')
-    expect(output).toContain(
-      "This desktop's mobile workspace needs a newer Orca Mobile app. Update Orca Mobile from the App Store, then try this host again."
-    )
     expect(primaryActionUrl()).toBe('itms-apps://apps.apple.com/app/orca-ide/id6766130217')
   })
 
   it('offers no download for a cached bundle the host outgrew, because none would clear it', () => {
-    const output = render({
+    render({
       kind: 'blocked',
       reason: 'bundle-incompatible',
       side: 'mobile',
@@ -106,32 +94,18 @@ describe('ProtocolBlockScreen', () => {
       requiredBundleRuntimeProtocolVersion: 4
     })
 
-    expect(output).toContain('Refresh the mobile workspace')
-    expect(output).toContain(
-      'The workspace cached for this host is older than the desktop expects. Reconnect to this host to download the current one.'
-    )
-    // A store update cannot replace a stale cache, so neither store link is offered.
-    expect(output).not.toContain('Open App Store')
-    expect(output).not.toContain('Open GitHub Releases')
-    expect(output).not.toContain('Update Orca')
     // Back to hosts is the only button left, and it is not a download.
     expect(pressableCount()).toBe(1)
-    expect(output).toContain('Back to hosts')
-    // Nothing was "already updated" here; the note keeps only the pairing fallback.
-    expect(output).not.toContain('Already updated?')
-    expect(output).toContain('If this message stays, remove this host and pair it again.')
   })
 
   it('sends a host older than its own bundle to the desktop update', () => {
-    const output = render({
+    render({
       kind: 'blocked',
       reason: 'bundle-incompatible',
       side: 'desktop',
       hostProtocolVersion: 1,
       requiredHostProtocolVersion: 2
     })
-    expect(output).toContain('Update Orca on your computer')
-    expect(output).toContain('This paired desktop app is too old for your current Orca Mobile app')
     expect(primaryActionUrl()).toBe(RELEASES_URL)
   })
 
@@ -141,36 +115,27 @@ describe('ProtocolBlockScreen', () => {
       url: 'https://github.com/stablyai/orca/releases/tag/mobile-v0.0.52'
     }
 
-    it.each(['android'] as const)('opens that exact release on %s', (os) => {
-      nativeTestState.platform.OS = os
-      const output = render(
-        { kind: 'blocked', reason: 'bundle-shell-too-old', schemaVersion: 2 },
-        release
-      )
-      expect(output).toContain('Get Orca 0.0.52')
-      expect(output).not.toContain('Open App Store')
-      expect(output).not.toContain('Open GitHub Releases')
+    it('opens the known Android release', () => {
+      nativeTestState.platform.OS = 'android'
+      render({ kind: 'blocked', reason: 'bundle-shell-too-old', schemaVersion: 2 }, release)
       expect(primaryActionUrl()).toBe(release.url)
     })
 
     it('leaves the desktop wall on the desktop releases', () => {
-      const output = render({ kind: 'blocked', reason: 'bundle-unavailable' }, release)
-      expect(output).not.toContain('Get Orca')
+      render({ kind: 'blocked', reason: 'bundle-unavailable' }, release)
       expect(primaryActionUrl()).toBe(RELEASES_URL)
     })
   })
 
   it.each([
-    ['ios', 'Open App Store', 'itms-apps://apps.apple.com/app/orca-ide/id6766130217'],
-    ['android', 'Open GitHub Releases', RELEASES_URL]
-  ] as const)('keeps the %s store link when no release is known', (os, label, url) => {
+    ['ios', 'itms-apps://apps.apple.com/app/orca-ide/id6766130217'],
+    ['android', RELEASES_URL]
+  ] as const)('keeps the %s store link when no release is known', (os, url) => {
     nativeTestState.platform.OS = os
-    const output = render(
+    render(
       { kind: 'blocked', reason: 'mobile-too-old', desktopVersion: 5, requiredMobileVersion: 9 },
       null
     )
-    expect(output).toContain(label)
-    expect(output).not.toContain('Get Orca')
     expect(primaryActionUrl()).toBe(url)
   })
 })
diff --git a/mobile/src/components/ProtocolBlockScreen.tsx b/mobile/src/components/ProtocolBlockScreen.tsx
index c6df85658b8..34c83fec1a3 100644
--- a/mobile/src/components/ProtocolBlockScreen.tsx
+++ b/mobile/src/components/ProtocolBlockScreen.tsx
@@ -1,5 +1,5 @@
 import { useWallAppUpdate } from '../app-update/use-wall-app-update'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 import { useRouteHandoff } from '../navigation/route-handoff'
 import { Platform, Pressable, Text, View } from 'react-native'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
diff --git a/mobile/src/components/SmartWorkspaceSourceRow.test.tsx b/mobile/src/components/SmartWorkspaceSourceRow.test.tsx
deleted file mode 100644
index c3f37566639..00000000000
--- a/mobile/src/components/SmartWorkspaceSourceRow.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { createElement } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, expect, it, vi } from 'vitest'
-import { SmartWorkspaceSourceRow } from './SmartWorkspaceSourceRow'
-
-vi.mock('react-native', () => ({ Text: 'Text', View: 'View' }))
-vi.mock('lucide-react-native', () => ({ GitBranch: 'Icon', Sparkles: 'Icon' }))
-vi.mock('../theme/mobile-theme', () => ({ colors: {}, radii: {}, spacing: {} }))
-vi.mock('../theme/themed-styles', () => ({ themedStyleSheet: (make: () => unknown) => make() }))
-vi.mock('../theme/use-mobile-color-scheme', () => ({ useMobileColorScheme: () => 'dark' }))
-vi.mock('../i18n/use-mobile-translation', () => ({
-  useMobileTranslation: () => (_key: string, fallback: string) => fallback
-}))
-vi.mock('./TaskProviderLogo', () => ({ TaskProviderLogo: () => null }))
-vi.mock('./list/ListGroup', () => ({ ListRow: 'ListRow' }))
-let renderer: ReactTestRenderer
-
-afterEach(() => {
-  act(() => renderer?.unmount())
-})
-
-it('renders a natural remote label without a namespace subtitle and keeps collision qualification', async () => {
-  const onPress = vi.fn()
-  const row = {
-    kind: 'branch' as const,
-    value: 'branch-refs/remotes/origin/topic',
-    refName: 'refs/remotes/origin/topic',
-    localBranchName: 'topic'
-  }
-  await act(async () => {
-    renderer = create(createElement(SmartWorkspaceSourceRow, { row, onPress }))
-  })
-  expect(renderer.toJSON()).toMatchObject({ props: { title: 'origin/topic', subtitle: 'topic' } })
-  await act(async () => {
-    renderer.update(
-      createElement(SmartWorkspaceSourceRow, {
-        row: { ...row, label: 'refs/remotes/origin/topic' },
-        onPress
-      })
-    )
-  })
-  expect(renderer.toJSON()).toMatchObject({
-    props: { title: 'refs/remotes/origin/topic', subtitle: 'topic' }
-  })
-})
diff --git a/mobile/src/components/TerminalShortcutSettings.tsx b/mobile/src/components/TerminalShortcutSettings.tsx
index 37e14d0620f..d3eb94dc6cf 100644
--- a/mobile/src/components/TerminalShortcutSettings.tsx
+++ b/mobile/src/components/TerminalShortcutSettings.tsx
@@ -8,24 +8,27 @@ import { useDirectionPadAvailable } from '../layout/use-shell-side-rail'
 import { CustomKeyModal } from './CustomKeyModal'
 import { ListRow } from './list/ListGroup'
 import { SettingsEmptyRow, SettingsSection } from '../settings/settings-screen-frame'
-import { loadCustomKeys, saveCustomKeys, type CustomKey } from '../terminal/terminal-custom-keys'
+import {
+  loadCustomKeys,
+  saveCustomKeys,
+  type CustomKey
+} from '../terminal/key-input/terminal-custom-keys'
 import { DragReorderList } from './DragReorderList'
 import { useSerializedStoredState } from '../storage/use-serialized-stored-state'
 import { colors } from '../theme/mobile-theme'
 import { styles } from './terminal-shortcut-settings-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import {
-  TERMINAL_ACCESSORY_KEYS,
-  type TerminalAccessoryKey
-} from '../terminal/terminal-accessory-keys'
+import '../terminal/key-input/terminal-accessory-keys'
+import type { TerminalAccessoryKey } from '../terminal/key-input/terminal-accessory-keys'
+import { TERMINAL_ACCESSORY_KEY_DEFINITIONS as TERMINAL_ACCESSORY_KEYS } from '../terminal/key-input/terminal-key-definitions'
 import {
   getDefaultTerminalAccessoryLayout,
   loadTerminalAccessoryLayout,
   reorderTerminalAccessoryBuiltInIds,
   saveTerminalAccessoryLayout,
   setTerminalAccessoryBuiltInVisible
-} from '../terminal/terminal-accessory-layout'
+} from '../terminal/key-input/terminal-accessory-layout'
 import { MobileSwitch } from './MobileSwitch'
 import { SmartRailRow } from './SmartRailRow'
 
diff --git a/mobile/src/components/WorktreeListRow.tsx b/mobile/src/components/WorktreeListRow.tsx
index 10207f88ba5..2f4cc3a260f 100644
--- a/mobile/src/components/WorktreeListRow.tsx
+++ b/mobile/src/components/WorktreeListRow.tsx
@@ -2,7 +2,7 @@ import { memo } from 'react'
 import { Bell, ChevronDown, ChevronRight, GitBranch } from 'lucide-react-native'
 import { Pressable, StyleSheet, Text, View } from 'react-native'
 import type { MobileRenderableRepoIcon } from '../host-screen/host-screen-reply-schema'
-import { triggerMediumImpact } from '../platform/haptics'
+import { triggerMediumImpact } from '../platform/haptics/haptics'
 import { colors, feedback, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/bottom-drawer/bottom-drawer-back-while-hiding.test.tsx b/mobile/src/components/bottom-drawer/bottom-drawer-back-while-hiding.test.tsx
index d0dc095044b..e2185120ded 100644
--- a/mobile/src/components/bottom-drawer/bottom-drawer-back-while-hiding.test.tsx
+++ b/mobile/src/components/bottom-drawer/bottom-drawer-back-while-hiding.test.tsx
@@ -7,7 +7,7 @@ type Timing = { to: number; callback?: (finished: boolean) => void }
 const animations = vi.hoisted((): { running: Timing[] } => ({ running: [] }))
 
 vi.mock('../../navigation/use-back-claim', () => ({ useBackClaim: () => {} }))
-vi.mock('../../platform/keyboard-occlusion', () => ({
+vi.mock('../../platform/keyboard/keyboard-occlusion', () => ({
   currentSoftKeyboardHeight: () => 0,
   subscribeSoftKeyboard: () => () => {}
 }))
@@ -43,7 +43,9 @@ vi.mock('react-native-gesture-handler', () => {
 })
 vi.mock('../AutoHeight', () => ({ AutoHeight: ({ children }: { children: unknown }) => children }))
 // The OS motion setting is read through AccessibilityInfo, which the react-native mock leaves out.
-vi.mock('../../platform/use-reduced-motion', () => ({ useReducedMotionEnabled: () => false }))
+vi.mock('../../platform/accessibility/use-reduced-motion', () => ({
+  useReducedMotionEnabled: () => false
+}))
 vi.mock('react-native-reanimated', () => {
   function isTiming(value: unknown): value is Timing {
     return typeof value === 'object' && value !== null && 'to' in value
diff --git a/mobile/src/components/bottom-drawer/bottom-drawer-close-lifecycle.test.ts b/mobile/src/components/bottom-drawer/bottom-drawer-close-lifecycle.test.ts
index 9060994ef01..2a703f42990 100644
--- a/mobile/src/components/bottom-drawer/bottom-drawer-close-lifecycle.test.ts
+++ b/mobile/src/components/bottom-drawer/bottom-drawer-close-lifecycle.test.ts
@@ -72,7 +72,7 @@ describe('BottomDrawer close lifecycle', () => {
     vi.restoreAllMocks()
   })
 
-  it('keeps close stable and delivers the latest action once after unmount', () => {
+  it('delivers the latest action once after unmount', () => {
     const firstAfterClose = vi.fn()
     const rendered: { current?: ReactTestRenderer } = {}
     const latestAfterClose = vi.fn(() => {
@@ -80,16 +80,11 @@ describe('BottomDrawer close lifecycle', () => {
     })
     const renderer = renderDrawer(true, vi.fn(), firstAfterClose)
     rendered.current = renderer
-    const initialOnHidden = mountedDrawer(renderer).props.onHidden
 
     updateDrawer(renderer, false, vi.fn(), firstAfterClose)
-    const closingOnHidden = mountedDrawer(renderer).props.onHidden
     updateDrawer(renderer, false, vi.fn(), latestAfterClose)
     const rerenderedOnHidden = mountedDrawer(renderer).props.onHidden
 
-    expect(closingOnHidden).toBe(initialOnHidden)
-    expect(rerenderedOnHidden).toBe(initialOnHidden)
-
     act(() => {
       rerenderedOnHidden()
       rerenderedOnHidden()
@@ -102,22 +97,4 @@ describe('BottomDrawer close lifecycle', () => {
     expect(latestAfterClose).toHaveBeenCalledTimes(1)
     expect(renderer.toJSON()).toBeNull()
   })
-
-  // Reopen before queued hide callback must invalidate it or next close leaves invisible tap-swallowing Modal.
-  it('a hide that lands after a reopen does not swallow the next close', () => {
-    const onAfterClose = vi.fn()
-    const renderer = renderDrawer(true, vi.fn(), onAfterClose)
-    const lateOnHidden = mountedDrawer(renderer).props.onHidden
-    updateDrawer(renderer, false, vi.fn(), onAfterClose)
-    updateDrawer(renderer, true, vi.fn(), onAfterClose)
-
-    act(() => lateOnHidden())
-    expect(mountedDrawer(renderer).props.visible).toBe(true)
-    expect(onAfterClose).not.toHaveBeenCalled()
-
-    updateDrawer(renderer, false, vi.fn(), onAfterClose)
-    act(() => mountedDrawer(renderer).props.onHidden())
-    expect(renderer.toJSON()).toBeNull()
-    expect(onAfterClose).toHaveBeenCalledTimes(1)
-  })
 })
diff --git a/mobile/src/components/bottom-drawer/bottom-drawer-constants.ts b/mobile/src/components/bottom-drawer/bottom-drawer-constants.ts
index b14c8a2c752..8790b5b5791 100644
--- a/mobile/src/components/bottom-drawer/bottom-drawer-constants.ts
+++ b/mobile/src/components/bottom-drawer/bottom-drawer-constants.ts
@@ -1,5 +1,5 @@
 import { Easing, useReducedMotion } from 'react-native-reanimated'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { SHEET_CURVE, SHEET_HEIGHT_DURATION_MS } from '../sheet-motion-values'
 
 export const BOTTOM_DRAWER_EASING = Easing.bezier(...SHEET_CURVE)
diff --git a/mobile/src/components/bottom-drawer/bottom-drawer-drag-motion.test.ts b/mobile/src/components/bottom-drawer/bottom-drawer-drag-motion.test.ts
index 62704e713e3..c4839f4b196 100644
--- a/mobile/src/components/bottom-drawer/bottom-drawer-drag-motion.test.ts
+++ b/mobile/src/components/bottom-drawer/bottom-drawer-drag-motion.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { bottomDrawerDismissMotion, shouldDismissBottomDrawer } from './bottom-drawer-drag-motion'
+import { shouldDismissBottomDrawer } from './bottom-drawer-drag-motion'
 
 describe('bottom drawer release', () => {
   it('judges where the sheet is heading, not where the finger let go', () => {
@@ -9,14 +9,4 @@ describe('bottom drawer release', () => {
     // A flick back up keeps the sheet even after a long drag.
     expect(shouldDismissBottomDrawer(180, -600, 777)).toBe(false)
   })
-
-  it('leaves at the finger speed, slow or thrown, within an ordinary close', () => {
-    const remaining = 825 - 112
-    for (const velocity of [800, 6000, 12000]) {
-      const { duration, x1, y1 } = bottomDrawerDismissMotion(112, velocity, 825, 300)
-      expect(duration).toBeLessThanOrEqual(300)
-      // The curve's start slope (y1 / x1) times the average speed is the speed it starts at.
-      expect(((y1 / x1) * remaining) / (duration / 1000)).toBeCloseTo(velocity)
-    }
-  })
 })
diff --git a/mobile/src/components/bottom-drawer/mounted-bottom-drawer.tsx b/mobile/src/components/bottom-drawer/mounted-bottom-drawer.tsx
index 9e3ff826558..c3386d79ef1 100644
--- a/mobile/src/components/bottom-drawer/mounted-bottom-drawer.tsx
+++ b/mobile/src/components/bottom-drawer/mounted-bottom-drawer.tsx
@@ -30,7 +30,10 @@ import {
 import { useResponsiveLayout } from '../../layout/responsive-layout'
 import { useWindowSafeAreaInsets } from '../../layout/side-safe-area'
 import { useBackClaim } from '../../navigation/use-back-claim'
-import { currentSoftKeyboardHeight, subscribeSoftKeyboard } from '../../platform/keyboard-occlusion'
+import {
+  currentSoftKeyboardHeight,
+  subscribeSoftKeyboard
+} from '../../platform/keyboard/keyboard-occlusion'
 import { hostOs } from '../../platform/host-os'
 import { hideDrawer, showDrawer, useBottomDrawerDrag } from './use-bottom-drawer-drag'
 import { useDrawerReducedMotion } from './bottom-drawer-constants'
diff --git a/mobile/src/components/bottom-drawer/option-pager.test.tsx b/mobile/src/components/bottom-drawer/option-pager.test.tsx
deleted file mode 100644
index df00998f3d2..00000000000
--- a/mobile/src/components/bottom-drawer/option-pager.test.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useState } from 'react'
-import { Pressable, Text } from 'react-native'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-vi.mock('react-native', () => ({
-  Platform: { OS: 'android' },
-  Pressable: 'Pressable',
-  Text: 'Text',
-  View: 'View',
-  StyleSheet: { create: <T,>(styles: T) => styles, absoluteFill: {} }
-}))
-vi.mock('../../platform/use-reduced-motion', () => ({ useReducedMotionEnabled: () => false }))
-vi.mock('./mounted-bottom-drawer', () => ({ MountedBottomDrawer: 'MountedBottomDrawer' }))
-vi.mock('react-native-reanimated', async () => {
-  const React = await import('react')
-  const { reanimatedPagerStub } = await import('../../test-support/reanimated-pager-stub')
-  return {
-    ...reanimatedPagerStub(),
-    // Shared values outlive the drawer's content, just as they do in Reanimated.
-    useSharedValue: (initial: number) => React.useRef({ value: initial }).current,
-    useAnimatedStyle: (style: () => object) => style()
-  }
-})
-
-import { BottomDrawer, OptionPager, useOptionPager } from './BottomDrawer'
-import { MountedBottomDrawer } from './mounted-bottom-drawer'
-
-function Sheet() {
-  const [visible, setVisible] = useState(false)
-  const pager = useOptionPager<'sortBy'>()
-  return (
-    <>
-      <Pressable accessibilityLabel="Workspace options" onPress={() => setVisible(true)} />
-      <BottomDrawer visible={visible} onClose={() => setVisible(false)} onAfterClose={pager.forget}>
-        <Pressable accessibilityLabel="Done" onPress={() => setVisible(false)} />
-        <OptionPager
-          pager={pager}
-          main={<Pressable accessibilityLabel="Sort by" onPress={() => pager.open('sortBy')} />}
-          page={
-            pager.page === null ? null : (
-              <Pressable accessibilityLabel="Back" onPress={pager.close}>
-                <Text>Recent</Text>
-              </Pressable>
-            )
-          }
-        />
-      </BottomDrawer>
-    </>
-  )
-}
-
-let renderer: ReactTestRenderer | null = null
-
-afterEach(() => {
-  act(() => renderer?.unmount())
-  renderer = null
-})
-
-function press(label: string) {
-  act(() => {
-    renderer!.root
-      .find((node) => String(node.type) === 'Pressable' && node.props.accessibilityLabel === label)
-      .props.onPress()
-  })
-}
-
-function layout(width: number) {
-  act(() => {
-    renderer!.root
-      .find((node) => String(node.type) === 'View' && node.props.onLayout)
-      .props.onLayout({ nativeEvent: { layout: { width } } })
-  })
-}
-
-const drawer = () => renderer!.root.findByType(MountedBottomDrawer)
-const main = () =>
-  renderer!.root.find((node) => String(node.type) === 'AnimatedView' && 'aria-hidden' in node.props)
-const mainOffset = () => main().props.style.at(-1).transform[0].translateX
-
-function open() {
-  press('Workspace options')
-  layout(600)
-}
-
-describe('a drawer option pager', () => {
-  it('reopens at the root with full-width content after Done from a sub-page', () => {
-    act(() => {
-      renderer = create(<Sheet />)
-    })
-    open()
-    expect(mainOffset()).toBeCloseTo(0)
-    press('Sort by')
-    expect(mainOffset()).toBeLessThan(0)
-
-    press('Done')
-    expect(drawer().props.visible).toBe(false)
-    expect(main().props['aria-hidden']).toBe(true)
-    // Native hide completes before KeyedBottomDrawer unmounts content and forgets its page.
-    act(() => drawer().props.onHidden())
-    expect(renderer!.root.findAllByType(MountedBottomDrawer)).toHaveLength(0)
-
-    open()
-    expect(main().props['aria-hidden']).toBe(false)
-    expect(mainOffset()).toBeCloseTo(0)
-    layout(390)
-    expect(mainOffset()).toBeCloseTo(0)
-  })
-
-  it('still pushes a sub-page and returns to the root with Back', () => {
-    act(() => {
-      renderer = create(<Sheet />)
-    })
-    open()
-    press('Sort by')
-    expect(main().props['aria-hidden']).toBe(true)
-    expect(mainOffset()).toBeLessThan(0)
-    press('Back')
-    expect(drawer().props.visible).toBe(true)
-    expect(main().props['aria-hidden']).toBe(false)
-    expect(mainOffset()).toBeCloseTo(0)
-  })
-})
diff --git a/mobile/src/components/composer-input/MessageBox.tsx b/mobile/src/components/composer-input/MessageBox.tsx
index dd009589c91..5b90513b1ca 100644
--- a/mobile/src/components/composer-input/MessageBox.tsx
+++ b/mobile/src/components/composer-input/MessageBox.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-native'
 import { colors } from '../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { useTextInputContentHeight } from '../../platform/text-input-content-height'
+import { useTextInputContentHeight } from '../../platform/text-input/text-input-content-height'
 import { ComposerSendButton } from './ComposerSendButton'
 import {
   composerInputStyles as styles,
diff --git a/mobile/src/components/custom-key-modal-save-refusal.test.tsx b/mobile/src/components/custom-key-modal-save-refusal.test.tsx
index e040dd3cb5d..20a0ebe0d88 100644
--- a/mobile/src/components/custom-key-modal-save-refusal.test.tsx
+++ b/mobile/src/components/custom-key-modal-save-refusal.test.tsx
@@ -7,24 +7,18 @@ const store = vi.hoisted(() => {
   const held: {
     raw: string | null
     refuse: boolean
-    failRead: boolean
-    writes: number
     holdWrites: Promise<void> | null
-  } = { raw: null, refuse: false, failRead: false, writes: 0, holdWrites: null }
+  } = { raw: null, refuse: false, holdWrites: null }
   return held
 })
 
 vi.mock('@react-native-async-storage/async-storage', () => ({
   default: {
     getItem: async () => {
-      if (store.failRead) {
-        throw new Error('the store could not be read')
-      }
       return store.raw
     },
     setItem: async (_key: string, value: string) => {
       await store.holdWrites
-      store.writes += 1
       if (store.refuse) {
         throw new Error(
           'Orca could not save orca:custom-accessory-keys: a stored value may be too large.'
@@ -68,7 +62,7 @@ vi.mock('lucide-react-native', () => ({
 vi.mock('./bottom-drawer/BottomDrawer', () => ({ BottomDrawer: hosts.View }))
 
 import { CustomKeyModal } from './CustomKeyModal'
-import { removeCustomKey, saveCustomKeys } from '../terminal/terminal-custom-keys'
+import { removeCustomKey, saveCustomKeys } from '../terminal/key-input/terminal-custom-keys'
 import { readMirroredStorage, retainMirroredStorage } from '../storage/mirrored-storage-keys'
 
 const CUSTOM_KEYS = 'orca:custom-accessory-keys'
@@ -130,18 +124,15 @@ beforeEach(() => {
   releaseStorage = retainMirroredStorage([CUSTOM_KEYS])
   store.raw = null
   store.refuse = false
-  store.failRead = false
-  store.writes = 0
   store.holdWrites = null
 })
 
 // Page allowlisted custom keys reject over-size/unseeded writes (rulings 33.4/33.6). Modal must catch void-call rejection or page faults and drops generation.
 describe('adding a custom key when the store refuses the write', () => {
-  it('does not let the refusal escape as an unhandled rejection', async () => {
+  it('keeps a refused addition out of callbacks and mirrored storage', async () => {
     store.refuse = true
     const before = mirrored()
-    const unhandled = vi.fn()
-    process.on('unhandledRejection', unhandled)
+
     const onKeysChanged = vi.fn()
     const onClose = vi.fn()
     let renderer: ReturnType<typeof create> | null = null
@@ -157,12 +148,10 @@ describe('adding a custom key when the store refuses the write', () => {
       await Promise.resolve()
       await Promise.resolve()
     })
-    process.off('unhandledRejection', unhandled)
-    expect(unhandled).not.toHaveBeenCalled()
+
     // Do not report unstored key as added to accessory row.
     expect(onKeysChanged).not.toHaveBeenCalled()
     expect(onClose).not.toHaveBeenCalled()
-    // Restore mirror after refused save: saveCustomKeys notes map before persistence, and next init must not include rejected value.
     expect(mirrored()).toBe(before)
   })
 })
@@ -184,11 +173,4 @@ describe('removing a custom key', () => {
     await Promise.all([reorder, removal])
     expect(JSON.parse(store.raw ?? '[]')).toEqual([third, kept])
   })
-
-  it('writes nothing when the stored list cannot be read, so a read failure erases nothing', async () => {
-    store.raw = JSON.stringify([kept, removed])
-    store.failRead = true
-    await expect(removeCustomKey(removed.id)).rejects.toThrow()
-    expect(store.writes).toBe(0)
-  })
 })
diff --git a/mobile/src/components/drag-reorder-positions.test.ts b/mobile/src/components/drag-reorder-positions.test.ts
index 8c8d0769b5e..2105a96db02 100644
--- a/mobile/src/components/drag-reorder-positions.test.ts
+++ b/mobile/src/components/drag-reorder-positions.test.ts
@@ -1,41 +1,16 @@
-import { describe, expect, it } from 'vitest'
-
+import { expect, it } from 'vitest'
 import {
   dragReorderLayout,
   dragReorderTarget,
   dragReorderPositionsFromKeys,
-  moveDragReorderKey,
-  orderedKeysFromDragReorderPositions
+  moveDragReorderKey
 } from './drag-reorder-positions'
 
-describe('drag reorder positions', () => {
-  it('shifts intermediate rows up when dragging a row earlier', () => {
-    const positions = dragReorderPositionsFromKeys(['a', 'b', 'c', 'd'])
-    expect(orderedKeysFromDragReorderPositions(moveDragReorderKey(positions, 'd', 1))).toEqual([
-      'a',
-      'd',
-      'b',
-      'c'
-    ])
-  })
-})
-
-it('projects a thousand variable-height rows and all row lookups with linear reads', () => {
-  const keys = Array.from({ length: 1000 }, (_, index) => `row-${index}`)
-  let reads = 0
-  const positions = new Proxy(dragReorderPositionsFromKeys(keys), {
-    get(target, key) {
-      if (typeof key === 'string') {
-        reads++
-        return target[key]
-      }
-      return undefined
-    }
-  })
-  const sizes = Object.fromEntries(keys.map((key, index) => [key, index % 2 ? 20 : 100]))
+it('lays out variable-height rows when targeting, reordering and resizing', () => {
+  const positions = dragReorderPositionsFromKeys(['row-0', 'row-1', 'row-2', 'row-3'])
+  const sizes = { 'row-0': 100, 'row-1': 20, 'row-2': 100, 'row-3': 20 }
   const layout = dragReorderLayout(positions, sizes)
-  expect(keys.map((key) => layout.tops[key]).at(-1)).toBe(59980)
-  expect(reads).toBe(1000)
+  expect(layout.tops['row-3']).toBe(220)
   expect(dragReorderTarget(positions, sizes, layout, 'row-0', 35)).toBe(1)
   const moved = moveDragReorderKey(positions, 'row-0', 2)
   expect(dragReorderLayout(moved, sizes).keys.slice(0, 3)).toEqual(['row-1', 'row-2', 'row-0'])
diff --git a/mobile/src/components/drag-reorder-test-harness.test-fixture.tsx b/mobile/src/components/drag-reorder-test-harness.test-fixture.tsx
index e232b2185bd..ca5848edaeb 100644
--- a/mobile/src/components/drag-reorder-test-harness.test-fixture.tsx
+++ b/mobile/src/components/drag-reorder-test-harness.test-fixture.tsx
@@ -241,7 +241,10 @@ vi.mock('../layout/use-shell-side-rail', () => ({ useDirectionPadAvailable: () =
 vi.mock('@react-native-async-storage/async-storage', () => ({
   default: { getItem: async () => null, setItem: async () => {} }
 }))
-vi.mock('../platform/haptics', () => ({ triggerMediumImpact: vi.fn(), triggerSelection: vi.fn() }))
+vi.mock('../platform/haptics/haptics', () => ({
+  triggerMediumImpact: vi.fn(),
+  triggerSelection: vi.fn()
+}))
 
 import { DragReorderList } from './DragReorderList'
 
diff --git a/mobile/src/components/html-preview-inert-links.test.ts b/mobile/src/components/html-preview-inert-links.test.ts
index b0f636f0b2e..bff57ed1988 100644
--- a/mobile/src/components/html-preview-inert-links.test.ts
+++ b/mobile/src/components/html-preview-inert-links.test.ts
@@ -30,29 +30,10 @@ describe('an artifact rendered for a shell that cannot open a link', () => {
     expect(inert(ARTIFACT).querySelectorAll('a[href], area[href]')).toHaveLength(0)
   })
 
-  it('keeps the text, the headings and the images the author wrote', () => {
-    const doc = inert(ARTIFACT)
-    expect(doc.getElementById('marker')?.textContent).toBe('text')
-    expect(doc.getElementById('top')?.textContent).toBe('tap')
-    expect(doc.getElementById('blank')?.textContent).toBe('window')
-    expect(doc.getElementById('mapped')?.getAttribute('src')).toBe('x.png')
-    expect(doc.title).toBe('A')
-    // The elements are still there and still in order: this is a hidden affordance, not a deletion.
-    expect([...doc.querySelectorAll('a')].map((one) => one.id)).toEqual([
-      'top',
-      'blank',
-      'root',
-      'empty',
-      'frag',
-      'named',
-      'svglink'
-    ])
-  })
-
   // Preserve authored doctype bytes/identifiers; srcdoc inherits embedder’s mode regardless, so test document.doctype rather than CSS1Compat.
   it('keeps the doctype whole, identifiers and all', () => {
     const doctypeOf = (html: string) => htmlPreviewWithInertLinks(html).split('>')[0] ?? ''
-    expect(doctypeOf(ARTIFACT).toLowerCase()).toBe('<!doctype html')
+
     expect(
       doctypeOf('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><body>x')
     ).toBe('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
@@ -63,10 +44,6 @@ describe('an artifact rendered for a shell that cannot open a link', () => {
     ).toContain(
       '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
     )
-    // Leave missing doctype absent rather than inventing author markup.
-    expect(htmlPreviewWithInertLinks('<html><body>x</body></html>').toLowerCase()).not.toContain(
-      '<!doctype'
-    )
   })
 
   // Browser parse drops one leading pre/listing/textarea newline; neither Chromium/WebKit serializer restores it. Reinsert before next parse.
@@ -84,17 +61,6 @@ describe('an artifact rendered for a shell that cannot open a link', () => {
     expect(out).toContain('<pre id="q">no newline</pre>')
   })
 
-  it('leaves an href inside a comment where a regex pass would have found it', () => {
-    // Use parser rather than regex so href inside comment remains untouched artifact text.
-    const doc = inert(
-      '<!doctype html><html><body><!-- <a href="https://example.com/x">c</a> -->' +
-        '<a id="real" href="https://example.com/z">r</a></body></html>'
-    )
-    expect(doc.body.innerHTML).toContain('href="https://example.com/x"')
-    // The control: a link that is rendered did lose its href.
-    expect(doc.getElementById('real')?.hasAttribute('href')).toBe(false)
-  })
-
   // Declarative shadowroot templates become rendered content at frame parse, but DOMParser leaves templates intact on Chromium 147/WebKit 26.4/happy-dom.
   // Traverse template.content recursively: document querySelectorAll misses links that would otherwise become dead anchors under sandbox.
   it('reaches a link inside a declarative shadow root, and inside one nested in it', () => {
diff --git a/mobile/src/components/html-preview-link-affordance.test.tsx b/mobile/src/components/html-preview-link-affordance.test.tsx
index 751854df369..271727165bb 100644
--- a/mobile/src/components/html-preview-link-affordance.test.tsx
+++ b/mobile/src/components/html-preview-link-affordance.test.tsx
@@ -29,8 +29,7 @@ vi.mock('lucide-react-native', () => ({
   Eye: () => null
 }))
 
-const { MobileHtmlPreview, MOBILE_HTML_PREVIEW_SANDBOX, MOBILE_HTML_PREVIEW_SEALED_SANDBOX } =
-  await import('./MobileHtmlPreview')
+const { MobileHtmlPreview } = await import('./MobileHtmlPreview')
 
 const ARTIFACT =
   '<!doctype html><html><body><a id="x" href="https://example.com/a">tap</a></body></html>'
@@ -76,19 +75,10 @@ describe('the frame the preview mounts for each answer the shell gives', () => {
   it('hands over an artifact with no link, in a frame that cannot navigate, when it cannot', () => {
     const frame = frameOf(false)
     // Both fences follow the one answer, which is the wiring this file exists for.
-    expect(frame?.sandbox).toBe(MOBILE_HTML_PREVIEW_SEALED_SANDBOX)
+    expect(frame?.sandbox).toBe('')
     expect(frame?.srcDoc).not.toContain('href')
     // The author's text is still there, so this is a hidden affordance and not a deletion.
     expect(frame?.srcDoc).toContain('tap')
     expect(frame?.srcDoc).toContain('id="x"')
   })
-
-  it('seals the frame with a sandbox that grants nothing, rather than dropping the attribute', () => {
-    // Require empty sandbox attribute: absent/undefined grants every capability, while empty grants none.
-    expect(MOBILE_HTML_PREVIEW_SEALED_SANDBOX).toBe('')
-    expect(frameOf(false)?.sandbox).toBe('')
-    expect(MOBILE_HTML_PREVIEW_SANDBOX.split(' ')).toContain(
-      'allow-top-navigation-by-user-activation'
-    )
-  })
 })
diff --git a/mobile/src/components/list/ListGroup.tsx b/mobile/src/components/list/ListGroup.tsx
index b27afdeae3d..66b34b3dc54 100644
--- a/mobile/src/components/list/ListGroup.tsx
+++ b/mobile/src/components/list/ListGroup.tsx
@@ -2,7 +2,7 @@ import { Children, Fragment, isValidElement, type ReactNode } from 'react'
 import { Pressable, StyleSheet, Text, View, type StyleProp, type ViewStyle } from 'react-native'
 import { Check, ChevronDown, ChevronRight } from 'lucide-react-native'
 import { DisclosureChevron } from '../DisclosureChevron'
-import { triggerSelection } from '../../platform/haptics'
+import { triggerSelection } from '../../platform/haptics/haptics'
 import { colors, feedback, radii, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/markdown-file-path-detection.test.ts b/mobile/src/components/markdown-file-path-detection.test.ts
index 9ecd9824b4c..fa42d518b48 100644
--- a/mobile/src/components/markdown-file-path-detection.test.ts
+++ b/mobile/src/components/markdown-file-path-detection.test.ts
@@ -22,20 +22,6 @@ describe('detectFilePathSegments', () => {
     ])
   })
 
-  it('detects POSIX absolute paths', () => {
-    expect(detectFilePathSegments('Wrote /Users/me/wt/src/app.tsx today')).toEqual([
-      { type: 'text', value: 'Wrote ' },
-      { type: 'file', value: '/Users/me/wt/src/app.tsx', path: '/Users/me/wt/src/app.tsx' },
-      { type: 'text', value: ' today' }
-    ])
-    expect(detectFilePathSegments('/repo/src/index.ts')).toEqual([
-      { type: 'file', value: '/repo/src/index.ts', path: '/repo/src/index.ts' }
-    ])
-    expect(detectFilePathSegments('/root.ts')).toEqual([
-      { type: 'file', value: '/root.ts', path: '/root.ts' }
-    ])
-  })
-
   it('detects paths with :line and :line:col suffixes', () => {
     expect(detectFilePathSegments('see src/foo.ts:42 here')).toEqual([
       { type: 'text', value: 'see ' },
@@ -69,15 +55,6 @@ describe('detectFilePathSegments', () => {
     expect(detectFilePathSegments('https://example.com/path/file.ts')).toEqual([
       { type: 'text', value: 'https://example.com/path/file.ts' }
     ])
-    expect(detectFilePathSegments('see https://example.com/path/file.ts:42 now')).toEqual([
-      { type: 'text', value: 'see https://example.com/path/file.ts:42 now' }
-    ])
-  })
-
-  it('does not match protocol-relative URLs', () => {
-    expect(detectFilePathSegments('load //cdn.example.com/lib/app.js')).toEqual([
-      { type: 'text', value: 'load //cdn.example.com/lib/app.js' }
-    ])
   })
 
   it('detects scoped-package file paths with a segment-leading @', () => {
@@ -90,15 +67,6 @@ describe('detectFilePathSegments', () => {
       },
       { type: 'text', value: ' here' }
     ])
-    expect(
-      detectFilePathSegments('node_modules/@scope/pkg/file.ts').filter((s) => s.type === 'file')
-    ).toEqual([
-      {
-        type: 'file',
-        value: 'node_modules/@scope/pkg/file.ts',
-        path: 'node_modules/@scope/pkg/file.ts'
-      }
-    ])
   })
 
   it('does not match emails or git URLs with a mid-token @', () => {
@@ -118,11 +86,7 @@ describe('detectFilePathSegments', () => {
 })
 
 describe('isFilePathCodeSpan', () => {
-  it('accepts POSIX absolute paths and :line citations', () => {
-    expect(isFilePathCodeSpan('/Users/me/wt/src/app.tsx')).toBe(true)
-    expect(isFilePathCodeSpan('src/foo.ts:42')).toBe(true)
-    expect(isFilePathCodeSpan('src/foo.ts:42:7')).toBe(true)
+  it('accepts a bare file name with a line citation', () => {
     expect(isFilePathCodeSpan('MobileNativeChatComposer.tsx:23')).toBe(true)
-    expect(isFilePathCodeSpan(String.raw`C:\repo\Main.tsx:12`)).toBe(true)
   })
 })
diff --git a/mobile/src/components/markdown-href-routing.test.ts b/mobile/src/components/markdown-href-routing.test.ts
deleted file mode 100644
index cc80494bfd9..00000000000
--- a/mobile/src/components/markdown-href-routing.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { routeMarkdownHref } from './markdown-href-routing'
-
-describe('routeMarkdownHref', () => {
-  it('carries a #L fragment as a :line suffix', () => {
-    expect(routeMarkdownHref('docs/plan.md#L42')).toEqual({
-      kind: 'file',
-      pathText: 'docs/plan.md:42'
-    })
-    expect(routeMarkdownHref('docs/plan.md?plain=1#line-7')).toEqual({
-      kind: 'file',
-      pathText: 'docs/plan.md:7'
-    })
-    expect(routeMarkdownHref('docs/plan.md#usage')).toEqual({
-      kind: 'file',
-      pathText: 'docs/plan.md'
-    })
-  })
-
-  it('routes file: URIs to the file opener', () => {
-    expect(routeMarkdownHref('file:///Users/me/wt/src/app.tsx')).toEqual({
-      kind: 'file',
-      pathText: '/Users/me/wt/src/app.tsx'
-    })
-    expect(routeMarkdownHref('file:///Users/me/wt/src/app.tsx#L12')).toEqual({
-      kind: 'file',
-      pathText: '/Users/me/wt/src/app.tsx:12'
-    })
-    expect(routeMarkdownHref('file:///C:/repo/src/index.ts')).toEqual({
-      kind: 'file',
-      pathText: 'C:/repo/src/index.ts'
-    })
-  })
-})
diff --git a/mobile/src/components/markdown-link-handler.ts b/mobile/src/components/markdown-link-handler.ts
index ceb005aff4e..78b99e24bb1 100644
--- a/mobile/src/components/markdown-link-handler.ts
+++ b/mobile/src/components/markdown-link-handler.ts
@@ -1,5 +1,5 @@
 import { createContext } from 'react'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 
 // Screens that offer choices for a tapped web link provide this; elsewhere the system browser opens it.
 export const MarkdownLinkHandlerContext = createContext<(url: string) => void>(openExternalLink)
diff --git a/mobile/src/components/mobile-markdown-growing-tree.test.ts b/mobile/src/components/mobile-markdown-growing-tree.test.ts
index 24833e3d5ec..25e77d46075 100644
--- a/mobile/src/components/mobile-markdown-growing-tree.test.ts
+++ b/mobile/src/components/mobile-markdown-growing-tree.test.ts
@@ -40,25 +40,6 @@ describe('text growing a character at a time', () => {
     ])
   })
 
-  it('keeps a fenced block whole across its blank lines', () => {
-    expect(grown('```\na\n\nb\n```\n\nafter')).toEqual([
-      {
-        type: 'code',
-        lang: null,
-        value: 'a\n\nb',
-        closed: true,
-        position: { start: { line: 1, column: 1 }, end: { line: 5, column: 1 } }
-      },
-      paragraph('after')
-    ])
-  })
-
-  it('makes one math block once a display formula closes past a blank line', () => {
-    expect(grown('$$\nx\n\ny\n$$')).toEqual([
-      { type: 'math', value: 'x\n\ny', source: '$$\nx\n\ny\n$$' }
-    ])
-  })
-
   it('ends a quote at a display formula that closes past a blank line', () => {
     expect(grown('> a\n$$\n\nb\n$$')).toEqual([
       { type: 'blockquote', children: [paragraph('a')] },
diff --git a/mobile/src/components/mobile-markdown-inline.tsx b/mobile/src/components/mobile-markdown-inline.tsx
index 295fc94caa8..44d6d073926 100644
--- a/mobile/src/components/mobile-markdown-inline.tsx
+++ b/mobile/src/components/mobile-markdown-inline.tsx
@@ -1,7 +1,7 @@
 import type { PhrasingContent } from 'mdast'
 import { Fragment, type ReactNode } from 'react'
 import type { TextProps } from 'react-native'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 import {
   detectFilePathSegments,
   isFilePathCodeSpan,
diff --git a/mobile/src/components/mobile-markdown-math.test.ts b/mobile/src/components/mobile-markdown-math.test.ts
index 63dd18c5e67..f8e4ed37d2d 100644
--- a/mobile/src/components/mobile-markdown-math.test.ts
+++ b/mobile/src/components/mobile-markdown-math.test.ts
@@ -31,21 +31,16 @@ describe('math in mobile Markdown follows desktop chat', () => {
       ['I:\\color{#1a7f37}{\\Huge{\\mathbf{+}}}'],
       '\u200b37'
     ],
-    ['prices', '$10 and $20', [], '$10 and $20'],
-    ['shell variables', 'echo $HOME and $PATH', [], 'echo $HOME and $PATH'],
     [
       'a price with operators',
       'Keep $5 + 2$ typed, render $5+2$',
       ['I:5+2'],
       'Keep $5 + 2$ typed, render '
     ],
-    ['a price then a formula', '$5 $x$', ['I:x'], '$5 '],
     ['a block that interrupts a paragraph', 'para\n$$\nx=1\n$$\nafter', ['D:x=1'], 'paraafter'],
     ['display formulas alone in a paragraph', '$$a$$ $$b$$', ['D:a', 'D:b'], ''],
-    ['a display opener among prose', '$$x$$ tail', ['I:x'], ' tail'],
     ['inline and bracket delimiters', '\\(a\\) and \\[b\\]', ['I:a', 'I:b'], ' and '],
     ['a citation', '\\[1, 2\\]', [], '[1, 2]'],
-    ['an unclosed block', '$$\nunclosed', [], '$$\nunclosed'],
     ['a formula in a link label', '[$x$](http://a)', [], '$x$'],
     ['a closed math fence', '```math\nx^2\n```', ['D:x^2'], '']
   ])('%s', (_name, source, math, text) => {
diff --git a/mobile/src/components/mobile-pr-url.ts b/mobile/src/components/mobile-pr-url.ts
index 8c9d15a374f..4b0f2aa1a09 100644
--- a/mobile/src/components/mobile-pr-url.ts
+++ b/mobile/src/components/mobile-pr-url.ts
@@ -1 +1 @@
-export { openExternalLink as openMobilePrUrl } from '../platform/external-link'
+export { openExternalLink as openMobilePrUrl } from '../platform/external-links/external-link'
diff --git a/mobile/src/components/mobile-webview-editor-web-fallbacks.test.tsx b/mobile/src/components/mobile-webview-editor-web-fallbacks.test.tsx
index bd233480e01..18ca2c7d9fc 100644
--- a/mobile/src/components/mobile-webview-editor-web-fallbacks.test.tsx
+++ b/mobile/src/components/mobile-webview-editor-web-fallbacks.test.tsx
@@ -106,36 +106,4 @@ describe('the rich markdown editor on the page', () => {
     })
     expect(onChange.mock.calls).toEqual([['edited']])
   })
-
-  it('keeps the document and toolbar read-only until editing is enabled', () => {
-    const host = document.createElement('div')
-    const onChange = vi.fn()
-    const editor = (editable: boolean) =>
-      createElement(MobileRichMarkdownEditor, {
-        content: 'body',
-        editable,
-        onChange
-      })
-    const renderer = render(editor(false), host)
-    const surface = host.querySelector<HTMLElement>('#editor')!
-    const buttons = findHosts(renderer, 'Pressable')
-    expect(buttons.length).toBeGreaterThan(0)
-    expect(buttons.filter((node) => node.props.disabled !== true)).toEqual([])
-    expect(surface.getAttribute('contenteditable')).toBe('false')
-    act(() => {
-      surface.dispatchEvent(new Event('input', { bubbles: true }))
-    })
-    expect(onChange).not.toHaveBeenCalled()
-
-    act(() => renderer.update(editor(true)))
-    const enabled = findHosts(renderer, 'Pressable')
-    expect(enabled).toHaveLength(buttons.length)
-    expect(enabled.filter((node) => node.props.disabled === true)).toEqual([])
-    expect(surface.getAttribute('contenteditable')).toBe('true')
-    act(() => {
-      surface.innerHTML = '<p>accepted</p>'
-      surface.dispatchEvent(new Event('input', { bubbles: true }))
-    })
-    expect(onChange.mock.calls).toEqual([['accepted']])
-  })
 })
diff --git a/mobile/src/components/nav-bar/BottomSearchBar.tsx b/mobile/src/components/nav-bar/BottomSearchBar.tsx
index e56e3070e55..ca4a518c711 100644
--- a/mobile/src/components/nav-bar/BottomSearchBar.tsx
+++ b/mobile/src/components/nav-bar/BottomSearchBar.tsx
@@ -4,8 +4,8 @@ import Svg, { Defs, LinearGradient, Rect, Stop } from 'react-native-svg'
 import { X } from 'lucide-react-native'
 import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useKeyboardOcclusion } from '../../platform/keyboard-occlusion'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useKeyboardOcclusion } from '../../platform/keyboard/keyboard-occlusion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, feedback, radii, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/nav-bar/NavBar.tsx b/mobile/src/components/nav-bar/NavBar.tsx
index 91a19430c8c..f8752a33eaf 100644
--- a/mobile/src/components/nav-bar/NavBar.tsx
+++ b/mobile/src/components/nav-bar/NavBar.tsx
@@ -9,7 +9,7 @@ import {
   type ViewStyle
 } from 'react-native'
 import { ChevronDown } from 'lucide-react-native'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, pressedStyle, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/components/nav-bar/PullDownMenu.tsx b/mobile/src/components/nav-bar/PullDownMenu.tsx
index da1297b7a41..87827d9c59d 100644
--- a/mobile/src/components/nav-bar/PullDownMenu.tsx
+++ b/mobile/src/components/nav-bar/PullDownMenu.tsx
@@ -13,7 +13,7 @@ import {
   type HostInstance
 } from 'react-native'
 import { Check } from 'lucide-react-native'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { useBackClaim } from '../../navigation/use-back-claim'
 import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
diff --git a/mobile/src/components/pr-sidebar/MobileLinkPrForm.tsx b/mobile/src/components/pr-sidebar/MobileLinkPrForm.tsx
index 03f03584590..0a1a0cf4d13 100644
--- a/mobile/src/components/pr-sidebar/MobileLinkPrForm.tsx
+++ b/mobile/src/components/pr-sidebar/MobileLinkPrForm.tsx
@@ -4,12 +4,12 @@ import { colors, radii, spacing, typography, pressedStyle } from '../../theme/mo
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import {
   parseGitHubIssueOrPRLink,
   parseGitHubIssueOrPRNumber
 } from '../../../../src/shared/github/repositories/links'
-import { linkMobilePr } from '../../source-control/mobile-pr-link'
+import { linkMobilePr } from '../../source-control/review/mobile-pr-link'
 import { TextField } from '../composer-input/TextField'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
diff --git a/mobile/src/components/pr-sidebar/PRCommentCard.tsx b/mobile/src/components/pr-sidebar/PRCommentCard.tsx
index f7837163433..0b9a2f44c30 100644
--- a/mobile/src/components/pr-sidebar/PRCommentCard.tsx
+++ b/mobile/src/components/pr-sidebar/PRCommentCard.tsx
@@ -1,6 +1,6 @@
 import { memo, useState } from 'react'
 import { Image, Platform, Pressable, Text, View } from 'react-native'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { Check, CornerDownRight, ExternalLink, Pencil, Trash2, Undo2 } from 'lucide-react-native'
 import type {
   GitHubReaction,
diff --git a/mobile/src/components/pr-sidebar/PrBasePicker.tsx b/mobile/src/components/pr-sidebar/PrBasePicker.tsx
index 59b58cf4199..16cd15dc1a2 100644
--- a/mobile/src/components/pr-sidebar/PrBasePicker.tsx
+++ b/mobile/src/components/pr-sidebar/PrBasePicker.tsx
@@ -4,7 +4,7 @@ import { Search } from 'lucide-react-native'
 import { colors } from '../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { searchMobilePrBaseRefs } from '../../source-control/mobile-pr-create-draft'
+import { searchMobilePrBaseRefs } from '../../source-control/review/creation/mobile-pr-create-draft'
 import { SheetHeader } from '../nav-bar/SheetHeader'
 import { ListGroup, ListRow } from '../list/ListGroup'
 import { TextField } from '../composer-input/TextField'
diff --git a/mobile/src/components/pr-sidebar/PrCheckFailureRow.tsx b/mobile/src/components/pr-sidebar/PrCheckFailureRow.tsx
index 2d7d8416984..4619c602da4 100644
--- a/mobile/src/components/pr-sidebar/PrCheckFailureRow.tsx
+++ b/mobile/src/components/pr-sidebar/PrCheckFailureRow.tsx
@@ -14,9 +14,9 @@ import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import type { Translate } from '../../i18n/mobile-i18n'
-import { openExternalLink } from '../../platform/external-link'
-import { useClipboardWriter } from '../../platform/clipboard'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { openExternalLink } from '../../platform/external-links/external-link'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import type { PRCheckDetail } from '../../../../src/shared/github/checks/check-types'
 import { LIST_LEADING_SLOT, LIST_ROW_PADDING } from '../list/ListGroup'
 import { PullDownMenu } from '../nav-bar/PullDownMenu'
diff --git a/mobile/src/components/pr-sidebar/PrChecksScreen.tsx b/mobile/src/components/pr-sidebar/PrChecksScreen.tsx
index 3663e3a12e8..5ca0e02d061 100644
--- a/mobile/src/components/pr-sidebar/PrChecksScreen.tsx
+++ b/mobile/src/components/pr-sidebar/PrChecksScreen.tsx
@@ -6,7 +6,7 @@ import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import type { Translate } from '../../i18n/mobile-i18n'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import type { PRCheckDetail } from '../../../../src/shared/github/checks/check-types'
 import { isBrokenCheck } from '../../../../src/shared/source-control/checks/pr-checks-fix-prompt'
 import { sortChecksBySeverity } from '../../../../src/shared/source-control/checks/pr-check-severity-order'
diff --git a/mobile/src/components/pr-sidebar/PrCommentsScreen.tsx b/mobile/src/components/pr-sidebar/PrCommentsScreen.tsx
index 6b99dc9e484..508da894c73 100644
--- a/mobile/src/components/pr-sidebar/PrCommentsScreen.tsx
+++ b/mobile/src/components/pr-sidebar/PrCommentsScreen.tsx
@@ -18,7 +18,7 @@ import { useMobileLaunchAgentLabel } from '../../session/agent-launch/use-mobile
 import { useHostProtocolGates } from '../host-protocol-gates-context'
 import { AgentLaunchNotice } from '../AgentLaunchNotice'
 import { useNow } from '../../hooks/use-now'
-import { useKeyboardOcclusion } from '../../platform/keyboard-occlusion'
+import { useKeyboardOcclusion } from '../../platform/keyboard/keyboard-occlusion'
 import { useBackClaim } from '../../navigation/use-back-claim'
 import { NavBarButton } from '../nav-bar/NavBarButton'
 import { PullDownMenu } from '../nav-bar/PullDownMenu'
diff --git a/mobile/src/components/pr-sidebar/PrCreateSheet.tsx b/mobile/src/components/pr-sidebar/PrCreateSheet.tsx
index 8080e0faf27..aeec9bb3043 100644
--- a/mobile/src/components/pr-sidebar/PrCreateSheet.tsx
+++ b/mobile/src/components/pr-sidebar/PrCreateSheet.tsx
@@ -5,32 +5,34 @@ import { colors, pressedStyle, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { SheetHeader } from '../nav-bar/SheetHeader'
 import { SheetPrimaryButton } from '../SheetPrimaryButton'
 import { ListGroup, ListRow } from '../list/ListGroup'
 import { MobileSwitch } from '../MobileSwitch'
 import { normalizeHostedReviewHeadRef } from '../../../../src/shared/source-control/hosted-review/hosted-review-refs'
-import { hostedReviewCopy } from '../../source-control/hosted-review-copy'
 import {
-  mobileHostedReviewCreateIntentProgressMessage,
-  type MobileHostedReviewCreateIntentProgress
-} from '../../source-control/mobile-hosted-review-create-intent'
+  hostedReviewCopy,
+  mobileHostedReviewCreateIntentProgressMessage
+} from '../../source-control/review/creation/hosted-review-copy'
+import '../../source-control/review/creation/mobile-hosted-review-create-intent'
+import type { MobileHostedReviewCreateIntentProgress } from '../../source-control/review/creation/mobile-hosted-review-create-intent'
+
 import {
   isMobileHostedReviewCommitFailure,
   runMobileHostedReviewCreateIntent
-} from '../../source-control/mobile-hosted-review-create-intent-runner'
+} from '../../source-control/review/creation/mobile-hosted-review-create-intent-runner'
 import {
   cancelMobilePrFields,
   generateMobilePrFields,
   loadMobilePrCreateDraft
-} from '../../source-control/mobile-pr-create-draft'
+} from '../../source-control/review/creation/mobile-pr-create-draft'
 import {
   getMobileCommitFailureStagedEntries,
   type MobileCommitFailureRecovery
-} from '../../source-control/mobile-commit-failure-recovery'
-import { useMobileCommitFailureRecovery } from '../../source-control/use-mobile-commit-failure-recovery'
-import { MobileCommitFailurePanel } from '../../source-control/MobileCommitFailurePanel'
+} from '../../source-control/commits/mobile-commit-failure-recovery'
+import { useMobileCommitFailureRecovery } from '../../source-control/commits/use-mobile-commit-failure-recovery'
+import { MobileCommitFailurePanel } from '../../source-control/commits/MobileCommitFailurePanel'
 import type { MobilePrTab } from './use-mobile-pr-tab'
 import { prSheetStyles as sheetStyles } from './pr-tab-styles'
 import { PrBasePicker } from './PrBasePicker'
diff --git a/mobile/src/components/pr-sidebar/PrTabEmptyState.tsx b/mobile/src/components/pr-sidebar/PrTabEmptyState.tsx
index d7107b90297..84b37bb9332 100644
--- a/mobile/src/components/pr-sidebar/PrTabEmptyState.tsx
+++ b/mobile/src/components/pr-sidebar/PrTabEmptyState.tsx
@@ -5,7 +5,7 @@ import { colors } from '../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { normalizeHostedReviewHeadRef } from '../../../../src/shared/source-control/hosted-review/hosted-review-refs'
-import { fetchWorktreeGitHubPRLink } from '../../source-control/mobile-pr-link'
+import { fetchWorktreeGitHubPRLink } from '../../source-control/review/mobile-pr-link'
 import { ListGroup, ListRow } from '../list/ListGroup'
 import { MobileLinkPrForm } from './MobileLinkPrForm'
 import type { MobilePrTab } from './use-mobile-pr-tab'
diff --git a/mobile/src/components/pr-sidebar/PrThreadRow.tsx b/mobile/src/components/pr-sidebar/PrThreadRow.tsx
index 68d3893e4e2..6e91ba4593f 100644
--- a/mobile/src/components/pr-sidebar/PrThreadRow.tsx
+++ b/mobile/src/components/pr-sidebar/PrThreadRow.tsx
@@ -26,7 +26,7 @@ import { colors, pressedStyle, radii, spacing, typography } from '../../theme/mo
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { canEditComment, isResolvableComment } from '../../source-control/review/pr-comment-actions'
 import { ConfirmModal } from '../ConfirmModal'
 import { PullDownMenu } from '../nav-bar/PullDownMenu'
diff --git a/mobile/src/components/pr-sidebar/PrThreadScreen.tsx b/mobile/src/components/pr-sidebar/PrThreadScreen.tsx
index d87cf43aae6..11f166c8c1e 100644
--- a/mobile/src/components/pr-sidebar/PrThreadScreen.tsx
+++ b/mobile/src/components/pr-sidebar/PrThreadScreen.tsx
@@ -5,8 +5,8 @@ import { colors, spacing, typography } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { openExternalLink } from '../../platform/external-link'
-import { useKeyboardOcclusion } from '../../platform/keyboard-occlusion'
+import { openExternalLink } from '../../platform/external-links/external-link'
+import { useKeyboardOcclusion } from '../../platform/keyboard/keyboard-occlusion'
 import { isResolvableComment } from '../../source-control/review/pr-comment-actions'
 import { MobileStateView } from '../MobileStateView'
 import { PrMarkdown } from './PrMarkdown'
diff --git a/mobile/src/components/pr-sidebar/pr-comment-severity.test.ts b/mobile/src/components/pr-sidebar/pr-comment-severity.test.ts
index b9f88792998..c2fb0272c5b 100644
--- a/mobile/src/components/pr-sidebar/pr-comment-severity.test.ts
+++ b/mobile/src/components/pr-sidebar/pr-comment-severity.test.ts
@@ -4,7 +4,6 @@ import { prCommentSeverity } from './pr-comment-severity'
 describe('prCommentSeverity', () => {
   it.each([
     ['_⚠️ Potential issue_ | _🟠 Major_\n\n**Guard the null case.**', 'major'],
-    ['_⚠️ Potential issue_ | _🔴 Critical_', 'critical'],
     ['_🧹 Nitpick_ | _🔵 Trivial_', 'trivial'],
     ['**Minor**: rename this.', 'minor'],
     ['_Major_', 'major']
@@ -14,11 +13,8 @@ describe('prCommentSeverity', () => {
 
   it.each([
     'This is a minor race in the poller.',
-    'Critical path: the merge button.',
     '_Majority_',
-    'Bumps `semver_major_bump` in ci',
-    'Set `ALLOW_MINOR_UPDATES` to true',
-    ''
+    'Set `ALLOW_MINOR_UPDATES` to true'
   ])('ignores the word outside a severity marker in %j', (body) => {
     expect(prCommentSeverity(body)).toBeNull()
   })
diff --git a/mobile/src/components/pr-sidebar/pr-tab-styles.ts b/mobile/src/components/pr-sidebar/pr-tab-styles.ts
index 15336f306ab..13fbed51ca3 100644
--- a/mobile/src/components/pr-sidebar/pr-tab-styles.ts
+++ b/mobile/src/components/pr-sidebar/pr-tab-styles.ts
@@ -1,7 +1,7 @@
 import { StyleSheet } from 'react-native'
 import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
-import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input-font-size'
+import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input/text-input-font-size'
 
 export const prTabStyles = themedStyleSheet(() => ({
   container: { flex: 1, backgroundColor: colors.bgBase },
diff --git a/mobile/src/components/pr-sidebar/use-mobile-pr-tab.ts b/mobile/src/components/pr-sidebar/use-mobile-pr-tab.ts
index 795f3acc787..359c1d5d60a 100644
--- a/mobile/src/components/pr-sidebar/use-mobile-pr-tab.ts
+++ b/mobile/src/components/pr-sidebar/use-mobile-pr-tab.ts
@@ -16,7 +16,7 @@ import {
   type PrSlice
 } from '../../source-control/review/mobile-pr-queries'
 import type { PrActionBusyKey } from '../../source-control/review/pr-actions-engine'
-import type { MobileGitStatusResult } from '../../source-control/mobile-git-status'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../source-control/git/git-status-reply-schema'
 import {
   useMobilePrActions,
   type MobilePrActions
@@ -30,7 +30,7 @@ import {
 import { usePRBotAuthorOverrides } from '../../source-control/review/use-pr-bot-author-overrides'
 import { useHostProtocolGates } from '../host-protocol-gates-context'
 import { useMobilePrPolling, type PrTabLive } from './use-mobile-pr-polling'
-import { unlinkMobilePr } from '../../source-control/mobile-pr-link'
+import { unlinkMobilePr } from '../../source-control/review/mobile-pr-link'
 import { translate } from '../../i18n/mobile-i18n'
 import { usePrCheckRunDetails } from './use-pr-check-run-details'
 import {
diff --git a/mobile/src/components/pr-sidebar/use-pr-tab-menu.ts b/mobile/src/components/pr-sidebar/use-pr-tab-menu.ts
index a977b03f32a..58d9b23a910 100644
--- a/mobile/src/components/pr-sidebar/use-pr-tab-menu.ts
+++ b/mobile/src/components/pr-sidebar/use-pr-tab-menu.ts
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useClipboardWriter } from '../../platform/clipboard'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { openMobilePrUrl } from '../mobile-pr-url'
 import type { ActionSheetAction } from '../ActionSheetModal'
 import { canEditPRTitle } from '../../source-control/review/pr-title-edit'
diff --git a/mobile/src/components/rich-markdown/document-style.ts b/mobile/src/components/rich-markdown/document-style.ts
index 235e0ea8b3f..a8763895e7c 100644
--- a/mobile/src/components/rich-markdown/document-style.ts
+++ b/mobile/src/components/rich-markdown/document-style.ts
@@ -1,5 +1,5 @@
 import { colors, getMobileColorScheme } from '../../theme/mobile-theme'
-import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input-font-size'
+import { TEXT_INPUT_FONT_SIZE } from '../../platform/text-input/text-input-font-size'
 
 // Read theme at build time; native embeds sheet, page scopes it to editor host.
 // #editor scrolls itself: iOS WebKit stops drawing selection ~2 screens into an editable scrolled by a separate box (#34472).
diff --git a/mobile/src/components/rich-markdown/editor-content.test.ts b/mobile/src/components/rich-markdown/editor-content.test.ts
index ccd608d4694..4a47d29caac 100644
--- a/mobile/src/components/rich-markdown/editor-content.test.ts
+++ b/mobile/src/components/rich-markdown/editor-content.test.ts
@@ -47,7 +47,6 @@ describe('the editor document content', () => {
         `data:image/png;base64,${btoa('images/diagram.png')}`
       )
     )
-    expect(loadImageSource).toHaveBeenCalledExactlyOnceWith('images/diagram.png')
     expect(editor.editor.querySelectorAll('img')[1]?.getAttribute('src')).toBe(
       'https://example.com/remote.png'
     )
@@ -76,16 +75,6 @@ describe('the editor document content', () => {
     ])
   })
 
-  it('writes a ticked checkbox back into the markup the next serialization reads', () => {
-    const editor = editorDocument()
-    editor.handle.setMarkdown('- [ ] Open', 1)
-    const checkbox = editor.editor.querySelector('input')!
-    checkbox.checked = true
-    checkbox.dispatchEvent(new Event('change', { bubbles: true }))
-    expect(editor.editor.querySelector('li')!.getAttribute('data-checked')).toBe('true')
-    expect(editor.posted).toEqual([{ type: 'change', markdown: '- [x] Open', generation: 1 }])
-  })
-
   it('reports one change for a checkbox tap, not one per event the tap raises', () => {
     // Assert click/input/change all bubble for one tick, then prove only one report; missing events cannot satisfy count accidentally.
     const editor = editorDocument()
@@ -99,20 +88,4 @@ describe('the editor document content', () => {
     expect(editor.editor.querySelector('li')!.getAttribute('data-checked')).toBe('true')
     expect(editor.posted).toEqual([{ type: 'change', markdown: '- [x] Open', generation: 1 }])
   })
-
-  it('reports one change for inline code over a selection, not one per emitting step', async () => {
-    // The wrap helper emitted and `runCommand` emits after every command: two identical changes.
-    const editor = editorDocument()
-    editor.handle.setMarkdown('one two', 1)
-    const text = editor.editor.querySelector('p')!.firstChild!
-    const range = document.createRange()
-    range.setStart(text, 0)
-    range.setEnd(text, 3)
-    const selection = window.getSelection()!
-    selection.removeAllRanges()
-    selection.addRange(range)
-    await editor.handle.runCommand('inlineCode')
-    expect(editor.editor.innerHTML).toBe('<p><code>one</code> two</p>')
-    expect(editor.posted).toEqual([{ type: 'change', markdown: '`one` two', generation: 1 }])
-  })
 })
diff --git a/mobile/src/components/rich-markdown/editor-inline-code-blocks.test.ts b/mobile/src/components/rich-markdown/editor-inline-code-blocks.test.ts
index 7b7cd4a3e9b..462cc2b8ddf 100644
--- a/mobile/src/components/rich-markdown/editor-inline-code-blocks.test.ts
+++ b/mobile/src/components/rich-markdown/editor-inline-code-blocks.test.ts
@@ -33,9 +33,7 @@ function select(range: Range) {
 }
 
 it.each([
-  ['first\n\nsecond\n\nthird', '`first`\n\n`second`\n\n`third`', ['first', 'second', 'third']],
   ['# Heading\n\n> Quoted', '# `Heading`\n\n> `Quoted`', ['Heading', 'Quoted']],
-  ['- first\n- second', '- `first`\n- `second`', ['first', 'second']],
   ['- [ ] first\n- [x] second', '- [ ] `first`\n- [x] `second`', ['first', 'second']],
   [
     'left ![pixel](https://example.com/pixel.png) right',
diff --git a/mobile/src/components/rich-markdown/editor-selection.test.ts b/mobile/src/components/rich-markdown/editor-selection.test.ts
index 4d3b442eeeb..400e1188d60 100644
--- a/mobile/src/components/rich-markdown/editor-selection.test.ts
+++ b/mobile/src/components/rich-markdown/editor-selection.test.ts
@@ -113,7 +113,6 @@ describe('the editor document caret, across a keyboard dismissal', () => {
   it('restores the pre-dismissal caret so a command does not insert at the end', async () => {
     const editor = runtime({ caret: 'paragraph-3' })
     editor.handle.dismissKeyboard()
-    expect(editor.selectedContainer()).toBe(null)
     await editor.handle.runCommand('bold')
     expect(editor.selectedContainer()).toBe('paragraph-3')
     expect(editor.focused()).toBe(true)
diff --git a/mobile/src/components/rich-markdown/markdown-code-block-dom.test.ts b/mobile/src/components/rich-markdown/markdown-code-block-dom.test.ts
index dfe13edc950..360ffe58999 100644
--- a/mobile/src/components/rich-markdown/markdown-code-block-dom.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-code-block-dom.test.ts
@@ -13,7 +13,6 @@ afterEach(() => {
 })
 
 it.each([
-  ['first<br>second', 'first\nsecond'],
   ['<code>first</code><br><br><code>second</code>', 'first\n\nsecond'],
   ['prefix <code>middle</code> suffix', 'prefix middle suffix'],
   ['<code>last line</code><br><br>', 'last line']
diff --git a/mobile/src/components/rich-markdown/markdown-code-delimiters.test.ts b/mobile/src/components/rich-markdown/markdown-code-delimiters.test.ts
index f272b6656b0..a80ea2a887b 100644
--- a/mobile/src/components/rich-markdown/markdown-code-delimiters.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-code-delimiters.test.ts
@@ -26,11 +26,8 @@ function mount() {
 }
 
 it.each([
-  ['a`b', '``a`b``'],
   ['a``b', '```a``b```'],
   ['`edge', '`` `edge ``'],
-  ['edge`', '`` edge` ``'],
-  ['`', '`` ` ``'],
   ['  surrounded  ', '`   surrounded   `'],
   ['   ', '`   `']
 ])('preserves selected inline code %j through the host and a reload', async (literal, saved) => {
diff --git a/mobile/src/components/rich-markdown/markdown-code-fence-allocation.test.ts b/mobile/src/components/rich-markdown/markdown-code-fence-allocation.test.ts
deleted file mode 100644
index 43488553521..00000000000
--- a/mobile/src/components/rich-markdown/markdown-code-fence-allocation.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { quietRichMarkdownEditorHost } from './rich-markdown-editor-host.test-support'
-import { MOBILE_MARKDOWN_EDIT_MAX_BYTES } from '../../../../src/shared/mobile-markdown-document'
-import { createRichMarkdownEditorDocument } from './create-rich-markdown-editor-document'
-import { RICH_MARKDOWN_EDITOR_MARKUP } from './document-markup'
-
-import type { MobileRichMarkdownEditorMessage } from '../mobile-rich-markdown-editor-contract'
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  document.body.innerHTML = ''
-})
-
-describe('code-block fence sizing', () => {
-  it('serializes an admitted editable document without collecting every backtick run', () => {
-    document.body.innerHTML = RICH_MARKDOWN_EDITOR_MARKUP
-    const posted: MobileRichMarkdownEditorMessage[] = []
-    const editorDocument = createRichMarkdownEditorDocument(
-      quietRichMarkdownEditorHost({
-        postToHost: (message) => posted.push(message),
-        keyboardInsetSource: () => null
-      })
-    )
-    try {
-      const code = '`a'.repeat((MOBILE_MARKDOWN_EDIT_MAX_BYTES - 40) / 2)
-      const markdown = `\`\`\`ts\n${code}\n\`\`\``
-      expect(markdown.length).toBeLessThan(MOBILE_MARKDOWN_EDIT_MAX_BYTES)
-      editorDocument.send.setMarkdown(markdown, 7)
-      editorDocument.send.setEditable(true)
-      const editor = document.getElementById('editor')
-      const codeElement = editor?.querySelector('code')
-      if (!editor || !codeElement) {
-        throw new Error('The loaded Markdown document has no code block')
-      }
-      codeElement.textContent = code + 'a'
-      posted.length = 0
-
-      const match = String.prototype.match
-      let largestMatchArray = 0
-      vi.spyOn(String.prototype, 'match').mockImplementation(function (this: string, pattern) {
-        const matches = match.call(this, pattern)
-        if (matches) {
-          largestMatchArray = Math.max(largestMatchArray, matches.length)
-        }
-        return matches
-      })
-      editor.dispatchEvent(new Event('input'))
-
-      const expected = `\`\`\`ts\n${code}a\n\`\`\``
-      expect(expected.length).toBeLessThan(MOBILE_MARKDOWN_EDIT_MAX_BYTES)
-      expect(posted).toEqual([{ type: 'change', markdown: expected, generation: 7 }])
-      expect(largestMatchArray).toBeLessThan(1024)
-    } finally {
-      editorDocument.stop()
-    }
-  })
-})
diff --git a/mobile/src/components/rich-markdown/markdown-code-literals.test.ts b/mobile/src/components/rich-markdown/markdown-code-literals.test.ts
index 19687646113..f972fb42b39 100644
--- a/mobile/src/components/rich-markdown/markdown-code-literals.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-code-literals.test.ts
@@ -31,7 +31,6 @@ it.each([
   editorDocument.send.setMarkdown(original, 7)
   const surface = document.getElementById('editor')!
   expect(surface.querySelector('code')?.textContent).toBe(codeText)
-  expect(editorDocument.send.currentMarkdown()).toBe(original)
 
   surface.lastElementChild!.append('!')
   surface.dispatchEvent(
@@ -60,7 +59,6 @@ it('preserves text after formatting the gap between inline code spans', async ()
 
   await editorDocument.send.runCommand('inlineCode')
 
-  expect(editorDocument.send.currentMarkdown()).toBe('`old middle tail`')
   expect(messages.filter((message) => message.type === 'change')).toEqual([
     { type: 'change', generation: 7, markdown: '`old middle tail`' }
   ])
@@ -68,24 +66,23 @@ it('preserves text after formatting the gap between inline code spans', async ()
   expect(document.querySelector('#editor code')?.textContent).toBe('old middle tail')
 })
 
-it.each([
-  ['<code>a`</code><code>``b</code>', '````a```b````', 'a```b'],
-  ['<code> left</code><code>right </code>', '`  leftright  `', ' leftright ']
-])('preserves adjacent literal code through save and reopen: %s', (html, markdown, text) => {
-  document.body.innerHTML = RICH_MARKDOWN_EDITOR_MARKUP
-  const editorDocument = createRichMarkdownEditorDocument(quietRichMarkdownEditorHost())
-  stopDocuments.push(editorDocument.stop)
-  const surface = document.getElementById('editor')!
-  surface.innerHTML = `<p>${html}</p>`
+it.each([['<code>a`</code><code>``b</code>', '````a```b````', 'a```b']])(
+  'preserves adjacent literal code through save and reopen: %s',
+  (html, markdown, text) => {
+    document.body.innerHTML = RICH_MARKDOWN_EDITOR_MARKUP
+    const editorDocument = createRichMarkdownEditorDocument(quietRichMarkdownEditorHost())
+    stopDocuments.push(editorDocument.stop)
+    const surface = document.getElementById('editor')!
+    surface.innerHTML = `<p>${html}</p>`
 
-  expect(editorDocument.send.currentMarkdown()).toBe(markdown)
-  editorDocument.send.setMarkdown(markdown, 8)
-  expect(surface.querySelector('code')?.textContent).toBe(text)
-  expect(editorDocument.send.currentMarkdown()).toBe(markdown)
-})
+    expect(editorDocument.send.currentMarkdown()).toBe(markdown)
+    editorDocument.send.setMarkdown(markdown, 8)
+    expect(surface.querySelector('code')?.textContent).toBe(text)
+    expect(editorDocument.send.currentMarkdown()).toBe(markdown)
+  }
+)
 
 it.each([
-  ['inline code', '<p><code>x\u00a0 z\u00a0</code> after</p>', '`x  z ` after'],
   ['an inline code line break', '<p><code>first<br>second</code></p>', '`first second`'],
   ['a code block', '<pre><code>\u00a0 \u00a0if x:</code></pre>', '```\n   if x:\n```']
 ])('saves browser-created spacing in %s as ordinary spaces', (_name, html, markdown) => {
diff --git a/mobile/src/components/rich-markdown/markdown-empty-tasks.test.ts b/mobile/src/components/rich-markdown/markdown-empty-tasks.test.ts
index 3dad7a19afb..20c0f5a2ea6 100644
--- a/mobile/src/components/rich-markdown/markdown-empty-tasks.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-empty-tasks.test.ts
@@ -28,8 +28,6 @@ function mount(markdown: string) {
 }
 
 it.each([
-  ['- [ ]', '- [ ]', [false]],
-  ['- [x]', '- [x]', [true]],
   ['- [ ]   ', '- [ ]', [false]],
   ['- [ ] Parent\n  - [x]', '- [ ] Parent\n  - [x]', [false, true]]
 ])(
diff --git a/mobile/src/components/rich-markdown/markdown-list-block-boundaries.test.ts b/mobile/src/components/rich-markdown/markdown-list-block-boundaries.test.ts
index 9f596557563..b2ff2d58cbe 100644
--- a/mobile/src/components/rich-markdown/markdown-list-block-boundaries.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-list-block-boundaries.test.ts
@@ -6,10 +6,7 @@ import { quietRichMarkdownEditorHost } from './rich-markdown-editor-host.test-su
 import type { MobileRichMarkdownEditorMessage } from '../mobile-rich-markdown-editor-contract'
 
 const stopDocuments: (() => void)[] = []
-const lists = [
-  ['bullet', '- First\n- Next\n\nOutside', 'li'],
-  ['task', '- [ ] First\n- [x] Next\n\nOutside', 'li > div']
-] as const
+const lists = [['task', '- [ ] First\n- [x] Next\n\nOutside', 'li > div']] as const
 
 function surface(source: string) {
   document.body.innerHTML = RICH_MARKDOWN_EDITOR_MARKUP
@@ -71,10 +68,7 @@ for (const [kind, source, selector] of lists) {
 it.each([
   ['<p>First<br></p><p>Second</p>', 'First<br />Second'],
   ['<p>First</p><p><br></p><p>Second</p>', 'First<br /><br />Second'],
-  ['<p>First</p>\n  <p>Second</p>', 'First<br />Second'],
-  ['<p>First\n</p><p>Second</p>', 'First<br />Second'],
   ['First<div>Second</div>Third', 'First<br />Second<br />Third'],
-  ['First<br><div>Second</div>', 'First<br />Second'],
   ['<strong>First</strong> <em>Second</em>', '**First** *Second*']
 ])('keeps existing breaks, empty lines and inline spaces without duplication: %j', (html, text) => {
   const { editorDocument, editor } = surface('- First\n- Next')
diff --git a/mobile/src/components/rich-markdown/markdown-list-linebreaks.test.ts b/mobile/src/components/rich-markdown/markdown-list-linebreaks.test.ts
index ebcc69ac183..de228bdf4ed 100644
--- a/mobile/src/components/rich-markdown/markdown-list-linebreaks.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-list-linebreaks.test.ts
@@ -30,7 +30,6 @@ afterEach(() => {
 
 for (const [kind, source, selector] of lists) {
   it.each([
-    ['First<br>Second', 'First<br />Second'],
     ['<strong>First<br>Second</strong>', '**First<br />Second**'],
     ['<code>First</code><br><code>Second</code>', '`First`<br />`Second`']
   ])(`keeps ${kind} item soft break inside its list through host save: %s`, (html, text) => {
@@ -107,7 +106,6 @@ it.each([
 
 it.each([
   ['<span>First</span><br>', 'First'],
-  ['<p>First<br></p>', 'First'],
   ['<p><strong>First<br></strong></p>', '**First**'],
   ['<span>First</span><br><ul><li><p>Child</p></li></ul>', 'First\n  - Child'],
   ['<p>First<br><br></p>', 'First<br /><br />'],
diff --git a/mobile/src/components/rich-markdown/markdown-quote-blocks.test.ts b/mobile/src/components/rich-markdown/markdown-quote-blocks.test.ts
index 9241627292f..e4c1bb99bce 100644
--- a/mobile/src/components/rich-markdown/markdown-quote-blocks.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-quote-blocks.test.ts
@@ -103,21 +103,3 @@ it('keeps quoted code literal rather than interpreting its block markers', () =>
   expect(editor.querySelectorAll('blockquote').length).toBe(1)
   expect(editorDocument.send.currentMarkdown()).toBe(markdown)
 })
-
-it('keeps task state and read-only controls inside quotes', () => {
-  const { editorDocument, editor } = surface()
-  const markdown = '> - [x] Done\n> - [ ] Open'
-  editorDocument.send.setEditable(false)
-  editorDocument.send.setMarkdown(markdown, 8)
-
-  expect(
-    Array.from(editor.querySelectorAll('input')).map((input) => ({
-      checked: input.checked,
-      disabled: input.disabled
-    }))
-  ).toEqual([
-    { checked: true, disabled: true },
-    { checked: false, disabled: true }
-  ])
-  expect(editorDocument.send.currentMarkdown()).toBe(markdown)
-})
diff --git a/mobile/src/components/rich-markdown/markdown-round-trip.test.ts b/mobile/src/components/rich-markdown/markdown-round-trip.test.ts
index 9e12092a039..4afc6e9da8e 100644
--- a/mobile/src/components/rich-markdown/markdown-round-trip.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-round-trip.test.ts
@@ -107,32 +107,6 @@ describe('the editor document, from markdown and back', () => {
     )
   })
 
-  it('round-trips every block the toolbar can produce', () => {
-    const markdown = [
-      '# Title',
-      '',
-      'Body with **bold**, *italic*, ~~strike~~ and `code`.',
-      '',
-      '> Quoted line',
-      '',
-      '| a | b |',
-      '| --- | --- |',
-      '| 1 | 2 |',
-      '',
-      '```ts',
-      'const x = 1',
-      '```',
-      '',
-      '---',
-      '',
-      '[docs](https://example.com/docs)',
-      '',
-      '![alt](https://example.com/a.png)'
-    ].join('\n')
-
-    expect(currentMarkdown(surface(markdown).scope)).toBe(markdown)
-  })
-
   it('makes progress on a marker with nothing after it, rather than reading it forever', () => {
     // Bare block markers pass isBlockStart but item/heading readers require text; ensure index advances as plain text instead of looping forever.
     const render = (markdown: string) =>
@@ -153,15 +127,6 @@ describe('the editor document, from markdown and back', () => {
     expect(render('- ok')).toBe('<ul><li><p>ok</p></li></ul>')
   })
 
-  it('round-trips a code block that holds a fence of its own', () => {
-    // Choose closing fence longer than any inner backtick run or reader ends code at its own content.
-    const markdown = ['````', '```', 'nested', '```', '````'].join('\n')
-    const { scope, html } = surface(markdown)
-
-    expect(html).toContain('<pre data-language=""><code>```\nnested\n```</code></pre>')
-    expect(currentMarkdown(scope)).toBe(markdown)
-  })
-
   it('round-trips a table cell that holds a pipe, and the backslash that hid it', () => {
     // Escape cell backslashes before pipes so literal pipe remains distinct from row separator.
     const markdown = ['| a \\| b | c\\\\d |', '| --- | --- |', '| 1 \\| 2 | 3 |'].join('\n')
diff --git a/mobile/src/components/rich-markdown/markdown-table-linebreaks.test.ts b/mobile/src/components/rich-markdown/markdown-table-linebreaks.test.ts
index 07a6f594418..784e9778ff4 100644
--- a/mobile/src/components/rich-markdown/markdown-table-linebreaks.test.ts
+++ b/mobile/src/components/rich-markdown/markdown-table-linebreaks.test.ts
@@ -32,7 +32,6 @@ function cellTexts(editor: HTMLElement) {
 }
 
 it.each([
-  ['First<br>Second', 'First<br />Second'],
   ['<strong>First<br>Second</strong>', '**First<br />Second**'],
   ['<code>First</code><br><code>Second</code>', '`First`<br />`Second`']
 ])('keeps a cell line break in its own table row through host save: %s', (html, cell) => {
@@ -71,20 +70,17 @@ it.each([
   expect(editor.querySelector('td')?.querySelector('br')).toBe(null)
 })
 
-it.each(['<br>', '<BR />', 'a<br/>b', '<br onload="run()">'])(
-  'keeps typed table markup literal: %s',
-  (text) => {
-    const { editorDocument, editor } = surface()
-    editor.querySelector('td')!.textContent = text
-    const markdown = editorDocument.send.currentMarkdown()
-    editorDocument.send.setMarkdown(markdown, 8)
+it.each(['a<br/>b', '<br onload="run()">'])('keeps typed table markup literal: %s', (text) => {
+  const { editorDocument, editor } = surface()
+  editor.querySelector('td')!.textContent = text
+  const markdown = editorDocument.send.currentMarkdown()
+  editorDocument.send.setMarkdown(markdown, 8)
 
-    expect(editor.querySelector('td')?.textContent).toBe(text)
-    expect(editor.querySelector('td')?.children.length).toBe(0)
-    expect(editor.querySelectorAll('tr').length).toBe(2)
-    expect(editorDocument.send.currentMarkdown()).toBe(markdown)
-  }
-)
+  expect(editor.querySelector('td')?.textContent).toBe(text)
+  expect(editor.querySelector('td')?.children.length).toBe(0)
+  expect(editor.querySelectorAll('tr').length).toBe(2)
+  expect(editorDocument.send.currentMarkdown()).toBe(markdown)
+})
 
 it('keeps a typed break literal when the browser splits it across text nodes', () => {
   const { editorDocument, editor } = surface()
diff --git a/mobile/src/components/rich-markdown/page-stylesheet.test.ts b/mobile/src/components/rich-markdown/page-stylesheet.test.ts
index ecf974867a8..fbf587dd23f 100644
--- a/mobile/src/components/rich-markdown/page-stylesheet.test.ts
+++ b/mobile/src/components/rich-markdown/page-stylesheet.test.ts
@@ -1,25 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import { scopeDocumentStyleToHost } from '../../style-scoping/document-style-scoping'
-import { richMarkdownEditorStyle } from './document-style'
 
-// Scope all editor selectors to mount host: native :root/*/html/body rules otherwise restyle whole RN Web app after editor unmount.
-// Move globals onto host, including theme variables/color/font/box model; unlike terminal, editor owns these page rules rather than delegating to app seam.
 const PREFIX = '.orca-rich-markdown-document-host'
 
 describe('the editor stylesheet on the page', () => {
-  it('moves the document’s own rules onto the host rather than dropping them', () => {
-    const scoped = scopeDocumentStyleToHost(richMarkdownEditorStyle(), PREFIX)
-    // Keep theme variables on host or correctly scoped selectors still render unstyled.
-    expect(scoped).toContain('--foreground:')
-    const rootRules = scoped
-      .split('}')
-      .filter((rule) => rule.includes('--foreground:') || rule.includes('min-height: 100%'))
-    expect(rootRules.length).toBeGreaterThan(0)
-    for (const rule of rootRules) {
-      expect(rule.trimStart().startsWith(PREFIX)).toBe(true)
-    }
-  })
-
   it('refuses a document-level selector it cannot move, rather than scoping it wrongly', () => {
     // Refuse compound host-global selector rather than silently rewriting body p into mismatching .host body p or changed .host p.
     expect(() => scopeDocumentStyleToHost('body p { color: red; }', PREFIX)).toThrow(
diff --git a/mobile/src/components/rich-markdown/rich-markdown-host-seams.test.ts b/mobile/src/components/rich-markdown/rich-markdown-host-seams.test.ts
deleted file mode 100644
index 67adb946b67..00000000000
--- a/mobile/src/components/rich-markdown/rich-markdown-host-seams.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { quietRichMarkdownEditorHost } from './rich-markdown-editor-host.test-support'
-import { createRichMarkdownEditorDocument } from './create-rich-markdown-editor-document'
-import { RICH_MARKDOWN_EDITOR_MARKUP } from './document-markup'
-
-import type { RichMarkdownEditorDocument } from './document-host-seams'
-
-// Page supplies messages, URL prompt and keyboard seams: shell owns ReactNativeWebView, window.prompt returns null, and screen already measures keyboard; test remaining live-window defaults.
-const startedDocuments: RichMarkdownEditorDocument[] = []
-
-afterEach(() => {
-  while (startedDocuments.length > 0) {
-    startedDocuments.pop()!.stop()
-  }
-  vi.unstubAllGlobals()
-})
-
-describe('the editor document host seams, once the page sets them', () => {
-  it('takes the caret from the selection the host names, not the window one', async () => {
-    // Save/restore only host selection: overlapping fields share window, and global selection belongs to whichever other field holds focus.
-    document.body.innerHTML = RICH_MARKDOWN_EDITOR_MARKUP
-    const editor = document.getElementById('editor')!
-    editor.innerHTML = '<p id="only">text</p>'
-    const ranges: Range[] = []
-    const windowSelection = window.getSelection()!
-    windowSelection.removeAllRanges()
-    // WebKit's own behaviour, and the reason the document saves a caret at all.
-    editor.addEventListener('blur', () => {
-      ranges.length = 0
-    })
-
-    const hostSelection: Selection = Object.create(windowSelection)
-    Object.defineProperty(hostSelection, 'rangeCount', { get: () => ranges.length })
-    hostSelection.getRangeAt = (index: number) => ranges[index]!
-    hostSelection.removeAllRanges = () => {
-      ranges.length = 0
-    }
-    hostSelection.addRange = (range: Range) => {
-      ranges.push(range)
-    }
-
-    const caret = document.createRange()
-    caret.selectNodeContents(document.getElementById('only')!)
-    caret.collapse(true)
-    ranges.push(caret)
-
-    const started = createRichMarkdownEditorDocument(
-      quietRichMarkdownEditorHost({
-        getSelection: () => hostSelection,
-        getDocument: () => hostDocument([]),
-        keyboardInsetSource: () => null,
-        postToHost: () => {}
-      })
-    )
-    startedDocuments.push(started)
-
-    // Saved out of the host's selection, which the blur then empties.
-    editor.focus()
-    started.send.dismissKeyboard()
-    expect(ranges).toEqual([])
-    // And restored into the host's selection rather than the window's.
-    await started.send.runCommand('bold')
-    expect(
-      ranges.map((range) => {
-        const container = range.commonAncestorContainer
-        return (container instanceof Element ? container : container.parentElement)?.id
-      })
-    ).toEqual(['only'])
-    expect(windowSelection.rangeCount).toBe(0)
-  })
-})
-
-// Host supplies real document with recorded execCommand because happy-dom lacks it; prove no global command lookup.
-function hostDocument(commands: [string, boolean, string | undefined][]): Document {
-  const page: Document = Object.create(document)
-  page.execCommand = (command: string, showUI?: boolean, value?: string) => {
-    commands.push([command, showUI === true, value])
-    return true
-  }
-  return page
-}
diff --git a/mobile/src/components/use-detail-card-scope.web.ts b/mobile/src/components/use-detail-card-scope.web.ts
index f83d48a4e61..f63168bd35a 100644
--- a/mobile/src/components/use-detail-card-scope.web.ts
+++ b/mobile/src/components/use-detail-card-scope.web.ts
@@ -1,6 +1,6 @@
 import { useLayoutEffect, useRef } from 'react'
 import type { DetailCardScopeOptions } from './use-detail-card-scope'
-import { isTextField } from '../platform/keyboard-persisting-taps'
+import { isTextField } from '../platform/keyboard/keyboard-persisting-taps'
 
 function element(value: unknown): HTMLElement | null {
   return value instanceof HTMLElement ? value : null
diff --git a/mobile/src/components/use-new-workspace-create-submit.ts b/mobile/src/components/use-new-workspace-create-submit.ts
index d1faecff608..57a851228b0 100644
--- a/mobile/src/components/use-new-workspace-create-submit.ts
+++ b/mobile/src/components/use-new-workspace-create-submit.ts
@@ -4,7 +4,7 @@ import type { PersistedTrustedOrcaHooks } from '../../../src/shared/orca-yaml-ho
 import type { RetiredNameRegistry } from '../../../src/shared/worktree/retired-name-registry'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 import { folderCreateBusyMessage, uncertainCreateMessage } from './new-workspace-create-copy'
-import { triggerError, triggerSuccess } from '../platform/haptics'
+import { triggerError, triggerSuccess } from '../platform/haptics/haptics'
 import type { WorktreeCreateParent } from '../new-workspace/creation/worktree-create-retry'
 import { createBlankWorkspace } from '../new-workspace/creation/blank-workspace-create'
 import { isMobileTuiAgentEnabled } from '../agents/mobile-tui-agents'
diff --git a/mobile/src/components/use-new-workspace-repositories.ts b/mobile/src/components/use-new-workspace-repositories.ts
index 15a0c14e57e..b34fa4d8cfa 100644
--- a/mobile/src/components/use-new-workspace-repositories.ts
+++ b/mobile/src/components/use-new-workspace-repositories.ts
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
 import { getRepoExecutionHostId, type ExecutionHostId } from '../../../src/shared/execution-host'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { cachedHostRepos } from '../host-screen/host-list-queries'
+import { cachedHostRepos } from '../host-screen/catalog/host-list-queries'
 import { listHostRepos } from '../worktree/server-repos'
 import { useServerRepos } from '../worktree/use-server-repos'
 import { useLastVisitedWorktreeRepoId } from '../worktree/use-last-visited-worktree-repo'
diff --git a/mobile/src/dictation/MobileDictationMeter.tsx b/mobile/src/dictation/MobileDictationMeter.tsx
index 7cf75cb2cc2..ad97b0941c1 100644
--- a/mobile/src/dictation/MobileDictationMeter.tsx
+++ b/mobile/src/dictation/MobileDictationMeter.tsx
@@ -6,7 +6,7 @@ import {
   type MobileDictationMeter
 } from '../hooks/mobile-dictation-meter'
 import { useNow } from '../hooks/use-now'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { colors, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/dictation/mobile-dictation-away-insert.ts b/mobile/src/dictation/mobile-dictation-away-insert.ts
index 483f08e232e..1f001666470 100644
--- a/mobile/src/dictation/mobile-dictation-away-insert.ts
+++ b/mobile/src/dictation/mobile-dictation-away-insert.ts
@@ -1,10 +1,10 @@
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 import { editMobileNativeChatDraft } from '../session/native-chat/composer/mobile-native-chat-draft-store'
-import { terminalInputSend } from '../terminal/mobile-terminal-operations'
+import { terminalInputSend } from '../terminal/host-operations/mobile-terminal-operations'
 import {
   buildTerminalSendParams,
   TERMINAL_INPUT_SEND_OPTIONS
-} from '../terminal/terminal-send-request'
+} from '../terminal/input-delivery/terminal-send-request'
 import { insertDictationText } from './mobile-dictation-text-insertion'
 
 // Where a dictation's words go when its screen is gone or behind another: the chat's draft, or the terminal's input.
diff --git a/mobile/src/dictation/mobile-dictation-host.tsx b/mobile/src/dictation/mobile-dictation-host.tsx
index 37daa11a247..fec51c8f541 100644
--- a/mobile/src/dictation/mobile-dictation-host.tsx
+++ b/mobile/src/dictation/mobile-dictation-host.tsx
@@ -2,8 +2,8 @@ import { useCallback, useLayoutEffect, useMemo, useRef, useState, type ReactNode
 import { useMobileDictation } from '../hooks/use-mobile-dictation'
 import type { UseMobileDictationResult } from '../hooks/mobile-dictation-session-state'
 import { useRouteHandoff } from '../navigation/route-handoff'
-import { triggerError } from '../platform/haptics'
-import { useClipboardWriter } from '../platform/clipboard'
+import { triggerError } from '../platform/haptics/haptics'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import { dictationFailureMessage, isDictationSetupRequiredError } from './mobile-dictation-setup'
 import { useMobileDictationHaptics } from './use-mobile-dictation-haptics'
 import { useMobileDictationSilenceStop } from './use-mobile-dictation-silence-stop'
diff --git a/mobile/src/dictation/use-mobile-dictation-announcements.ts b/mobile/src/dictation/use-mobile-dictation-announcements.ts
index 0dd2d729a4c..dd9a4dec999 100644
--- a/mobile/src/dictation/use-mobile-dictation-announcements.ts
+++ b/mobile/src/dictation/use-mobile-dictation-announcements.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import type { UseMobileDictationResult } from '../hooks/mobile-dictation-session-state'
-import { useAccessibilityAnnouncer } from '../platform/accessibility-announcer'
+import { useAccessibilityAnnouncer } from '../platform/accessibility/accessibility-announcer'
 import { dictationAnnounceCopy } from './mobile-dictation-announce-copy'
 import { dictationKeptFailureCause } from './mobile-dictation-controls-copy'
 
diff --git a/mobile/src/dictation/use-mobile-dictation-cancel-drop.ts b/mobile/src/dictation/use-mobile-dictation-cancel-drop.ts
index 2ba5895f968..86fc8afa888 100644
--- a/mobile/src/dictation/use-mobile-dictation-cancel-drop.ts
+++ b/mobile/src/dictation/use-mobile-dictation-cancel-drop.ts
@@ -1,6 +1,7 @@
 import { useCallback, type RefObject } from 'react'
 import type { GestureResponderEvent, HostInstance } from 'react-native'
-import { measurePageBox, type PageBox } from '../platform/page-box'
+import { measurePageBox } from '../platform/view-measurement/page-box'
+import type { PageBox } from '../platform/view-measurement/page-box-contract'
 
 // A dragging finger lands less precisely than a tap, so the drop zone reaches past ✕.
 const DROP_SLOP = 12
diff --git a/mobile/src/dictation/use-mobile-dictation-haptics.ts b/mobile/src/dictation/use-mobile-dictation-haptics.ts
index ae927fdd6b5..e0125da9327 100644
--- a/mobile/src/dictation/use-mobile-dictation-haptics.ts
+++ b/mobile/src/dictation/use-mobile-dictation-haptics.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react'
-import { triggerEdgeBump, triggerSelection } from '../platform/haptics'
+import { triggerEdgeBump, triggerSelection } from '../platform/haptics/haptics'
 import type { UseMobileDictationResult } from '../hooks/mobile-dictation-session-state'
 
 /** Taps when recording begins and returns a stop that ticks. */
diff --git a/mobile/src/files/MobileFilePreviewScreen.tsx b/mobile/src/files/MobileFilePreviewScreen.tsx
index 37dab60d168..dbf347ede61 100644
--- a/mobile/src/files/MobileFilePreviewScreen.tsx
+++ b/mobile/src/files/MobileFilePreviewScreen.tsx
@@ -1,5 +1,9 @@
-import { saveErrorMessageFromPreviewResult } from './mobile-file-preview-response'
-import { MobileChatAttachmentPreview } from './MobileChatAttachmentPreview'
+import {
+  saveErrorMessageFromPreviewResult,
+  previewError,
+  type MobileFilePreviewResult
+} from './preview/mobile-file-preview-response'
+import { MobileChatAttachmentPreview } from './attachments/MobileChatAttachmentPreview'
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { Alert, View } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
@@ -15,33 +19,34 @@ import { useWorkspaceClient } from '../worktree/use-workspace-client'
 import { connectionRetryAction } from '../transport/connection/connection-retry-action'
 import {
   loadMobileFilePreview,
-  previewError,
-  saveMobileTerminalArtifactPreview,
-  type MobileFilePreviewResult
-} from './mobile-file-preview-request'
-import { MobileFilePreviewDiscardModal } from './MobileFilePreviewDiscardModal'
+  saveMobileTerminalArtifactPreview
+} from './preview/mobile-file-preview-request'
+import { MobileFilePreviewDiscardModal } from './preview/MobileFilePreviewDiscardModal'
 import { NavBar } from '../components/nav-bar/NavBar'
 import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { MobileFilePreviewBody } from './MobileFilePreviewBody'
+import { MobileFilePreviewBody } from './preview/MobileFilePreviewBody'
 import {
   MobileMarkdownPreviewModeBar,
   useMarkdownPreviewMode
-} from './MobileMarkdownPreviewModeBar'
+} from './markdown/MobileMarkdownPreviewModeBar'
 import {
   displayNameFromPreviewPath,
   type MobileFilePreviewRouteState
-} from './mobile-file-preview-route'
-import { previewSourceFromRoute, sourceKeyForPreview } from './mobile-file-preview-source'
-import { normalizeMobileFilePreviewLineColumn } from './mobile-file-preview-line-column'
+} from './preview/mobile-file-preview-route'
+import { previewSourceFromRoute, sourceKeyForPreview } from './preview/mobile-file-preview-source'
+import { normalizeMobileFilePreviewLineColumn } from './preview/mobile-file-preview-line-column'
 import {
   hasUnsavedMobileTerminalArtifactDraft,
   isEditableMobileTerminalArtifactPreview,
   shouldKeepDirtyDraftOnPreviewLoadResult
-} from './mobile-file-preview-editability'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { mobileMarkdownFileLink } from './mobile-markdown-file-link'
-import { useMobileFilePreviewBack } from './use-mobile-file-preview-back'
-import { filePreviewEditDraftKey, MobileFilePreviewEditDraft } from './MobileFilePreviewEditDraft'
+} from './terminal-artifacts/mobile-file-preview-editability'
+import { filePreviewStyles as styles } from './preview/mobile-file-preview-styles'
+import { mobileMarkdownFileLink } from './markdown/mobile-markdown-file-link'
+import { useMobileFilePreviewBack } from './preview/use-mobile-file-preview-back'
+import {
+  filePreviewEditDraftKey,
+  MobileFilePreviewEditDraft
+} from './terminal-artifacts/MobileFilePreviewEditDraft'
 import { dropDocumentEditDraft } from '../drafts/document-edit-draft-rows'
 
 type Props = {
diff --git a/mobile/src/files/AttachmentTextScrollView.tsx b/mobile/src/files/attachments/AttachmentTextScrollView.tsx
similarity index 95%
rename from mobile/src/files/AttachmentTextScrollView.tsx
rename to mobile/src/files/attachments/AttachmentTextScrollView.tsx
index 07c84177e19..b9d5255f358 100644
--- a/mobile/src/files/AttachmentTextScrollView.tsx
+++ b/mobile/src/files/attachments/AttachmentTextScrollView.tsx
@@ -3,9 +3,9 @@ import { Platform, ScrollView, Text, View, type ScrollViewInstance } from 'react
 import type {
   AttachmentTextSource,
   AttachmentTextWindow
-} from '../../../src/shared/attachment-text/attachment-text-source'
-import { AttachmentTextViewport } from '../../../src/shared/attachment-text/attachment-text-viewport'
-import { chatAttachmentPreviewStyles as styles } from './mobile-file-preview-styles'
+} from '../../../../src/shared/attachment-text/attachment-text-source'
+import { AttachmentTextViewport } from '../../../../src/shared/attachment-text/attachment-text-viewport'
+import { chatAttachmentPreviewStyles as styles } from '../preview/mobile-file-preview-styles'
 
 function scrollElement(view: ScrollViewInstance | null): HTMLElement | null {
   if (Platform.OS !== 'web') {
diff --git a/mobile/src/files/MobileChatAttachmentPreview.tsx b/mobile/src/files/attachments/MobileChatAttachmentPreview.tsx
similarity index 87%
rename from mobile/src/files/MobileChatAttachmentPreview.tsx
rename to mobile/src/files/attachments/MobileChatAttachmentPreview.tsx
index c1ab21efabb..a2deb2f9515 100644
--- a/mobile/src/files/MobileChatAttachmentPreview.tsx
+++ b/mobile/src/files/attachments/MobileChatAttachmentPreview.tsx
@@ -1,20 +1,20 @@
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { Translate } from '../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { Translate } from '../../i18n/mobile-i18n'
 import { createMobileChatAttachmentReader } from './mobile-chat-attachment-read'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { useMemo, useState, useEffect, useCallback } from 'react'
 import { Pressable, Text, View } from 'react-native'
 import { AttachmentTextScrollView } from './AttachmentTextScrollView'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { useWorkspaceRouteHandoff } from '../navigation/workspace-route-handoff'
-import { useWorkspaceClient } from '../worktree/use-workspace-client'
-import { createAttachmentTextPreviewHook } from '../../../src/shared/attachment-text/use-attachment-text-preview'
-import { chatTextAttachmentName } from '../../../src/shared/native-chat-text-attachment-references'
-import { MOBILE_BRIDGE_MAX_FRAME_BYTES } from '../../../src/shared/mobile-bridge-frame-bytes'
-import { useClipboardWriter } from '../platform/clipboard'
-import { getUiIntlLocale } from '../i18n/ui-intl-locale'
-import { chatAttachmentPreviewStyles as styles } from './mobile-file-preview-styles'
-import type { MobileFilePreviewRouteParams } from './mobile-file-preview-route'
+import { useWorkspaceRouteHandoff } from '../../navigation/workspace-route-handoff'
+import { useWorkspaceClient } from '../../worktree/use-workspace-client'
+import { createAttachmentTextPreviewHook } from '../../../../src/shared/attachment-text/use-attachment-text-preview'
+import { chatTextAttachmentName } from '../../../../src/shared/native-chat-text-attachment-references'
+import { MOBILE_BRIDGE_MAX_FRAME_BYTES } from '../../../../src/shared/mobile-bridge-frame-bytes'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { getUiIntlLocale } from '../../i18n/ui-intl-locale'
+import { chatAttachmentPreviewStyles as styles } from '../preview/mobile-file-preview-styles'
+import type { MobileFilePreviewRouteParams } from '../preview/mobile-file-preview-route'
 
 const useAttachmentTextPreview = createAttachmentTextPreviewHook({
   useState,
diff --git a/mobile/src/files/attachments/mobile-agent-image-fit.ts b/mobile/src/files/attachments/mobile-agent-image-fit.ts
index 5c49afb7774..345af967411 100644
--- a/mobile/src/files/attachments/mobile-agent-image-fit.ts
+++ b/mobile/src/files/attachments/mobile-agent-image-fit.ts
@@ -8,7 +8,7 @@ import {
 import { base64DecodedByteLength } from '../../../../src/shared/agent-session/agent-session-attachments'
 import { detectImageFileSignature } from '../../../../src/shared/image-file-signature'
 import { decodeBase64Bytes } from '../../transport/encryption/base64-byte-codec'
-import type { PickedMobileImage } from '../../platform/media-picker-contract'
+import type { PickedMobileImage } from '../../platform/media-picking/media-picker-contract'
 
 // Page-only: decodes and re-encodes through the WebView's canvas.
 
diff --git a/mobile/src/files/mobile-chat-attachment-read.ts b/mobile/src/files/attachments/mobile-chat-attachment-read.ts
similarity index 83%
rename from mobile/src/files/mobile-chat-attachment-read.ts
rename to mobile/src/files/attachments/mobile-chat-attachment-read.ts
index c3f2953ff98..0a9ae36f7a8 100644
--- a/mobile/src/files/mobile-chat-attachment-read.ts
+++ b/mobile/src/files/attachments/mobile-chat-attachment-read.ts
@@ -1,14 +1,14 @@
-import { sharedPromiseSettlementWaiters } from '../../../src/shared/promise-settlement-waiters'
-import { hostStatusProbe } from '../transport/connection/host-status-probe-operations'
-import { readHostStatusReply } from '../query/host-status-query'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { sharedPromiseSettlementWaiters } from '../../../../src/shared/promise-settlement-waiters'
+import { hostStatusProbe } from '../../transport/connection/host-status-probe-operations'
+import { readHostStatusReply } from '../../query/host-status-query'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import {
   attachmentTextChunkSchema,
   type AttachmentTextRead
-} from '../../../src/shared/attachment-text/attachment-text-source'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+} from '../../../../src/shared/attachment-text/attachment-text-source'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 
 // Match the shared wire identifier without importing the host capability aggregate into this route.
 const AGENT_SESSION_TEXT_ATTACHMENT_READ_CAPABILITY = 'native-chat.text-attachment-read.v1'
diff --git a/mobile/src/files/attachments/mobile-file-source-picker.ts b/mobile/src/files/attachments/mobile-file-source-picker.ts
index ab4f501d54f..81740ab1602 100644
--- a/mobile/src/files/attachments/mobile-file-source-picker.ts
+++ b/mobile/src/files/attachments/mobile-file-source-picker.ts
@@ -3,7 +3,7 @@ import {
   MOBILE_PICKED_FILE_MAX_BYTES,
   MobileFileTooLargeError,
   type PickedMobileFile
-} from '../../platform/media-picker-contract'
+} from '../../platform/media-picking/media-picker-contract'
 import {
   defaultMobileImageFileFactory,
   readUriAsBase64,
diff --git a/mobile/src/files/attachments/mobile-image-attachment.ts b/mobile/src/files/attachments/mobile-image-attachment.ts
index 259d2816731..c8912568ebe 100644
--- a/mobile/src/files/attachments/mobile-image-attachment.ts
+++ b/mobile/src/files/attachments/mobile-image-attachment.ts
@@ -3,7 +3,10 @@ import {
   buildMobileTerminalImagePastePayload,
   saveMobileClipboardImageAsTempFile
 } from './mobile-clipboard-image'
-import type { MobileImageSource, PickedMobileImage } from '../../platform/media-picker-contract'
+import type {
+  MobileImageSource,
+  PickedMobileImage
+} from '../../platform/media-picking/media-picker-contract'
 import { nativeChatTerminalWrite } from '../../terminal/session/mobile-session-terminal-operations'
 import type { MobileClipboardImageRpcSender } from './mobile-clipboard-image-operations'
 
diff --git a/mobile/src/files/attachments/mobile-image-paste-agent.ts b/mobile/src/files/attachments/mobile-image-paste-agent.ts
index a822f06cb49..5ced45f3416 100644
--- a/mobile/src/files/attachments/mobile-image-paste-agent.ts
+++ b/mobile/src/files/attachments/mobile-image-paste-agent.ts
@@ -1,4 +1,4 @@
-import { resolveMobileTerminalTabOwnedAgentId } from '../../terminal/session/mobile-terminal-tab-agent'
+import { resolveMobileTerminalTabOwnedAgentId } from '../../session/tabs/mobile-terminal-tab-agent'
 import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
 
 export function resolveMobileImageAttachmentAgent(
diff --git a/mobile/src/files/attachments/mobile-image-source-picker.ts b/mobile/src/files/attachments/mobile-image-source-picker.ts
index 1df1e6f7175..812c44f9001 100644
--- a/mobile/src/files/attachments/mobile-image-source-picker.ts
+++ b/mobile/src/files/attachments/mobile-image-source-picker.ts
@@ -8,10 +8,13 @@ import {
   assertClipboardImageByteLengthWithinLimit
 } from '../../../../src/shared/clipboard-image'
 import { MobileImageBase64Accumulator } from './mobile-image-base64-accumulator'
-import { isPickedImageMime } from '../../platform/mobile-picked-file-name'
+import { isPickedImageMime } from '../../platform/media-picking/mobile-picked-file-name'
 // Import permission errors from the Expo-free contract so page-side catches cannot pull native picker code into the bundle.
-import { ImageLibraryPermissionError } from '../../platform/media-picker-contract'
-import type { MobileImageSource, PickedMobileImage } from '../../platform/media-picker-contract'
+import { ImageLibraryPermissionError } from '../../platform/media-picking/media-picker-contract'
+import type {
+  MobileImageSource,
+  PickedMobileImage
+} from '../../platform/media-picking/media-picker-contract'
 
 const MOBILE_IMAGE_READ_CHUNK_BYTES = 256 * 1024
 
diff --git a/mobile/src/files/attachments/use-mobile-image-attachment.ts b/mobile/src/files/attachments/use-mobile-image-attachment.ts
index 450a50e4975..ab35e266d51 100644
--- a/mobile/src/files/attachments/use-mobile-image-attachment.ts
+++ b/mobile/src/files/attachments/use-mobile-image-attachment.ts
@@ -2,11 +2,11 @@ import { useCallback, useState } from 'react'
 import { translate } from '../../i18n/mobile-i18n'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../transport/connection/connection-state'
-import { useMediaPicker } from '../../platform/media-picker'
+import { useMediaPicker } from '../../platform/media-picking/media-picker'
 import {
   ImageLibraryPermissionError,
   type MobileImageSource
-} from '../../platform/media-picker-contract'
+} from '../../platform/media-picking/media-picker-contract'
 import { attachMobileImageToTerminal } from './mobile-image-attachment'
 import { fitMobileAgentImage } from './mobile-agent-image-fit'
 
diff --git a/mobile/src/files/attachments/use-mobile-session-attachments.ts b/mobile/src/files/attachments/use-mobile-session-attachments.ts
index 34998f4c8a3..8689eabafad 100644
--- a/mobile/src/files/attachments/use-mobile-session-attachments.ts
+++ b/mobile/src/files/attachments/use-mobile-session-attachments.ts
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { AppState, type AppStateStatus } from 'react-native'
-import { useClipboardReader } from '../../platform/clipboard'
-import { triggerSelection, triggerError } from '../../platform/haptics'
+import { useClipboardReader } from '../../platform/clipboard/clipboard'
+import { triggerSelection, triggerError } from '../../platform/haptics/haptics'
 import { resolveMobileImageAttachmentAgent } from './mobile-image-paste-agent'
 import { useMobileNewTabAgentOptions } from '../../session/agent-launch/use-mobile-new-tab-agent-options'
 import { useMobileSessionImageAttachments } from './use-mobile-session-image-attachments'
@@ -11,8 +11,8 @@ import {
   resolveMobileNativeChatSessionId
 } from '../../session/native-chat/mobile-native-chat-eligibility'
 import { useMobileAttachmentInputLeaseGate } from './use-mobile-attachment-input-lease-gate'
-import { useMobileTerminalPaste } from '../../terminal/session/use-mobile-terminal-paste'
-import type { MobileSessionAccessorySelectionModel } from '../../terminal/session/use-mobile-session-accessory-selection'
+import { useMobileTerminalPaste } from '../../terminal/session/input-controls/use-mobile-terminal-paste'
+import type { MobileSessionAccessorySelectionModel } from '../../terminal/session/accessory-keys/use-mobile-session-accessory-selection'
 
 export function useMobileSessionAttachments(scope: MobileSessionAccessorySelectionModel) {
   const {
diff --git a/mobile/src/files/attachments/use-mobile-session-image-attachments.ts b/mobile/src/files/attachments/use-mobile-session-image-attachments.ts
index 00af1d341b1..6c50ce1af36 100644
--- a/mobile/src/files/attachments/use-mobile-session-image-attachments.ts
+++ b/mobile/src/files/attachments/use-mobile-session-image-attachments.ts
@@ -1,6 +1,6 @@
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../transport/connection/connection-state'
-import type { MobileImageSource } from '../../platform/media-picker-contract'
+import type { MobileImageSource } from '../../platform/media-picking/media-picker-contract'
 import type {
   MobileNativeChatSendIntent,
   MobileNativeChatSendOutcome
diff --git a/mobile/src/files/MobileFileExplorerPanel.test.ts b/mobile/src/files/explorer/MobileFileExplorerPanel.test.ts
similarity index 94%
rename from mobile/src/files/MobileFileExplorerPanel.test.ts
rename to mobile/src/files/explorer/MobileFileExplorerPanel.test.ts
index 4d3863a0356..70f50164519 100644
--- a/mobile/src/files/MobileFileExplorerPanel.test.ts
+++ b/mobile/src/files/explorer/MobileFileExplorerPanel.test.ts
@@ -4,12 +4,12 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { MobileFileExplorerPanel } from './MobileFileExplorerPanel'
 import type { MobileDirEntry } from './file-tree'
-import { createOrcaQueryClient } from '../query/orca-query-client'
-import { settleQueryNotifications } from '../test-support/rpc-recording/hook-mount'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { stubRpcClient } from '../transport/rpc/rpc-client-test-stub'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import { createOrcaQueryClient } from '../../query/orca-query-client'
+import { settleQueryNotifications } from '../../test-support/rpc-recording/hook-mount'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { stubRpcClient } from '../../transport/rpc/rpc-client-test-stub'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 
 const mounted: ReactTestRenderer[] = []
 
@@ -25,7 +25,9 @@ const mockTransport = vi.hoisted(
   })
 )
 
-vi.mock('../platform/use-reduced-motion', () => ({ useReducedMotionEnabled: () => true }))
+vi.mock('../../platform/accessibility/use-reduced-motion', () => ({
+  useReducedMotionEnabled: () => true
+}))
 vi.mock('react-native-reanimated', () => ({
   Easing: { bezier: () => (t: number) => t },
   default: { View: 'AnimatedView' },
@@ -110,7 +112,7 @@ vi.mock('lucide-react-native', () => ({
   X: 'X'
 }))
 
-vi.mock('../platform/haptics', () => ({
+vi.mock('../../platform/haptics/haptics', () => ({
   triggerSelection: vi.fn()
 }))
 
@@ -118,7 +120,7 @@ vi.mock('./mobile-file-explorer-row-actions-sheet', () => ({
   useMobileFileExplorerRowActions: () => ({ openRowActions: () => {}, rowActionsSheet: null })
 }))
 
-vi.mock('../transport/connection/host-client-hooks', () => ({
+vi.mock('../../transport/connection/host-client-hooks', () => ({
   useForceReconnect: () => mockTransport.forceReconnect,
   useHostClient: () => ({
     client: mockTransport.client,
diff --git a/mobile/src/files/MobileFileExplorerPanel.tsx b/mobile/src/files/explorer/MobileFileExplorerPanel.tsx
similarity index 90%
rename from mobile/src/files/MobileFileExplorerPanel.tsx
rename to mobile/src/files/explorer/MobileFileExplorerPanel.tsx
index b0bcb0dea2c..d87d3061071 100644
--- a/mobile/src/files/MobileFileExplorerPanel.tsx
+++ b/mobile/src/files/explorer/MobileFileExplorerPanel.tsx
@@ -17,38 +17,38 @@ import {
   type QueryKey,
   type UseQueryResult
 } from '@tanstack/react-query'
-import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
-import { useWorkspaceRouteHandoff } from '../navigation/workspace-route-handoff'
-import { useHostQueries, useHostQuery } from '../query/host-query'
-import { hostQueryKey, hostScopeKey } from '../query/host-query-key'
-import { hostScreenState } from '../query/host-query-screen-state'
-import { useForceReconnect } from '../transport/connection/host-client-hooks'
-import { useWorkspaceClient } from '../worktree/use-workspace-client'
-import { connectionRetryAction } from '../transport/connection/connection-retry-action'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { getWorktreeLabel } from '../worktree/worktree-label'
+import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
+import { useWorkspaceRouteHandoff } from '../../navigation/workspace-route-handoff'
+import { useHostQueries, useHostQuery } from '../../query/host-query'
+import { hostQueryKey, hostScopeKey } from '../../query/host-query-key'
+import { hostScreenState } from '../../query/host-query-screen-state'
+import { useForceReconnect } from '../../transport/connection/host-client-hooks'
+import { useWorkspaceClient } from '../../worktree/use-workspace-client'
+import { connectionRetryAction } from '../../transport/connection/connection-retry-action'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { getWorktreeLabel } from '../../worktree/worktree-label'
 import type { DirectoryCache, DirectoryState, FileExplorerRow } from './file-tree'
-import { spacing } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { spacing } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { fileDirectoryQuery, type DirectoryRead } from './mobile-file-explorer-operations'
 import { fileExplorerStyles as styles } from './mobile-file-explorer-styles'
 import { useMobileFileExplorerRows } from './mobile-file-explorer-rows'
 import { MobileFileExplorerRow } from './mobile-file-explorer-row'
 import { useMobileFileExplorerRowActions } from './mobile-file-explorer-row-actions-sheet'
 import { useMobileFileExplorerPaging } from './use-mobile-file-explorer-paging'
-import { useRefreshHint } from '../query/refresh-hint'
-import { navigateToMobileFilePreview } from './mobile-file-preview-navigation'
+import { useRefreshHint } from '../../query/refresh-hint'
+import { navigateToMobileFilePreview } from '../preview/mobile-file-preview-navigation'
 import {
   MobileLoadErrorState,
   MobileNoMatchState,
   MobileOfflineState,
   MobileStateView
-} from '../components/MobileStateView'
-import { BottomSearchBar } from '../components/nav-bar/BottomSearchBar'
-import { NavBar } from '../components/nav-bar/NavBar'
-import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+} from '../../components/MobileStateView'
+import { BottomSearchBar } from '../../components/nav-bar/BottomSearchBar'
+import { NavBar } from '../../components/nav-bar/NavBar'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 const ROOT = { relativePath: '' }
 const NO_FOLDERS: ReadonlySet<string> = new Set()
diff --git a/mobile/src/files/file-explorer-reply-schema.ts b/mobile/src/files/explorer/file-explorer-reply-schema.ts
similarity index 92%
rename from mobile/src/files/file-explorer-reply-schema.ts
rename to mobile/src/files/explorer/file-explorer-reply-schema.ts
index f02c6492e4f..0d91d11e337 100644
--- a/mobile/src/files/file-explorer-reply-schema.ts
+++ b/mobile/src/files/explorer/file-explorer-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
+import { salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
 
 // Require an array because the cache sorts/walks it unguarded. Drop rows without name or isDirectory; salvage decorative isSymlink.
 export const fileDirectoryEntriesSchema = salvagingArray(
diff --git a/mobile/src/files/file-list-fallback.ts b/mobile/src/files/explorer/file-list-fallback.ts
similarity index 100%
rename from mobile/src/files/file-list-fallback.ts
rename to mobile/src/files/explorer/file-list-fallback.ts
diff --git a/mobile/src/files/file-tree.test.ts b/mobile/src/files/explorer/file-tree.test.ts
similarity index 100%
rename from mobile/src/files/file-tree.test.ts
rename to mobile/src/files/explorer/file-tree.test.ts
diff --git a/mobile/src/files/file-tree.ts b/mobile/src/files/explorer/file-tree.ts
similarity index 97%
rename from mobile/src/files/file-tree.ts
rename to mobile/src/files/explorer/file-tree.ts
index eeecd29128e..9d283aecfd1 100644
--- a/mobile/src/files/file-tree.ts
+++ b/mobile/src/files/explorer/file-tree.ts
@@ -1,5 +1,5 @@
-import { MEDIA_FILE_MIME_TYPES } from '../../../src/shared/file-preview/media-mime-types'
-import { compareFileNames } from '../../../src/shared/file-listing/file-name-sort'
+import { MEDIA_FILE_MIME_TYPES } from '../../../../src/shared/file-preview/media-mime-types'
+import { compareFileNames } from '../../../../src/shared/file-listing/file-name-sort'
 
 export type MobileDirEntry = {
   name: string
diff --git a/mobile/src/files/mobile-file-explorer-operations.ts b/mobile/src/files/explorer/mobile-file-explorer-operations.ts
similarity index 90%
rename from mobile/src/files/mobile-file-explorer-operations.ts
rename to mobile/src/files/explorer/mobile-file-explorer-operations.ts
index 5e3e7f35ea4..d3858727544 100644
--- a/mobile/src/files/mobile-file-explorer-operations.ts
+++ b/mobile/src/files/explorer/mobile-file-explorer-operations.ts
@@ -1,11 +1,14 @@
-import { translate } from '../i18n/mobile-i18n'
-import { defineHostQuery } from '../query/host-query'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { isMobileMethodUnavailableError } from '../transport/rpc/mobile-method-unavailable'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant, rpcResultVariants } from '../transport/rpc/rpc-operation-result-reader'
-import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../../../src/shared/file-listing/file-dir-page'
-import { compareDirEntries } from '../../../src/shared/file-listing/file-name-sort'
+import { translate } from '../../i18n/mobile-i18n'
+import { defineHostQuery } from '../../query/host-query'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { isMobileMethodUnavailableError } from '../../transport/rpc/mobile-method-unavailable'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import {
+  rpcResultVariant,
+  rpcResultVariants
+} from '../../transport/rpc/rpc-operation-result-reader'
+import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../../../../src/shared/file-listing/file-dir-page'
+import { compareDirEntries } from '../../../../src/shared/file-listing/file-name-sort'
 import {
   fileDirectoryEntriesSchema,
   fileDirectoryPageSchema,
diff --git a/mobile/src/files/mobile-file-explorer-row-actions-sheet.tsx b/mobile/src/files/explorer/mobile-file-explorer-row-actions-sheet.tsx
similarity index 82%
rename from mobile/src/files/mobile-file-explorer-row-actions-sheet.tsx
rename to mobile/src/files/explorer/mobile-file-explorer-row-actions-sheet.tsx
index 5a1f0db5025..acaaaa45566 100644
--- a/mobile/src/files/mobile-file-explorer-row-actions-sheet.tsx
+++ b/mobile/src/files/explorer/mobile-file-explorer-row-actions-sheet.tsx
@@ -1,9 +1,9 @@
 import { useState } from 'react'
 import { Copy } from 'lucide-react-native'
-import { ActionSheetModal, type ActionSheetAction } from '../components/ActionSheetModal'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useClipboardWriter } from '../platform/clipboard'
-import { triggerError, triggerSuccess } from '../platform/haptics'
+import { ActionSheetModal, type ActionSheetAction } from '../../components/ActionSheetModal'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import type { TreeNode } from './file-tree'
 
 /** Which row's actions are open, and the sheet that shows them. */
diff --git a/mobile/src/files/mobile-file-explorer-row.tsx b/mobile/src/files/explorer/mobile-file-explorer-row.tsx
similarity index 95%
rename from mobile/src/files/mobile-file-explorer-row.tsx
rename to mobile/src/files/explorer/mobile-file-explorer-row.tsx
index c6923495607..d773409b27d 100644
--- a/mobile/src/files/mobile-file-explorer-row.tsx
+++ b/mobile/src/files/explorer/mobile-file-explorer-row.tsx
@@ -1,4 +1,4 @@
-import { classifyMobileArtifact } from './mobile-artifact-kind'
+import { classifyMobileArtifact } from '../preview/mobile-artifact-kind'
 import { ActivityIndicator, Pressable, Text, View } from 'react-native'
 import {
   ChevronDown,
@@ -8,10 +8,10 @@ import {
   Folder,
   Image as ImageIcon
 } from 'lucide-react-native'
-import { triggerMediumImpact, triggerSelection } from '../platform/haptics'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { colors, spacing } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { triggerMediumImpact, triggerSelection } from '../../platform/haptics/haptics'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { colors, spacing } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import {
   DIRECTORY_PAGE_SIZE,
   type FileExplorerRow,
@@ -20,9 +20,9 @@ import {
   type TreeNode
 } from './file-tree'
 import type { FolderPagingStatus } from './use-mobile-file-explorer-paging'
-import { getUiIntlLocale } from '../i18n/ui-intl-locale'
+import { getUiIntlLocale } from '../../i18n/ui-intl-locale'
 import { fileExplorerStyles as styles } from './mobile-file-explorer-styles'
-import { canPreviewMobileFileRow } from './mobile-file-preview-navigation'
+import { canPreviewMobileFileRow } from '../preview/mobile-file-preview-navigation'
 
 type Props = {
   item: FileExplorerRow
diff --git a/mobile/src/files/mobile-file-explorer-rows.tsx b/mobile/src/files/explorer/mobile-file-explorer-rows.tsx
similarity index 100%
rename from mobile/src/files/mobile-file-explorer-rows.tsx
rename to mobile/src/files/explorer/mobile-file-explorer-rows.tsx
diff --git a/mobile/src/files/mobile-file-explorer-styles.ts b/mobile/src/files/explorer/mobile-file-explorer-styles.ts
similarity index 94%
rename from mobile/src/files/mobile-file-explorer-styles.ts
rename to mobile/src/files/explorer/mobile-file-explorer-styles.ts
index 4233138fe49..88b1e8589f1 100644
--- a/mobile/src/files/mobile-file-explorer-styles.ts
+++ b/mobile/src/files/explorer/mobile-file-explorer-styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native'
-import { colors, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
+import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
 
 export const fileExplorerStyles = themedStyleSheet(() => ({
   container: {
diff --git a/mobile/src/files/native-chat-file-search-operations.ts b/mobile/src/files/explorer/native-chat-file-search-operations.ts
similarity index 83%
rename from mobile/src/files/native-chat-file-search-operations.ts
rename to mobile/src/files/explorer/native-chat-file-search-operations.ts
index 8f39e7d5873..9718b93015b 100644
--- a/mobile/src/files/native-chat-file-search-operations.ts
+++ b/mobile/src/files/explorer/native-chat-file-search-operations.ts
@@ -1,6 +1,6 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import '../terminal/terminal-reply-schema'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
+import '../../terminal/host-operations/terminal-reply-schema'
 import { workspaceFilePathsSchema } from './workspace-file-paths-reply-schema'
 
 // Skip refusals to retain suggestions; inspect method_not_found first to fall back from search to inventory.
diff --git a/mobile/src/files/use-mobile-file-explorer-paging.ts b/mobile/src/files/explorer/use-mobile-file-explorer-paging.ts
similarity index 93%
rename from mobile/src/files/use-mobile-file-explorer-paging.ts
rename to mobile/src/files/explorer/use-mobile-file-explorer-paging.ts
index 767e4294d5b..2b004108626 100644
--- a/mobile/src/files/use-mobile-file-explorer-paging.ts
+++ b/mobile/src/files/explorer/use-mobile-file-explorer-paging.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../../../src/shared/file-listing/file-dir-page'
-import { hostQueryKey, type HostQueryTarget } from '../query/host-query-key'
-import { hostReadClient } from '../query/host-read-client'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../../../../src/shared/file-listing/file-dir-page'
+import { hostQueryKey, type HostQueryTarget } from '../../query/host-query-key'
+import { hostReadClient } from '../../query/host-read-client'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import { DIRECTORY_PAGE_SIZE } from './file-tree'
 import {
   fileDirectoryQuery,
diff --git a/mobile/src/files/workspace-file-paths-reply-schema.ts b/mobile/src/files/explorer/workspace-file-paths-reply-schema.ts
similarity index 84%
rename from mobile/src/files/workspace-file-paths-reply-schema.ts
rename to mobile/src/files/explorer/workspace-file-paths-reply-schema.ts
index 743c7eb409f..6f86037daea 100644
--- a/mobile/src/files/workspace-file-paths-reply-schema.ts
+++ b/mobile/src/files/explorer/workspace-file-paths-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
+import { salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
 
 // Keep legacy missing/unreadable file lists empty; validate the container before projecting nonempty relative paths.
 export const workspaceFilePathsSchema = z
diff --git a/mobile/src/files/MobileFileMarkdownPreview.tsx b/mobile/src/files/markdown/MobileFileMarkdownPreview.tsx
similarity index 79%
rename from mobile/src/files/MobileFileMarkdownPreview.tsx
rename to mobile/src/files/markdown/MobileFileMarkdownPreview.tsx
index 6ee17d248e5..1a2b08723f2 100644
--- a/mobile/src/files/MobileFileMarkdownPreview.tsx
+++ b/mobile/src/files/markdown/MobileFileMarkdownPreview.tsx
@@ -1,15 +1,15 @@
 import { MobileMarkdownPreviewImage } from './MobileMarkdownPreviewImage'
-import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
 import { ScrollView } from 'react-native'
-import { MobileMarkdown } from '../components/MobileMarkdown'
-import { MOBILE_MARKDOWN_DOCUMENT_SCALE } from '../components/mobile-markdown-styles'
+import { MobileMarkdown } from '../../components/MobileMarkdown'
+import { MOBILE_MARKDOWN_DOCUMENT_SCALE } from '../../components/mobile-markdown-styles'
 import {
   MobileFilePreviewSourceText,
   MobileFilePreviewTruncatedNote
-} from './MobileFilePreviewSourceText'
+} from '../preview/MobileFilePreviewSourceText'
 import type { MarkdownPreviewMode } from './MobileMarkdownPreviewModeBar'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { filePreviewStyles as styles } from '../preview/mobile-file-preview-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 
 type Props = {
   mode: MarkdownPreviewMode
diff --git a/mobile/src/files/MobileMarkdownPreviewImage.tsx b/mobile/src/files/markdown/MobileMarkdownPreviewImage.tsx
similarity index 82%
rename from mobile/src/files/MobileMarkdownPreviewImage.tsx
rename to mobile/src/files/markdown/MobileMarkdownPreviewImage.tsx
index d3c61a10a26..07dd6e735eb 100644
--- a/mobile/src/files/MobileMarkdownPreviewImage.tsx
+++ b/mobile/src/files/markdown/MobileMarkdownPreviewImage.tsx
@@ -1,15 +1,15 @@
 import { useEffect, useState } from 'react'
 import { ActivityIndicator, Image, Pressable, Text, View } from 'react-native'
-import { colors, spacing, typography, pressedStyle } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { MobileLoadErrorState } from '../components/MobileStateView'
-import { MobileNativeChatImageViewer } from '../session/native-chat/visual/MobileNativeChatImageViewer'
-import { MobileImageViewerActions } from '../session/native-chat/visual/MobileImageViewerActions'
-import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
+import { colors, spacing, typography, pressedStyle } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { MobileLoadErrorState } from '../../components/MobileStateView'
+import { MobileNativeChatImageViewer } from '../../session/native-chat/visual/MobileNativeChatImageViewer'
+import { MobileImageViewerActions } from '../../session/native-chat/visual/MobileImageViewerActions'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
 import { loadMarkdownPreviewImage } from './mobile-markdown-image-source'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type Props = {
   client: MobileFilePreviewRpcSender | null
diff --git a/mobile/src/files/MobileMarkdownPreviewModeBar.tsx b/mobile/src/files/markdown/MobileMarkdownPreviewModeBar.tsx
similarity index 85%
rename from mobile/src/files/MobileMarkdownPreviewModeBar.tsx
rename to mobile/src/files/markdown/MobileMarkdownPreviewModeBar.tsx
index 5a85333f346..7a8371c1bb9 100644
--- a/mobile/src/files/MobileMarkdownPreviewModeBar.tsx
+++ b/mobile/src/files/markdown/MobileMarkdownPreviewModeBar.tsx
@@ -1,10 +1,10 @@
 import { useState } from 'react'
 import { View } from 'react-native'
-import { MobileSegmentedControl } from '../components/MobileSegmentedControl'
-import { MobileSourceCopyButton } from '../components/MobileSourceCopyButton'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
+import { MobileSegmentedControl } from '../../components/MobileSegmentedControl'
+import { MobileSourceCopyButton } from '../../components/MobileSourceCopyButton'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { filePreviewStyles as styles } from '../preview/mobile-file-preview-styles'
 
 export type MarkdownPreviewMode = 'preview' | 'source'
 
diff --git a/mobile/src/files/mobile-markdown-file-link.test.ts b/mobile/src/files/markdown/mobile-markdown-file-link.test.ts
similarity index 96%
rename from mobile/src/files/mobile-markdown-file-link.test.ts
rename to mobile/src/files/markdown/mobile-markdown-file-link.test.ts
index 34d926ef441..412dc80519f 100644
--- a/mobile/src/files/mobile-markdown-file-link.test.ts
+++ b/mobile/src/files/markdown/mobile-markdown-file-link.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { routeMarkdownHref } from '../components/markdown-href-routing'
+import { routeMarkdownHref } from '../../components/markdown-href-routing'
 import { mobileMarkdownFileLink } from './mobile-markdown-file-link'
 
 const params = {
diff --git a/mobile/src/files/mobile-markdown-file-link.ts b/mobile/src/files/markdown/mobile-markdown-file-link.ts
similarity index 86%
rename from mobile/src/files/mobile-markdown-file-link.ts
rename to mobile/src/files/markdown/mobile-markdown-file-link.ts
index c5f8ea0552b..9d8a615d059 100644
--- a/mobile/src/files/mobile-markdown-file-link.ts
+++ b/mobile/src/files/markdown/mobile-markdown-file-link.ts
@@ -2,12 +2,12 @@ import {
   isWindowsAbsolutePathLike,
   relativePathInsideRoot,
   resolveRuntimePath
-} from '../../../src/shared/cross-platform-path'
-import { splitFilePathLineSuffix } from '../components/markdown-file-path-detection'
+} from '../../../../src/shared/cross-platform-path'
+import { splitFilePathLineSuffix } from '../../components/markdown-file-path-detection'
 import {
   createMobileFilePreviewHref,
   type MobileFilePreviewRouteParams
-} from './mobile-file-preview-route'
+} from '../preview/mobile-file-preview-route'
 
 export function mobileMarkdownFileLink(params: MobileFilePreviewRouteParams, pathText: string) {
   if (params.source === 'terminalArtifact' || !params.relativePath) {
diff --git a/mobile/src/files/mobile-markdown-image-source.test.ts b/mobile/src/files/markdown/mobile-markdown-image-source.test.ts
similarity index 55%
rename from mobile/src/files/mobile-markdown-image-source.test.ts
rename to mobile/src/files/markdown/mobile-markdown-image-source.test.ts
index 547969f1852..0aa0fb60404 100644
--- a/mobile/src/files/mobile-markdown-image-source.test.ts
+++ b/mobile/src/files/markdown/mobile-markdown-image-source.test.ts
@@ -30,28 +30,4 @@ describe('Markdown preview images', () => {
       })
     }
   )
-
-  it.each([
-    '../../private.png',
-    '/private.png',
-    'C:\\private.png',
-    'file:///tmp/private.png',
-    'javascript:alert(1)',
-    'notes.txt'
-  ])('does not read unauthorized or unsupported image locations: %s', async (href) => {
-    const client = host()
-    await expect(loadMarkdownPreviewImage(client, 'wt', 'docs/readme.md', href)).rejects.toThrow()
-    expect(client.sendRequest).not.toHaveBeenCalled()
-  })
-
-  it.each(['/Users/me/notes/readme.md', 'C:\\notes\\readme.md'])(
-    'does not read workspace images for a document outside the workspace: %s',
-    async (documentPath) => {
-      const client = host()
-      await expect(
-        loadMarkdownPreviewImage(client, 'wt', documentPath, 'images/d.png')
-      ).rejects.toThrow()
-      expect(client.sendRequest).not.toHaveBeenCalled()
-    }
-  )
 })
diff --git a/mobile/src/files/mobile-markdown-image-source.ts b/mobile/src/files/markdown/mobile-markdown-image-source.ts
similarity index 79%
rename from mobile/src/files/mobile-markdown-image-source.ts
rename to mobile/src/files/markdown/mobile-markdown-image-source.ts
index de157ae1db5..209467b11d1 100644
--- a/mobile/src/files/mobile-markdown-image-source.ts
+++ b/mobile/src/files/markdown/mobile-markdown-image-source.ts
@@ -2,12 +2,12 @@ import {
   isWindowsAbsolutePathLike,
   relativePathInsideRoot,
   resolveRuntimePath
-} from '../../../src/shared/cross-platform-path'
-import { routeMarkdownHref } from '../components/markdown-href-routing'
-import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
-import { loadMobileFilePreview } from './mobile-file-preview-request'
-import { classifyMobileArtifact } from './mobile-artifact-kind'
-import { svgMarkupDataUri } from '../../../src/shared/file-preview/svg-document'
+} from '../../../../src/shared/cross-platform-path'
+import { routeMarkdownHref } from '../../components/markdown-href-routing'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
+import { loadMobileFilePreview } from '../preview/mobile-file-preview-request'
+import { classifyMobileArtifact } from '../preview/mobile-artifact-kind'
+import { svgMarkupDataUri } from '../../../../src/shared/file-preview/svg-document'
 
 // Absolute paths leave the workspace; an external-file tab's document has no workspace images.
 function isOutsideWorkspace(path: string): boolean {
diff --git a/mobile/src/files/MobileFileMediaPreview.tsx b/mobile/src/files/media/MobileFileMediaPreview.tsx
similarity index 84%
rename from mobile/src/files/MobileFileMediaPreview.tsx
rename to mobile/src/files/media/MobileFileMediaPreview.tsx
index e62bdaddff2..d9251974d7c 100644
--- a/mobile/src/files/MobileFileMediaPreview.tsx
+++ b/mobile/src/files/media/MobileFileMediaPreview.tsx
@@ -1,18 +1,18 @@
 import { useEffect, useState } from 'react'
 import { ActivityIndicator, Text, View } from 'react-native'
-import { colors } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
+import { colors } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
 import { PDF_MIME_TYPE, type MobileFileMedia } from './mobile-file-media'
 import { downloadMobileFileMedia, type MobileMediaSink } from './mobile-file-media-download'
 import { createMobileMediaSink } from './mobile-media-preview-cache'
 import { MobileMediaPlayback } from './MobileMediaPlayback'
 import { MobilePdfPreview } from './MobilePdfPreview'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { formatPreviewByteLength } from './mobile-file-preview-response'
-import { MobileLoadErrorState } from '../components/MobileStateView'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { filePreviewStyles as styles } from '../preview/mobile-file-preview-styles'
+import { formatPreviewByteLength } from '../preview/mobile-file-preview-response'
+import { MobileLoadErrorState } from '../../components/MobileStateView'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type State = { uri: string } | { error: string } | { bytes: number; total: number }
 type Props = { media: MobileFileMedia; client: MobileFilePreviewRpcSender | null; title: string }
diff --git a/mobile/src/files/MobileMediaPlayback.tsx b/mobile/src/files/media/MobileMediaPlayback.tsx
similarity index 91%
rename from mobile/src/files/MobileMediaPlayback.tsx
rename to mobile/src/files/media/MobileMediaPlayback.tsx
index 855532848b4..86acdc9afc4 100644
--- a/mobile/src/files/MobileMediaPlayback.tsx
+++ b/mobile/src/files/media/MobileMediaPlayback.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react'
 import { Text, View } from 'react-native'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { filePreviewStyles as styles } from '../preview/mobile-file-preview-styles'
 
 export type MobileMediaPlaybackProps = { uri: string; mimeType: string; title: string }
 
diff --git a/mobile/src/files/MobilePdfPreview.tsx b/mobile/src/files/media/MobilePdfPreview.tsx
similarity index 82%
rename from mobile/src/files/MobilePdfPreview.tsx
rename to mobile/src/files/media/MobilePdfPreview.tsx
index 2fb92e4db68..bdbc71cecf9 100644
--- a/mobile/src/files/MobilePdfPreview.tsx
+++ b/mobile/src/files/media/MobilePdfPreview.tsx
@@ -1,15 +1,15 @@
 import { useCallback, useRef, useState } from 'react'
 import { useFocusEffect } from 'expo-router'
 import { ActivityIndicator, Text, View } from 'react-native'
-import { colors } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { usePdfOpener } from '../platform/pdf-opener'
-import { PdfOpenRefusedError } from '../platform/pdf-opener-contract'
+import { colors } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { usePdfOpener } from '../../platform/pdf-viewing/pdf-opener'
+import { PdfOpenRefusedError } from '../../platform/pdf-viewing/pdf-opener-contract'
 import type { MobileFileMedia } from './mobile-file-media'
-import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { MobileLoadErrorState, MobileStateButton } from '../components/MobileStateView'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { filePreviewStyles as styles } from '../preview/mobile-file-preview-styles'
+import { MobileLoadErrorState, MobileStateButton } from '../../components/MobileStateView'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type State =
   | { status: 'opening' }
diff --git a/mobile/src/files/mobile-file-media-download.ts b/mobile/src/files/media/mobile-file-media-download.ts
similarity index 93%
rename from mobile/src/files/mobile-file-media-download.ts
rename to mobile/src/files/media/mobile-file-media-download.ts
index 71ae4eaa484..29ffe879839 100644
--- a/mobile/src/files/mobile-file-media-download.ts
+++ b/mobile/src/files/media/mobile-file-media-download.ts
@@ -1,10 +1,10 @@
 import { Buffer } from 'buffer/index.js'
 import * as z from 'zod'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
 import type { MobileFileMedia } from './mobile-file-media'
-import { isMobileMethodUnavailableError } from '../transport/rpc/mobile-method-unavailable'
+import { isMobileMethodUnavailableError } from '../../transport/rpc/mobile-method-unavailable'
 
 export const MOBILE_MEDIA_CHUNK_BYTES = 384 * 1024
 export const MOBILE_MEDIA_MAX_BYTES = 256 * 1024 * 1024
diff --git a/mobile/src/files/mobile-file-media.ts b/mobile/src/files/media/mobile-file-media.ts
similarity index 90%
rename from mobile/src/files/mobile-file-media.ts
rename to mobile/src/files/media/mobile-file-media.ts
index c6fbeeddb18..3a745d654e2 100644
--- a/mobile/src/files/mobile-file-media.ts
+++ b/mobile/src/files/media/mobile-file-media.ts
@@ -1,4 +1,4 @@
-import { MEDIA_FILE_MIME_TYPES } from '../../../src/shared/file-preview/media-mime-types'
+import { MEDIA_FILE_MIME_TYPES } from '../../../../src/shared/file-preview/media-mime-types'
 
 export const PDF_MIME_TYPE = 'application/pdf'
 
diff --git a/mobile/src/files/mobile-media-preview-cache.ts b/mobile/src/files/media/mobile-media-preview-cache.ts
similarity index 100%
rename from mobile/src/files/mobile-media-preview-cache.ts
rename to mobile/src/files/media/mobile-media-preview-cache.ts
diff --git a/mobile/src/files/file-exists-error.ts b/mobile/src/files/mutation-ownership/file-exists-error.ts
similarity index 85%
rename from mobile/src/files/file-exists-error.ts
rename to mobile/src/files/mutation-ownership/file-exists-error.ts
index 929774fb201..f00b9e913cd 100644
--- a/mobile/src/files/file-exists-error.ts
+++ b/mobile/src/files/mutation-ownership/file-exists-error.ts
@@ -1,4 +1,4 @@
-import '../i18n/mobile-i18n'
+import '../../i18n/mobile-i18n'
 
 export function isFileExistsErrorMessage(message: string): boolean {
   const normalized = message.toLowerCase()
diff --git a/mobile/src/files/file-ownership-reply-schema.ts b/mobile/src/files/mutation-ownership/file-ownership-reply-schema.ts
similarity index 93%
rename from mobile/src/files/file-ownership-reply-schema.ts
rename to mobile/src/files/mutation-ownership/file-ownership-reply-schema.ts
index 916fcff091f..4e8f1c07202 100644
--- a/mobile/src/files/file-ownership-reply-schema.ts
+++ b/mobile/src/files/mutation-ownership/file-ownership-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../src/shared/zod-salvage'
 
 // Ownership routes writes: unreadable routing members must fail, since salvaging them to absent could send a remote mutation locally.
 
diff --git a/mobile/src/files/mobile-file-mutation-ownership.ts b/mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts
similarity index 85%
rename from mobile/src/files/mobile-file-mutation-ownership.ts
rename to mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts
index 31fd49806ec..e1bc71cb0db 100644
--- a/mobile/src/files/mobile-file-mutation-ownership.ts
+++ b/mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts
@@ -1,13 +1,13 @@
-import { parseExecutionHostId } from '../../../src/shared/execution-host'
-import { assertFileMutationOwnershipCapability } from '../../../src/shared/file-write/file-mutation-ownership'
-import type { SshConnectionState, SshMutationExpectation } from '../../../src/shared/ssh-types'
-import { translate } from '../i18n/mobile-i18n'
+import { parseExecutionHostId } from '../../../../src/shared/execution-host'
+import { assertFileMutationOwnershipCapability } from '../../../../src/shared/file-write/file-mutation-ownership'
+import type { SshConnectionState, SshMutationExpectation } from '../../../../src/shared/ssh-types'
+import { translate } from '../../i18n/mobile-i18n'
 import {
-  fileOwnershipRuntimeStatusRead,
   fileOwnershipSshStateRead,
   fileOwnershipWorktreeRead,
   type MobileFileOwnershipRpcSender
 } from './mobile-file-ownership-operations'
+import { taskRuntimeStatusRead } from '../../tasks/screen-state/mobile-task-runtime-operations'
 
 const FILE_MUTATION_TIMEOUT_MS = 15_000
 
@@ -53,10 +53,10 @@ export async function captureMobileFileMutationOwnership(
   client: MobileFileOwnershipRpcSender,
   worktree: string
 ): Promise<MobileFileMutationOwnership> {
-  const statusReply = await fileOwnershipRuntimeStatusRead.request(client, undefined, {
+  const statusReply = await taskRuntimeStatusRead.request(client, undefined, {
     timeoutMs: FILE_MUTATION_TIMEOUT_MS
   })
-  const status = fileOwnershipRuntimeStatusRead.interpret(statusReply)
+  const status = taskRuntimeStatusRead.interpret(statusReply)
   assertFileMutationOwnershipCapability(status)
 
   const worktreeReply = await fileOwnershipWorktreeRead.request(
diff --git a/mobile/src/files/mobile-file-ownership-operations.ts b/mobile/src/files/mutation-ownership/mobile-file-ownership-operations.ts
similarity index 83%
rename from mobile/src/files/mobile-file-ownership-operations.ts
rename to mobile/src/files/mutation-ownership/mobile-file-ownership-operations.ts
index 15943df7f30..7db0e0cc98a 100644
--- a/mobile/src/files/mobile-file-ownership-operations.ts
+++ b/mobile/src/files/mutation-ownership/mobile-file-ownership-operations.ts
@@ -1,5 +1,5 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import {
   fileOwnershipSshStateSchema,
   fileOwnershipWorktreeSchema
@@ -8,7 +8,7 @@ import {
 // All ownership reads must succeed before a write: refusal or malformed replies abort with a named error rather than risking the wrong host.
 
 // Reuse the Tasks runtime-status operation; this gate needs the same fields.
-export { taskRuntimeStatusRead as fileOwnershipRuntimeStatusRead } from '../tasks/screen-state/mobile-task-runtime-operations'
+import '../../tasks/screen-state/mobile-task-runtime-operations'
 
 export const fileOwnershipWorktreeRead = bindDeferredRpcOperation(
   defineRpcOperation({
diff --git a/mobile/src/files/MobileFilePreviewBody.tsx b/mobile/src/files/preview/MobileFilePreviewBody.tsx
similarity index 88%
rename from mobile/src/files/MobileFilePreviewBody.tsx
rename to mobile/src/files/preview/MobileFilePreviewBody.tsx
index 811223a0b20..7f8d5fddb3b 100644
--- a/mobile/src/files/MobileFilePreviewBody.tsx
+++ b/mobile/src/files/preview/MobileFilePreviewBody.tsx
@@ -1,24 +1,24 @@
-import { MobileFileMediaPreview } from './MobileFileMediaPreview'
+import { MobileFileMediaPreview } from '../media/MobileFileMediaPreview'
 import type { MobileFilePreviewRpcSender } from './mobile-file-preview-operations'
 import { Text, View } from 'react-native'
 import { FileText } from 'lucide-react-native'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import type { MobileFilePreviewResult } from './mobile-file-preview-request'
-import { MobileFileMarkdownPreview } from './MobileFileMarkdownPreview'
-import type { MarkdownPreviewMode } from './MobileMarkdownPreviewModeBar'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { MobileFilePreviewResult } from './mobile-file-preview-response'
+import { MobileFileMarkdownPreview } from '../markdown/MobileFileMarkdownPreview'
+import type { MarkdownPreviewMode } from '../markdown/MobileMarkdownPreviewModeBar'
 import { MobileFilePreviewEditableSource } from './MobileFilePreviewEditableSource'
 import { MobileFilePreviewSourceText } from './MobileFilePreviewSourceText'
 import type { MobileFilePreviewLineColumn } from './mobile-file-preview-line-column'
 import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { MobilePanZoomImage } from '../components/MobilePanZoomImage'
-import { MobileHtmlPreview } from '../components/MobileHtmlPreview'
-import { MobileSvgPreview } from '../components/MobileSvgPreview'
+import { MobilePanZoomImage } from '../../components/MobilePanZoomImage'
+import { MobileHtmlPreview } from '../../components/MobileHtmlPreview'
+import { MobileSvgPreview } from '../../components/MobileSvgPreview'
 import {
   MobileLoadErrorState,
   MobileOfflineState,
   MobileStateView
-} from '../components/MobileStateView'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+} from '../../components/MobileStateView'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type Props = {
   preview: MobileFilePreviewResult
diff --git a/mobile/src/files/MobileFilePreviewDiscardModal.tsx b/mobile/src/files/preview/MobileFilePreviewDiscardModal.tsx
similarity index 86%
rename from mobile/src/files/MobileFilePreviewDiscardModal.tsx
rename to mobile/src/files/preview/MobileFilePreviewDiscardModal.tsx
index ddf40459f1b..50d8047746f 100644
--- a/mobile/src/files/MobileFilePreviewDiscardModal.tsx
+++ b/mobile/src/files/preview/MobileFilePreviewDiscardModal.tsx
@@ -1,5 +1,5 @@
-import { ConfirmModal } from '../components/ConfirmModal'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { ConfirmModal } from '../../components/ConfirmModal'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 export function MobileFilePreviewDiscardModal(props: {
   visible: boolean
diff --git a/mobile/src/files/MobileFilePreviewEditableSource.tsx b/mobile/src/files/preview/MobileFilePreviewEditableSource.tsx
similarity index 93%
rename from mobile/src/files/MobileFilePreviewEditableSource.tsx
rename to mobile/src/files/preview/MobileFilePreviewEditableSource.tsx
index 4d41b14d780..d10c509c6d9 100644
--- a/mobile/src/files/MobileFilePreviewEditableSource.tsx
+++ b/mobile/src/files/preview/MobileFilePreviewEditableSource.tsx
@@ -2,9 +2,9 @@ import { useEffect, useState } from 'react'
 import { Text, TextInput, View } from 'react-native'
 import type { MobileFilePreviewLineColumn } from './mobile-file-preview-line-column'
 import { textOffsetForLineColumn } from './mobile-file-preview-line-column'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type Props = {
   title: string
diff --git a/mobile/src/files/MobileFilePreviewSourceText.tsx b/mobile/src/files/preview/MobileFilePreviewSourceText.tsx
similarity index 89%
rename from mobile/src/files/MobileFilePreviewSourceText.tsx
rename to mobile/src/files/preview/MobileFilePreviewSourceText.tsx
index 1b694e801cc..d98dcbfa287 100644
--- a/mobile/src/files/MobileFilePreviewSourceText.tsx
+++ b/mobile/src/files/preview/MobileFilePreviewSourceText.tsx
@@ -1,12 +1,13 @@
 import { useEffect, useMemo, useRef } from 'react'
 import { ScrollView, Text, type ScrollViewInstance } from 'react-native'
-import { MobileSyntaxSegments } from '../components/MobileSyntaxSegments'
-import { formatPreviewByteLength } from './mobile-file-preview-request'
+import { MobileSyntaxSegments } from '../../components/MobileSyntaxSegments'
+import './mobile-file-preview-request'
+import { formatPreviewByteLength } from './mobile-file-preview-response'
 import { scrollOffsetForPreviewLine } from './mobile-file-preview-line-column'
 import { buildMobileFilePreviewSyntax } from './mobile-file-preview-syntax'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { filePreviewStyles as styles } from './mobile-file-preview-styles'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 export function MobileFilePreviewSourceText({
   relativePath,
diff --git a/mobile/src/files/file-preview-reply-schema.ts b/mobile/src/files/preview/file-preview-reply-schema.ts
similarity index 96%
rename from mobile/src/files/file-preview-reply-schema.ts
rename to mobile/src/files/preview/file-preview-reply-schema.ts
index 5b84f0268b7..7aa7d223a76 100644
--- a/mobile/src/files/file-preview-reply-schema.ts
+++ b/mobile/src/files/preview/file-preview-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../src/shared/zod-salvage'
 
 // Require unguarded members, salvage typed guards to their existing fallbacks, and retain unknown for truthiness-only reads.
 
diff --git a/mobile/src/files/mobile-artifact-kind.ts b/mobile/src/files/preview/mobile-artifact-kind.ts
similarity index 100%
rename from mobile/src/files/mobile-artifact-kind.ts
rename to mobile/src/files/preview/mobile-artifact-kind.ts
diff --git a/mobile/src/files/mobile-file-preview-line-column.ts b/mobile/src/files/preview/mobile-file-preview-line-column.ts
similarity index 100%
rename from mobile/src/files/mobile-file-preview-line-column.ts
rename to mobile/src/files/preview/mobile-file-preview-line-column.ts
diff --git a/mobile/src/files/mobile-file-preview-navigation.ts b/mobile/src/files/preview/mobile-file-preview-navigation.ts
similarity index 89%
rename from mobile/src/files/mobile-file-preview-navigation.ts
rename to mobile/src/files/preview/mobile-file-preview-navigation.ts
index e9e3fbcc5bc..f050fac9961 100644
--- a/mobile/src/files/mobile-file-preview-navigation.ts
+++ b/mobile/src/files/preview/mobile-file-preview-navigation.ts
@@ -1,6 +1,6 @@
-import { mobileFileMediaMime } from './mobile-file-media'
+import { mobileFileMediaMime } from '../media/mobile-file-media'
 import { classifyMobileArtifact } from './mobile-artifact-kind'
-import { defaultScheduleTimer } from '../platform/timer-scheduler'
+import { defaultScheduleTimer } from '../../platform/timer-scheduler'
 import {
   createMobileFilePreviewHref,
   type MobileFilePreviewHref,
diff --git a/mobile/src/files/mobile-file-preview-operations.ts b/mobile/src/files/preview/mobile-file-preview-operations.ts
similarity index 95%
rename from mobile/src/files/mobile-file-preview-operations.ts
rename to mobile/src/files/preview/mobile-file-preview-operations.ts
index a75f58e44df..b88b8b86a0c 100644
--- a/mobile/src/files/mobile-file-preview-operations.ts
+++ b/mobile/src/files/preview/mobile-file-preview-operations.ts
@@ -1,5 +1,5 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import {
   filePreviewImageSchema,
   filePreviewTextSchema,
diff --git a/mobile/src/files/mobile-file-preview-request.test.ts b/mobile/src/files/preview/mobile-file-preview-request.test.ts
similarity index 95%
rename from mobile/src/files/mobile-file-preview-request.test.ts
rename to mobile/src/files/preview/mobile-file-preview-request.test.ts
index 89692886a59..51150105f98 100644
--- a/mobile/src/files/mobile-file-preview-request.test.ts
+++ b/mobile/src/files/preview/mobile-file-preview-request.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { RpcFailure, RpcResponse, RpcSuccess } from '../transport/rpc/rpc-wire-types'
+import type { RpcFailure, RpcResponse, RpcSuccess } from '../../transport/rpc/rpc-wire-types'
 import { saveMobileTerminalArtifactPreview } from './mobile-file-preview-request'
 
-import '../transport/rpc/rpc-incompatible-reply-error'
+import '../../transport/rpc/rpc-incompatible-reply-error'
 
 function ok(result: unknown): RpcSuccess {
   return { id: '1', ok: true, result, _meta: { runtimeId: 'runtime-1' } }
diff --git a/mobile/src/files/mobile-file-preview-request.ts b/mobile/src/files/preview/mobile-file-preview-request.ts
similarity index 94%
rename from mobile/src/files/mobile-file-preview-request.ts
rename to mobile/src/files/preview/mobile-file-preview-request.ts
index 52288a8b17b..546dba823ab 100644
--- a/mobile/src/files/mobile-file-preview-request.ts
+++ b/mobile/src/files/preview/mobile-file-preview-request.ts
@@ -1,8 +1,8 @@
-import { terminalArtifactPreviewMatchesBase } from './mobile-file-preview-editability'
-import { mobileFileMedia } from './mobile-file-media'
+import { terminalArtifactPreviewMatchesBase } from '../terminal-artifacts/mobile-file-preview-editability'
+import { mobileFileMedia } from '../media/mobile-file-media'
 import { classifyMobileArtifact } from './mobile-artifact-kind'
-import type { RpcAcceptedResult } from '../transport/rpc/rpc-accepted-result'
-import type { RpcFailure, RpcResponse } from '../transport/rpc/rpc-wire-types'
+import type { RpcAcceptedResult } from '../../transport/rpc/rpc-accepted-result'
+import type { RpcFailure, RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import {
   filePreviewImageRead,
   filePreviewTextRead,
@@ -22,14 +22,7 @@ import {
   refreshTerminalArtifactSourceAfterGrantFailure,
   type MobileTerminalArtifactPreviewSource,
   type TerminalArtifactRetryOptions
-} from './mobile-terminal-artifact-grant-refresh'
-
-export { formatPreviewByteLength, previewError } from './mobile-file-preview-response'
-
-export type {
-  MobileFilePreviewResult,
-  MobileFilePreviewTextKind
-} from './mobile-file-preview-response'
+} from '../terminal-artifacts/mobile-terminal-artifact-grant-refresh'
 
 export type MobileFilePreviewReadMethod = 'files.read' | 'files.readPreview'
 export type MobileTerminalArtifactPreviewReadMethod =
diff --git a/mobile/src/files/mobile-file-preview-response.ts b/mobile/src/files/preview/mobile-file-preview-response.ts
similarity index 94%
rename from mobile/src/files/mobile-file-preview-response.ts
rename to mobile/src/files/preview/mobile-file-preview-response.ts
index ef2e7324d8b..3f7501613de 100644
--- a/mobile/src/files/mobile-file-preview-response.ts
+++ b/mobile/src/files/preview/mobile-file-preview-response.ts
@@ -1,10 +1,10 @@
-import type { MobileFileMedia } from './mobile-file-media'
+import type { MobileFileMedia } from '../media/mobile-file-media'
 import { classifyMobileArtifact } from './mobile-artifact-kind'
-import { translate } from '../i18n/mobile-i18n'
-import { getUiIntlLocale } from '../i18n/ui-intl-locale'
-import type { RpcFailure } from '../transport/rpc/rpc-wire-types'
-import { isMarkdownPath } from './file-tree'
-import { isTerminalArtifactGrantError } from './terminal-artifact-grant-error'
+import { translate } from '../../i18n/mobile-i18n'
+import { getUiIntlLocale } from '../../i18n/ui-intl-locale'
+import type { RpcFailure } from '../../transport/rpc/rpc-wire-types'
+import { isMarkdownPath } from '../explorer/file-tree'
+import { isTerminalArtifactGrantError } from '../terminal-artifacts/terminal-artifact-grant-error'
 
 export type MobileFilePreviewTextKind = 'html' | 'markdown' | 'svg' | 'text'
 
diff --git a/mobile/src/files/mobile-file-preview-retry.test.tsx b/mobile/src/files/preview/mobile-file-preview-retry.test.tsx
similarity index 72%
rename from mobile/src/files/mobile-file-preview-retry.test.tsx
rename to mobile/src/files/preview/mobile-file-preview-retry.test.tsx
index c81519c9f02..5241f3f5bc4 100644
--- a/mobile/src/files/mobile-file-preview-retry.test.tsx
+++ b/mobile/src/files/preview/mobile-file-preview-retry.test.tsx
@@ -1,4 +1,4 @@
-vi.mock('./MobileFileMediaPreview', () => ({ MobileFileMediaPreview: () => null }))
+vi.mock('../media/MobileFileMediaPreview', () => ({ MobileFileMediaPreview: () => null }))
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, expect, it, vi } from 'vitest'
@@ -39,25 +39,24 @@ vi.mock('lucide-react-native', () => ({
   Save: 'Icon',
   WifiOff: 'Icon'
 }))
-vi.mock('../navigation/route-handoff', () => ({
+vi.mock('../../navigation/route-handoff', () => ({
   useRouteHandoff: () => ({ back: () => {}, canGoBack: () => false, push })
 }))
-vi.mock('../components/ConfirmModal', () => ({ ConfirmModal: () => null }))
-vi.mock('./MobileFileMarkdownPreview', () => ({
+vi.mock('../../components/ConfirmModal', () => ({ ConfirmModal: () => null }))
+vi.mock('../markdown/MobileFileMarkdownPreview', () => ({
   MobileFileMarkdownPreview: 'MobileFileMarkdownPreview'
 }))
-vi.mock('../components/MobileSourceCopyButton', () => ({ MobileSourceCopyButton: () => null }))
+vi.mock('../../components/MobileSourceCopyButton', () => ({ MobileSourceCopyButton: () => null }))
 vi.mock('./MobileFilePreviewSourceText', () => ({ MobileFilePreviewSourceText: () => null }))
 // No shell client initially: the screen must settle on waiting.
-vi.mock('../transport/connection/host-client-hooks', () => ({
+vi.mock('../../transport/connection/host-client-hooks', () => ({
   useForceReconnect: () => transport.forceReconnect,
   useHostClient: () => ({ ...transport.connection, clientId: null })
 }))
 
-import { MobileFilePreviewScreen } from './MobileFilePreviewScreen'
-import { WorkspaceExecutionHostContext } from '../navigation/workspace-execution-host'
-import { resetDocumentEditDraftsForTests } from '../drafts/document-edit-draft-rows'
-import type { ExecutionHostId } from '../../../src/shared/execution-host'
+import { MobileFilePreviewScreen } from '../MobileFilePreviewScreen'
+
+import { resetDocumentEditDraftsForTests } from '../../drafts/document-edit-draft-rows'
 
 let tree: ReactTestRenderer | null = null
 
@@ -160,33 +159,3 @@ it('keeps an editable dirty draft when a reconnect read returns a truncated file
   expect(editor().props.value).toBe('My unsaved changes')
   expect(save().props.disabled).toBe(false)
 })
-
-it.each(['host', 'executionHost'] as const)(
-  'does not carry a draft across %s authority with the same workspace and path',
-  async (authority) => {
-    serveReads(async () => previewReply('Original'))
-    const withExecutionHost =
-      (value: ExecutionHostId | undefined) => (screen: ReturnType<typeof createElement>) =>
-        createElement(WorkspaceExecutionHostContext.Provider, { value }, screen)
-    const { rendered, editor, save } = await mountArtifact(withExecutionHost(undefined))
-    await act(async () => editor().props.onChangeText('My unsaved changes'))
-    await act(async () => {
-      rendered.update(
-        withExecutionHost(authority === 'executionHost' ? 'runtime:other-server' : undefined)(
-          createElement(MobileFilePreviewScreen, {
-            route: {
-              ...ARTIFACT_ROUTE,
-              params: {
-                ...ARTIFACT_ROUTE.params,
-                hostId: authority === 'host' ? 'host-b' : 'host-a',
-                grantId: 'grant-b'
-              }
-            }
-          })
-        )
-      )
-    })
-    expect(editor().props.value).toBe('Original')
-    expect(save().props.disabled).toBe(true)
-  }
-)
diff --git a/mobile/src/files/mobile-file-preview-route.ts b/mobile/src/files/preview/mobile-file-preview-route.ts
similarity index 98%
rename from mobile/src/files/mobile-file-preview-route.ts
rename to mobile/src/files/preview/mobile-file-preview-route.ts
index 7c1b2c401f4..bec6960059d 100644
--- a/mobile/src/files/mobile-file-preview-route.ts
+++ b/mobile/src/files/preview/mobile-file-preview-route.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 
 export type MobileFilePreviewParamValue = string | string[] | undefined
 
diff --git a/mobile/src/files/mobile-file-preview-source.ts b/mobile/src/files/preview/mobile-file-preview-source.ts
similarity index 100%
rename from mobile/src/files/mobile-file-preview-source.ts
rename to mobile/src/files/preview/mobile-file-preview-source.ts
diff --git a/mobile/src/files/mobile-file-preview-styles.ts b/mobile/src/files/preview/mobile-file-preview-styles.ts
similarity index 95%
rename from mobile/src/files/mobile-file-preview-styles.ts
rename to mobile/src/files/preview/mobile-file-preview-styles.ts
index f0d91330251..ac11a88eb0d 100644
--- a/mobile/src/files/mobile-file-preview-styles.ts
+++ b/mobile/src/files/preview/mobile-file-preview-styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native'
-import { colors, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
+import { colors, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
 
 export const filePreviewStyles = themedStyleSheet(() => ({
   container: {
diff --git a/mobile/src/files/mobile-file-preview-syntax.ts b/mobile/src/files/preview/mobile-file-preview-syntax.ts
similarity index 93%
rename from mobile/src/files/mobile-file-preview-syntax.ts
rename to mobile/src/files/preview/mobile-file-preview-syntax.ts
index 5a67f6d7d90..c3f4de4d689 100644
--- a/mobile/src/files/mobile-file-preview-syntax.ts
+++ b/mobile/src/files/preview/mobile-file-preview-syntax.ts
@@ -2,7 +2,7 @@ import {
   highlightMobileCode,
   resolveMobileSyntaxLanguage,
   type MobileSyntaxSegment
-} from './session-documents/mobile-file-syntax'
+} from '../session-documents/mobile-file-syntax'
 
 export type MobileFilePreviewSyntax = {
   language: string
diff --git a/mobile/src/files/use-mobile-file-preview-back.test.ts b/mobile/src/files/preview/use-mobile-file-preview-back.test.ts
similarity index 85%
rename from mobile/src/files/use-mobile-file-preview-back.test.ts
rename to mobile/src/files/preview/use-mobile-file-preview-back.test.ts
index a0ff5d5ad08..f29ff872f40 100644
--- a/mobile/src/files/use-mobile-file-preview-back.test.ts
+++ b/mobile/src/files/preview/use-mobile-file-preview-back.test.ts
@@ -135,21 +135,4 @@ describe('leaving the file preview', () => {
   })
 
   // The bundler selects use-back-claim.web.ts for the shell’s Back key; the hook uses one seam on both platforms.
-  it('registers once across a rebuilt handler, rather than per dependency change', () => {
-    const leave = vi.fn()
-    const renderer = render(false, leave)
-    expect(native.addEventListener).toHaveBeenCalledTimes(1)
-    expect(native.addEventListener.mock.calls[0]?.[0]).toBe('hardwareBackPress')
-    act(() => {
-      renderer.update(createElement(Screen, { hasUnsavedDraft: true, leave }))
-    })
-    expect(native.addEventListener).toHaveBeenCalledTimes(1)
-    let handled = false
-    act(() => {
-      handled = native.addEventListener.mock.calls[0]?.[1]?.() ?? false
-    })
-    expect(handled).toBe(true)
-    expect(leave).not.toHaveBeenCalled()
-    expect(held.back?.confirmingDiscard).toBe(true)
-  })
 })
diff --git a/mobile/src/files/use-mobile-file-preview-back.ts b/mobile/src/files/preview/use-mobile-file-preview-back.ts
similarity index 96%
rename from mobile/src/files/use-mobile-file-preview-back.ts
rename to mobile/src/files/preview/use-mobile-file-preview-back.ts
index a92d10747c1..ac2f4bed6a8 100644
--- a/mobile/src/files/use-mobile-file-preview-back.ts
+++ b/mobile/src/files/preview/use-mobile-file-preview-back.ts
@@ -1,5 +1,5 @@
 import { useCallback, useState } from 'react'
-import { useBackClaim } from '../navigation/use-back-claim'
+import { useBackClaim } from '../../navigation/use-back-claim'
 
 export type MobileFilePreviewBack = {
   confirmingDiscard: boolean
diff --git a/mobile/src/files/session-documents/MobileSessionFileReader.tsx b/mobile/src/files/session-documents/MobileSessionFileReader.tsx
index d87903a4fe1..957963c2f15 100644
--- a/mobile/src/files/session-documents/MobileSessionFileReader.tsx
+++ b/mobile/src/files/session-documents/MobileSessionFileReader.tsx
@@ -1,5 +1,5 @@
-import { MobileFileMediaPreview } from '../MobileFileMediaPreview'
-import type { MobileFilePreviewRpcSender } from '../mobile-file-preview-operations'
+import { MobileFileMediaPreview } from '../media/MobileFileMediaPreview'
+import type { MobileFilePreviewRpcSender } from '../preview/mobile-file-preview-operations'
 import { useState, useEffect, useCallback, useMemo } from 'react'
 import {
   FlatList,
diff --git a/mobile/src/files/file-tab-doc-reply-schema.ts b/mobile/src/files/session-documents/file-tab-doc-reply-schema.ts
similarity index 96%
rename from mobile/src/files/file-tab-doc-reply-schema.ts
rename to mobile/src/files/session-documents/file-tab-doc-reply-schema.ts
index 8a9ad61b634..8dcdbdde1dc 100644
--- a/mobile/src/files/file-tab-doc-reply-schema.ts
+++ b/mobile/src/files/session-documents/file-tab-doc-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../src/shared/zod-salvage'
 
 // Tabs publish members directly into ready documents; their readers must be stricter than the preview screen’s guarded normalizers.
 
diff --git a/mobile/src/files/mobile-diff-image-preview.ts b/mobile/src/files/session-documents/mobile-diff-image-preview.ts
similarity index 91%
rename from mobile/src/files/mobile-diff-image-preview.ts
rename to mobile/src/files/session-documents/mobile-diff-image-preview.ts
index 41599515a67..477a0fd3eaa 100644
--- a/mobile/src/files/mobile-diff-image-preview.ts
+++ b/mobile/src/files/session-documents/mobile-diff-image-preview.ts
@@ -1,4 +1,4 @@
-import { buildImageDataUri } from '../../../src/shared/file-preview/image-data-uri'
+import { buildImageDataUri } from '../../../../src/shared/file-preview/image-data-uri'
 
 // Only modifiedDeleted proves deletion; read failures can also return empty modifiedContent with modifiedIsBinary false.
 // Omit kind: the reply reader admits every non-text arm, including unknown host arms.
diff --git a/mobile/src/files/mobile-file-tab-doc-operations.ts b/mobile/src/files/session-documents/mobile-file-tab-doc-operations.ts
similarity index 92%
rename from mobile/src/files/mobile-file-tab-doc-operations.ts
rename to mobile/src/files/session-documents/mobile-file-tab-doc-operations.ts
index aef0cb50328..c25926fe980 100644
--- a/mobile/src/files/mobile-file-tab-doc-operations.ts
+++ b/mobile/src/files/session-documents/mobile-file-tab-doc-operations.ts
@@ -1,5 +1,8 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant, rpcResultVariants } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import {
+  rpcResultVariant,
+  rpcResultVariants
+} from '../../transport/rpc/rpc-operation-result-reader'
 import {
   fileTabBinaryDiffSchema,
   fileTabImageSchema,
diff --git a/mobile/src/files/mobile-file-tab-doc.ts b/mobile/src/files/session-documents/mobile-file-tab-doc.ts
similarity index 91%
rename from mobile/src/files/mobile-file-tab-doc.ts
rename to mobile/src/files/session-documents/mobile-file-tab-doc.ts
index 1efca7607b1..70f82ab3db2 100644
--- a/mobile/src/files/mobile-file-tab-doc.ts
+++ b/mobile/src/files/session-documents/mobile-file-tab-doc.ts
@@ -1,10 +1,10 @@
-import { mobileFileMedia, type MobileFileMedia } from './mobile-file-media'
-import { buildImageDataUri } from '../../../src/shared/file-preview/image-data-uri'
-import { classifyMobileArtifact } from './mobile-artifact-kind'
+import { mobileFileMedia, type MobileFileMedia } from '../media/mobile-file-media'
+import { buildImageDataUri } from '../../../../src/shared/file-preview/image-data-uri'
+import { classifyMobileArtifact } from '../preview/mobile-artifact-kind'
 import {
   buildMobileDiffLines,
   type MobileDiffLine
-} from '../source-control/review/mobile-diff-lines'
+} from '../../source-control/review/mobile-diff-lines'
 import { mobileDiffImageDataUri } from './mobile-diff-image-preview'
 import {
   fileTabDiffRead,
diff --git a/mobile/src/files/session-documents/mobile-file-tap-open.ts b/mobile/src/files/session-documents/mobile-file-tap-open.ts
index f08eed88cad..52a8dc84a37 100644
--- a/mobile/src/files/session-documents/mobile-file-tap-open.ts
+++ b/mobile/src/files/session-documents/mobile-file-tap-open.ts
@@ -2,10 +2,10 @@ import type { ParsedFileLinkLocation } from '../../../../src/shared/file-links/f
 import type { RuntimeNativeChatFileContext } from '../../../../src/shared/native-chat/native-chat-file-context'
 import type { RuntimeTerminalPathResolution } from '../../../../src/shared/terminal/runtime-terminal-file-path'
 import { filesystemPathToFileUri } from '../../../../src/shared/file-links/file-uri-path'
-import { createMobileFilePreviewHref } from '../mobile-file-preview-route'
-import { classifyMobileArtifact } from '../mobile-artifact-kind'
+import { createMobileFilePreviewHref } from '../preview/mobile-file-preview-route'
+import { classifyMobileArtifact } from '../preview/mobile-artifact-kind'
 import { fileTapOpenRun } from './mobile-file-tap-operations'
-import { terminalArtifactPathResolve as fileTapPathResolve } from '../mobile-file-preview-operations'
+import { terminalArtifactPathResolve as fileTapPathResolve } from '../preview/mobile-file-preview-operations'
 import { mapWithConcurrency } from '../../../../src/shared/map-with-concurrency'
 import {
   shouldActivateOpenedMobileSessionTab,
diff --git a/mobile/src/files/session-documents/mobile-file-tap-operations.ts b/mobile/src/files/session-documents/mobile-file-tap-operations.ts
index b150abc6d3e..36b4b26c4da 100644
--- a/mobile/src/files/session-documents/mobile-file-tap-operations.ts
+++ b/mobile/src/files/session-documents/mobile-file-tap-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../mobile-file-preview-operations'
+import '../preview/mobile-file-preview-operations'
 import { fileTapOpenedSchema } from './mobile-file-tap-reply-schema'
 import '../../agent-history/mobile-ai-vault-resume-reply-schema'
 import '../../browser/tab-navigation/mobile-session-browser-reply-schema'
diff --git a/mobile/src/files/session-documents/mobile-markdown-reader-status.ts b/mobile/src/files/session-documents/mobile-markdown-reader-status.ts
index e238cda5922..0b5958e531e 100644
--- a/mobile/src/files/session-documents/mobile-markdown-reader-status.ts
+++ b/mobile/src/files/session-documents/mobile-markdown-reader-status.ts
@@ -1,5 +1,5 @@
 import { translate } from '../../i18n/mobile-i18n'
-import { formatPreviewByteLength } from '../mobile-file-preview-response'
+import { formatPreviewByteLength } from '../preview/mobile-file-preview-response'
 import type { MarkdownDocState } from './session-document-state'
 
 export function markdownReaderStatusText(
diff --git a/mobile/src/files/session-documents/mobile-markdown-tab-operations.ts b/mobile/src/files/session-documents/mobile-markdown-tab-operations.ts
index cb863e4277a..cfed414b60c 100644
--- a/mobile/src/files/session-documents/mobile-markdown-tab-operations.ts
+++ b/mobile/src/files/session-documents/mobile-markdown-tab-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../mobile-file-preview-operations'
+import '../preview/mobile-file-preview-operations'
 import { sessionLaunchUnreadReplySchema } from '../../transport/rpc/rpc-uninterpreted-reply-schemas'
 import '../../agent-history/mobile-ai-vault-resume-reply-schema'
 import '../../browser/tab-navigation/mobile-session-browser-reply-schema'
@@ -17,7 +17,7 @@ export const sessionMarkdownNoteCreate = bindDeferredRpcOperation(
   })
 )
 
-import '../../terminal/terminal-reply-schema'
+import '../../terminal/host-operations/terminal-reply-schema'
 import { markdownTabDocumentSchema } from './mobile-markdown-tab-reply-schema'
 
 // Inspect renderer_unavailable before interpretation so headless hosts can fall back to disk.
diff --git a/mobile/src/files/session-documents/mobile-session-document-read-settlement.ts b/mobile/src/files/session-documents/mobile-session-document-read-settlement.ts
index 39d21b702e7..af20065d729 100644
--- a/mobile/src/files/session-documents/mobile-session-document-read-settlement.ts
+++ b/mobile/src/files/session-documents/mobile-session-document-read-settlement.ts
@@ -1,4 +1,4 @@
-import type { MobileFileMedia } from '../mobile-file-media'
+import type { MobileFileMedia } from '../media/mobile-file-media'
 import type { MobileDiffLine } from '../../source-control/review/mobile-diff-lines'
 import type { FileDocState, MarkdownDocState, ReadyFileDocState } from './session-document-state'
 
diff --git a/mobile/src/source-control/mobile-source-file-open-operations.ts b/mobile/src/files/session-documents/mobile-source-file-open-operations.ts
similarity index 94%
rename from mobile/src/source-control/mobile-source-file-open-operations.ts
rename to mobile/src/files/session-documents/mobile-source-file-open-operations.ts
index 0d47ca53d58..aea303d18c8 100644
--- a/mobile/src/source-control/mobile-source-file-open-operations.ts
+++ b/mobile/src/files/session-documents/mobile-source-file-open-operations.ts
@@ -1,6 +1,6 @@
 import * as z from 'zod'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 
 // Tabs arrive through the session stream; open callers consume only acceptance, so leave payloads unconstrained.
 const unreadPayload = z.unknown()
diff --git a/mobile/src/files/session-documents/session-document-state.ts b/mobile/src/files/session-documents/session-document-state.ts
index 84574cdc51a..feb12e4cec3 100644
--- a/mobile/src/files/session-documents/session-document-state.ts
+++ b/mobile/src/files/session-documents/session-document-state.ts
@@ -1,4 +1,4 @@
-import type { MobileFileMedia } from '../mobile-file-media'
+import type { MobileFileMedia } from '../media/mobile-file-media'
 import type { MobileDiffLine } from '../../source-control/review/mobile-diff-lines'
 import type { MobileSyntaxSegment } from './mobile-file-syntax'
 
diff --git a/mobile/src/files/session-documents/use-mobile-file-tap-handlers.ts b/mobile/src/files/session-documents/use-mobile-file-tap-handlers.ts
index 6e455fdbb86..8de04d481d8 100644
--- a/mobile/src/files/session-documents/use-mobile-file-tap-handlers.ts
+++ b/mobile/src/files/session-documents/use-mobile-file-tap-handlers.ts
@@ -1,11 +1,11 @@
 import { isCommittedChatAttachmentCandidate } from '../../../../src/shared/native-chat-text-attachment-references'
-import { createMobileFilePreviewHref } from '../mobile-file-preview-route'
+import { createMobileFilePreviewHref } from '../preview/mobile-file-preview-route'
 import { useCallback, useLayoutEffect, useRef, type MutableRefObject } from 'react'
 import type { ParsedFileLinkLocation } from '../../../../src/shared/file-links/file-link-location'
 import { hostStackRouteHref } from '../../navigation/host-stack-navigation'
 import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
 import { useWorkspaceRouteHandoff } from '../../navigation/workspace-route-handoff'
-import { triggerSelection } from '../../platform/haptics'
+import { triggerSelection } from '../../platform/haptics/haptics'
 import { openMobileFileTap, type FileTapSessionTab } from './mobile-file-tap-open'
 import { mobileSessionRouteTarget } from '../../session/mobile-session-route'
 import { openMobileNativeChatFileTap } from '../../session/native-chat/visual/mobile-native-chat-open-file'
diff --git a/mobile/src/files/session-documents/use-mobile-session-document-readers.ts b/mobile/src/files/session-documents/use-mobile-session-document-readers.ts
index e89617b35d5..59026686880 100644
--- a/mobile/src/files/session-documents/use-mobile-session-document-readers.ts
+++ b/mobile/src/files/session-documents/use-mobile-session-document-readers.ts
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useRef } from 'react'
 import type { RpcFailure } from '../../transport/rpc/rpc-wire-types'
 import { translate } from '../../i18n/mobile-i18n'
-import { resolveMobileFileTabDoc } from '../mobile-file-tab-doc'
+import { resolveMobileFileTabDoc } from './mobile-file-tab-doc'
 import { shouldIgnoreTrimWhitespace } from '../../../../src/shared/diff-whitespace'
-import { useMobileSourceControlSettings } from '../../source-control/mobile-source-control-settings'
-import { filePreviewTextRead } from '../mobile-file-preview-operations'
+import { useMobileSourceControlSettings } from '../../source-control/settings/mobile-source-control-settings'
+import { filePreviewTextRead } from '../preview/mobile-file-preview-operations'
 import { markdownTabRead } from './mobile-markdown-tab-operations'
 import {
   buildMarkdownDiskFallbackDoc,
diff --git a/mobile/src/files/session-documents/use-mobile-session-file-actions.ts b/mobile/src/files/session-documents/use-mobile-session-file-actions.ts
index 1a2652f192f..bab858e9911 100644
--- a/mobile/src/files/session-documents/use-mobile-session-file-actions.ts
+++ b/mobile/src/files/session-documents/use-mobile-session-file-actions.ts
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { useMobileFileTapHandlers } from './use-mobile-file-tap-handlers'
 import { resolveMobileNativeChatSessionId } from '../../session/native-chat/mobile-native-chat-eligibility'
 import { useProvideSessionScreenHandlers } from '../../session/session-screen-handlers'
 import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
-import type { MobileSessionTerminalSendActionsModel } from '../../terminal/session/use-mobile-session-terminal-send-actions'
+import type { MobileSessionTerminalSendActionsModel } from '../../terminal/session/input-controls/use-mobile-session-terminal-send-actions'
 
 export function useMobileSessionFileActions(scope: MobileSessionTerminalSendActionsModel) {
   const {
diff --git a/mobile/src/files/session-documents/use-mobile-session-markdown-actions.ts b/mobile/src/files/session-documents/use-mobile-session-markdown-actions.ts
index 41502a7ba5e..6b6687eaded 100644
--- a/mobile/src/files/session-documents/use-mobile-session-markdown-actions.ts
+++ b/mobile/src/files/session-documents/use-mobile-session-markdown-actions.ts
@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react'
 import { Keyboard, Platform } from 'react-native'
-import { useClipboardWriter } from '../../platform/clipboard'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
 import { translate } from '../../i18n/mobile-i18n'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { useBackClaim } from '../../navigation/use-back-claim'
@@ -8,7 +8,7 @@ import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-
 import { useSessionLeaveGuard } from '../../session/session-leave-guard'
 import { markdownTabSave } from './mobile-markdown-tab-operations'
 import { dropDocumentEditDraft, markdownTabDraftKey } from '../../drafts/document-edit-draft-rows'
-import { triggerSuccess, triggerError } from '../../platform/haptics'
+import { triggerSuccess, triggerError } from '../../platform/haptics/haptics'
 import type { DirtyMarkdownDraft } from './session-document-state'
 import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
 import type { MobileSessionDiffCommentsModel } from '../../source-control/review/use-mobile-session-diff-comments'
diff --git a/mobile/src/files/MobileFilePreviewEditDraft.tsx b/mobile/src/files/terminal-artifacts/MobileFilePreviewEditDraft.tsx
similarity index 70%
rename from mobile/src/files/MobileFilePreviewEditDraft.tsx
rename to mobile/src/files/terminal-artifacts/MobileFilePreviewEditDraft.tsx
index bea1c2ab81b..545dcae77f2 100644
--- a/mobile/src/files/MobileFilePreviewEditDraft.tsx
+++ b/mobile/src/files/terminal-artifacts/MobileFilePreviewEditDraft.tsx
@@ -1,16 +1,16 @@
-import { fileEditDraftKey } from '../drafts/document-edit-draft-rows'
-import { DocumentEditDraftOfferBar } from '../drafts/DocumentEditDraftOfferBar'
+import { fileEditDraftKey } from '../../drafts/document-edit-draft-rows'
+import { DocumentEditDraftOfferBar } from '../../drafts/DocumentEditDraftOfferBar'
 import {
   useDocumentEditDraft,
   type DocumentEditDraftOffer
-} from '../drafts/use-document-edit-draft'
-import { useClipboardWriter } from '../platform/clipboard'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import { useKeyboardOcclusion } from '../platform/keyboard-occlusion'
-import { spacing } from '../theme/mobile-theme'
+} from '../../drafts/use-document-edit-draft'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import { useKeyboardOcclusion } from '../../platform/keyboard/keyboard-occlusion'
+import { spacing } from '../../theme/mobile-theme'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import type { MobileFilePreviewSource } from './mobile-file-preview-request'
-import { resolveMarkdownFloatingActionsBottom } from './session-documents/markdown-floating-actions-layout'
+import type { MobileFilePreviewSource } from '../preview/mobile-file-preview-request'
+import { resolveMarkdownFloatingActionsBottom } from '../session-documents/markdown-floating-actions-layout'
 
 /** Only terminal artifacts are editable in the file preview. */
 export function filePreviewEditDraftKey(
diff --git a/mobile/src/files/mobile-file-preview-editability.ts b/mobile/src/files/terminal-artifacts/mobile-file-preview-editability.ts
similarity index 89%
rename from mobile/src/files/mobile-file-preview-editability.ts
rename to mobile/src/files/terminal-artifacts/mobile-file-preview-editability.ts
index 14313e813df..50c1ba5bca7 100644
--- a/mobile/src/files/mobile-file-preview-editability.ts
+++ b/mobile/src/files/terminal-artifacts/mobile-file-preview-editability.ts
@@ -1,7 +1,5 @@
-import type {
-  MobileFilePreviewResult,
-  MobileFilePreviewSource
-} from './mobile-file-preview-request'
+import type { MobileFilePreviewSource } from '../preview/mobile-file-preview-request'
+import type { MobileFilePreviewResult } from '../preview/mobile-file-preview-response'
 
 export function isEditableMobileTerminalArtifactPreview(
   preview: MobileFilePreviewResult,
diff --git a/mobile/src/files/mobile-terminal-artifact-grant-refresh.ts b/mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts
similarity index 93%
rename from mobile/src/files/mobile-terminal-artifact-grant-refresh.ts
rename to mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts
index c3ac115c907..ea3de1e2c37 100644
--- a/mobile/src/files/mobile-terminal-artifact-grant-refresh.ts
+++ b/mobile/src/files/terminal-artifacts/mobile-terminal-artifact-grant-refresh.ts
@@ -1,9 +1,9 @@
-import type { RuntimeNativeChatFileContext } from '../../../src/shared/native-chat/native-chat-file-context'
-import type { RpcFailure } from '../transport/rpc/rpc-wire-types'
+import type { RuntimeNativeChatFileContext } from '../../../../src/shared/native-chat/native-chat-file-context'
+import type { RpcFailure } from '../../transport/rpc/rpc-wire-types'
 import {
   terminalArtifactPathResolve,
   type MobileFilePreviewRpcSender
-} from './mobile-file-preview-operations'
+} from '../preview/mobile-file-preview-operations'
 import { isTerminalArtifactGrantError } from './terminal-artifact-grant-error'
 
 export type MobileTerminalArtifactPreviewSource = {
diff --git a/mobile/src/files/terminal-artifact-grant-error.ts b/mobile/src/files/terminal-artifacts/terminal-artifact-grant-error.ts
similarity index 100%
rename from mobile/src/files/terminal-artifact-grant-error.ts
rename to mobile/src/files/terminal-artifacts/terminal-artifact-grant-error.ts
diff --git a/mobile/src/home/MobileHomeScreen.tsx b/mobile/src/home/MobileHomeScreen.tsx
index 048b43c3ee9..3d31bb2db08 100644
--- a/mobile/src/home/MobileHomeScreen.tsx
+++ b/mobile/src/home/MobileHomeScreen.tsx
@@ -9,7 +9,7 @@ import { useOpenMobileAccounts } from '../accounts/use-open-mobile-accounts'
 import { ActionSheetModal } from '../components/ActionSheetModal'
 import { ConfirmModal } from '../components/ConfirmModal'
 import { getHostListActionSheetActions } from '../host-list-action-sheet-actions'
-import { triggerMediumImpact } from '../platform/haptics'
+import { triggerMediumImpact } from '../platform/haptics/haptics'
 import { useAgentListRowActions } from '../agents/use-agent-list-row-actions'
 import { useOpenMobileTasks } from '../tasks/use-open-mobile-tasks'
 import { useOpenMobileAutomations } from '../automations/use-open-mobile-automations'
@@ -26,7 +26,7 @@ import { resolveHomeHostConnectionState } from '../transport/hosts/home-host-aut
 import { removeHostAndCloseClient } from '../host-catalog/host-removal-lifecycle'
 import { loadHostCatalog } from '../host-catalog/host-store'
 import type { HostCatalogEntry, HostProfile } from '../host-catalog/host-profile'
-import { useOpenMobileHostEdit } from '../host-screen/use-open-mobile-host-edit'
+import { useOpenMobileHostEdit } from '../host-screen/identity/use-open-mobile-host-edit'
 import { mobileConnectionPathLabel } from '../transport/connection/mobile-connection-path-label'
 import { newWorkspaceOverlayHref } from '../new-workspace/new-workspace-overlay-route'
 import { useMobileHomeData } from './use-mobile-home-data'
diff --git a/mobile/src/home/home-query-restore.ts b/mobile/src/home/home-query-restore.ts
index 67f3cda09b4..9c6760408dc 100644
--- a/mobile/src/home/home-query-restore.ts
+++ b/mobile/src/home/home-query-restore.ts
@@ -5,7 +5,7 @@ import {
   HOST_LIST_TARGET,
   homeWorktreeCountsKey,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 import { hostObserverOptions } from '../query/host-query'
 import { accountsSnapshotFamily, accountsSnapshotKey } from '../accounts/accounts-snapshot-stream'
 import { persistedHostQueryKey } from '../query/host-query-persistence'
diff --git a/mobile/src/home/tabs/MobileHomeAutomationsTab.tsx b/mobile/src/home/tabs/MobileHomeAutomationsTab.tsx
index eeda1071407..c9f3e806753 100644
--- a/mobile/src/home/tabs/MobileHomeAutomationsTab.tsx
+++ b/mobile/src/home/tabs/MobileHomeAutomationsTab.tsx
@@ -14,7 +14,7 @@ import { useAutomationRuns } from '../../automations/use-automation-runs'
 import { describeLoadError } from '../../components/load-error-description'
 import { useNow } from '../../hooks/use-now'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/home/tabs/MobileHomeFab.tsx b/mobile/src/home/tabs/MobileHomeFab.tsx
index 0f37550c526..c25184e0e90 100644
--- a/mobile/src/home/tabs/MobileHomeFab.tsx
+++ b/mobile/src/home/tabs/MobileHomeFab.tsx
@@ -2,7 +2,7 @@ import { Plus } from 'lucide-react-native'
 import { useEffect, useState } from 'react'
 import { Pressable, Text, View } from 'react-native'
 import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, radii, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/home/tabs/MobileHomeTabBar.tsx b/mobile/src/home/tabs/MobileHomeTabBar.tsx
index f5d84087a79..129dc771c27 100644
--- a/mobile/src/home/tabs/MobileHomeTabBar.tsx
+++ b/mobile/src/home/tabs/MobileHomeTabBar.tsx
@@ -15,7 +15,7 @@ import Animated, {
   withTiming
 } from 'react-native-reanimated'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, radii, spacing } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/home/tabs/MobileHomeUsageTab.tsx b/mobile/src/home/tabs/MobileHomeUsageTab.tsx
index 0f97179ff0c..a8850bbbd2b 100644
--- a/mobile/src/home/tabs/MobileHomeUsageTab.tsx
+++ b/mobile/src/home/tabs/MobileHomeUsageTab.tsx
@@ -18,7 +18,7 @@ import { ClaudeIcon, OpenAIIcon } from '../../components/AgentIcons'
 import { useNow } from '../../hooks/use-now'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { useResponsiveLayout } from '../../layout/responsive-layout'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import type { HomeStatsSummary } from '../../stats/home-stats-total'
 import { colors, spacing } from '../../theme/mobile-theme'
 import '../../theme/themed-styles'
diff --git a/mobile/src/home/use-mobile-home-data.ts b/mobile/src/home/use-mobile-home-data.ts
index 86db717735c..c5cbdb23736 100644
--- a/mobile/src/home/use-mobile-home-data.ts
+++ b/mobile/src/home/use-mobile-home-data.ts
@@ -21,7 +21,7 @@ import {
   HOST_LIST_TARGET,
   homeWorktreeCountsKey,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 import { useNow } from '../hooks/use-now'
 import {
   loadMobileOnboardingSteps,
diff --git a/mobile/src/hooks/mobile-dictation-audio-chunk.ts b/mobile/src/hooks/mobile-dictation-audio-chunk.ts
index 524c11ec299..0c0a359798f 100644
--- a/mobile/src/hooks/mobile-dictation-audio-chunk.ts
+++ b/mobile/src/hooks/mobile-dictation-audio-chunk.ts
@@ -5,7 +5,7 @@ import {
 } from './mobile-dictation-pending-audio-budget'
 import { bytesToBase64 } from './mobile-dictation-session-state'
 import { dictationAudioChunkSend } from '../dictation/mobile-dictation-operations'
-import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../src/shared/rpc-contract/speech-params'
+import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../src/shared/rpc-contract/speech/speech-params'
 import { isRpcDeliveryUnknown } from '../transport/rpc/rpc-delivery-ambiguity'
 import { rpcPayloadMember } from '../transport/rpc/rpc-reader-payload'
 import { waitForRpcClientReconnected } from '../transport/rpc/rpc-client-reconnect-wait'
@@ -17,7 +17,7 @@ import { dictationSessionErrorMessage } from '../dictation/mobile-dictation-setu
 import type {
   DictationCapture,
   DictationCaptureChunk
-} from '../platform/dictation-capture-contract'
+} from '../platform/audio-capture/dictation-capture-contract'
 import type { MobileDictationPendingAudioBudget } from './mobile-dictation-pending-audio-budget'
 import type { MobileDictationHeldAudio } from './mobile-dictation-held-audio'
 import type { MobileDictationRecording } from './mobile-dictation-recording'
diff --git a/mobile/src/hooks/mobile-dictation-background.test.tsx b/mobile/src/hooks/mobile-dictation-background.test.tsx
index 585c78e85a8..06e5ab70a1c 100644
--- a/mobile/src/hooks/mobile-dictation-background.test.tsx
+++ b/mobile/src/hooks/mobile-dictation-background.test.tsx
@@ -7,7 +7,7 @@ import {
   rpcSuccess,
   type FakeRpcClient
 } from '../mobile-web-shell/bridge-host-test-fakes'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
 
 const appState = vi.hoisted(() => ({ handlers: new Set<(state: string) => void>() }))
 const microphone = vi.hoisted(() => ({ ends: 0 }))
@@ -23,7 +23,7 @@ vi.mock('react-native', () => ({
   Platform: { OS: 'ios' }
 }))
 
-vi.mock('../platform/dictation-capture', () => {
+vi.mock('../platform/audio-capture/dictation-capture', () => {
   const capture: DictationCapture = {
     open: async () => ({ ok: true }),
     begin: () => true,
@@ -109,29 +109,4 @@ describe('leaving the app while dictating', () => {
     expect(transcripts).toEqual(['what was heard'])
     expect(dictation().status).toBe('idle')
   })
-
-  it('keeps what the open mic heard while the computer is still starting', async () => {
-    const rpc = createFakeRpcClient()
-    const transcripts: string[] = []
-    mount(rpc, transcripts)
-    await act(async () => {
-      void dictation().start()
-      for (let turn = 0; turn < 20 && rpc.requests.length === 0; turn += 1) {
-        await Promise.resolve()
-      }
-    })
-    expect(dictation().status).toBe('starting')
-    const endsBefore = microphone.ends
-
-    act(() => {
-      leave('background')
-    })
-    expect(microphone.ends).toBe(endsBefore + 1)
-
-    await act(async () => {
-      await pump(rpc)
-    })
-    expect(transcripts).toEqual(['what was heard'])
-    expect(dictation().status).toBe('idle')
-  })
 })
diff --git a/mobile/src/hooks/mobile-dictation-capture-open.ts b/mobile/src/hooks/mobile-dictation-capture-open.ts
index aeb753d466a..753f4934730 100644
--- a/mobile/src/hooks/mobile-dictation-capture-open.ts
+++ b/mobile/src/hooks/mobile-dictation-capture-open.ts
@@ -1,5 +1,5 @@
 import { dictationSessionErrorMessage } from '../dictation/mobile-dictation-setup'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
 
 type OpenMobileDictationCaptureOptions = {
   capture: DictationCapture
diff --git a/mobile/src/hooks/mobile-dictation-desktop-start.ts b/mobile/src/hooks/mobile-dictation-desktop-start.ts
index 1086409ea5c..056ff563c93 100644
--- a/mobile/src/hooks/mobile-dictation-desktop-start.ts
+++ b/mobile/src/hooks/mobile-dictation-desktop-start.ts
@@ -6,7 +6,7 @@ import {
   dictationSessionFinish,
   dictationSessionStart
 } from '../dictation/mobile-dictation-operations'
-import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../src/shared/rpc-contract/speech-params'
+import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../src/shared/rpc-contract/speech/speech-params'
 import { pairedDictationFinishTimeoutMs } from '../../../src/shared/dictation-finish-deadlines'
 import { rpcPayloadMember } from '../transport/rpc/rpc-reader-payload'
 import { probeLivenessWhileWaiting } from '../transport/rpc/rpc-liveness-probe-while-waiting'
diff --git a/mobile/src/hooks/mobile-dictation-device-engine.ts b/mobile/src/hooks/mobile-dictation-device-engine.ts
index 30758b3cc3f..d48642250a8 100644
--- a/mobile/src/hooks/mobile-dictation-device-engine.ts
+++ b/mobile/src/hooks/mobile-dictation-device-engine.ts
@@ -2,8 +2,8 @@ import type {
   BridgeSpeechFailure,
   BridgeSpeechRead
 } from '../mobile-web-shell/bridge/bridge-speech-verbs'
-import type { OnDeviceSpeech } from '../platform/on-device-speech-contract'
-import { DICTATION_CAPTURE_DRAIN_INTERVAL_MS } from '../platform/dictation-capture-contract'
+import type { OnDeviceSpeech } from '../platform/speech/on-device-speech-contract'
+import { DICTATION_CAPTURE_DRAIN_INTERVAL_MS } from '../platform/audio-capture/dictation-capture-contract'
 import { translate } from '../i18n/mobile-i18n'
 
 // Which engine hears this dictation. fallback: a failed phone session may replay its audio to the computer (Automatic only).
diff --git a/mobile/src/hooks/mobile-dictation-engine-run.ts b/mobile/src/hooks/mobile-dictation-engine-run.ts
index b61d5390e51..8ee2bfe74ee 100644
--- a/mobile/src/hooks/mobile-dictation-engine-run.ts
+++ b/mobile/src/hooks/mobile-dictation-engine-run.ts
@@ -1,7 +1,7 @@
 import type { RefObject } from 'react'
 import { dictationSessionErrorMessage } from '../dictation/mobile-dictation-setup'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
-import type { OnDeviceSpeech } from '../platform/on-device-speech-contract'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
+import type { OnDeviceSpeech } from '../platform/speech/on-device-speech-contract'
 import { openMobileDictationCapture } from './mobile-dictation-capture-open'
 import { createMobileDictationId, type DictationStatus } from './mobile-dictation-session-state'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
diff --git a/mobile/src/hooks/mobile-dictation-finish.ts b/mobile/src/hooks/mobile-dictation-finish.ts
index c676c3de41f..1e692aa30e2 100644
--- a/mobile/src/hooks/mobile-dictation-finish.ts
+++ b/mobile/src/hooks/mobile-dictation-finish.ts
@@ -1,5 +1,5 @@
 import { rpcPayloadMember } from '../transport/rpc/rpc-reader-payload'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
 import { isCurrentMobileDictationFinish } from './mobile-dictation-session-state'
 import { finishDesktopDictation } from './mobile-dictation-desktop-start'
 import {
diff --git a/mobile/src/hooks/mobile-dictation-held-audio.ts b/mobile/src/hooks/mobile-dictation-held-audio.ts
index 21e142a5683..eefa4d13b74 100644
--- a/mobile/src/hooks/mobile-dictation-held-audio.ts
+++ b/mobile/src/hooks/mobile-dictation-held-audio.ts
@@ -2,8 +2,8 @@ import {
   DICTATION_SAMPLE_RATE,
   MAX_DICTATION_AUDIO_CHUNK_BYTES,
   PCM_BYTES_PER_SAMPLE
-} from '../../../src/shared/rpc-contract/speech-params'
-import type { DictationCaptureChunk } from '../platform/dictation-capture-contract'
+} from '../../../src/shared/rpc-contract/speech/speech-params'
+import type { DictationCaptureChunk } from '../platform/audio-capture/dictation-capture-contract'
 
 // Five minutes of 16 kHz PCM (9.6 MB): the longest recording kept for a replay to the computer.
 export const MAX_HELD_AUDIO_BYTES = DICTATION_SAMPLE_RATE * PCM_BYTES_PER_SAMPLE * 300
diff --git a/mobile/src/hooks/mobile-dictation-meter.ts b/mobile/src/hooks/mobile-dictation-meter.ts
index dda46c194d4..4ddd9cd2dc3 100644
--- a/mobile/src/hooks/mobile-dictation-meter.ts
+++ b/mobile/src/hooks/mobile-dictation-meter.ts
@@ -11,8 +11,8 @@ import {
 import {
   DICTATION_SAMPLE_RATE,
   PCM_BYTES_PER_SAMPLE
-} from '../../../src/shared/rpc-contract/speech-params'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
+} from '../../../src/shared/rpc-contract/speech/speech-params'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
 
 const WINDOW_MS = 50
 const WINDOW_SAMPLES = (DICTATION_SAMPLE_RATE * WINDOW_MS) / 1000
diff --git a/mobile/src/hooks/mobile-dictation-on-device.test.tsx b/mobile/src/hooks/mobile-dictation-on-device.test.tsx
index cca33fcf3c9..8406d44a613 100644
--- a/mobile/src/hooks/mobile-dictation-on-device.test.tsx
+++ b/mobile/src/hooks/mobile-dictation-on-device.test.tsx
@@ -11,8 +11,8 @@ import {
 import type {
   DictationCapture,
   DictationCaptureChunk
-} from '../platform/dictation-capture-contract'
-import type { OnDeviceSpeech } from '../platform/on-device-speech-contract'
+} from '../platform/audio-capture/dictation-capture-contract'
+import type { OnDeviceSpeech } from '../platform/speech/on-device-speech-contract'
 import type {
   BridgeSpeechFinish,
   BridgeSpeechRead,
@@ -40,7 +40,7 @@ vi.mock('react-native', () => ({
   Platform: { OS: 'ios' }
 }))
 
-vi.mock('../platform/dictation-capture', () => {
+vi.mock('../platform/audio-capture/dictation-capture', () => {
   const capture: DictationCapture = {
     open: async () => ({ ok: true }),
     begin: () => true,
@@ -55,7 +55,7 @@ vi.mock('../platform/dictation-capture', () => {
   return { useDictationCapture: () => capture }
 })
 
-vi.mock('../platform/on-device-speech', () => {
+vi.mock('../platform/speech/on-device-speech', () => {
   const speech: OnDeviceSpeech = {
     status: async () => ({
       status: 'ready',
@@ -200,60 +200,3 @@ describe('a phone recognizer that fails at the finish', () => {
     expect(dictation().status).toBe('error')
   })
 })
-
-describe('a phone recognizer that fails after a long dictation', () => {
-  it('replays all of it to the computer instead of calling the connection slow', async () => {
-    const rpc = createFakeRpcClient()
-    const sent: SentRequest[] = []
-    const transcripts: string[] = []
-    mount(rpc, (text) => transcripts.push(text))
-    await act(async () => {
-      await dictation().start()
-    })
-    // 40 s of 16 kHz PCM: more than the 30 s the host may have pending at once.
-    for (let second = 0; second < 40; second += 1) {
-      speak(Array.from({ length: 32_000 }, () => second))
-    }
-    seam.finish = { text: null, failure: 'failed' }
-    await act(async () => {
-      const stopped = dictation().stop()
-      await pump(rpc, sent)
-      await stopped
-    })
-    expect(held.errors).toEqual([])
-    expect(chunkAudio(sent).map(([seq]) => seq)).toEqual([0, 1, 2, 3, 4, 5, 6, 7])
-    expect(transcripts).toEqual(['from the computer'])
-  })
-})
-
-describe('a stop while a failed phone dictation is reaching the computer', () => {
-  it('finishes on the computer once its start lands, with the audio kept so far', async () => {
-    const rpc = createFakeRpcClient()
-    const sent: SentRequest[] = []
-    const transcripts: string[] = []
-    mount(rpc, (text) => transcripts.push(text))
-    await act(async () => {
-      await dictation().start()
-    })
-    speak([1, 2, 3])
-    seam.read = { revision: 1, committed: '', tentative: '', failure: 'failed' }
-    // The drain tick reads the failure and starts the computer's session.
-    await act(async () => {
-      await vi.waitFor(() =>
-        expect(rpc.requests.map((request) => request.method)).toEqual(['speech.dictation.start'])
-      )
-    })
-    await act(async () => {
-      const stopped = dictation().stop()
-      await pump(rpc, sent)
-      await stopped
-    })
-    expect(sent.map((request) => request.method)).toEqual([
-      'speech.dictation.start',
-      'speech.dictation.chunk',
-      'speech.dictation.finish'
-    ])
-    expect(transcripts).toEqual(['from the computer'])
-    expect(dictation().status).toBe('idle')
-  })
-})
diff --git a/mobile/src/hooks/mobile-dictation-pending-audio-budget.ts b/mobile/src/hooks/mobile-dictation-pending-audio-budget.ts
index d2b83fe9b99..3efc52c4f78 100644
--- a/mobile/src/hooks/mobile-dictation-pending-audio-budget.ts
+++ b/mobile/src/hooks/mobile-dictation-pending-audio-budget.ts
@@ -2,7 +2,7 @@ import {
   DICTATION_SAMPLE_RATE,
   MOBILE_DICTATION_MAX_PENDING_AUDIO_BYTES,
   PCM_BYTES_PER_SAMPLE
-} from '../../../src/shared/rpc-contract/speech-params'
+} from '../../../src/shared/rpc-contract/speech/speech-params'
 
 export const MOBILE_DICTATION_PCM_SAMPLE_RATE = DICTATION_SAMPLE_RATE
 
diff --git a/mobile/src/hooks/mobile-dictation-recording.ts b/mobile/src/hooks/mobile-dictation-recording.ts
index 872c6231794..5ca09c6daa5 100644
--- a/mobile/src/hooks/mobile-dictation-recording.ts
+++ b/mobile/src/hooks/mobile-dictation-recording.ts
@@ -1,4 +1,4 @@
-import type { DictationCaptureChunk } from '../platform/dictation-capture-contract'
+import type { DictationCaptureChunk } from '../platform/audio-capture/dictation-capture-contract'
 import { MAX_HELD_AUDIO_BYTES, type MobileDictationHeldAudio } from './mobile-dictation-held-audio'
 
 // Everything one dictation heard, from the tap, whichever engine hears it: replayed to the computer when the phone fails, and kept after a failure for Retry.
diff --git a/mobile/src/hooks/mobile-dictation-retry.test.tsx b/mobile/src/hooks/mobile-dictation-retry.test.tsx
index 474685d5a83..cb025b734ba 100644
--- a/mobile/src/hooks/mobile-dictation-retry.test.tsx
+++ b/mobile/src/hooks/mobile-dictation-retry.test.tsx
@@ -10,7 +10,7 @@ import {
 import type {
   DictationCapture,
   DictationCaptureChunk
-} from '../platform/dictation-capture-contract'
+} from '../platform/audio-capture/dictation-capture-contract'
 
 type Seam = {
   chunkHandlers: Set<(chunk: DictationCaptureChunk) => void>
@@ -25,7 +25,7 @@ vi.mock('react-native', () => ({
 }))
 
 // Keep capture identity stable like both real seams; a fresh object on render would rerun teardown and cancel dictation.
-vi.mock('../platform/dictation-capture', () => {
+vi.mock('../platform/audio-capture/dictation-capture', () => {
   const capture: DictationCapture = {
     open: async () => ({ ok: true }),
     begin: () => true,
diff --git a/mobile/src/hooks/mobile-dictation-send-window.test.tsx b/mobile/src/hooks/mobile-dictation-send-window.test.tsx
index 5df494d67f3..2649f71518a 100644
--- a/mobile/src/hooks/mobile-dictation-send-window.test.tsx
+++ b/mobile/src/hooks/mobile-dictation-send-window.test.tsx
@@ -10,7 +10,7 @@ import {
 import type {
   DictationCapture,
   DictationCaptureChunk
-} from '../platform/dictation-capture-contract'
+} from '../platform/audio-capture/dictation-capture-contract'
 
 const chunkHandlers = vi.hoisted(() => new Set<(chunk: DictationCaptureChunk) => void>())
 
@@ -19,7 +19,7 @@ vi.mock('react-native', () => ({
   Platform: { OS: 'ios' }
 }))
 
-vi.mock('../platform/dictation-capture', () => {
+vi.mock('../platform/audio-capture/dictation-capture', () => {
   const capture: DictationCapture = {
     open: async () => ({ ok: true }),
     begin: () => true,
@@ -40,11 +40,6 @@ function chunkRequests(rpc: FakeRpcClient): SentRequest[] {
   return rpc.requests.filter((request) => request.method === 'speech.dictation.chunk')
 }
 
-function paramsOf(request: SentRequest): { audioBase64: string; seq: number } {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: chunk requests carry DictationChunk params.
-  return request.args[1] as { audioBase64: string; seq: number }
-}
-
 async function answer(rpc: FakeRpcClient, requests: SentRequest[], text: string): Promise<void> {
   for (const request of requests) {
     rpc.requests.splice(rpc.requests.indexOf(request), 1)
@@ -94,35 +89,6 @@ function speak(count: number): void {
 }
 
 describe('phone dictation chunks on a link that stops answering', () => {
-  it('keep four requests waiting, then send the audio captured meanwhile as one, before the finish', async () => {
-    const rpc = createFakeRpcClient()
-    const transcripts: string[] = []
-    const dictation = await startDictation(rpc, transcripts)
-
-    speak(10)
-    const waiting = chunkRequests(rpc)
-    expect(waiting.map((request) => paramsOf(request).seq)).toEqual([0, 1, 2, 3])
-
-    let stopped: Promise<void> = Promise.resolve()
-    await act(async () => {
-      stopped = dictation().stop()
-      await answer(rpc, waiting, '')
-    })
-    // Six held two-byte captures, merged into one request after the first that came free.
-    const merged = chunkRequests(rpc)
-    expect(merged.map(paramsOf)).toEqual([
-      { ...paramsOf(merged[0]), seq: 4, audioBase64: 'BAQFBQYGBwcICAkJ' }
-    ])
-    expect(rpc.requests.some((request) => request.method === 'speech.dictation.finish')).toBe(false)
-
-    await act(async () => {
-      await answer(rpc, merged, '')
-      await answer(rpc, [...rpc.requests], 'all ten')
-      await stopped
-    })
-    expect(transcripts).toEqual(['all ten'])
-  })
-
   it('keep the newest text so far when an older reply arrives last', async () => {
     const rpc = createFakeRpcClient()
     const dictation = await startDictation(rpc)
diff --git a/mobile/src/hooks/mobile-dictation-stop-tail.test.tsx b/mobile/src/hooks/mobile-dictation-stop-tail.test.tsx
index a99d87534e4..1ac7b0ca48e 100644
--- a/mobile/src/hooks/mobile-dictation-stop-tail.test.tsx
+++ b/mobile/src/hooks/mobile-dictation-stop-tail.test.tsx
@@ -11,7 +11,7 @@ import {
 import type {
   DictationCapture,
   DictationCaptureChunk
-} from '../platform/dictation-capture-contract'
+} from '../platform/audio-capture/dictation-capture-contract'
 
 type Seam = {
   chunkHandlers: Set<(chunk: DictationCaptureChunk) => void>
@@ -26,7 +26,7 @@ vi.mock('react-native', () => ({
 }))
 
 // Keep capture identity stable like both real seams; a fresh object on render would rerun teardown and cancel dictation.
-vi.mock('../platform/dictation-capture', () => {
+vi.mock('../platform/audio-capture/dictation-capture', () => {
   const capture: DictationCapture = {
     open: async () => ({ ok: true }),
     begin: () => true,
@@ -150,32 +150,6 @@ describe('the audio a capture hands over as it ends', () => {
       methods.indexOf('speech.dictation.finish')
     )
   })
-
-  it('stops being accepted once the capture has ended', async () => {
-    const rpc = createFakeRpcClient()
-    const sent: SentRequest[] = []
-    mount(rpc)
-    await act(async () => {
-      const started = dictation().start()
-      await pump(rpc, sent)
-      await started
-    })
-    await act(async () => {
-      const stopped = dictation().stop()
-      await pump(rpc, sent)
-      await stopped
-    })
-    const before = sent.filter((request) => request.method === 'speech.dictation.chunk').length
-    for (const handler of seam.chunkHandlers) {
-      handler({ data: Uint8Array.from([1, 2, 3, 4]), droppedBytes: 0 })
-    }
-    await act(async () => {
-      await pump(rpc, sent)
-    })
-    expect(sent.filter((request) => request.method === 'speech.dictation.chunk')).toHaveLength(
-      before
-    )
-  })
 })
 
 describe('a finish whose dictation stopped being the current one', () => {
diff --git a/mobile/src/hooks/use-mobile-dictation-interruptions.ts b/mobile/src/hooks/use-mobile-dictation-interruptions.ts
index a0c5ccf0892..7f4ff4f7c50 100644
--- a/mobile/src/hooks/use-mobile-dictation-interruptions.ts
+++ b/mobile/src/hooks/use-mobile-dictation-interruptions.ts
@@ -1,7 +1,7 @@
 import { useEffect, type RefObject } from 'react'
 import { AppState } from 'react-native'
 import { dictationSessionErrorMessage } from '../dictation/mobile-dictation-setup'
-import type { DictationCapture } from '../platform/dictation-capture-contract'
+import type { DictationCapture } from '../platform/audio-capture/dictation-capture-contract'
 import type { MobileDictationAudioPhase } from './mobile-dictation-audio-chunk'
 import type { DictationStatus } from './mobile-dictation-session-state'
 
diff --git a/mobile/src/hooks/use-mobile-dictation.ts b/mobile/src/hooks/use-mobile-dictation.ts
index 027042548be..36e36ff36f6 100644
--- a/mobile/src/hooks/use-mobile-dictation.ts
+++ b/mobile/src/hooks/use-mobile-dictation.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { useDictationCapture } from '../platform/dictation-capture'
-import { useOnDeviceSpeech } from '../platform/on-device-speech'
+import { useDictationCapture } from '../platform/audio-capture/dictation-capture'
+import { useOnDeviceSpeech } from '../platform/speech/on-device-speech'
 import { dictationSessionErrorMessage } from '../dictation/mobile-dictation-setup'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { useMobileDictationMeter } from './mobile-dictation-meter'
diff --git a/mobile/src/hooks/use-phone-dictation-ready.ts b/mobile/src/hooks/use-phone-dictation-ready.ts
index 214e659455d..6ffc8a4490c 100644
--- a/mobile/src/hooks/use-phone-dictation-ready.ts
+++ b/mobile/src/hooks/use-phone-dictation-ready.ts
@@ -1,5 +1,5 @@
 import { useCallback, useRef, useState } from 'react'
-import { useOnDeviceSpeech } from '../platform/on-device-speech'
+import { useOnDeviceSpeech } from '../platform/speech/on-device-speech'
 import { chooseMobileDictationRoute } from './mobile-dictation-device-engine'
 
 // Whether a tap now would dictate on the phone itself. The ref answers inside a tap; the state re-renders the mic.
diff --git a/mobile/src/host-screen/host-list-queries.ts b/mobile/src/host-screen/catalog/host-list-queries.ts
similarity index 93%
rename from mobile/src/host-screen/host-list-queries.ts
rename to mobile/src/host-screen/catalog/host-list-queries.ts
index 08c966625e2..940935375bb 100644
--- a/mobile/src/host-screen/host-list-queries.ts
+++ b/mobile/src/host-screen/catalog/host-list-queries.ts
@@ -3,32 +3,32 @@ import {
   getRepoExecutionHostId,
   parseExecutionHostId,
   type ExecutionHostId
-} from '../../../src/shared/execution-host'
-import { MOBILE_RELAY_HOST_WORKTREE_DELTAS_RUNTIME_CAPABILITY } from '../../../src/shared/mobile-desktop-relay-contract'
-import type { MobileRelayHost } from '../../../src/shared/remote-runtime/relay/mobile-relay-hosts-contract'
+} from '../../../../src/shared/execution-host'
+import { MOBILE_RELAY_HOST_WORKTREE_DELTAS_RUNTIME_CAPABILITY } from '../../../../src/shared/mobile-desktop-relay-contract'
+import type { MobileRelayHost } from '../../../../src/shared/remote-runtime/relay/mobile-relay-hosts-contract'
 import type { Query, QueryClient } from '@tanstack/react-query'
-import { defineHostQuery } from '../query/host-query'
-import { hostQueryKey, type HostQueryTarget } from '../query/host-query-key'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import { defineHostQuery } from '../../query/host-query'
+import { hostQueryKey, type HostQueryTarget } from '../../query/host-query-key'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import {
   applyServerWorkspaces,
   fetchServerWorkspaces,
   NO_SERVER_WORKSPACES,
   ServerRowSnapshots,
   type ServerWorkspaces
-} from '../worktree/server-workspaces'
+} from '../../worktree/server-workspaces'
 import {
   readWorktreeCatalogSnapshot,
   type WorktreeCatalogSnapshot
-} from '../worktree/worktree-catalog-snapshot-client'
-import type { Worktree } from '../worktree/workspace-list-types'
+} from '../../worktree/worktree-catalog-snapshot-client'
+import type { Worktree } from '../../worktree/workspace-list-types'
 import {
   hostRepoCatalogRepos,
   hostSshTargetSummarySchema,
   type HostRepoCatalogRow
-} from './host-screen-reply-schema'
-import { hostPlatformRead, hostRepoCatalogSnapshotRead } from './host-screen-operations'
-import { NODE_PLATFORM_NAMES } from '../transport/connection/mobile-runtime-host-platform'
+} from '../host-screen-reply-schema'
+import { hostPlatformRead, hostRepoCatalogSnapshotRead } from '../host-screen-operations'
+import { NODE_PLATFORM_NAMES } from '../../transport/connection/mobile-runtime-host-platform'
 import {
   acceptedMetadata,
   readHostSshTargetLabels,
diff --git a/mobile/src/host-screen/host-repo-looks.ts b/mobile/src/host-screen/catalog/host-repo-looks.ts
similarity index 88%
rename from mobile/src/host-screen/host-repo-looks.ts
rename to mobile/src/host-screen/catalog/host-repo-looks.ts
index be34ac661e9..b096d1a88a6 100644
--- a/mobile/src/host-screen/host-repo-looks.ts
+++ b/mobile/src/host-screen/catalog/host-repo-looks.ts
@@ -1,7 +1,7 @@
 import { useState } from 'react'
-import type { SectionRepo } from '../worktree/workspace-list-types'
-import { sectionRepoColor } from '../worktree/workspace-filter-repos'
-import { readMobileRepoIcon, type MobileHostRepoIcon } from './host-screen-reply-schema'
+import type { SectionRepo } from '../../worktree/workspace-list-types'
+import { sectionRepoColor } from '../../worktree/workspace-filter-repos'
+import { readMobileRepoIcon, type MobileHostRepoIcon } from '../host-screen-reply-schema'
 
 export type RepoLook = { color: string; icon: MobileHostRepoIcon | null }
 
diff --git a/mobile/src/host-screen/host-ssh-target-labels-read.ts b/mobile/src/host-screen/catalog/host-ssh-target-labels-read.ts
similarity index 74%
rename from mobile/src/host-screen/host-ssh-target-labels-read.ts
rename to mobile/src/host-screen/catalog/host-ssh-target-labels-read.ts
index a1efa773ecb..93e391da0b1 100644
--- a/mobile/src/host-screen/host-ssh-target-labels-read.ts
+++ b/mobile/src/host-screen/catalog/host-ssh-target-labels-read.ts
@@ -1,10 +1,11 @@
-import { isHostNotConnectedError } from '../query/host-query-errors'
-import { optionalSettingsRead } from '../settings/mobile-settings-read-operations'
-import type { RpcAcceptedResult } from '../transport/rpc/rpc-accepted-result'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
-import { buildHostLabelById } from '../worktree/worktree-host-context-labels'
-import { hostSshTargetSummariesRead } from './host-screen-operations'
+import { isHostNotConnectedError } from '../../query/host-query-errors'
+import { optionalSettingsRead } from '../../settings/mobile-settings-read-operations'
+import type { RpcAcceptedResult } from '../../transport/rpc/rpc-accepted-result'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
+import '../../worktree/worktree-host-context-labels'
+import { buildHostLabelById } from '../../../../src/shared/worktree/host-context-labels'
+import { hostSshTargetSummariesRead } from '../host-screen-operations'
 
 export async function settledMetadataReply(
   send: () => Promise<RpcResponse>
diff --git a/mobile/src/host-screen/use-host-project-sections.ts b/mobile/src/host-screen/catalog/use-host-project-sections.ts
similarity index 81%
rename from mobile/src/host-screen/use-host-project-sections.ts
rename to mobile/src/host-screen/catalog/use-host-project-sections.ts
index 37337359f61..1b21e70269e 100644
--- a/mobile/src/host-screen/use-host-project-sections.ts
+++ b/mobile/src/host-screen/catalog/use-host-project-sections.ts
@@ -1,19 +1,21 @@
 import { useEffect } from 'react'
 import * as z from 'zod'
-import type { ProjectGroup } from '../../../src/shared/project-group-types'
-import { ProjectSectionCatalogSchema } from '../../../src/shared/project-section-catalog-schema'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
-import { defineHostQuery, useHostQuery } from '../query/host-query'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import type { ProjectGroup } from '../../../../src/shared/project-group-types'
+import {
+  ProjectSectionCatalogSchema,
+  type ServedProjectSections
+} from '../../../../src/shared/project-section-catalog-schema'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
+import { defineHostQuery, useHostQuery } from '../../query/host-query'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import {
   hostProjectGroupsRead,
   projectSectionsRead,
-  readServedProjectSections,
-  type ServedProjectSections
-} from '../worktree/project-sections-operations'
-import { readHostMethodReply } from './host-sidebar-feed-operations'
+  readServedProjectSections
+} from '../../worktree/project-sections-operations'
+import { readHostMethodReply } from '../sidebar-feed/host-sidebar-feed-operations'
 import { HOST_LIST_TARGET, NO_HOST_LIST_INPUT } from './host-list-queries'
-import type { HostScreenState } from './use-host-screen-state'
+import type { HostScreenState } from '../use-host-screen-state'
 
 type HostProjectSections = {
   sections: ServedProjectSections | null
diff --git a/mobile/src/host-screen/use-host-repo-icon-data-urls.ts b/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts
similarity index 87%
rename from mobile/src/host-screen/use-host-repo-icon-data-urls.ts
rename to mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts
index d6552f1ec61..933a4a2efd5 100644
--- a/mobile/src/host-screen/use-host-repo-icon-data-urls.ts
+++ b/mobile/src/host-screen/catalog/use-host-repo-icon-data-urls.ts
@@ -1,7 +1,10 @@
 import { useEffect, useRef, useState } from 'react'
-import { MAX_REPO_ICON_IDS_PER_READ } from '../../../src/shared/sidebar-list/repo-icon-data-urls-contract'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { readHostMethodReply, sidebarRepoIconsRead } from './host-sidebar-feed-operations'
+import { MAX_REPO_ICON_IDS_PER_READ } from '../../../../src/shared/sidebar-list/repo-icon-data-urls-contract'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import {
+  readHostMethodReply,
+  sidebarRepoIconsRead
+} from '../sidebar-feed/host-sidebar-feed-operations'
 
 const NO_DATA_URLS: ReadonlyMap<string, string | null> = new Map()
 
diff --git a/mobile/src/host-screen/use-host-repo-metadata.ts b/mobile/src/host-screen/catalog/use-host-repo-metadata.ts
similarity index 80%
rename from mobile/src/host-screen/use-host-repo-metadata.ts
rename to mobile/src/host-screen/catalog/use-host-repo-metadata.ts
index 2d306455441..ec77527a46d 100644
--- a/mobile/src/host-screen/use-host-repo-metadata.ts
+++ b/mobile/src/host-screen/catalog/use-host-repo-metadata.ts
@@ -1,10 +1,10 @@
 import { useEffect } from 'react'
-import { getRepoExecutionHostId } from '../../../src/shared/execution-host'
-import { useHostQuery } from '../query/host-query'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { buildRepoHostIdByRepoId } from '../worktree/worktree-host-context-labels'
-import { buildSshHostHealthById } from '../worktree/worktree-host-health'
-import type { SectionRepo } from '../worktree/workspace-list-types'
+import { getRepoExecutionHostId } from '../../../../src/shared/execution-host'
+import { useHostQuery } from '../../query/host-query'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { buildRepoHostIdByRepoId } from '../../worktree/worktree-host-context-labels'
+import { buildSshHostHealthById } from '../../worktree/worktree-host-health'
+import type { SectionRepo } from '../../worktree/workspace-list-types'
 import {
   catalogNeedsHostLabels,
   HOST_LIST_TARGET,
@@ -12,8 +12,8 @@ import {
   hostRepoLabelsQuery,
   NO_HOST_LIST_INPUT
 } from './host-list-queries'
-import type { HostRepoCatalogRow } from './host-screen-reply-schema'
-import type { HostScreenState } from './use-host-screen-state'
+import type { HostRepoCatalogRow } from '../host-screen-reply-schema'
+import type { HostScreenState } from '../use-host-screen-state'
 
 function desktopSectionRepo(repo: HostRepoCatalogRow): SectionRepo {
   return {
diff --git a/mobile/src/host-screen/use-host-worktree-catalog.ts b/mobile/src/host-screen/catalog/use-host-worktree-catalog.ts
similarity index 86%
rename from mobile/src/host-screen/use-host-worktree-catalog.ts
rename to mobile/src/host-screen/catalog/use-host-worktree-catalog.ts
index edbad9c48fc..6a1664ebec5 100644
--- a/mobile/src/host-screen/use-host-worktree-catalog.ts
+++ b/mobile/src/host-screen/catalog/use-host-worktree-catalog.ts
@@ -1,33 +1,33 @@
-import { MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../src/shared/mobile-desktop-relay-contract'
-import { WORKTREE_ROWS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../src/shared/worktree-runtime-capabilities'
-import { readWorktreeFirstPage } from '../worktree/worktree-catalog-first-page'
-import type { Worktree } from '../worktree/workspace-list-types'
+import { MOBILE_RELAY_HOSTS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../../src/shared/mobile-desktop-relay-contract'
+import { WORKTREE_ROWS_CHANGED_EVENT_RUNTIME_CAPABILITY } from '../../../../src/shared/worktree-runtime-capabilities'
+import { readWorktreeFirstPage } from '../../worktree/worktree-catalog-first-page'
+import type { Worktree } from '../../worktree/workspace-list-types'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { AppState } from 'react-native'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
 import { useFocusEffect } from 'expo-router'
 import { useQueryClient } from '@tanstack/react-query'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { RpcIncompatibleReplyError } from '../transport/rpc/rpc-incompatible-reply-error'
-import { startHostWorktreeRefresh } from '../worktree/host-worktree-refresh'
-import type { HostSidebarFeedTriggers } from './host-sidebar-feed-connection'
-import { areWorktreeListsEqual } from '../worktree/worktree-list-snapshot'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { RpcIncompatibleReplyError } from '../../transport/rpc/rpc-incompatible-reply-error'
+import { startHostWorktreeRefresh } from '../../worktree/host-worktree-refresh'
+import type { HostSidebarFeedTriggers } from '../sidebar-feed/host-sidebar-feed-connection'
+import { areWorktreeListsEqual } from '../../worktree/worktree-list-snapshot'
 import {
   clearConfirmedActiveWorktreeIdentity,
   retainLiveSleptWorktreeIdentities
-} from '../worktree/worktree-host-row-identity'
-import { savePinnedIds } from '../storage/preferences'
-import type { HostScreenState } from './use-host-screen-state'
-import { relaysToServers } from '../worktree/execution-host-scoped-rpc-client'
-import { NO_SERVER_WORKSPACES } from '../worktree/server-workspaces'
-import { useRelayHosts } from '../worktree/relay-hosts-feed'
-import { WorktreeCatalogReadError } from '../worktree/worktree-catalog-snapshot-client'
-import { useHostQuery } from '../query/host-query'
-import { hostReadClient } from '../query/host-read-client'
-import { hostScopeKey } from '../query/host-query-key'
-import { isHostNotConnectedError } from '../query/host-query-errors'
-import { refetchHostQueryAfterInFlight } from '../query/host-event-router'
+} from '../../worktree/worktree-host-row-identity'
+import { savePinnedIds } from '../../storage/preferences'
+import type { HostScreenState } from '../use-host-screen-state'
+import { relaysToServers } from '../../worktree/execution-host-scoped-rpc-client'
+import { NO_SERVER_WORKSPACES } from '../../worktree/server-workspaces'
+import { useRelayHosts } from '../../worktree/relay-hosts-feed'
+import { WorktreeCatalogReadError } from '../../worktree/worktree-catalog-snapshot-client'
+import { useHostQuery } from '../../query/host-query'
+import { hostReadClient } from '../../query/host-read-client'
+import { hostScopeKey } from '../../query/host-query-key'
+import { isHostNotConnectedError } from '../../query/host-query-errors'
+import { refetchHostQueryAfterInFlight } from '../../query/host-event-router'
 import {
   isHostListQuery,
   HOST_LIST_BACKSTOP_POLL_MS,
diff --git a/mobile/src/host-screen/host-edit-navigation.ts b/mobile/src/host-screen/host-edit-navigation.ts
deleted file mode 100644
index c1e667c5ca2..00000000000
--- a/mobile/src/host-screen/host-edit-navigation.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  hostStackHostRoute,
-  navigateToHostStackRoute,
-  type HostStackHostRoute,
-  type HostStackNavigationController,
-  type HostStackNavigationState,
-  type HostStackRootNavigation,
-  type HostStackRouteTarget,
-  type HostStackRouter
-} from '../navigation/host-stack-navigation'
-
-export type MobileHostEditHostRoute = HostStackHostRoute
-export type MobileHostEditNavigationState = HostStackNavigationState
-export type MobileHostEditRootNavigation = HostStackRootNavigation
-export type MobileHostEditRouter = HostStackRouter
-export type MobileHostEditNavigationController = HostStackNavigationController
-
-export function mobileHostEditHostRoute(hostId: string): MobileHostEditHostRoute {
-  return hostStackHostRoute(hostId)
-}
-
-export function mobileHostEditRouteTarget(hostId: string): HostStackRouteTarget {
-  return {
-    name: '[hostId]/edit',
-    params: { hostId }
-  }
-}
-
-export function navigateToMobileHostEdit(
-  navigation: MobileHostEditRootNavigation,
-  router: MobileHostEditRouter,
-  hostId: string
-): MobileHostEditNavigationController {
-  return navigateToHostStackRoute(navigation, router, hostId, mobileHostEditRouteTarget(hostId))
-}
diff --git a/mobile/src/host-screen/host-screen-overlays.tsx b/mobile/src/host-screen/host-screen-overlays.tsx
index ba7f8977bc7..ddee0ad056a 100644
--- a/mobile/src/host-screen/host-screen-overlays.tsx
+++ b/mobile/src/host-screen/host-screen-overlays.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 import { Pressable, Text, View } from 'react-native'
 import { Edit3, Moon, Pin, PinOff } from 'lucide-react-native'
 import { buildWorktreeNavigationActions } from '../agent-history/worktree-navigation-actions'
@@ -12,12 +12,13 @@ import { ConfirmModal } from '../components/ConfirmModal'
 import { OrcaHookTrustDrawer } from '../components/OrcaHookTrustDrawer'
 import { NewWorktreeModalController } from '../components/NewWorktreeModalController'
 import { hostNewWorktreeSessionRoute } from '../host-new-worktree-session-route'
-import { isWorktreePinned, type Worktree } from '../worktree/workspace-list-sections'
+import { isWorktreePinned } from '../worktree/workspace-list-sections'
+import type { Worktree } from '../worktree/workspace-list-types'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { hostScreenStyles as styles } from './host-screen-styles'
-import { WorkspaceOptionsSheet } from './workspace-options-sheet'
-import { WorkspaceDetailsSheet } from './workspace-details-sheet'
-import { WorkspaceRenameSheet } from './workspace-rename-sheet'
+import { WorkspaceOptionsSheet } from './workspace-options/workspace-options-sheet'
+import { WorkspaceDetailsSheet } from './workspace-actions/workspace-details-sheet'
+import { WorkspaceRenameSheet } from './workspace-actions/workspace-rename-sheet'
 import type { HostScreenController } from './use-host-screen-controller'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 
diff --git a/mobile/src/host-screen/host-screen-reply-schema.test.ts b/mobile/src/host-screen/host-screen-reply-schema.test.ts
deleted file mode 100644
index e6aba400135..00000000000
--- a/mobile/src/host-screen/host-screen-reply-schema.test.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  hostPlatformSchema,
-  hostRepoCatalogSchema,
-  hostSshTargetSummariesSchema,
-  hostViewSettingsSchema
-} from './host-screen-reply-schema'
-
-describe('host screen reply schemas', () => {
-  it('requires the repo list and drops a row no map could key', () => {
-    expect(hostRepoCatalogSchema.safeParse({}).success).toBe(false)
-    const parsed = hostRepoCatalogSchema.parse({
-      repos: [{ id: 'r1', displayName: 'orca' }, { id: 'r2' }, { displayName: 'ghost' }]
-    })
-    expect(parsed.map((repo) => repo.id)).toEqual(['r1'])
-  })
-
-  it('salvages badgeColor onto the generated swatch main fell back to', () => {
-    expect(
-      hostRepoCatalogSchema.parse({ repos: [{ id: 'r', displayName: 'o', badgeColor: 3 }] })[0]
-        ?.badgeColor
-    ).toBeUndefined()
-  })
-
-  it('keeps a known repo icon arm and degrades an unknown one to absent', () => {
-    const known = hostRepoCatalogSchema.parse({
-      repos: [{ id: 'r', displayName: 'o', repoIcon: { type: 'emoji', emoji: 'x' } }]
-    })
-    expect(known[0]?.repoIcon).toEqual({ type: 'emoji', emoji: 'x' })
-    const unknown = hostRepoCatalogSchema.parse({
-      repos: [{ id: 'r', displayName: 'o', repoIcon: { type: 'svg', markup: '<svg/>' } }]
-    })
-    // Unknown icon arms retain the row and use MobileRepoIcon’s Folder default.
-    expect(unknown[0]?.id).toBe('r')
-    expect(unknown[0]?.repoIcon).toBeUndefined()
-  })
-
-  it('keeps an image icon whose source this build has never heard of', () => {
-    const [repo] = hostRepoCatalogSchema.parse({
-      repos: [
-        {
-          id: 'r',
-          displayName: 'o',
-          repoIcon: {
-            type: 'image',
-            src: 'https://example.invalid/a.png',
-            source: 'gitlab',
-            label: 'acme/orca'
-          }
-        }
-      ]
-    })
-    // MobileRepoIcon ignores source; constraining it would drop images from newer hosts for a member the renderer never reads.
-    expect(repo?.repoIcon).toEqual({
-      type: 'image',
-      src: 'https://example.invalid/a.png',
-      source: 'gitlab',
-      label: 'acme/orca'
-    })
-  })
-
-  it('passes a host-id spelling through for getRepoExecutionHostId to judge', () => {
-    const [repo] = hostRepoCatalogSchema.parse({
-      repos: [{ id: 'r', displayName: 'o', executionHostId: 'cloud:zone-a', connectionId: null }]
-    })
-    expect(repo?.executionHostId).toBe('cloud:zone-a')
-    expect(repo?.connectionId).toBeNull()
-  })
-
-  it('degrades an unreadable ssh target list to the empty one that falls back to host ids', () => {
-    expect(hostSshTargetSummariesSchema.parse({})).toEqual([])
-    expect(hostSshTargetSummariesSchema.parse({ targets: 'none' })).toEqual([])
-    expect(
-      hostSshTargetSummariesSchema.parse({
-        targets: [{ id: 't', label: 'T' }, { id: 'u' }, { label: 'V' }]
-      })
-    ).toEqual([{ id: 't', label: 'T' }])
-  })
-
-  it('keeps SSH lifecycle fields raw and drops a malformed one without losing the target', () => {
-    expect(
-      hostSshTargetSummariesSchema.parse({
-        targets: [
-          { id: 't', label: 'T', connected: false, connectionStatus: 'hibernating' },
-          { id: 'u', label: 'U', connected: 'no', connectionStatus: 7 }
-        ]
-      })
-    ).toEqual([
-      { id: 't', label: 'T', connected: false, connectionStatus: 'hibernating' },
-      { id: 'u', label: 'U' }
-    ])
-  })
-
-  it('answers the empty target list for a reply that is no object at all', () => {
-    // Label writes precede platform writes; malformed targets must degrade to [] rather than skip both.
-    for (const payload of [null, undefined, 'nope', 42, []]) {
-      expect(hostSshTargetSummariesSchema.parse(payload)).toEqual([])
-    }
-  })
-
-  it('reads only a platform Node could have reported', () => {
-    expect(hostPlatformSchema.parse({ platform: 'win32' })).toBe('win32')
-    expect(hostPlatformSchema.parse({ platform: 'plan9' })).toBeNull()
-    expect(hostPlatformSchema.parse({ platform: '' })).toBeNull()
-    expect(hostPlatformSchema.parse({})).toBeNull()
-    for (const payload of [null, undefined, 'nope', 42]) {
-      expect(hostPlatformSchema.parse(payload)).toBeNull()
-    }
-  })
-
-  it('requires the ui member main read with a bare property access', () => {
-    expect(hostViewSettingsSchema.safeParse({}).success).toBe(false)
-    expect(hostViewSettingsSchema.safeParse(null).success).toBe(false)
-    expect(hostViewSettingsSchema.parse({ ui: {} })).toEqual({})
-  })
-
-  it('degrades an unknown grouping or sort arm to absent so the local mode is kept', () => {
-    const parsed = hostViewSettingsSchema.parse({
-      ui: { groupBy: 'agent', sortBy: 'stars', hideSleepingWorkspaces: 'yes' }
-    })
-    expect(parsed.groupBy).toBeUndefined()
-    expect(parsed.sortBy).toBeUndefined()
-    expect(parsed.hideSleepingWorkspaces).toBeUndefined()
-  })
-
-  it('keeps the known view arms and the lists the screen adopts', () => {
-    const parsed = hostViewSettingsSchema.parse({
-      ui: {
-        groupBy: 'workspace-status',
-        sortBy: 'recent',
-        filterRepoIds: ['r1'],
-        collapsedGroups: [],
-        workspaceStatuses: [{ id: 'active', label: 'Active' }]
-      }
-    })
-    expect(parsed.groupBy).toBe('workspace-status')
-    expect(parsed.sortBy).toBe('recent')
-    expect(parsed.filterRepoIds).toEqual(['r1'])
-    expect(parsed.workspaceStatuses).toEqual([{ id: 'active', label: 'Active' }])
-  })
-
-  it('reads every Workspace options value the desktop mirrors to its phone', () => {
-    const ui = {
-      hideAutomationGeneratedWorkspaces: true,
-      hideCliCreatedWorkspaces: false,
-      hideDetachedHeadWorkspaces: true,
-      hideWorkspacesFromOtherDevices: true,
-      projectOrderBy: 'recent',
-      worktreeCardProperties: ['status', 'a-property-from-a-newer-desktop'],
-      agentActivityDisplayMode: 'full'
-    }
-    expect(hostViewSettingsSchema.parse({ ui })).toEqual(ui)
-  })
-
-  it('reads a desktop that predates them as absent, which keeps the local value', () => {
-    const parsed = hostViewSettingsSchema.parse({
-      ui: { groupBy: 'repo', projectOrderBy: 'alphabetical', agentActivityDisplayMode: 7 }
-    })
-    expect(parsed).toEqual({ groupBy: 'repo' })
-  })
-
-  it('salvages a non-array status catalog rather than handing a string to the group lookups', () => {
-    expect(
-      hostViewSettingsSchema.parse({ ui: { workspaceStatuses: 'active' } }).workspaceStatuses
-    ).toBeUndefined()
-  })
-})
-
-describe('repo icon payloads', () => {
-  it('preserves the lucide icon name the row renders', () => {
-    const [row] = hostRepoCatalogSchema.parse({
-      repos: [{ id: 'r', displayName: 'r', repoIcon: { type: 'lucide', name: 'Terminal' } }]
-    })
-    expect(row?.repoIcon).toEqual({ type: 'lucide', name: 'Terminal' })
-  })
-})
diff --git a/mobile/src/host-screen/host-screen-view.tsx b/mobile/src/host-screen/host-screen-view.tsx
index 0aa860410de..c566c1e3d9b 100644
--- a/mobile/src/host-screen/host-screen-view.tsx
+++ b/mobile/src/host-screen/host-screen-view.tsx
@@ -7,7 +7,7 @@ import { hostScreenStyles as styles } from './host-screen-styles'
 import { HostBottomBar } from './host-bottom-bar'
 import { HostConnectionStatus, HostScreenHeader } from './host-screen-header'
 import { HostScreenOverlays } from './host-screen-overlays'
-import { HostWorkspaceList } from './host-workspace-list'
+import { HostWorkspaceList } from './workspace-list/host-workspace-list'
 import type { HostScreenController } from './use-host-screen-controller'
 
 export function HostScreenView({ controller }: { controller: HostScreenController }) {
diff --git a/mobile/src/host-screen/host-sidebar-feed-sections.test.ts b/mobile/src/host-screen/host-sidebar-feed-sections.test.ts
deleted file mode 100644
index 5d0cf70ce29..00000000000
--- a/mobile/src/host-screen/host-sidebar-feed-sections.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  buildSidebarFeedRows,
-  type SidebarFeedView
-} from '../../../src/shared/sidebar-list/sidebar-feed-rows'
-
-import { buildSidebarFeedCatalog } from '../../../src/shared/sidebar-list/sidebar-feed-catalog'
-import { buildHostFeedView } from './host-sidebar-feed-inputs'
-import { buildHostFeedSections } from './host-sidebar-feed-sections'
-import {
-  SERVED_SECTIONS,
-  feedDomains,
-  feedKey,
-  feedRow,
-  phoneView
-} from './host-sidebar-feed.test-fixture'
-import type { MobileViewState } from '../worktree/workspace-view-settings'
-import type { ProjectGroup } from '../../../src/shared/project-group-types'
-import { readServedProjectSections } from '../worktree/project-sections-operations'
-import { NO_WORKTREE_HOST_CONTEXT } from '../worktree/worktree-host-context-labels'
-
-function phoneFeedView(
-  view: MobileViewState,
-  showPinnedInGroups = false,
-  hostPlatform: NodeJS.Platform | null = 'darwin'
-): SidebarFeedView {
-  return buildHostFeedView({
-    view,
-    projectOrderBy: 'manual',
-    desktop: { ...feedDomains().desktop!, showPinnedInGroups },
-    hostPlatform
-  })
-}
-
-describe('the phone list from the sidebar feed', () => {
-  it('files a grouped project under its group header, nested and in the group’s order', () => {
-    const group = (id: string, name: string, extra: Partial<ProjectGroup> = {}): ProjectGroup => ({
-      id,
-      name,
-      parentPath: null,
-      parentGroupId: null,
-      createdFrom: 'manual',
-      tabOrder: 0,
-      isCollapsed: false,
-      color: null,
-      createdAt: 0,
-      updatedAt: 0,
-      ...extra
-    })
-    const served = readServedProjectSections({
-      id: 'sections',
-      ok: true,
-      result: {
-        catalog: {
-          ...SERVED_SECTIONS,
-          repos: [
-            // Use reversed fixture order so only projectGroupOrder can produce the expected order.
-            { ...SERVED_SECTIONS.repos[0]!, projectGroupId: 'pg-inner', projectGroupOrder: 1 },
-            { ...SERVED_SECTIONS.repos[1]!, projectGroupId: 'pg-inner', projectGroupOrder: 0 }
-          ],
-          projectGroups: [
-            group('pg-school', 'school'),
-            group('pg-inner', 'inner', { parentGroupId: 'pg-school', createdFrom: 'folder-scan' })
-          ]
-        }
-      }
-    })
-    if (served.kind !== 'answered' || !served.value) {
-      throw new Error('expected a served catalog')
-    }
-    const grouped = buildSidebarFeedCatalog(served.value, [], [])
-    const base = feedDomains()
-    const domains = feedDomains({
-      workspaces: new Map([
-        ...base.workspaces,
-        [feedKey('|orca::/w/solo'), feedRow({ id: 'orca::/w/solo', manualOrder: 4 })]
-      ])
-    })
-    const built = buildSidebarFeedRows(domains, grouped, phoneFeedView(phoneView()))
-    const sections = buildHostFeedSections({
-      rows: built.sectionRows,
-      lastVisited: null,
-      liveRows: [],
-      hostContextOf: NO_WORKTREE_HOST_CONTEXT,
-      repoHostIdByRepoId: new Map([['lab', 'ssh:gpu']]),
-      search: ''
-    })
-    const headers = sections.map(
-      (section) =>
-        `${section.title}${section.isProjectGroup ? ' group' : ''} depth=${String(section.projectGroupDepth ?? 0)}`
-    )
-    expect(headers).toEqual([
-      'Pinned depth=0',
-      'school group depth=0',
-      'inner group depth=1',
-      'lab depth=2',
-      'orca depth=2'
-    ])
-    expect(
-      sections
-        .slice(-2)
-        .map((section) =>
-          section.data.map((row) => [
-            row.view.projectGroupDepth,
-            row.view.inFolderScanGroup === true
-          ])
-        )
-    ).toEqual([[[2, true]], [[2, true]]])
-    expect(sections.at(-2)?.data.map((row) => row.row.worktreeId)).toEqual(['lab::/w/gpu'])
-  })
-})
diff --git a/mobile/src/host-screen/host-sidebar-feed.test-fixture.ts b/mobile/src/host-screen/host-sidebar-feed.test-fixture.ts
deleted file mode 100644
index 85afd5b4998..00000000000
--- a/mobile/src/host-screen/host-sidebar-feed.test-fixture.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import type { SidebarFeedDomains } from '../../../src/shared/sidebar-list/sidebar-feed-domains'
-import type { WorkspaceRow } from '../../../src/shared/sidebar-list/workspace-rows'
-import {
-  parseWorktreeHostIdentity,
-  type HostScopedWorktreeKey
-} from '../../../src/shared/worktree/host-qualified-identity'
-import type { ServedProjectSections } from '../worktree/project-sections-operations'
-import { INITIAL_MOBILE_VIEW, type MobileViewState } from '../worktree/workspace-view-settings'
-import type { Worktree } from '../worktree/workspace-list-types'
-
-export function feedRow(overrides: Partial<WorkspaceRow> & Pick<WorkspaceRow, 'id'>): WorkspaceRow {
-  return {
-    hostId: 'local',
-    kind: 'git',
-    repoId: 'orca',
-    path: `/w/${overrides.id}`,
-    branch: overrides.id,
-    displayName: overrides.id,
-    isMainWorktree: false,
-    lineage: null,
-    isPinned: false,
-    isArchived: false,
-    isUnread: false,
-    workspaceStatus: 'in-progress',
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    linkedGitLabMR: null,
-    linkedGitLabIssue: null,
-    linkedItems: [],
-    defaultBranch: false,
-    ...overrides
-  }
-}
-
-export const FEED_ROWS = {
-  parent: feedRow({
-    id: 'orca::/w/parent',
-    isPinned: true,
-    instanceId: 'i-parent',
-    manualOrder: 1
-  }),
-  child: feedRow({
-    id: 'orca::/w/child',
-    instanceId: 'i-child',
-    manualOrder: 2,
-    lineage: {
-      parentWorktreeId: 'orca::/w/parent',
-      worktreeInstanceId: 'i-child',
-      parentWorktreeInstanceId: 'i-parent'
-    }
-  }),
-  remote: feedRow({ id: 'lab::/w/gpu', hostId: 'ssh:gpu', repoId: 'lab', manualOrder: 3 })
-}
-
-export function feedKey(identity: string): HostScopedWorktreeKey {
-  const key = parseWorktreeHostIdentity(identity)
-  if (!key) {
-    throw new Error(`not a row identity: ${identity}`)
-  }
-  return key
-}
-
-export function feedDomains(overrides: Partial<SidebarFeedDomains> = {}): SidebarFeedDomains {
-  return {
-    workspaces: new Map([
-      [feedKey('|orca::/w/parent'), FEED_ROWS.parent],
-      [feedKey('|orca::/w/child'), FEED_ROWS.child],
-      [feedKey('ssh:gpu|lab::/w/gpu'), FEED_ROWS.remote]
-    ]),
-    activity: new Map(),
-    review: new Map(),
-    creations: new Map(),
-    pairedServerHosts: new Map(),
-    pairedServerRows: new Map(),
-    repoIcons: new Map(),
-    desktop: {
-      desktopActive: { hostId: null, worktreeId: 'orca::/w/parent' },
-      pinnedWorkspaceIds: ['orca::/w/parent'],
-      repoOrder: [
-        { hostId: 'local', repoId: 'orca' },
-        { hostId: 'ssh:gpu', repoId: 'lab' }
-      ],
-      workspaceHostOrder: [],
-      sshHosts: { 'ssh:gpu': { label: 'GPU box', status: 'connected' } },
-      wslHosts: {}
-    },
-    projectCatalog: null,
-    retention: null,
-    ...overrides
-  }
-}
-
-type ServedRepo = ServedProjectSections['repos'][number]
-
-function servedRepo(fields: Pick<ServedRepo, 'id' | 'path'> & Partial<ServedRepo>): ServedRepo {
-  return {
-    displayName: fields.id,
-    badgeColor: undefined,
-    addedAt: undefined,
-    connectionId: undefined,
-    executionHostId: undefined,
-    projectGroupId: undefined,
-    projectGroupOrder: undefined,
-    ...fields
-  }
-}
-
-export const SERVED_SECTIONS: ServedProjectSections = {
-  repos: [
-    servedRepo({ id: 'orca', path: '/r/orca', badgeColor: '#f00' }),
-    servedRepo({ id: 'lab', path: '/r/lab', connectionId: 'gpu' })
-  ],
-  projects: [],
-  setups: [],
-  projectOrderBy: 'manual',
-  projectGroups: undefined
-}
-
-export function phoneView(overrides: Partial<MobileViewState> = {}): MobileViewState {
-  return { ...INITIAL_MOBILE_VIEW, groupBy: 'repo', sortBy: 'manual', ...overrides }
-}
-
-export function liveRow(overrides: Partial<Worktree> & Pick<Worktree, 'worktreeId'>): Worktree {
-  return {
-    repoId: 'orca',
-    repo: 'orca',
-    branch: overrides.worktreeId,
-    displayName: overrides.worktreeId,
-    path: `/w/${overrides.worktreeId}`,
-    liveTerminalCount: 0,
-    hasAttachedPty: false,
-    unread: false,
-    isPinned: false,
-    linkedPR: null,
-    ...overrides
-  }
-}
diff --git a/mobile/src/host-screen/identity/host-edit-navigation.ts b/mobile/src/host-screen/identity/host-edit-navigation.ts
new file mode 100644
index 00000000000..7360a528e1a
--- /dev/null
+++ b/mobile/src/host-screen/identity/host-edit-navigation.ts
@@ -0,0 +1,22 @@
+import {
+  navigateToHostStackRoute,
+  type HostStackNavigationController,
+  type HostStackRootNavigation,
+  type HostStackRouteTarget,
+  type HostStackRouter
+} from '../../navigation/host-stack-navigation'
+
+export function mobileHostEditRouteTarget(hostId: string): HostStackRouteTarget {
+  return {
+    name: '[hostId]/edit',
+    params: { hostId }
+  }
+}
+
+export function navigateToMobileHostEdit(
+  navigation: HostStackRootNavigation,
+  router: HostStackRouter,
+  hostId: string
+): HostStackNavigationController {
+  return navigateToHostStackRoute(navigation, router, hostId, mobileHostEditRouteTarget(hostId))
+}
diff --git a/mobile/src/host-screen/host-stored-identity.ts b/mobile/src/host-screen/identity/host-stored-identity.ts
similarity index 83%
rename from mobile/src/host-screen/host-stored-identity.ts
rename to mobile/src/host-screen/identity/host-stored-identity.ts
index dd02444eb75..45cef67e4fb 100644
--- a/mobile/src/host-screen/host-stored-identity.ts
+++ b/mobile/src/host-screen/identity/host-stored-identity.ts
@@ -1,5 +1,5 @@
-import type { HostProfile } from '../host-catalog/host-profile'
-import type { HostMachine } from '../../../src/shared/host-machine-line'
+import type { HostProfile } from '../../host-catalog/host-profile'
+import type { HostMachine } from '../../../../src/shared/host-machine-line'
 
 export type HostStoredDescriptor = {
   personalName?: string
diff --git a/mobile/src/host-screen/use-host-screen-identity.ts b/mobile/src/host-screen/identity/use-host-screen-identity.ts
similarity index 80%
rename from mobile/src/host-screen/use-host-screen-identity.ts
rename to mobile/src/host-screen/identity/use-host-screen-identity.ts
index 057a23b8718..59ad8a8229e 100644
--- a/mobile/src/host-screen/use-host-screen-identity.ts
+++ b/mobile/src/host-screen/identity/use-host-screen-identity.ts
@@ -1,17 +1,17 @@
 import { useEffect } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { translate } from '../i18n/mobile-i18n'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
-import { loadPinnedIds } from '../storage/preferences'
-import { loadHosts, peekHosts } from '../host-catalog/host-store'
-import { updateLastConnected } from '../host-catalog/host-connection-history'
-import type { HostProfile } from '../host-catalog/host-profile'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { HostScreenState } from './use-host-screen-state'
+import { translate } from '../../i18n/mobile-i18n'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
+import { loadPinnedIds } from '../../storage/preferences'
+import { loadHosts, peekHosts } from '../../host-catalog/host-store'
+import { updateLastConnected } from '../../host-catalog/host-connection-history'
+import type { HostProfile } from '../../host-catalog/host-profile'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { HostScreenState } from '../use-host-screen-state'
 import { storedHostDescriptor } from './host-stored-identity'
-import { INITIAL_MOBILE_VIEW } from '../worktree/workspace-view-settings'
-import { cachedHostView } from './host-view-memory'
-import { cachedHostWorktrees } from './host-list-queries'
+import { INITIAL_MOBILE_VIEW } from '../../worktree/workspace-view-settings'
+import { cachedHostView } from '../view-settings/host-view-memory'
+import { cachedHostWorktrees } from '../catalog/host-list-queries'
 
 // The host as last read this launch, so the title's first frame shows its name, not "Host".
 export function peekStoredHost(hostId: string | undefined): HostProfile | null {
diff --git a/mobile/src/host-screen/use-open-mobile-host-edit.ts b/mobile/src/host-screen/identity/use-open-mobile-host-edit.ts
similarity index 81%
rename from mobile/src/host-screen/use-open-mobile-host-edit.ts
rename to mobile/src/host-screen/identity/use-open-mobile-host-edit.ts
index a6517e3a3d9..0bf5e726969 100644
--- a/mobile/src/host-screen/use-open-mobile-host-edit.ts
+++ b/mobile/src/host-screen/identity/use-open-mobile-host-edit.ts
@@ -1,5 +1,5 @@
 import { useCallback } from 'react'
-import { useOpenHostStackRoute } from '../navigation/use-open-host-stack-route'
+import { useOpenHostStackRoute } from '../../navigation/use-open-host-stack-route'
 import { mobileHostEditRouteTarget } from './host-edit-navigation'
 
 export function useOpenMobileHostEdit(): (hostId: string) => void {
diff --git a/mobile/src/host-screen/host-sidebar-feed-connection.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-connection.ts
similarity index 82%
rename from mobile/src/host-screen/host-sidebar-feed-connection.ts
rename to mobile/src/host-screen/sidebar-feed/host-sidebar-feed-connection.ts
index d48e56d65a2..bf1ed86d98a 100644
--- a/mobile/src/host-screen/host-sidebar-feed-connection.ts
+++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-connection.ts
@@ -2,8 +2,8 @@ import {
   SidebarFeedReader,
   type SidebarFeedNotice,
   type SidebarFeedReaderRead
-} from '../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+} from '../../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 import { hostSidebarFeedTransport } from './host-sidebar-feed-operations'
 
 export type HostSidebarFeedTriggers = {
diff --git a/mobile/src/host-screen/host-sidebar-feed-inputs.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts
similarity index 75%
rename from mobile/src/host-screen/host-sidebar-feed-inputs.ts
rename to mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts
index bba09257ec2..936a32aa55b 100644
--- a/mobile/src/host-screen/host-sidebar-feed-inputs.ts
+++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs.ts
@@ -3,12 +3,12 @@ import {
   LOCAL_EXECUTION_HOST_ID,
   normalizeExecutionHostId,
   type ExecutionHostId
-} from '../../../src/shared/execution-host'
-import { getHostContextLabel } from '../../../src/shared/worktree/host-context-labels'
-import type { DesktopSidebarFacts } from '../../../src/shared/sidebar-list/desktop-sidebar-facts'
-import type { SidebarFeedView } from '../../../src/shared/sidebar-list/sidebar-feed-rows'
-import type { ProjectOrderBy } from '../../../src/shared/ui-chrome-types'
-import type { MobileViewState } from '../worktree/workspace-view-settings'
+} from '../../../../src/shared/execution-host'
+import { getHostContextLabel } from '../../../../src/shared/worktree/host-context-labels'
+import type { DesktopSidebarFacts } from '../../../../src/shared/sidebar-list/desktop-sidebar-facts'
+import type { SidebarFeedView } from '../../../../src/shared/sidebar-list/sidebar-feed-rows'
+import type { ProjectOrderBy } from '../../../../src/shared/ui-chrome-types'
+import type { MobileViewState } from '../../worktree/workspace-view-settings'
 
 // Mirror desktop UI/settings into the shared sidebar builder; resolved all-host scope matches desktop legacy scope.
 export function buildHostFeedView(args: {
diff --git a/mobile/src/host-screen/host-sidebar-feed-operations.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts
similarity index 79%
rename from mobile/src/host-screen/host-sidebar-feed-operations.ts
rename to mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts
index 3f69e0ce52e..0aa0bf7e949 100644
--- a/mobile/src/host-screen/host-sidebar-feed-operations.ts
+++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations.ts
@@ -1,11 +1,11 @@
 import * as z from 'zod'
-import { SidebarInputsReadResultSchema } from '../../../src/shared/sidebar-list/sidebar-inputs-feed-contract'
-import type { SidebarFeedTransport } from '../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import { isMobileMethodUnavailableError } from '../transport/rpc/mobile-method-unavailable'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { SidebarInputsReadResultSchema } from '../../../../src/shared/sidebar-list/sidebar-inputs-feed-contract'
+import type { SidebarFeedTransport } from '../../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
+import { isMobileMethodUnavailableError } from '../../transport/rpc/mobile-method-unavailable'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 
 // Only ORCA_SIDEBAR_INPUTS=main pages read this feed; method_not_found or an older allowlist’s forbidden means the page is newer than the host.
 
diff --git a/mobile/src/host-screen/host-sidebar-feed-sections.ts b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts
similarity index 89%
rename from mobile/src/host-screen/host-sidebar-feed-sections.ts
rename to mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts
index fcdf2861ab7..f26ea3c39f3 100644
--- a/mobile/src/host-screen/host-sidebar-feed-sections.ts
+++ b/mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts
@@ -2,26 +2,31 @@ import {
   LOCAL_EXECUTION_HOST_ID,
   getWorktreeExecutionHostId,
   type ExecutionHostId
-} from '../../../src/shared/execution-host'
-import { folderWorkspaceToWorktree } from '../../../src/shared/folder-workspaces/folder-workspace-worktree'
-import { getFolderWorkspaceHostId } from '../../../src/shared/sidebar-list/folder-workspace-host-id'
-import type { HostSectionRow } from '../../../src/shared/sidebar-list/host-section-rows'
-import type { GroupHeaderRow } from '../../../src/shared/sidebar-list/row-types'
-import { PR_GROUP_LABELS } from '../../../src/shared/workspace-view/workspace-pr-groups'
-import type { Worktree as HostWorktree } from '../../../src/shared/worktree/types'
-import { composeWorktreeHostIdentity } from '../../../src/shared/worktree/host-qualified-identity'
-import type { Section, Worktree, WorktreeHostContextView } from '../worktree/workspace-list-types'
+} from '../../../../src/shared/execution-host'
+import { folderWorkspaceToWorktree } from '../../../../src/shared/folder-workspaces/folder-workspace-worktree'
+import { getFolderWorkspaceHostId } from '../../../../src/shared/sidebar-list/folder-workspace-host-id'
+import type { HostSectionRow } from '../../../../src/shared/sidebar-list/host-section-rows'
+import type { GroupHeaderRow } from '../../../../src/shared/sidebar-list/row-types'
+import { PR_GROUP_LABELS } from '../../../../src/shared/workspace-view/workspace-pr-groups'
+import type { Worktree as HostWorktree } from '../../../../src/shared/worktree/types'
+import { composeWorktreeHostIdentity } from '../../../../src/shared/worktree/host-qualified-identity'
+import type {
+  Section,
+  Worktree,
+  WorktreeHostContextView
+} from '../../worktree/workspace-list-types'
 import {
   isLastVisitedWorktreeRow,
   type LastVisitedWorktreeOnHost
-} from '../worktree/host-list-highlight'
+} from '../../worktree/host-list-highlight'
 import {
   resolveWorktreeHostId,
   type WorktreeHostContextOf
-} from '../worktree/worktree-host-context-labels'
-import { filterWorktrees } from '../worktree/workspace-list-sections'
-import { rowFiltersForView, type MobileViewState } from '../worktree/workspace-view-settings'
-import type { HiddenProjects } from '../../../src/shared/hidden-projects'
+} from '../../worktree/worktree-host-context-labels'
+import '../../worktree/workspace-list-sections'
+import { filterWorktrees } from '../../worktree/workspace-row-filtering'
+import { rowFiltersForView, type MobileViewState } from '../../worktree/workspace-view-settings'
+import type { HiddenProjects } from '../../../../src/shared/hidden-projects'
 
 export type HostFeedListSources = {
   rows: readonly HostSectionRow[]
diff --git a/mobile/src/host-screen/use-host-sidebar-feed.ts b/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts
similarity index 87%
rename from mobile/src/host-screen/use-host-sidebar-feed.ts
rename to mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts
index 380b4e1cc7a..e66829b05a6 100644
--- a/mobile/src/host-screen/use-host-sidebar-feed.ts
+++ b/mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed.ts
@@ -1,16 +1,16 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
-import type { SidebarFeedDomains } from '../../../src/shared/sidebar-list/sidebar-feed-domains'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
+import type { SidebarFeedDomains } from '../../../../src/shared/sidebar-list/sidebar-feed-domains'
 import type {
   SidebarFeedNotice,
   SidebarFeedReader
-} from '../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
+} from '../../../../src/shared/sidebar-feed-client/sidebar-feed-reader'
 import {
   isReadableSidebarFeed,
   type SidebarFeedSnapshot
-} from '../../../src/shared/sidebar-feed-client/sidebar-feed-snapshot'
-import { RememberedSidebarFeeds } from '../../../src/shared/sidebar-feed-client/remembered-sidebar-feeds'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+} from '../../../../src/shared/sidebar-feed-client/sidebar-feed-snapshot'
+import { RememberedSidebarFeeds } from '../../../../src/shared/sidebar-feed-client/remembered-sidebar-feeds'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import {
   createHostSidebarFeedReader,
   type HostSidebarFeedTriggers
diff --git a/mobile/src/host-screen/use-host-screen-controller.ts b/mobile/src/host-screen/use-host-screen-controller.ts
index e5ea6277d43..0bc3da7bf96 100644
--- a/mobile/src/host-screen/use-host-screen-controller.ts
+++ b/mobile/src/host-screen/use-host-screen-controller.ts
@@ -17,17 +17,20 @@ import {
   useReconnectAttempt,
   useRelayRecoveryStatus
 } from '../transport/connection/client-context-connection-metrics'
-import { useHostDisplayWorktrees, useResolvedHostPlatform } from './use-host-display-worktrees'
-import { useHostListSections } from './use-host-list-sections'
-import { useSwitchedHostSidebarFeed } from './use-host-sidebar-feed'
-import { useHostProjectSections } from './use-host-project-sections'
-import { useHostRepoMetadata } from './use-host-repo-metadata'
-import { peekStoredHost, useHostScreenIdentity } from './use-host-screen-identity'
+import {
+  useHostDisplayWorktrees,
+  useResolvedHostPlatform
+} from './workspace-list/use-host-display-worktrees'
+import { useHostListSections } from './workspace-list/use-host-list-sections'
+import { useSwitchedHostSidebarFeed } from './sidebar-feed/use-host-sidebar-feed'
+import { useHostProjectSections } from './catalog/use-host-project-sections'
+import { useHostRepoMetadata } from './catalog/use-host-repo-metadata'
+import { peekStoredHost, useHostScreenIdentity } from './identity/use-host-screen-identity'
 import { useHostScreenState } from './use-host-screen-state'
-import { useHostViewSettings } from './use-host-view-settings'
+import { useHostViewSettings } from './view-settings/use-host-view-settings'
 import { countActiveWorkspaceFilters } from '../../../src/shared/workspace-view/workspace-row-filters'
-import { useHostWorktreeActions } from './use-host-worktree-actions'
-import { useHostWorktreeCatalog } from './use-host-worktree-catalog'
+import { useHostWorktreeActions } from './workspace-actions/use-host-worktree-actions'
+import { useHostWorktreeCatalog } from './catalog/use-host-worktree-catalog'
 import { useHostDisplay } from '../host-descriptors/use-host-display'
 import { classifyConnection } from '../transport/connection/connection-health'
 
diff --git a/mobile/src/host-screen/use-host-screen-state.ts b/mobile/src/host-screen/use-host-screen-state.ts
index 4f40a1a95bb..3b965964dfb 100644
--- a/mobile/src/host-screen/use-host-screen-state.ts
+++ b/mobile/src/host-screen/use-host-screen-state.ts
@@ -2,17 +2,17 @@ import { useCallback, useRef, useState } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
 import type { ExecutionHostId } from '../../../src/shared/execution-host'
 import type { ExecutionHostHealth } from '../../../src/shared/execution-host/execution-host-health'
-import { storedHostDescriptor, type HostStoredDescriptor } from './host-stored-identity'
+import { storedHostDescriptor, type HostStoredDescriptor } from './identity/host-stored-identity'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 import type { HostProfile } from '../host-catalog/host-profile'
 import { INITIAL_MOBILE_VIEW, type MobileViewState } from '../worktree/workspace-view-settings'
-import type { Worktree } from '../worktree/workspace-list-sections'
-import type { ServedProjectSections } from '../worktree/project-sections-operations'
-import type { SectionRepo } from '../worktree/workspace-list-types'
+
+import type { ServedProjectSections } from '../../../src/shared/project-section-catalog-schema'
+import type { SectionRepo, Worktree } from '../worktree/workspace-list-types'
 import { NO_SERVER_WORKSPACES, type ServerWorkspaces } from '../worktree/server-workspaces'
 import type { ProjectGroup } from '../../../src/shared/project-group-types'
-import { cachedHostWorktrees } from './host-list-queries'
-import { cachedHostView, useHostViewMemory } from './host-view-memory'
+import { cachedHostWorktrees } from './catalog/host-list-queries'
+import { cachedHostView, useHostViewMemory } from './view-settings/host-view-memory'
 
 export function useHostScreenState(
   hostId: string | undefined,
diff --git a/mobile/src/host-screen/host-list-settings-operations.ts b/mobile/src/host-screen/view-settings/host-list-settings-operations.ts
similarity index 80%
rename from mobile/src/host-screen/host-list-settings-operations.ts
rename to mobile/src/host-screen/view-settings/host-list-settings-operations.ts
index 4af11d70e45..ed977bb0d1c 100644
--- a/mobile/src/host-screen/host-list-settings-operations.ts
+++ b/mobile/src/host-screen/view-settings/host-list-settings-operations.ts
@@ -1,7 +1,7 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import type { RpcCompatibleReader } from '../transport/rpc/rpc-operation-contract'
-import '../../../src/shared/source-control/listing/source-control-group-order'
-import { settingsMember, settingsField } from '../settings/mobile-settings-projection'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
+import '../../../../src/shared/source-control/listing/source-control-group-order'
+import { settingsMember, settingsField } from '../../settings/mobile-settings-projection'
 
 type HostListSettings = {
   showPinnedWorktreesInGroups: boolean
diff --git a/mobile/src/host-screen/host-view-memory.ts b/mobile/src/host-screen/view-settings/host-view-memory.ts
similarity index 86%
rename from mobile/src/host-screen/host-view-memory.ts
rename to mobile/src/host-screen/view-settings/host-view-memory.ts
index c04f436c9f7..0701f08b7e8 100644
--- a/mobile/src/host-screen/host-view-memory.ts
+++ b/mobile/src/host-screen/view-settings/host-view-memory.ts
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
 import { skipToken, useQuery, useQueryClient, type QueryClient } from '@tanstack/react-query'
 import * as z from 'zod'
-import { hostQueryKey } from '../query/host-query-key'
-import type { PersistedHostFamily } from '../query/host-query-persistence'
-import type { MobileViewState } from '../worktree/workspace-view-settings'
-import { HOST_LIST_TARGET, NO_HOST_LIST_INPUT } from './host-list-queries'
+import { hostQueryKey } from '../../query/host-query-key'
+import type { PersistedHostFamily } from '../../query/host-query-persistence'
+import type { MobileViewState } from '../../worktree/workspace-view-settings'
+import { HOST_LIST_TARGET, NO_HOST_LIST_INPUT } from '../catalog/host-list-queries'
 
 const storedViewSchema = z.looseObject({
   groupBy: z.string(),
diff --git a/mobile/src/host-screen/host-view-pending-changes.ts b/mobile/src/host-screen/view-settings/host-view-pending-changes.ts
similarity index 98%
rename from mobile/src/host-screen/host-view-pending-changes.ts
rename to mobile/src/host-screen/view-settings/host-view-pending-changes.ts
index 76f2d48924b..6f932beb9f1 100644
--- a/mobile/src/host-screen/host-view-pending-changes.ts
+++ b/mobile/src/host-screen/view-settings/host-view-pending-changes.ts
@@ -2,7 +2,7 @@ import type {
   MobileViewPatch,
   MobileViewState,
   WorkspaceViewSettings
-} from '../worktree/workspace-view-settings'
+} from '../../worktree/workspace-view-settings'
 
 // Show the desired value until the desktop answers; a slow response is not a refusal.
 export type PendingViewChange = { opId: number; sentAt: number } & (
diff --git a/mobile/src/host-screen/use-host-pending-view-changes.test.ts b/mobile/src/host-screen/view-settings/use-host-pending-view-changes.test.ts
similarity index 92%
rename from mobile/src/host-screen/use-host-pending-view-changes.test.ts
rename to mobile/src/host-screen/view-settings/use-host-pending-view-changes.test.ts
index 29a393415cb..9961183eda9 100644
--- a/mobile/src/host-screen/use-host-pending-view-changes.test.ts
+++ b/mobile/src/host-screen/view-settings/use-host-pending-view-changes.test.ts
@@ -3,11 +3,13 @@ import { act, create as createRenderer } from 'react-test-renderer'
 
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-vi.mock('../../../src/shared/sidebar-inputs-switch', () => ({ ORCA_SIDEBAR_INPUTS_IS_MAIN: true }))
+vi.mock('../../../../src/shared/sidebar-inputs-switch', () => ({
+  ORCA_SIDEBAR_INPUTS_IS_MAIN: true
+}))
 
-import '../../../src/shared/rpc-contract/workspace-view-collapse-params'
-import { FakeSession } from '../transport/connection/mobile-endpoint-supervisor-test-fakes'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import '../../../../src/shared/rpc-contract/workspaces/workspace-view-collapse-params'
+import { FakeSession } from '../../transport/connection/mobile-endpoint-supervisor-test-fakes'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import {
   addPendingViewChange,
   reconcilePendingViewChanges,
@@ -128,10 +130,7 @@ describe('the phone’s own option changes', () => {
     act(() => {
       screen.current().controls.reconcile({ sortBy: 'recent' }, { resend: true, sentByOpId })
     })
-    expect(screen.send.mock.calls).toEqual([
-      ['ui.set', { sortBy: 'name' }],
-      ['ui.set', { sortBy: 'name' }]
-    ])
+
     act(() => {
       screen.current().controls.reconcile({ sortBy: 'name' }, { resend: false, sentByOpId })
     })
diff --git a/mobile/src/host-screen/use-host-pending-view-changes.ts b/mobile/src/host-screen/view-settings/use-host-pending-view-changes.ts
similarity index 93%
rename from mobile/src/host-screen/use-host-pending-view-changes.ts
rename to mobile/src/host-screen/view-settings/use-host-pending-view-changes.ts
index fd5aeca638b..6df67901a6b 100644
--- a/mobile/src/host-screen/use-host-pending-view-changes.ts
+++ b/mobile/src/host-screen/view-settings/use-host-pending-view-changes.ts
@@ -1,9 +1,12 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { MobileViewPatch, WorkspaceViewSettings } from '../worktree/workspace-view-settings'
-import { hostViewSettingsWrite } from './host-screen-operations'
-import { readHostMethodReply, setCollapsedWrite } from './host-sidebar-feed-operations'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { MobileViewPatch, WorkspaceViewSettings } from '../../worktree/workspace-view-settings'
+import { hostViewSettingsWrite } from '../host-screen-operations'
+import {
+  readHostMethodReply,
+  setCollapsedWrite
+} from '../sidebar-feed/host-sidebar-feed-operations'
 import {
   PENDING_VIEW_CHANGE_STALE_MS,
   addPendingViewChange,
diff --git a/mobile/src/host-screen/use-host-view-settings.ts b/mobile/src/host-screen/view-settings/use-host-view-settings.ts
similarity index 93%
rename from mobile/src/host-screen/use-host-view-settings.ts
rename to mobile/src/host-screen/view-settings/use-host-view-settings.ts
index 208d262439f..a2c83d1a58a 100644
--- a/mobile/src/host-screen/use-host-view-settings.ts
+++ b/mobile/src/host-screen/view-settings/use-host-view-settings.ts
@@ -1,37 +1,37 @@
 import { useCallback, useRef } from 'react'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { getMobileWorkspaceLineageGroupKey } from '../worktree/mobile-workspace-lineage'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { getMobileWorkspaceLineageGroupKey } from '../../worktree/mobile-workspace-lineage'
 import {
   applyDesktopViewSettings,
   buildWorkspaceViewSettingsUpdate,
   type MobileViewPatch,
   type MobileViewState,
   type WorkspaceViewSettings
-} from '../worktree/workspace-view-settings'
+} from '../../worktree/workspace-view-settings'
 import {
   changedWorkspaceRowFilters,
   NO_WORKSPACE_ROW_FILTERS
-} from '../../../src/shared/workspace-view/workspace-row-filters'
+} from '../../../../src/shared/workspace-view/workspace-row-filters'
 import {
   hostCardLayoutWrite,
   hostViewSettingsRead,
   hostViewSettingsWrite
-} from './host-screen-operations'
+} from '../host-screen-operations'
 import { hostListSettingsRead } from './host-list-settings-operations'
 import type {
   AgentActivityDisplayMode,
   ProjectOrderBy,
   WorktreeCardProperty
-} from '../../../src/shared/ui-chrome-types'
-import { getWorktreeCardModeUpdates } from '../../../src/shared/worktree/card-properties'
-import type { HostScreenState } from './use-host-screen-state'
+} from '../../../../src/shared/ui-chrome-types'
+import { getWorktreeCardModeUpdates } from '../../../../src/shared/worktree/card-properties'
+import type { HostScreenState } from '../use-host-screen-state'
 import { applyCollapse, withPendingViewChanges } from './host-view-pending-changes'
 import {
   useSwitchedHostPendingViewChanges,
   type PendingViewStatus
 } from './use-host-pending-view-changes'
-import type { FilterState, WorkspaceListItem } from '../worktree/workspace-list-types'
+import type { FilterState, WorkspaceListItem } from '../../worktree/workspace-list-types'
 
 const REFUSED_NOTE = 'The desktop did not take that change.'
 const NOTHING_PENDING: PendingViewStatus = { pending: [], stale: false }
diff --git a/mobile/src/host-screen/use-host-worktree-actions.ts b/mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts
similarity index 83%
rename from mobile/src/host-screen/use-host-worktree-actions.ts
rename to mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts
index d96d2e8c9ab..a64de9fe88b 100644
--- a/mobile/src/host-screen/use-host-worktree-actions.ts
+++ b/mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts
@@ -1,52 +1,33 @@
 import { useCallback } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
 import type { useRouter } from 'expo-router'
-import { floatingWorkspaceSessionPath } from '../session/floating-workspace'
-import { holdSessionLeave } from '../session/session-leave-guard'
-import { savePinnedIds } from '../storage/preferences'
-import type { useForgetHostClient } from '../transport/connection/host-client-hooks'
-import { removeHostAndCloseClient } from '../host-catalog/host-removal-lifecycle'
-import { isPageHostRemovalUnavailable } from '../host-catalog/page-host-removal-refusal'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import { floatingWorkspaceSessionPath } from '../../session/floating-workspace'
+import { holdSessionLeave } from '../../session/session-leave-guard'
+import { savePinnedIds } from '../../storage/preferences'
+import type { useForgetHostClient } from '../../transport/connection/host-client-hooks'
+import { removeHostAndCloseClient } from '../../host-catalog/host-removal-lifecycle'
+import { isPageHostRemovalUnavailable } from '../../host-catalog/page-host-removal-refusal'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import {
   rpcClientForExecutionHost,
   workspaceRouteExecutionHost
-} from '../worktree/execution-host-scoped-rpc-client'
-import { serverUpdateNeededNotice } from '../host-route-notice'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { leaveHostRoute } from '../host-route-exit'
-import { getWorktreeRowIdentity, isSameWorktreeRow } from '../worktree/worktree-host-row-identity'
-import { noteLastVisitedWorktree } from '../worktree/last-visited-worktree-by-host'
-import { isWorktreePinned, type Worktree } from '../worktree/workspace-list-sections'
+} from '../../worktree/execution-host-scoped-rpc-client'
+import { serverUpdateNeededNotice } from '../../host-route-notice'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { leaveHostRoute } from '../../host-route-exit'
 import {
-  worktreeActivate,
-  worktreeDisplayNameWrite,
-  worktreePinWrite,
-  worktreeSleep
-} from './host-screen-operations'
-import type { HostScreenState } from './use-host-screen-state'
+  getWorktreeRowIdentity,
+  isSameWorktreeRow
+} from '../../worktree/worktree-host-row-identity'
+import { noteLastVisitedWorktree } from '../../worktree/last-visited-worktree-by-host'
+import { isWorktreePinned } from '../../worktree/workspace-list-sections'
+import type { Worktree } from '../../worktree/workspace-list-types'
+import { worktreeActivate, worktreePinWrite, worktreeSleep } from '../host-screen-operations'
+import type { HostScreenState } from '../use-host-screen-state'
 import { useHostWorktreeDelete } from './use-host-worktree-delete'
-import { defineHostMutation, useHostMutation, type HostMutationPhase } from '../query/host-mutation'
-
-async function sendWorkspaceRename(
-  client: RpcClient,
-  vars: { worktreeId: string; displayName: string }
-): Promise<void> {
-  worktreeDisplayNameWrite.interpret(
-    await worktreeDisplayNameWrite.request(client, {
-      worktree: `id:${vars.worktreeId}`,
-      displayName: vars.displayName
-    })
-  )
-}
-
-const workspaceRename = defineHostMutation({
-  offline: 'draft',
-  send: sendWorkspaceRename,
-  // Renaming is idempotent, so a lost reply is settled by sending the same name again.
-  confirm: sendWorkspaceRename
-})
+import { useHostMutation, type HostMutationPhase } from '../../query/host-mutation'
+import { workspaceRename } from './workspace-rename-mutation'
 
 export function useHostWorktreeActions(args: {
   client: RpcClient | null
diff --git a/mobile/src/host-screen/use-host-worktree-delete.ts b/mobile/src/host-screen/workspace-actions/use-host-worktree-delete.ts
similarity index 91%
rename from mobile/src/host-screen/use-host-worktree-delete.ts
rename to mobile/src/host-screen/workspace-actions/use-host-worktree-delete.ts
index eb4b90885c1..e609a05f757 100644
--- a/mobile/src/host-screen/use-host-worktree-delete.ts
+++ b/mobile/src/host-screen/workspace-actions/use-host-worktree-delete.ts
@@ -1,20 +1,20 @@
 import { useCallback, useRef, useState } from 'react'
-import type { PersistedTrustedOrcaHooks } from '../../../src/shared/orca-yaml-hook-types'
-import { ARCHIVE_HOOK_FAILED_REMOVAL_CODE } from '../../../src/shared/worktree/archive-hook-removal-gate'
-import type { OrcaHookTrustPrompt } from '../components/OrcaHookTrustDrawer'
-import { newWorkspaceUiStateRead } from '../components/new-workspace-operations'
-import { canUseRepoWideTrust } from '../../../src/shared/orca-hook-trust-entries'
+import type { PersistedTrustedOrcaHooks } from '../../../../src/shared/orca-yaml-hook-types'
+import { ARCHIVE_HOOK_FAILED_REMOVAL_CODE } from '../../../../src/shared/worktree/archive-hook-removal-gate'
+import type { OrcaHookTrustPrompt } from '../../components/OrcaHookTrustDrawer'
+import { newWorkspaceUiStateRead } from '../../components/new-workspace-operations'
+import { canUseRepoWideTrust } from '../../../../src/shared/orca-hook-trust-entries'
 import {
   persistOrcaHookTrustApproval,
   wasOrcaHookPreviouslyApproved
-} from '../new-workspace/creation/setup-hook-trust'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+} from '../../new-workspace/creation/setup-hook-trust'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import { buildWorktreeRemoveRequest } from './worktree-remove-request'
-import { removeWorktreeRow } from '../worktree/worktree-host-row-identity'
-import type { Worktree } from '../worktree/workspace-list-sections'
-import { worktreeArchiveHookTrustRead, worktreeRemove } from './host-screen-operations'
-import type { HostScreenState } from './use-host-screen-state'
+import { removeWorktreeRow } from '../../worktree/worktree-host-row-identity'
+import type { Worktree } from '../../worktree/workspace-list-types'
+import { worktreeArchiveHookTrustRead, worktreeRemove } from '../host-screen-operations'
+import type { HostScreenState } from '../use-host-screen-state'
 
 type ArchiveHookDecision =
   | { kind: 'run' | 'skip' }
diff --git a/mobile/src/host-screen/workspace-details-sheet.tsx b/mobile/src/host-screen/workspace-actions/workspace-details-sheet.tsx
similarity index 90%
rename from mobile/src/host-screen/workspace-details-sheet.tsx
rename to mobile/src/host-screen/workspace-actions/workspace-details-sheet.tsx
index e285c5b6480..1bf6ac07cee 100644
--- a/mobile/src/host-screen/workspace-details-sheet.tsx
+++ b/mobile/src/host-screen/workspace-actions/workspace-details-sheet.tsx
@@ -8,30 +8,30 @@ import {
   SquareTerminal,
   StickyNote
 } from 'lucide-react-native'
-import { colors, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { prStateColor } from '../components/WorktreeMetaGlyphs'
-import { PrStateIcon } from '../components/PrStateIcon'
+import { colors, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { prStateColor } from '../../components/WorktreeMetaGlyphs'
+import { PrStateIcon } from '../../components/PrStateIcon'
 import {
   LIST_LEADING_INSET,
   LIST_LEADING_SLOT,
   LIST_ROW_PADDING,
   ListGroup,
   ListRow
-} from '../components/list/ListGroup'
-import { TaskProviderLogo } from '../components/TaskProviderLogo'
-import { getWorktreeGitIdentityDisplay } from '../../../src/shared/worktree/git-identity-display'
+} from '../../components/list/ListGroup'
+import { TaskProviderLogo } from '../../components/TaskProviderLogo'
+import { getWorktreeGitIdentityDisplay } from '../../../../src/shared/worktree/git-identity-display'
 import {
   buildWorkspaceDetailLinks,
   buildWorkspaceOrigin,
   workspaceNotes,
   type WorkspaceDetailLink,
   type WorkspaceOrigin
-} from '../worktree/workspace-details-model'
-import type { Worktree } from '../worktree/workspace-list-types'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+} from '../../worktree/workspace-details-model'
+import type { Worktree } from '../../worktree/workspace-list-types'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 const ICON_SIZE = 16
 
diff --git a/mobile/src/host-screen/workspace-actions/workspace-rename-mutation.ts b/mobile/src/host-screen/workspace-actions/workspace-rename-mutation.ts
new file mode 100644
index 00000000000..88fa50851dc
--- /dev/null
+++ b/mobile/src/host-screen/workspace-actions/workspace-rename-mutation.ts
@@ -0,0 +1,22 @@
+import { worktreeDisplayNameWrite } from '../host-screen-operations'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { defineHostMutation } from '../../query/host-mutation'
+
+async function sendWorkspaceRename(
+  client: RpcClient,
+  vars: { worktreeId: string; displayName: string }
+): Promise<void> {
+  worktreeDisplayNameWrite.interpret(
+    await worktreeDisplayNameWrite.request(client, {
+      worktree: `id:${vars.worktreeId}`,
+      displayName: vars.displayName
+    })
+  )
+}
+
+export const workspaceRename = defineHostMutation({
+  offline: 'draft',
+  send: sendWorkspaceRename,
+  // Renaming is idempotent, so a lost reply is settled by sending the same name again.
+  confirm: sendWorkspaceRename
+})
diff --git a/mobile/src/host-screen/workspace-rename-sheet.tsx b/mobile/src/host-screen/workspace-actions/workspace-rename-sheet.tsx
similarity index 78%
rename from mobile/src/host-screen/workspace-rename-sheet.tsx
rename to mobile/src/host-screen/workspace-actions/workspace-rename-sheet.tsx
index 52f525515db..a9bc55d11bc 100644
--- a/mobile/src/host-screen/workspace-rename-sheet.tsx
+++ b/mobile/src/host-screen/workspace-actions/workspace-rename-sheet.tsx
@@ -1,10 +1,10 @@
-import { automaticWorktreeDisplayName } from '../../../src/shared/worktree/display-name-provenance'
-import { TextInputSheetContent } from '../components/TextInputModal'
-import { useDraftRenameSheet } from '../components/use-draft-rename-sheet'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { HostMutationPhase } from '../query/host-mutation'
-import type { Worktree } from '../worktree/workspace-list-types'
-import { getWorktreeRowIdentity } from '../worktree/worktree-host-row-identity'
+import { automaticWorktreeDisplayName } from '../../../../src/shared/worktree/display-name-provenance'
+import { TextInputSheetContent } from '../../components/TextInputModal'
+import { useDraftRenameSheet } from '../../components/use-draft-rename-sheet'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { HostMutationPhase } from '../../query/host-mutation'
+import type { Worktree } from '../../worktree/workspace-list-types'
+import { getWorktreeRowIdentity } from '../../worktree/worktree-host-row-identity'
 
 export function workspaceRenameDraftKey(hostId: string, row: Worktree): string {
   return `workspace-rename:${hostId}:${getWorktreeRowIdentity(row)}`
diff --git a/mobile/src/host-screen/worktree-remove-request.ts b/mobile/src/host-screen/workspace-actions/worktree-remove-request.ts
similarity index 78%
rename from mobile/src/host-screen/worktree-remove-request.ts
rename to mobile/src/host-screen/workspace-actions/worktree-remove-request.ts
index 1d8fc8e8a4d..fda5a919efc 100644
--- a/mobile/src/host-screen/worktree-remove-request.ts
+++ b/mobile/src/host-screen/workspace-actions/worktree-remove-request.ts
@@ -1,6 +1,6 @@
-import { worktreeRemovalReplyTimeoutMs } from '../../../src/shared/worktree/archive-hook-removal-gate'
-import { RECIPE_REMOVAL_REPLY_TIMEOUT_MS } from '../../../src/shared/recipe-host-removal'
-import type { Worktree } from '../worktree/workspace-list-sections'
+import { worktreeRemovalReplyTimeoutMs } from '../../../../src/shared/worktree/archive-hook-removal-gate'
+import { RECIPE_REMOVAL_REPLY_TIMEOUT_MS } from '../../../../src/shared/recipe-host-removal'
+import type { Worktree } from '../../worktree/workspace-list-types'
 
 export type WorktreeRemoveHooks = {
   runHooks: boolean
diff --git a/mobile/src/host-screen/host-pending-creation-row.tsx b/mobile/src/host-screen/workspace-list/host-pending-creation-row.tsx
similarity index 80%
rename from mobile/src/host-screen/host-pending-creation-row.tsx
rename to mobile/src/host-screen/workspace-list/host-pending-creation-row.tsx
index 8be4f9e8ece..185643a13a0 100644
--- a/mobile/src/host-screen/host-pending-creation-row.tsx
+++ b/mobile/src/host-screen/workspace-list/host-pending-creation-row.tsx
@@ -1,9 +1,9 @@
 import { ActivityIndicator, Text, View } from 'react-native'
-import { colors, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import type { SectionPendingCreation } from '../worktree/workspace-list-types'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { colors, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { SectionPendingCreation } from '../../worktree/workspace-list-types'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 export function HostPendingCreationRow({ creation }: { creation: SectionPendingCreation }) {
   const t = useMobileTranslation()
diff --git a/mobile/src/host-screen/host-workspace-list.tsx b/mobile/src/host-screen/workspace-list/host-workspace-list.tsx
similarity index 88%
rename from mobile/src/host-screen/host-workspace-list.tsx
rename to mobile/src/host-screen/workspace-list/host-workspace-list.tsx
index 745d53c1736..61d38dfb911 100644
--- a/mobile/src/host-screen/host-workspace-list.tsx
+++ b/mobile/src/host-screen/workspace-list/host-workspace-list.tsx
@@ -9,36 +9,36 @@ import {
   View
 } from 'react-native'
 import { ChevronRight, FolderTree, Pin } from 'lucide-react-native'
-import { AuthFailedBanner } from '../components/AuthFailedBanner'
-import { Presence } from '../components/AutoHeight'
-import { DisclosureChevron } from '../components/DisclosureChevron'
-import { HostDiagnosticsLink } from '../components/HostDiagnosticsLink'
-import { HostOfflineBanner, useHostOfflineBanner } from '../components/HostOfflineBanner'
-import { isConnectionOutage } from '../transport/connection/connection-health'
-import { HostRouteNoticeBanner } from '../components/HostRouteNoticeBanner'
-import { MobileRepoIcon } from '../components/MobileRepoIcon'
-import type { CollapsingTitle } from '../components/nav-bar/PageTitle'
-import { WorktreeListRow } from '../components/WorktreeListRow'
-import { WORKTREE_ROW_LAYOUT } from '../components/worktree-list-row-layout'
-import { colors, spacing } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { getWorktreeRowIdentity } from '../worktree/worktree-host-row-identity'
+import { AuthFailedBanner } from '../../components/AuthFailedBanner'
+import { Presence } from '../../components/AutoHeight'
+import { DisclosureChevron } from '../../components/DisclosureChevron'
+import { HostDiagnosticsLink } from '../../components/HostDiagnosticsLink'
+import { HostOfflineBanner, useHostOfflineBanner } from '../../components/HostOfflineBanner'
+import { isConnectionOutage } from '../../transport/connection/connection-health'
+import { HostRouteNoticeBanner } from '../../components/HostRouteNoticeBanner'
+import { MobileRepoIcon } from '../../components/MobileRepoIcon'
+import type { CollapsingTitle } from '../../components/nav-bar/PageTitle'
+import { WorktreeListRow } from '../../components/WorktreeListRow'
+import { WORKTREE_ROW_LAYOUT } from '../../components/worktree-list-row-layout'
+import { colors, spacing } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { getWorktreeRowIdentity } from '../../worktree/worktree-host-row-identity'
 import {
   HostWorkspaceListReopen,
   HostWorkspaceListStates
-} from '../worktree/host-workspace-list-states'
-import { getWorktreeDotStatus, hasWorktreeAgentState } from '../worktree/workspace-list-ordering'
-import type { Section, WorkspaceListItem, Worktree } from '../worktree/workspace-list-types'
-import { DEFAULT_REPO_BADGE_COLOR } from '../../../src/shared/repo-badge-color'
-import { getWorktreeCardDetails } from '../../../src/shared/worktree/card-properties'
-import { hostScreenStyles as styles } from './host-screen-styles'
-import { useRepoLookById, type RepoLook } from './host-repo-looks'
+} from '../../worktree/host-workspace-list-states'
+import { getWorktreeDotStatus, hasWorktreeAgentState } from '../../worktree/workspace-list-ordering'
+import type { Section, WorkspaceListItem, Worktree } from '../../worktree/workspace-list-types'
+import { DEFAULT_REPO_BADGE_COLOR } from '../../../../src/shared/repo-badge-color'
+import { getWorktreeCardDetails } from '../../../../src/shared/worktree/card-properties'
+import { hostScreenStyles as styles } from '../host-screen-styles'
+import { useRepoLookById, type RepoLook } from '../catalog/host-repo-looks'
 import { HostPendingCreationRow } from './host-pending-creation-row'
 import { useSlowPendingKeys } from './use-slow-pending-keys'
-import { useHostMutationDrafts } from '../query/host-mutation-drafts'
-import { workspaceRenameDraftKey } from './workspace-rename-sheet'
-import { projectGroupHeaderIndent } from '../worktree/project-group-indent'
-import type { HostScreenController } from './use-host-screen-controller'
+import { useHostMutationDrafts } from '../../query/host-mutation-drafts'
+import { workspaceRenameDraftKey } from '../workspace-actions/workspace-rename-sheet'
+import { projectGroupHeaderIndent } from '../../worktree/project-group-indent'
+import type { HostScreenController } from '../use-host-screen-controller'
 
 export function HostWorkspaceList({
   controller,
diff --git a/mobile/src/host-screen/use-host-display-worktrees.ts b/mobile/src/host-screen/workspace-list/use-host-display-worktrees.ts
similarity index 82%
rename from mobile/src/host-screen/use-host-display-worktrees.ts
rename to mobile/src/host-screen/workspace-list/use-host-display-worktrees.ts
index 517c0924fa2..aac98051673 100644
--- a/mobile/src/host-screen/use-host-display-worktrees.ts
+++ b/mobile/src/host-screen/workspace-list/use-host-display-worktrees.ts
@@ -1,14 +1,14 @@
 import { useMemo } from 'react'
-import { useHostDescriptor } from '../host-descriptors/host-descriptor-store'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import { useHostDescriptor } from '../../host-descriptors/host-descriptor-store'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 import {
   serverHostHealth,
   serverHostHealthLabels,
   withServerHosts
-} from '../worktree/server-workspaces'
-import { buildWorktreeHostContextOf } from '../worktree/worktree-host-context-labels'
-import { applyWorktreeRowDisplayState } from '../worktree/worktree-host-row-identity'
-import type { HostScreenState } from './use-host-screen-state'
+} from '../../worktree/server-workspaces'
+import { buildWorktreeHostContextOf } from '../../worktree/worktree-host-context-labels'
+import { applyWorktreeRowDisplayState } from '../../worktree/worktree-host-row-identity'
+import type { HostScreenState } from '../use-host-screen-state'
 
 /** The desktop's platform: its own report, or the paired descriptor's before that lands. */
 export function useResolvedHostPlatform(
diff --git a/mobile/src/host-screen/use-host-list-sections.ts b/mobile/src/host-screen/workspace-list/use-host-list-sections.ts
similarity index 78%
rename from mobile/src/host-screen/use-host-list-sections.ts
rename to mobile/src/host-screen/workspace-list/use-host-list-sections.ts
index 96ca76f8333..e1ac7799ab2 100644
--- a/mobile/src/host-screen/use-host-list-sections.ts
+++ b/mobile/src/host-screen/workspace-list/use-host-list-sections.ts
@@ -1,25 +1,28 @@
 import { useMemo } from 'react'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../src/shared/sidebar-inputs-switch'
-import { buildSidebarFeedRows } from '../../../src/shared/sidebar-list/sidebar-feed-rows'
-import { repoIconFeedKey } from '../../../src/shared/sidebar-list/repo-icon-data-urls-contract'
-import type { ProjectOrderBy } from '../../../src/shared/ui-chrome-types'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { buildProjectSectionCatalog } from '../worktree/project-section-catalog'
-import { useWorkspaceSections } from '../worktree/use-workspace-sections'
-import { buildFilterRepos, type WorkspaceSectionRepo } from '../worktree/workspace-filter-repos'
-import type { Section, SectionRepo, Worktree } from '../worktree/workspace-list-types'
-import type { WorktreeHostContextOf } from '../worktree/worktree-host-context-labels'
-import type { MobileLineageStores } from '../worktree/mobile-workspace-lineage'
-import { useLastVisitedWorktreeOnHost } from '../worktree/use-last-visited-worktree-on-host'
-import { rowFiltersForView } from '../worktree/workspace-view-settings'
-import { buildSidebarFeedCatalog } from '../../../src/shared/sidebar-list/sidebar-feed-catalog'
-import { buildHostFeedView } from './host-sidebar-feed-inputs'
-import { buildHostFeedSections, buildPreFeedSections } from './host-sidebar-feed-sections'
-import { useHostRepoIconDataUrls } from './use-host-repo-icon-data-urls'
-import type { HostSidebarFeed } from './use-host-sidebar-feed'
-import type { HostScreenState } from './use-host-screen-state'
-import { indexHiddenProjects } from '../../../src/shared/hidden-projects'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../src/shared/execution-host'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../src/shared/sidebar-inputs-switch'
+import { buildSidebarFeedRows } from '../../../../src/shared/sidebar-list/sidebar-feed-rows'
+import { repoIconFeedKey } from '../../../../src/shared/sidebar-list/repo-icon-data-urls-contract'
+import type { ProjectOrderBy } from '../../../../src/shared/ui-chrome-types'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { buildProjectSectionCatalog } from '../../worktree/project-section-catalog'
+import { useWorkspaceSections } from '../../worktree/use-workspace-sections'
+import { buildFilterRepos, type WorkspaceSectionRepo } from '../../worktree/workspace-filter-repos'
+import type { Section, SectionRepo, Worktree } from '../../worktree/workspace-list-types'
+import type { WorktreeHostContextOf } from '../../worktree/worktree-host-context-labels'
+import type { MobileLineageStores } from '../../worktree/mobile-workspace-lineage'
+import { useLastVisitedWorktreeOnHost } from '../../worktree/use-last-visited-worktree-on-host'
+import { rowFiltersForView } from '../../worktree/workspace-view-settings'
+import { buildSidebarFeedCatalog } from '../../../../src/shared/sidebar-list/sidebar-feed-catalog'
+import { buildHostFeedView } from '../sidebar-feed/host-sidebar-feed-inputs'
+import {
+  buildHostFeedSections,
+  buildPreFeedSections
+} from '../sidebar-feed/host-sidebar-feed-sections'
+import { useHostRepoIconDataUrls } from '../catalog/use-host-repo-icon-data-urls'
+import type { HostSidebarFeed } from '../sidebar-feed/use-host-sidebar-feed'
+import type { HostScreenState } from '../use-host-screen-state'
+import { indexHiddenProjects } from '../../../../src/shared/hidden-projects'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../src/shared/execution-host'
 
 export type HostListSectionsInputs = {
   client: RpcClient | null
diff --git a/mobile/src/host-screen/use-slow-pending-keys.test.tsx b/mobile/src/host-screen/workspace-list/use-slow-pending-keys.test.tsx
similarity index 100%
rename from mobile/src/host-screen/use-slow-pending-keys.test.tsx
rename to mobile/src/host-screen/workspace-list/use-slow-pending-keys.test.tsx
diff --git a/mobile/src/host-screen/use-slow-pending-keys.ts b/mobile/src/host-screen/workspace-list/use-slow-pending-keys.ts
similarity index 100%
rename from mobile/src/host-screen/use-slow-pending-keys.ts
rename to mobile/src/host-screen/workspace-list/use-slow-pending-keys.ts
diff --git a/mobile/src/host-screen/phone-card-property-choices.ts b/mobile/src/host-screen/workspace-options/phone-card-property-choices.ts
similarity index 75%
rename from mobile/src/host-screen/phone-card-property-choices.ts
rename to mobile/src/host-screen/workspace-options/phone-card-property-choices.ts
index 66f4736120c..d68a4fa5e6e 100644
--- a/mobile/src/host-screen/phone-card-property-choices.ts
+++ b/mobile/src/host-screen/workspace-options/phone-card-property-choices.ts
@@ -1,5 +1,5 @@
-import type { WorkspaceViewChoice } from '../../../src/shared/workspace-view/workspace-view-options'
-import type { WorktreeCardProperty } from '../../../src/shared/ui-chrome-types'
+import type { WorkspaceViewChoice } from '../../../../src/shared/workspace-view/workspace-view-options'
+import type { WorktreeCardProperty } from '../../../../src/shared/ui-chrome-types'
 
 // Omit Ports: the phone has no port scan; desktop retains it.
 const PHONE_HIDDEN_CARD_PROPERTIES: ReadonlySet<WorktreeCardProperty> = new Set(['ports'])
diff --git a/mobile/src/host-screen/workspace-option-controls-copy.ts b/mobile/src/host-screen/workspace-options/workspace-option-controls-copy.ts
similarity index 92%
rename from mobile/src/host-screen/workspace-option-controls-copy.ts
rename to mobile/src/host-screen/workspace-options/workspace-option-controls-copy.ts
index 89d8213811b..188a6a2507c 100644
--- a/mobile/src/host-screen/workspace-option-controls-copy.ts
+++ b/mobile/src/host-screen/workspace-options/workspace-option-controls-copy.ts
@@ -1,9 +1,9 @@
-import * as viewOptions from '../../../src/shared/workspace-view/workspace-view-options'
-import type { WorkspaceViewChoice } from '../../../src/shared/workspace-view/workspace-view-options'
-import type { WorktreeCardProperty } from '../../../src/shared/ui-chrome-types'
-import type { Translate } from '../i18n/mobile-i18n'
+import * as viewOptions from '../../../../src/shared/workspace-view/workspace-view-options'
+import type { WorkspaceViewChoice } from '../../../../src/shared/workspace-view/workspace-view-options'
+import type { WorktreeCardProperty } from '../../../../src/shared/ui-chrome-types'
+import type { Translate } from '../../i18n/mobile-i18n'
 import { phoneCardPropertyChoices } from './phone-card-property-choices'
-import type { HostScreenController } from './use-host-screen-controller'
+import type { HostScreenController } from '../use-host-screen-controller'
 
 function workspaceOptionChoices<Id extends string>(
   choices: readonly WorkspaceViewChoice<Id>[],
diff --git a/mobile/src/host-screen/workspace-option-controls.tsx b/mobile/src/host-screen/workspace-options/workspace-option-controls.tsx
similarity index 91%
rename from mobile/src/host-screen/workspace-option-controls.tsx
rename to mobile/src/host-screen/workspace-options/workspace-option-controls.tsx
index 95556c3c644..9863b9fe464 100644
--- a/mobile/src/host-screen/workspace-option-controls.tsx
+++ b/mobile/src/host-screen/workspace-options/workspace-option-controls.tsx
@@ -1,19 +1,19 @@
 import { useState, type ComponentType } from 'react'
 import { View } from 'react-native'
-import { MobileSearchField } from '../components/MobileSearchField'
-import { MobileSegmentedControl } from '../components/MobileSegmentedControl'
-import * as viewOptions from '../../../src/shared/workspace-view/workspace-view-options'
+import { MobileSearchField } from '../../components/MobileSearchField'
+import { MobileSegmentedControl } from '../../components/MobileSegmentedControl'
+import * as viewOptions from '../../../../src/shared/workspace-view/workspace-view-options'
 import type {
   WorkspaceViewChoice,
   WorkspaceViewOptionKey
-} from '../../../src/shared/workspace-view/workspace-view-options'
-import * as hostVisibility from '../../../src/shared/workspace-view/workspace-host-visibility'
-import type { ExecutionHostId } from '../../../src/shared/execution-host'
-import type { WorktreeCardProperty } from '../../../src/shared/ui-chrome-types'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { hostScreenStyles as styles } from './host-screen-styles'
+} from '../../../../src/shared/workspace-view/workspace-view-options'
+import * as hostVisibility from '../../../../src/shared/workspace-view/workspace-host-visibility'
+import type { ExecutionHostId } from '../../../../src/shared/execution-host'
+import type { WorktreeCardProperty } from '../../../../src/shared/ui-chrome-types'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { hostScreenStyles as styles } from '../host-screen-styles'
 import { withoutPhoneHiddenProperties } from './phone-card-property-choices'
-import type { HostScreenController } from './use-host-screen-controller'
+import type { HostScreenController } from '../use-host-screen-controller'
 import {
   groupByChoices,
   sortByChoices,
@@ -23,11 +23,11 @@ import {
   cardPropertyChoices,
   cardDisplayChoices
 } from './workspace-option-controls-copy'
-import { ListGroup, SectionHeader } from '../components/list/ListGroup'
+import { ListGroup, SectionHeader } from '../../components/list/ListGroup'
 import { CheckRow, ChoiceRows, SwitchRow } from './workspace-option-rows'
 import { choiceLabel, summarizeChecklist } from './workspace-option-values'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 export type WorkspaceOptionHost = { id: ExecutionHostId; label: string }
 
diff --git a/mobile/src/host-screen/workspace-option-rows.tsx b/mobile/src/host-screen/workspace-options/workspace-option-rows.tsx
similarity index 88%
rename from mobile/src/host-screen/workspace-option-rows.tsx
rename to mobile/src/host-screen/workspace-options/workspace-option-rows.tsx
index a90265472df..caa67a9ced1 100644
--- a/mobile/src/host-screen/workspace-option-rows.tsx
+++ b/mobile/src/host-screen/workspace-options/workspace-option-rows.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react'
 import { View } from 'react-native'
-import { MobileSwitch } from '../components/MobileSwitch'
-import { ListGroup, ListRow } from '../components/list/ListGroup'
-import type { WorkspaceViewChoice } from '../../../src/shared/workspace-view/workspace-view-options'
+import { MobileSwitch } from '../../components/MobileSwitch'
+import { ListGroup, ListRow } from '../../components/list/ListGroup'
+import type { WorkspaceViewChoice } from '../../../../src/shared/workspace-view/workspace-view-options'
 
 export function CheckRow(props: {
   label: string
diff --git a/mobile/src/host-screen/workspace-option-values.ts b/mobile/src/host-screen/workspace-options/workspace-option-values.ts
similarity index 100%
rename from mobile/src/host-screen/workspace-option-values.ts
rename to mobile/src/host-screen/workspace-options/workspace-option-values.ts
diff --git a/mobile/src/host-screen/workspace-options-sheet.tsx b/mobile/src/host-screen/workspace-options/workspace-options-sheet.tsx
similarity index 90%
rename from mobile/src/host-screen/workspace-options-sheet.tsx
rename to mobile/src/host-screen/workspace-options/workspace-options-sheet.tsx
index 284c9d08a9d..d3757a8be0b 100644
--- a/mobile/src/host-screen/workspace-options-sheet.tsx
+++ b/mobile/src/host-screen/workspace-options/workspace-options-sheet.tsx
@@ -1,35 +1,35 @@
 import { useMemo, type ReactNode } from 'react'
 import { ActivityIndicator, Text, View } from 'react-native'
 import { ChevronLeft } from 'lucide-react-native'
-import { colors } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useBackClaim } from '../navigation/use-back-claim'
+import { colors } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useBackClaim } from '../../navigation/use-back-claim'
 import {
   BottomDrawer,
   OptionPager,
   useOptionPager,
   type OptionPagerControls
-} from '../components/bottom-drawer/BottomDrawer'
-import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { SheetHeader } from '../components/nav-bar/SheetHeader'
+} from '../../components/bottom-drawer/BottomDrawer'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import { SheetHeader } from '../../components/nav-bar/SheetHeader'
 import {
   LOCAL_EXECUTION_HOST_ID,
   parseExecutionHostId,
   type ExecutionHostId
-} from '../../../src/shared/execution-host'
+} from '../../../../src/shared/execution-host'
 import {
   getShownWorkspaceViewSections,
   type WorkspaceViewOptionKey,
   type WorkspaceViewSection
-} from '../../../src/shared/workspace-view/workspace-view-options'
-import { getHostContextLabel } from '../../../src/shared/worktree/host-context-labels'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { resolveWorktreeHostId } from '../worktree/worktree-host-context-labels'
-import { withServerHosts } from '../worktree/server-workspaces'
-import { hostScreenStyles as styles } from './host-screen-styles'
-import type { HostScreenController } from './use-host-screen-controller'
-import { ListGroup, SectionHeader } from '../components/list/ListGroup'
+} from '../../../../src/shared/workspace-view/workspace-view-options'
+import { getHostContextLabel } from '../../../../src/shared/worktree/host-context-labels'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { resolveWorktreeHostId } from '../../worktree/worktree-host-context-labels'
+import { withServerHosts } from '../../worktree/server-workspaces'
+import { hostScreenStyles as styles } from '../host-screen-styles'
+import type { HostScreenController } from '../use-host-screen-controller'
+import { ListGroup, SectionHeader } from '../../components/list/ListGroup'
 import { DrillRow } from './workspace-option-rows'
 import {
   WORKSPACE_OPTION_CONTROLS,
diff --git a/mobile/src/host-screen/worktree-remove-request.test.ts b/mobile/src/host-screen/worktree-remove-request.test.ts
deleted file mode 100644
index a787e7ca421..00000000000
--- a/mobile/src/host-screen/worktree-remove-request.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { worktreeRemovalReplyTimeoutMs } from '../../../src/shared/worktree/archive-hook-removal-gate'
-import { RECIPE_REMOVAL_REPLY_TIMEOUT_MS } from '../../../src/shared/recipe-host-removal'
-import { buildWorktreeRemoveRequest } from './worktree-remove-request'
-
-describe('phone worktree delete request', () => {
-  it('keeps the ordinary delete for workspaces the desktop did not tag', () => {
-    expect(buildWorktreeRemoveRequest({ worktreeId: 'r::/w' }, { runHooks: false })).toEqual({
-      params: { worktree: 'id:r::/w', force: true, runHooks: false },
-      timeoutMs: worktreeRemovalReplyTimeoutMs(false)
-    })
-  })
-
-  it('asks for the named recipe environment to be destroyed, and waits for its destroy step', () => {
-    const request = buildWorktreeRemoveRequest(
-      { worktreeId: 'r::/w', recipeEnvironment: { name: 'task' } },
-      { runHooks: true }
-    )
-    expect(request.params).toEqual({
-      worktree: 'id:r::/w',
-      force: true,
-      runHooks: true,
-      destroyHost: true
-    })
-    expect(request.timeoutMs).toBe(RECIPE_REMOVAL_REPLY_TIMEOUT_MS)
-  })
-})
diff --git a/mobile/src/layout/side-rail.tsx b/mobile/src/layout/side-rail.tsx
index 4b2ea69a040..dc769c99ffd 100644
--- a/mobile/src/layout/side-rail.tsx
+++ b/mobile/src/layout/side-rail.tsx
@@ -10,7 +10,7 @@ import {
 import { StyleSheet, useWindowDimensions, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useReservedRegions } from './reserved-regions'
-import { useKeyboardOcclusion } from '../platform/keyboard-occlusion'
+import { useKeyboardOcclusion } from '../platform/keyboard/keyboard-occlusion'
 import {
   getSideRailStrip,
   hasTerminalDirectionPadSpace,
diff --git a/mobile/src/mobile-web-shell/DownloadProgressBar.tsx b/mobile/src/mobile-web-shell/DownloadProgressBar.tsx
index 7364dfe8d5a..55619dab191 100644
--- a/mobile/src/mobile-web-shell/DownloadProgressBar.tsx
+++ b/mobile/src/mobile-web-shell/DownloadProgressBar.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react'
 import { Animated, Easing, Platform, StyleSheet, View } from 'react-native'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { colors } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx b/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
index baacf8790c5..84d89d80029 100644
--- a/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
+++ b/mobile/src/mobile-web-shell/MobileWebShellScreen.tsx
@@ -20,10 +20,10 @@ import { cancelledShellNavigationTarget } from './cancelled-navigation-target'
 import { playPageHaptic } from './page-haptics'
 import { useMobileWebShellBridge } from './use-mobile-web-shell-bridge'
 import type { MobileWebShellRuntime } from './mobile-web-shell-runtime'
-import { useKeyboardOcclusion } from '../platform/keyboard-occlusion'
+import { useKeyboardOcclusion } from '../platform/keyboard/keyboard-occlusion'
 import { useNativeDeviceVerbs } from '../platform/use-native-device-verbs'
-import { useNativePdfViewer } from '../platform/native-pdf-view'
-import { useNativeImageActions } from '../platform/native-image-actions'
+import { useNativePdfViewer } from '../platform/pdf-viewing/native-pdf-view'
+import { useNativeImageActions } from '../platform/image-actions/native-image-actions'
 import { processDeviceStore } from '../device-store/device-store'
 import { serveDeviceStoreVerb } from './device-store-verb-server'
 import { BRIDGE_STORE_VERB } from './bridge/bridge-store-verb'
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.test.ts b/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.test.ts
index 19da0366f3b..bee1db1acbb 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.test.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.test.ts
@@ -2,15 +2,15 @@
 import { afterEach, describe, expect, it } from 'vitest'
 
 import { BridgeNativeVerbRefusedError } from '../bridge-host-errors'
-import { createNativeAudioCapture, type NativeAudioEngine } from '../../platform/native-audio'
 import {
-  BRIDGE_AUDIO_READ_MAX_BASE64_CHARS,
+  createNativeAudioCapture,
+  type NativeAudioEngine
+} from '../../platform/audio-capture/native-audio'
+import {
   BRIDGE_AUDIO_RING_MAX_BYTES,
   audioReadResultSchema,
   audioStopResultSchema
 } from './bridge-audio-verbs'
-import { BRIDGE_MAX_MESSAGE_BYTES } from './bridge-caps'
-import { readBridgeHostMessage } from './bridge-envelope'
 
 const captures = new Set<ReturnType<typeof createNativeAudioCapture>>()
 function createCapture(engine: NativeAudioEngine) {
@@ -117,36 +117,6 @@ function decode(base64: string): Uint8Array {
   return bytes
 }
 
-describe('what the audio schemas refuse', () => {
-  it('accepts a complete full-ring drain within the result and frame caps', async () => {
-    const { engine, emit } = createTestEngine()
-    const capture = createCapture(engine)
-    await capture.serve('native.audio.start', { sampleRate: 16_000 })
-    const bytes = pcm(BRIDGE_AUDIO_RING_MAX_BYTES, 19)
-    emit(bytes)
-    const result = audioReadResultSchema.parse(
-      await capture.serve('native.audio.read', { maxBytes: BRIDGE_AUDIO_RING_MAX_BYTES })
-    )
-    expect(decode(result.base64)).toEqual(bytes)
-    const raw = JSON.stringify({
-      v: 1,
-      type: 'reply',
-      id: 'AAAAAAAAAAAAAAAAAAAAAA',
-      payload: { id: 'audio', ok: true, result }
-    })
-    expect(new TextEncoder().encode(raw).byteLength).toBeLessThanOrEqual(BRIDGE_MAX_MESSAGE_BYTES)
-    expect(readBridgeHostMessage(raw).ok).toBe(true)
-    expect(
-      audioReadResultSchema.safeParse({
-        base64: 'A'.repeat(BRIDGE_AUDIO_READ_MAX_BASE64_CHARS + 1),
-        droppedBytes: 0,
-        recording: true,
-        interruption: null
-      }).success
-    ).toBe(false)
-  })
-})
-
 describe('the shell capture', () => {
   it('serves a partial drain from the front and keeps the rest for the next read', async () => {
     const { engine, emit } = createTestEngine()
@@ -235,30 +205,6 @@ describe('the shell capture', () => {
     expect(read.base64).toBe('')
   })
 
-  it('leaves one capture behind when two starts race the permission prompt', async () => {
-    // Concurrent starts can both leave the OS prompt and reach listen; replacement must remove the earlier handlers rather than leak a ring nobody drains.
-    const entered = gate()
-    const blocked = gate()
-    const { engine, log, liveListeners } = createTestEngine({
-      permission: async () => {
-        entered.release()
-        await blocked.promise
-        return 'granted'
-      }
-    })
-    const capture = createCapture(engine)
-    const first = capture.serve('native.audio.start', { sampleRate: 16_000 })
-    await entered.promise
-    const second = capture.serve('native.audio.start', { sampleRate: 16_000 })
-    blocked.release()
-    await expect(first).resolves.toMatchObject({ started: true })
-    await expect(second).resolves.toMatchObject({ started: true })
-    expect(liveListeners()).toEqual({ microphone: 1, interruptions: 1 })
-    capture.dispose()
-    expect(liveListeners()).toEqual({ microphone: 0, interruptions: 0 })
-    expect(log.filter((entry) => entry === 'end')).toHaveLength(2)
-  })
-
   it('does not open a capture for a start that lands after the session ended', async () => {
     const entered = gate()
     const blocked = gate()
@@ -280,30 +226,6 @@ describe('the shell capture', () => {
     expect(log).not.toContain('end')
   })
 
-  it('tears the device down for a start that lost the race after opening', async () => {
-    const entered = gate()
-    const blocked = gate()
-    const { engine, log, liveListeners } = createTestEngine({
-      open: async (sampleRate) => {
-        entered.release()
-        await blocked.promise
-        return { opened: true, sampleRate }
-      }
-    })
-    const capture = createCapture(engine)
-    const pending = capture.serve('native.audio.start', { sampleRate: 16_000 })
-    await entered.promise
-    capture.dispose()
-    blocked.release()
-    await expect(pending).resolves.toEqual({
-      started: false,
-      sampleRate: 16_000,
-      permission: 'granted'
-    })
-    expect(log.filter((entry) => entry === 'end')).toHaveLength(1)
-    expect(liveListeners()).toEqual({ microphone: 0, interruptions: 0 })
-  })
-
   it('ends a capture a stop asked for while its start was still opening', async () => {
     const entered = gate()
     const blocked = gate()
@@ -326,32 +248,6 @@ describe('the shell capture', () => {
   })
 })
 
-describe('the screen the shell holds awake while it is capturing', () => {
-  it('gives it back when the engine throws after the capture is open', async () => {
-    const { engine, screen } = createTestEngine({
-      begin: () => {
-        throw new Error('the audio engine would not start')
-      }
-    })
-    const capture = createCapture(engine)
-    await expect(capture.serve('native.audio.start', { sampleRate: 16_000 })).rejects.toThrow(
-      'would not start'
-    )
-    expect(screen).toEqual(['+', '-'])
-  })
-
-  it('does not take it twice when a second start replaces the first', async () => {
-    const { engine, screen } = createTestEngine()
-    const capture = createCapture(engine)
-    await capture.serve('native.audio.start', { sampleRate: 16_000 })
-    await capture.serve('native.audio.start', { sampleRate: 16_000 })
-    // Replace the old capture’s wake tag before activating another; never hold two with only one future release.
-    expect(screen).toEqual(['+', '-', '+'])
-    capture.dispose()
-    expect(screen).toEqual(['+', '-', '+', '-'])
-  })
-})
-
 describe('the tail the stop reply carries', () => {
   it('hands a byte to the read or to the stop, never to both and never to neither', async () => {
     const { engine, emit } = createTestEngine()
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.ts b/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.ts
index 6f20248e4d5..b3595701cb4 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-audio-verbs.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { MAX_DICTATION_AUDIO_CHUNK_BYTES } from '../../../../src/shared/rpc-contract/speech-params'
+import { MAX_DICTATION_AUDIO_CHUNK_BYTES } from '../../../../src/shared/rpc-contract/speech/speech-params'
 
 // The shell owns microphone PCM and its wake lock; the page owns dictation state/RPCs. Pull from the ring through existing request/reply rather than adding a push frame.
 // Keep verb grant segments lowercase: a camel-cased audio.readChunk would fail manifest grammar and reject the whole bundle.
diff --git a/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.ts b/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.ts
index 7dfff72f157..25af8db2513 100644
--- a/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.ts
+++ b/mobile/src/mobile-web-shell/bridge/bridge-native-verbs.ts
@@ -21,7 +21,7 @@ import { imageParamsSchema, imageResultSchema } from './bridge-image-verbs'
 import { BRIDGE_SPEECH_VERB, speechParamsSchema, speechResultSchema } from './bridge-speech-verbs'
 import { BRIDGE_STORE_VERB, storeParamsSchema, storeResultSchema } from './bridge-store-verb'
 import { PAGE_STORAGE_MAX_KEY_CHARS } from '../page-storage-keys'
-import { mobileFileMediaMime, PDF_MIME_TYPE } from '../../files/mobile-file-media'
+import { mobileFileMediaMime, PDF_MIME_TYPE } from '../../files/media/mobile-file-media'
 
 // Fence native-prefixed requests on-device; desktop allowlist refusal alone would hide leaked forwarding and depend on desktop version.
 // Native replies use existing frames/in-flight caps without runtime _meta; adding a verb needs a table row and handler, never a new frame kind.
diff --git a/mobile/src/mobile-web-shell/page-haptics.ts b/mobile/src/mobile-web-shell/page-haptics.ts
index aa294542eb8..45c3856553e 100644
--- a/mobile/src/mobile-web-shell/page-haptics.ts
+++ b/mobile/src/mobile-web-shell/page-haptics.ts
@@ -4,7 +4,7 @@ import {
   triggerMediumImpact,
   triggerSelection,
   triggerSuccess
-} from '../platform/haptics'
+} from '../platform/haptics/haptics'
 import type { BridgeHapticsKind } from './bridge/bridge-haptics-notify'
 
 // Reuse native functions so platform styles stay identical. The typed table covers every bridge kind; the platform-seams haptics census checks new native functions also get a kind.
diff --git a/mobile/src/mobile-web-shell/shell-screen-route.test.ts b/mobile/src/mobile-web-shell/shell-screen-route.test.ts
deleted file mode 100644
index 62da0363a8b..00000000000
--- a/mobile/src/mobile-web-shell/shell-screen-route.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { BRIDGE_MAX_ROUTE_PARAM_CHARS } from './bridge/bridge-caps'
-import { BridgeInitRouteSchema, type BridgeInitRoute } from './bridge/bridge-envelope'
-import { shellRouteHref } from './bridge/page-bootstrap'
-import { shellScreenRoute, shellScreenRouteKey } from './shell-screen-route'
-import {
-  mobileFilePreviewShellParams,
-  normalizeMobileFilePreviewRouteParams
-} from '../files/mobile-file-preview-route'
-
-const PREVIEW_PATH = '/h/host-1/files/preview/wt-1'
-
-function previewRoute(absolutePath: string) {
-  const route = normalizeMobileFilePreviewRouteParams({
-    hostId: 'host-1',
-    worktreeId: 'wt-1',
-    source: 'terminalArtifact',
-    absolutePath,
-    grantId: 'grant-1'
-  })
-  if (!route.ok) {
-    throw new Error(route.message)
-  }
-  return { pathname: PREVIEW_PATH, params: mobileFilePreviewShellParams(route.params) }
-}
-
-describe('the route a switch hands the shell', () => {
-  it('is one the page could actually be given', () => {
-    const route = previewRoute('/logs/run.txt')
-    expect(BridgeInitRouteSchema.safeParse(route).success).toBe(true)
-    expect(shellScreenRoute(route)).toEqual(route)
-  })
-
-  it('is nothing when a file path is longer than a param may be', () => {
-    // Use a real Windows long path: without a length guard the bridge drops init.route to null and shows an update refusal over a working native screen.
-    const route = previewRoute(`/logs/${'a'.repeat(BRIDGE_MAX_ROUTE_PARAM_CHARS)}.txt`)
-    expect(BridgeInitRouteSchema.safeParse(route).success).toBe(false)
-    expect(shellScreenRoute(route)).toBeNull()
-  })
-
-  it('is nothing when a worktree id is not a segment the page will route', () => {
-    // Dot segments survive encodeURIComponent and escape the intended /h/ prefix when resolved.
-    const route = { pathname: '/h/host-1/files/..', params: { name: 'Files' } }
-    // Prove schema refusal too so an always-null guard cannot pass.
-    expect(BridgeInitRouteSchema.safeParse(route).success).toBe(false)
-    expect(shellScreenRoute(route)).toBeNull()
-  })
-
-  it('keeps a path with a slash, a space and a dot segment, which are params and not segments', () => {
-    const route = {
-      pathname: '/h/host-1/files/preview/wt-1',
-      params: { relativePath: 'docs/../my notes/readme.md', source: 'worktree' }
-    }
-    expect(shellScreenRoute(route)).toEqual(route)
-  })
-})
-
-describe('the key a shell screen remounts on', () => {
-  // Pin native remount keys to the page serializer’s URL; importing its RPC-adjacent module into native routes would cross the platform boundary.
-  it.each<BridgeInitRoute>([
-    { pathname: '/h/host-1/files/wt-1' },
-    { pathname: '/h/host-1/files/wt-1', params: { name: 'my worktree' } },
-    {
-      pathname: '/h/host-1/files/preview/wt-1',
-      params: { relativePath: 'docs/my notes/readme.md', source: 'worktree', line: '12' }
-    }
-  ])('is the href the page would write into its history: %o', (route) => {
-    expect(shellScreenRouteKey(route)).toBe(shellRouteHref(route))
-  })
-})
diff --git a/mobile/src/mobile-web-shell/shell-screen-route.ts b/mobile/src/mobile-web-shell/shell-screen-route.ts
index 79dfadc1924..4cbafc53914 100644
--- a/mobile/src/mobile-web-shell/shell-screen-route.ts
+++ b/mobile/src/mobile-web-shell/shell-screen-route.ts
@@ -7,7 +7,7 @@ export function shellScreenRoute(route: BridgeInitRoute): BridgeInitRoute | null
 }
 
 // Include params in remount identity so files/labels update the document; pane taps deliberately use a separate in-place init path.
-// Match the page bootstrap serializer, pinned by tests instead of importing its RPC/document dependencies into native routes.
+// Match the page bootstrap serializer without importing its RPC/document dependencies into native routes.
 export function shellScreenRouteKey(route: BridgeInitRoute): string {
   const search = new URLSearchParams(route.params ?? {}).toString()
   return search === '' ? route.pathname : `${route.pathname}?${search}`
diff --git a/mobile/src/mobile-web-shell/terminal-direction-pad.tsx b/mobile/src/mobile-web-shell/terminal-direction-pad.tsx
index 260c73d877b..2b5ccac3adf 100644
--- a/mobile/src/mobile-web-shell/terminal-direction-pad.tsx
+++ b/mobile/src/mobile-web-shell/terminal-direction-pad.tsx
@@ -12,7 +12,7 @@ import {
   createTerminalAccessoryRepeatController,
   TERMINAL_ACCESSORY_REPEAT_DELAY_MS,
   TERMINAL_ACCESSORY_REPEAT_INTERVAL_MS
-} from '../terminal/terminal-accessory-repeat'
+} from '../terminal/key-input/terminal-accessory-repeat'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/mobile-web-shell/terminal-key-rail.tsx b/mobile/src/mobile-web-shell/terminal-key-rail.tsx
index fad5bc9ec6d..c18629c4902 100644
--- a/mobile/src/mobile-web-shell/terminal-key-rail.tsx
+++ b/mobile/src/mobile-web-shell/terminal-key-rail.tsx
@@ -10,12 +10,12 @@ import {
 } from 'lucide-react-native'
 import { hasTerminalDirectionPadSpace } from '../layout/side-rail-strip'
 import { useSideRailStrip, useSideRailDirectionPadAvailable } from '../layout/side-rail'
-import { TERMINAL_ACCESSORY_KEY_DEFINITIONS } from '../terminal/terminal-key-definitions'
+import { TERMINAL_ACCESSORY_KEY_DEFINITIONS } from '../terminal/key-input/terminal-key-definitions'
 import {
   createTerminalAccessoryRepeatController,
   TERMINAL_ACCESSORY_REPEAT_DELAY_MS,
   TERMINAL_ACCESSORY_REPEAT_INTERVAL_MS
-} from '../terminal/terminal-accessory-repeat'
+} from '../terminal/key-input/terminal-accessory-repeat'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { colors, feedback, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
diff --git a/mobile/src/mock-server-key-pair.test.ts b/mobile/src/mock-server-key-pair.test.ts
index 1db9757e1e2..b4dbcccd3dd 100644
--- a/mobile/src/mock-server-key-pair.test.ts
+++ b/mobile/src/mock-server-key-pair.test.ts
@@ -3,7 +3,6 @@ import { mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import nacl from 'tweetnacl'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { loadOrCreateMockServerKeyPair } from '../scripts/mock-server-key-pair'
 
@@ -186,20 +185,6 @@ describe('mock server key persistence', () => {
     }
   })
 
-  it('re-keys canonical-length content with malformed base64', () => {
-    const keyFile = keyFilePath()
-    const encoded = Buffer.from(nacl.box.keyPair().secretKey).toString('base64')
-    const malformed = `${encoded.slice(0, 4)}!${encoded.slice(4)}`
-    expect(Buffer.from(malformed, 'base64')).toHaveLength(nacl.box.secretKeyLength)
-    writeFileSync(keyFile, malformed)
-    const logger = { warn: vi.fn() }
-
-    const loaded = loadOrCreateMockServerKeyPair(keyFile, logger)
-
-    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('invalid base64'))
-    expect(readFileSync(keyFile, 'utf-8')).toBe(Buffer.from(loaded.secretKey).toString('base64'))
-  })
-
   it('makes concurrent creators converge on the persisted winner', async () => {
     const keyFile = keyFilePath()
     const lockFile = `${keyFile}.lock`
@@ -224,13 +209,4 @@ describe('mock server key persistence', () => {
       await cleanupConcurrentCreators(creators, lockFile, parentOwnsLock)
     }
   })
-
-  it('does not overwrite an invalid key owned by another creator', () => {
-    const keyFile = keyFilePath()
-    writeFileSync(keyFile, 'invalid')
-    writeFileSync(`${keyFile}.lock`, '', { flag: 'wx', mode: 0o600 })
-
-    expect(() => loadOrCreateMockServerKeyPair(keyFile)).toThrow('remained busy')
-    expect(readFileSync(keyFile, 'utf-8')).toBe('invalid')
-  })
 })
diff --git a/mobile/src/new-workspace/NewWorkspacePageScreen.tsx b/mobile/src/new-workspace/NewWorkspacePageScreen.tsx
index c067d406cfa..0386361d49b 100644
--- a/mobile/src/new-workspace/NewWorkspacePageScreen.tsx
+++ b/mobile/src/new-workspace/NewWorkspacePageScreen.tsx
@@ -7,7 +7,7 @@ import { useHostWorktreeRows } from './use-host-worktree-rows'
 import { useRouteHandoff } from '../navigation/route-handoff'
 import { firstParam } from '../navigation/route-param-reader'
 import { workspaceRouteHref } from '../navigation/workspace-execution-host'
-import { openExternalLink } from '../platform/external-link'
+import { openExternalLink } from '../platform/external-links/external-link'
 import { useHostClient } from '../transport/connection/host-client-hooks'
 import { useHostProtocolGates } from '../components/host-protocol-gates-context'
 
diff --git a/mobile/src/new-workspace/source-selection/smart-source-search-requests.ts b/mobile/src/new-workspace/source-selection/smart-source-search-requests.ts
index ea998a34180..53292641e33 100644
--- a/mobile/src/new-workspace/source-selection/smart-source-search-requests.ts
+++ b/mobile/src/new-workspace/source-selection/smart-source-search-requests.ts
@@ -11,7 +11,7 @@ import {
   buildJiraTextMatchJql
 } from '../../../../src/shared/jira/jira-search-input-jql'
 import { jiraIssueSearchRead } from '../../tasks/providers/jira/mobile-jira-operations'
-import { repoBaseRefSearchRead } from '../../source-control/mobile-repo-base-ref-operations'
+import { repoBaseRefSearchRead } from '../../source-control/branches/mobile-repo-base-ref-operations'
 import {
   githubWorkItemSearchRead,
   gitlabWorkItemSearchRead,
diff --git a/mobile/src/new-workspace/use-host-label-by-id.ts b/mobile/src/new-workspace/use-host-label-by-id.ts
index 6ea165fc630..8bc1410d4c1 100644
--- a/mobile/src/new-workspace/use-host-label-by-id.ts
+++ b/mobile/src/new-workspace/use-host-label-by-id.ts
@@ -4,7 +4,7 @@ import {
   HOST_LIST_TARGET,
   hostRepoLabelsQuery,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 import { useHostQuery } from '../query/host-query'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 
diff --git a/mobile/src/new-workspace/use-host-worktree-rows.ts b/mobile/src/new-workspace/use-host-worktree-rows.ts
index 8b3a5693abe..d78cf11e4ed 100644
--- a/mobile/src/new-workspace/use-host-worktree-rows.ts
+++ b/mobile/src/new-workspace/use-host-worktree-rows.ts
@@ -5,7 +5,7 @@ import {
   HOST_LIST_TARGET,
   hostWorktreeCatalogQuery,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 
 type WorktreeRow = Pick<Worktree, 'path' | 'repoId' | 'branch'>
 
diff --git a/mobile/src/onboarding/MobileOnboardingPage.test.ts b/mobile/src/onboarding/MobileOnboardingPage.test.ts
deleted file mode 100644
index 48612248143..00000000000
--- a/mobile/src/onboarding/MobileOnboardingPage.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { createElement, type ReactNode } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { MobileOnboardingPage } from './MobileOnboardingPage'
-import { findByHostType } from '../test-support/react-test-renderer-host-nodes'
-
-vi.mock('react-native', async () => {
-  const React = await import('react')
-  class AnimatedValue {
-    interpolate() {
-      return 0
-    }
-    setValue() {}
-  }
-  return {
-    AccessibilityInfo: {
-      addEventListener: vi.fn(() => ({ remove: vi.fn() })),
-      isReduceMotionEnabled: vi.fn(() => Promise.resolve(true))
-    },
-    ActivityIndicator: 'ActivityIndicator',
-    Animated: {
-      Value: AnimatedValue,
-      View: 'AnimatedView',
-      delay: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      loop: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      parallel: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      sequence: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      timing: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() }))
-    },
-    Easing: { cubic: (t: number) => t, in: (e: unknown) => e, out: (e: unknown) => e },
-    Image: 'Image',
-    Pressable: 'Pressable',
-    ScrollView: ({ children, ...props }: { children?: ReactNode }) =>
-      React.createElement('ScrollView', props, children),
-    StyleSheet: { create: (styles: unknown) => styles },
-    Text: 'Text',
-    View: 'View'
-  }
-})
-
-vi.mock('lucide-react-native', () => ({
-  MessageSquare: 'MessageSquare'
-}))
-
-vi.mock('../components/OrcaLogo', () => ({ OrcaLogo: 'OrcaLogo' }))
-
-describe('MobileOnboardingPage', () => {
-  let renderer: ReactTestRenderer | null = null
-
-  afterEach(() => {
-    act(() => renderer?.unmount())
-    renderer = null
-    vi.restoreAllMocks()
-  })
-
-  async function renderPage(
-    step: 'session-view' | 'notifications',
-    options: { active?: boolean; busyChoice?: 'chat' | 'enable' | null } = {}
-  ) {
-    const onSessionChoice = vi.fn()
-    const onNotificationChoice = vi.fn()
-    const consoleError = vi.spyOn(console, 'error').mockImplementation((...args) => {
-      if (typeof args[0] !== 'string' || !args[0].includes('react-test-renderer is deprecated')) {
-        throw new Error(String(args[0]))
-      }
-    })
-    await act(async () => {
-      renderer = create(
-        createElement(MobileOnboardingPage, {
-          step,
-          width: 390,
-          active: options.active ?? true,
-          busyChoice: options.busyChoice ?? null,
-          error: null,
-          onSessionChoice,
-          onNotificationChoice
-        })
-      )
-    })
-    consoleError.mockRestore()
-    return { onSessionChoice, onNotificationChoice }
-  }
-
-  function button(label: string) {
-    return renderer!.root.find(
-      (node) => String(node.type) === 'Pressable' && node.props.accessibilityLabel === label
-    )
-  }
-
-  it('renders the session choices and sends exactly one selected view', async () => {
-    const callbacks = await renderPage('session-view')
-
-    act(() => button('Open sessions in Chat UI').props.onPress())
-    expect(callbacks.onSessionChoice).toHaveBeenCalledExactlyOnceWith('chat')
-    expect(callbacks.onNotificationChoice).not.toHaveBeenCalled()
-  })
-
-  it('renders the notification choices and sends the selected option', async () => {
-    const callbacks = await renderPage('notifications')
-    act(() => button('Skip notifications for now').props.onPress())
-
-    expect(callbacks.onNotificationChoice).toHaveBeenCalledWith('skip')
-    expect(callbacks.onSessionChoice).not.toHaveBeenCalled()
-  })
-
-  it('disables both notification choices while permission is pending', async () => {
-    await renderPage('notifications', { busyChoice: 'enable' })
-    const enable = button('Enable agent notifications')
-    const secondary = button('Skip notifications for now')
-
-    expect(enable.props.disabled).toBe(true)
-    expect(secondary.props.disabled).toBe(true)
-  })
-
-  it('hides an off-screen page from assistive technology', async () => {
-    await renderPage('notifications', { active: false })
-    const scrollView = findByHostType(renderer!.root, 'ScrollView')
-
-    expect(scrollView.props.accessibilityElementsHidden).toBe(true)
-    expect(scrollView.props.importantForAccessibility).toBe('no-hide-descendants')
-  })
-})
diff --git a/mobile/src/onboarding/NotificationOnboardingPreview.test.ts b/mobile/src/onboarding/NotificationOnboardingPreview.test.ts
deleted file mode 100644
index fa400485a9f..00000000000
--- a/mobile/src/onboarding/NotificationOnboardingPreview.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { createElement, type ReactNode } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { NotificationOnboardingPreview } from './NotificationOnboardingPreview'
-import { findAllByHostType } from '../test-support/react-test-renderer-host-nodes'
-
-const mocks = vi.hoisted(() => {
-  const anim = () => ({ start: vi.fn(), stop: vi.fn() })
-  return {
-    reducedMotion: true,
-    reducedMotionResult: null as Promise<boolean> | null,
-    timing: vi.fn(anim),
-    loop: vi.fn(anim)
-  }
-})
-
-vi.mock('react-native', async () => {
-  const React = await import('react')
-  class AnimatedValue {
-    interpolate() {
-      return 0
-    }
-    setValue() {}
-  }
-  return {
-    AccessibilityInfo: {
-      addEventListener: vi.fn(() => ({ remove: vi.fn() })),
-      isReduceMotionEnabled: vi.fn(
-        () => mocks.reducedMotionResult ?? Promise.resolve(mocks.reducedMotion)
-      )
-    },
-    Animated: {
-      Value: AnimatedValue,
-      View: ({ children, ...props }: { children?: ReactNode }) =>
-        React.createElement('AnimatedView', props, children),
-      delay: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      loop: mocks.loop,
-      parallel: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      sequence: vi.fn(() => ({ start: vi.fn(), stop: vi.fn() })),
-      timing: mocks.timing
-    },
-    Easing: { cubic: (t: number) => t, in: (e: unknown) => e, out: (e: unknown) => e },
-    StyleSheet: { create: (styles: unknown) => styles },
-    Text: 'Text',
-    View: 'View'
-  }
-})
-
-vi.mock('../components/OrcaLogo', () => ({ OrcaLogo: 'OrcaLogo' }))
-
-describe('NotificationOnboardingPreview', () => {
-  let renderer: ReactTestRenderer | null = null
-
-  afterEach(() => {
-    act(() => renderer?.unmount())
-    renderer = null
-    mocks.reducedMotion = true
-    mocks.reducedMotionResult = null
-    mocks.timing.mockClear()
-    mocks.loop.mockClear()
-    vi.restoreAllMocks()
-  })
-
-  async function renderPreview(active = true) {
-    const consoleError = vi.spyOn(console, 'error').mockImplementation((...args) => {
-      if (typeof args[0] !== 'string' || !args[0].includes('react-test-renderer is deprecated')) {
-        throw new Error(String(args[0]))
-      }
-    })
-    await act(async () => {
-      renderer = create(createElement(NotificationOnboardingPreview, { active }))
-    })
-    consoleError.mockRestore()
-  }
-
-  it('shows sample agent-done and needs-input banners as a decorative mock', async () => {
-    await renderPreview()
-    const preview = renderer!.root.findByProps({ testID: 'notification-onboarding-preview' })
-    const copy = findAllByHostType(renderer!.root, 'Text')
-      .flatMap((node) => node.props.children)
-      .join(' ')
-
-    expect(preview.props.accessibilityElementsHidden).toBe(true)
-    expect(preview.props.importantForAccessibility).toBe('no-hide-descendants')
-    expect(copy).toContain('Codex finished')
-    expect(copy).toContain('Claude needs input')
-  })
-
-  it('does not animate the banners when the page is off-screen', async () => {
-    mocks.reducedMotion = false
-    await renderPreview(false)
-    expect(mocks.loop).not.toHaveBeenCalled()
-  })
-
-  it('loops the arriving banners while the page is active', async () => {
-    mocks.reducedMotion = false
-    await renderPreview(true)
-    expect(mocks.loop).toHaveBeenCalledOnce()
-    expect(mocks.loop.mock.results[0]?.value.start).toHaveBeenCalledOnce()
-  })
-
-  it('does not start the loop until reduced-motion is known', async () => {
-    let resolvePreference: (enabled: boolean) => void = () => {}
-    mocks.reducedMotionResult = new Promise((resolve) => {
-      resolvePreference = resolve
-    })
-
-    await renderPreview(true)
-    expect(mocks.loop).not.toHaveBeenCalled()
-
-    await act(async () => {
-      resolvePreference(false)
-    })
-    expect(mocks.loop).toHaveBeenCalledOnce()
-  })
-})
diff --git a/mobile/src/onboarding/NotificationOnboardingPreview.tsx b/mobile/src/onboarding/NotificationOnboardingPreview.tsx
index 2a97d48997c..dbcc69a9492 100644
--- a/mobile/src/onboarding/NotificationOnboardingPreview.tsx
+++ b/mobile/src/onboarding/NotificationOnboardingPreview.tsx
@@ -6,7 +6,7 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 
 function sampleNotifications(t: Translate) {
   return [
diff --git a/mobile/src/onboarding/legacy-notification-opt-in-route.test.ts b/mobile/src/onboarding/legacy-notification-opt-in-route.test.ts
deleted file mode 100644
index edbb44f8e72..00000000000
--- a/mobile/src/onboarding/legacy-notification-opt-in-route.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { legacyNotificationOptInDestination } from './legacy-notification-opt-in-destination'
-
-describe('legacy notification opt-in destination', () => {
-  it('selects only notifications and preserves a scalar hostId', () => {
-    expect(legacyNotificationOptInDestination({ hostId: 'paired-host' })).toEqual({
-      pathname: '/mobile-onboarding',
-      params: { steps: 'notifications', hostId: 'paired-host' }
-    })
-  })
-
-  it('ignores unrelated legacy parameters', () => {
-    const legacyParams = {
-      hostId: 'paired-host',
-      steps: 'session-view',
-      returnTo: '/settings'
-    }
-
-    expect(legacyNotificationOptInDestination(legacyParams)).toEqual({
-      pathname: '/mobile-onboarding',
-      params: { steps: 'notifications', hostId: 'paired-host' }
-    })
-  })
-})
diff --git a/mobile/src/pairing/pairing-visuals.tsx b/mobile/src/pairing/pairing-visuals.tsx
index d25c004d00f..825a89aafc7 100644
--- a/mobile/src/pairing/pairing-visuals.tsx
+++ b/mobile/src/pairing/pairing-visuals.tsx
@@ -10,7 +10,7 @@ import Animated, {
 import { Check } from 'lucide-react-native'
 import { SHEET_CURVE } from '../components/sheet-motion-values'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { pairScanStyles as scanStyles } from '../pair-scan-styles'
 import { colors, radii } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
diff --git a/mobile/src/platform/accessibility-announcer.ts b/mobile/src/platform/accessibility/accessibility-announcer.ts
similarity index 100%
rename from mobile/src/platform/accessibility-announcer.ts
rename to mobile/src/platform/accessibility/accessibility-announcer.ts
diff --git a/mobile/src/platform/accessibility-announcer.web.ts b/mobile/src/platform/accessibility/accessibility-announcer.web.ts
similarity index 85%
rename from mobile/src/platform/accessibility-announcer.web.ts
rename to mobile/src/platform/accessibility/accessibility-announcer.web.ts
index 647555ab841..4e5f816cf49 100644
--- a/mobile/src/platform/accessibility-announcer.web.ts
+++ b/mobile/src/platform/accessibility/accessibility-announcer.web.ts
@@ -1,5 +1,5 @@
 import { useCallback } from 'react'
-import { useNativeVerbs } from '../mobile-web-shell/bridge/use-native-verbs'
+import { useNativeVerbs } from '../../mobile-web-shell/bridge/use-native-verbs'
 
 // RNW's announceForAccessibility does nothing, so the shell announces; older shells and Android leave it to the page's live region.
 export function useAccessibilityAnnouncer(): (message: string) => Promise<boolean> {
diff --git a/mobile/src/platform/native-accessibility-announce.ts b/mobile/src/platform/accessibility/native-accessibility-announce.ts
similarity index 85%
rename from mobile/src/platform/native-accessibility-announce.ts
rename to mobile/src/platform/accessibility/native-accessibility-announce.ts
index b171ff3948e..3a18cbc13f9 100644
--- a/mobile/src/platform/native-accessibility-announce.ts
+++ b/mobile/src/platform/accessibility/native-accessibility-announce.ts
@@ -1,5 +1,5 @@
 import { AccessibilityInfo, Platform } from 'react-native'
-import { a11yAnnounceParamsSchema } from '../mobile-web-shell/bridge/bridge-native-verbs'
+import { a11yAnnounceParamsSchema } from '../../mobile-web-shell/bridge/bridge-native-verbs'
 
 // VoiceOver ignores the page's live regions inside the shell's WebView, so the shell announces for it; TalkBack reads them, so Android leaves it to the page.
 export function serveNativeAnnounceVerb(params: unknown): { announced: boolean } {
diff --git a/mobile/src/platform/use-reduced-motion.ts b/mobile/src/platform/accessibility/use-reduced-motion.ts
similarity index 100%
rename from mobile/src/platform/use-reduced-motion.ts
rename to mobile/src/platform/accessibility/use-reduced-motion.ts
diff --git a/mobile/src/platform/dictation-capture-compile-fence.ts b/mobile/src/platform/audio-capture/dictation-capture-compile-fence.ts
similarity index 86%
rename from mobile/src/platform/dictation-capture-compile-fence.ts
rename to mobile/src/platform/audio-capture/dictation-capture-compile-fence.ts
index c580a2c5d22..721f05a4298 100644
--- a/mobile/src/platform/dictation-capture-compile-fence.ts
+++ b/mobile/src/platform/audio-capture/dictation-capture-compile-fence.ts
@@ -1,7 +1,7 @@
 import type { MicrophoneDataEvent } from '@orca/expo-two-way-audio'
-import { enqueueMobileDictationAudioChunk } from '../hooks/mobile-dictation-audio-chunk'
+import { enqueueMobileDictationAudioChunk } from '../../hooks/mobile-dictation-audio-chunk'
 import type { DictationCaptureChunk } from './dictation-capture-contract'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 
 // Pin capture chunks separately from raw microphone events so droppedBytes cannot disappear at the sender. Unused expect-error directives fail typecheck; this module never runs.
 
diff --git a/mobile/src/platform/dictation-capture-contract.ts b/mobile/src/platform/audio-capture/dictation-capture-contract.ts
similarity index 100%
rename from mobile/src/platform/dictation-capture-contract.ts
rename to mobile/src/platform/audio-capture/dictation-capture-contract.ts
diff --git a/mobile/src/platform/dictation-capture.ts b/mobile/src/platform/audio-capture/dictation-capture.ts
similarity index 95%
rename from mobile/src/platform/dictation-capture.ts
rename to mobile/src/platform/audio-capture/dictation-capture.ts
index e3ef12486f3..e57920a5972 100644
--- a/mobile/src/platform/dictation-capture.ts
+++ b/mobile/src/platform/audio-capture/dictation-capture.ts
@@ -5,7 +5,7 @@ import {
   tearDown,
   toggleRecording
 } from '@orca/expo-two-way-audio'
-import { bridgeAudioInterruptionEndsCapture } from '../mobile-web-shell/bridge/bridge-audio-verbs'
+import { bridgeAudioInterruptionEndsCapture } from '../../mobile-web-shell/bridge/bridge-audio-verbs'
 import { nativeMicrophoneScreenLock } from './native-audio-device'
 import type { DictationCapture } from './dictation-capture-contract'
 
diff --git a/mobile/src/platform/dictation-capture.web.ts b/mobile/src/platform/audio-capture/dictation-capture.web.ts
similarity index 91%
rename from mobile/src/platform/dictation-capture.web.ts
rename to mobile/src/platform/audio-capture/dictation-capture.web.ts
index ca4aac3e0b9..68491051509 100644
--- a/mobile/src/platform/dictation-capture.web.ts
+++ b/mobile/src/platform/audio-capture/dictation-capture.web.ts
@@ -1,11 +1,14 @@
 import { useMemo } from 'react'
 import {
-  BRIDGE_AUDIO_RING_MAX_BYTES,
   bridgeAudioInterruptionEndsCapture,
   type BridgeAudioChunk
-} from '../mobile-web-shell/bridge/bridge-audio-verbs'
-import { useNativeVerbs, type NativeVerbs } from '../mobile-web-shell/bridge/use-native-verbs'
-import { MOBILE_DICTATION_PCM_SAMPLE_RATE } from '../hooks/mobile-dictation-pending-audio-budget'
+} from '../../mobile-web-shell/bridge/bridge-audio-verbs'
+import {
+  MAX_DICTATION_AUDIO_CHUNK_BYTES as BRIDGE_AUDIO_RING_MAX_BYTES,
+  DICTATION_SAMPLE_RATE as MOBILE_DICTATION_PCM_SAMPLE_RATE
+} from '../../../../src/shared/rpc-contract/speech/speech-params'
+import { useNativeVerbs, type NativeVerbs } from '../../mobile-web-shell/bridge/use-native-verbs'
+import '../../hooks/mobile-dictation-pending-audio-budget'
 import {
   DICTATION_CAPTURE_DRAIN_INTERVAL_MS,
   type DictationCapture,
diff --git a/mobile/src/platform/microphone-screen-lock.ts b/mobile/src/platform/audio-capture/microphone-screen-lock.ts
similarity index 100%
rename from mobile/src/platform/microphone-screen-lock.ts
rename to mobile/src/platform/audio-capture/microphone-screen-lock.ts
diff --git a/mobile/src/platform/native-audio-device.ts b/mobile/src/platform/audio-capture/native-audio-device.ts
similarity index 96%
rename from mobile/src/platform/native-audio-device.ts
rename to mobile/src/platform/audio-capture/native-audio-device.ts
index 7ace5684478..e051019ffe0 100644
--- a/mobile/src/platform/native-audio-device.ts
+++ b/mobile/src/platform/audio-capture/native-audio-device.ts
@@ -7,7 +7,7 @@ import {
   toggleRecording
 } from '@orca/expo-two-way-audio'
 import { activateKeepAwakeAsync, deactivateKeepAwake } from 'expo-keep-awake'
-import { BRIDGE_AUDIO_INTERRUPTIONS } from '../mobile-web-shell/bridge/bridge-audio-verbs'
+import { BRIDGE_AUDIO_INTERRUPTIONS } from '../../mobile-web-shell/bridge/bridge-audio-verbs'
 import { createMicrophoneScreenLock } from './microphone-screen-lock'
 import type { NativeAudioEngine } from './native-audio'
 
diff --git a/mobile/src/platform/native-audio-session-ownership.test.ts b/mobile/src/platform/audio-capture/native-audio-session-ownership.test.ts
similarity index 97%
rename from mobile/src/platform/native-audio-session-ownership.test.ts
rename to mobile/src/platform/audio-capture/native-audio-session-ownership.test.ts
index 60717ebcc53..d8741d69882 100644
--- a/mobile/src/platform/native-audio-session-ownership.test.ts
+++ b/mobile/src/platform/audio-capture/native-audio-session-ownership.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it } from 'vitest'
 import { createNativeAudioCapture, type NativeAudioEngine } from './native-audio'
-import { audioReadResultSchema } from '../mobile-web-shell/bridge/bridge-audio-verbs'
+import { audioReadResultSchema } from '../../mobile-web-shell/bridge/bridge-audio-verbs'
 
 function gate() {
   let release = () => {}
diff --git a/mobile/src/platform/native-audio.ts b/mobile/src/platform/audio-capture/native-audio.ts
similarity index 94%
rename from mobile/src/platform/native-audio.ts
rename to mobile/src/platform/audio-capture/native-audio.ts
index 472f13de5bc..05e93303c80 100644
--- a/mobile/src/platform/native-audio.ts
+++ b/mobile/src/platform/audio-capture/native-audio.ts
@@ -1,15 +1,15 @@
 import {
-  BRIDGE_AUDIO_RING_MAX_BYTES,
   bridgeAudioInterruptionEndsCapture,
   audioReadParamsSchema,
   audioStartParamsSchema,
   audioStopParamsSchema,
   type BridgeAudioInterruption,
   type BridgeAudioPermission
-} from '../mobile-web-shell/bridge/bridge-audio-verbs'
-import type { BridgeNativeVerb } from '../mobile-web-shell/bridge/bridge-native-verbs'
-import { BridgeNativeVerbRefusedError } from '../mobile-web-shell/bridge-host-errors'
-import { bytesToBase64 } from '../hooks/mobile-dictation-session-state'
+} from '../../mobile-web-shell/bridge/bridge-audio-verbs'
+import { MAX_DICTATION_AUDIO_CHUNK_BYTES as BRIDGE_AUDIO_RING_MAX_BYTES } from '../../../../src/shared/rpc-contract/speech/speech-params'
+import type { BridgeNativeVerb } from '../../mobile-web-shell/bridge/bridge-native-verbs'
+import { BridgeNativeVerbRefusedError } from '../../mobile-web-shell/bridge-host-errors'
+import { bytesToBase64 } from '../../hooks/mobile-dictation-session-state'
 import type { MicrophoneScreenLock } from './microphone-screen-lock'
 
 // Keep transcription protocol in the page so it can update without a binary release; the shell owns only microphone permission and PCM capture.
diff --git a/mobile/src/platform/clipboard.test.tsx b/mobile/src/platform/clipboard/clipboard.test.tsx
similarity index 54%
rename from mobile/src/platform/clipboard.test.tsx
rename to mobile/src/platform/clipboard/clipboard.test.tsx
index 09c56cbac15..7db037f82b7 100644
--- a/mobile/src/platform/clipboard.test.tsx
+++ b/mobile/src/platform/clipboard/clipboard.test.tsx
@@ -1,6 +1,6 @@
 import { act, create } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ClipboardImage, ClipboardReader, ClipboardWriter } from './clipboard'
+import type { ClipboardImage, ClipboardReader } from './clipboard'
 
 const clipboard = vi.hoisted(() => ({
   setStringAsync: vi.fn(() => Promise.resolve(true)),
@@ -12,23 +12,7 @@ const clipboard = vi.hoisted(() => ({
 
 vi.mock('expo-clipboard', () => clipboard)
 
-import { useClipboardReader, useClipboardWriter } from './clipboard'
-
-function mountWriter(): ClipboardWriter {
-  const held: { writer: ClipboardWriter | null } = { writer: null }
-  function Screen(): null {
-    held.writer = useClipboardWriter()
-    return null
-  }
-  act(() => {
-    create(<Screen />)
-  })
-  const writer = held.writer
-  if (writer === null) {
-    throw new Error('nothing mounted')
-  }
-  return writer
-}
+import { useClipboardReader } from './clipboard'
 
 function mountReader(): ClipboardReader {
   const held: { reader: ClipboardReader | null } = { reader: null }
@@ -63,38 +47,7 @@ afterEach(() => {
   vi.restoreAllMocks()
 })
 
-describe('writing the clipboard on a phone', () => {
-  it('hands the text to the app unchanged', async () => {
-    const writer = mountWriter()
-    await expect(writer.writeText('copied')).resolves.toBeUndefined()
-    expect(clipboard.setStringAsync.mock.calls).toEqual([['copied']])
-  })
-
-  it('propagates a pasteboard write failure', async () => {
-    clipboard.setStringAsync.mockRejectedValue(new Error('Clipboard unavailable'))
-    const writer = mountWriter()
-    await expect(writer.writeText('copied')).rejects.toThrow('Clipboard unavailable')
-  })
-})
-
 describe('reading the clipboard on a phone', () => {
-  it('hands back the text the app has', async () => {
-    clipboard.getStringAsync.mockImplementation(() => Promise.resolve('pasted'))
-    await expect(mountReader().readText()).resolves.toBe('pasted')
-  })
-
-  it('asks for PNG and returns the image and its dimensions', async () => {
-    clipboard.getImageAsync.mockResolvedValue({
-      data: 'data:image/png;base64,AQID',
-      size: { width: 3, height: 1 }
-    })
-    await expect(mountReader().readImage()).resolves.toEqual({
-      data: 'data:image/png;base64,AQID',
-      size: { width: 3, height: 1 }
-    })
-    expect(clipboard.getImageAsync.mock.calls).toEqual([[{ format: 'png' }]])
-  })
-
   it('starts both probes before either has answered', async () => {
     // Hold both probes open to prove they start in parallel; sequential awaits add IPC latency on mount/foreground/toggle.
     const started: string[] = []
@@ -115,14 +68,6 @@ describe('reading the clipboard on a phone', () => {
     expect(started).toEqual(['string', 'image'])
   })
 
-  it('probes both kinds without reading either', async () => {
-    clipboard.hasImageAsync.mockImplementation(() => Promise.resolve(true))
-    await expect(mountReader().contents()).resolves.toEqual({ text: false, image: true })
-    // Probe without reading so iOS does not show paste consent just to enable a button.
-    expect(clipboard.getStringAsync).not.toHaveBeenCalled()
-    expect(clipboard.getImageAsync).not.toHaveBeenCalled()
-  })
-
   it('reads a probe that threw as absent, rather than disabling paste on a rejection', async () => {
     clipboard.hasStringAsync.mockImplementation(() => Promise.reject(new Error('no pasteboard')))
     await expect(mountReader().contents()).resolves.toEqual({ text: false, image: false })
diff --git a/mobile/src/platform/clipboard.ts b/mobile/src/platform/clipboard/clipboard.ts
similarity index 100%
rename from mobile/src/platform/clipboard.ts
rename to mobile/src/platform/clipboard/clipboard.ts
diff --git a/mobile/src/platform/clipboard.web.ts b/mobile/src/platform/clipboard/clipboard.web.ts
similarity index 93%
rename from mobile/src/platform/clipboard.web.ts
rename to mobile/src/platform/clipboard/clipboard.web.ts
index fe0c4c126e0..86867c3fbb0 100644
--- a/mobile/src/platform/clipboard.web.ts
+++ b/mobile/src/platform/clipboard/clipboard.web.ts
@@ -2,8 +2,8 @@ import { useMemo } from 'react'
 import {
   readStagedMediaItem,
   releaseAllStagedMedia
-} from '../mobile-web-shell/bridge/staged-media-bytes'
-import { useNativeVerbs } from '../mobile-web-shell/bridge/use-native-verbs'
+} from '../../mobile-web-shell/bridge/staged-media-bytes'
+import { useNativeVerbs } from '../../mobile-web-shell/bridge/use-native-verbs'
 import type { ClipboardImage, ClipboardReader, ClipboardWriter } from './clipboard'
 
 // Use native clipboard verbs: navigator.clipboard requires a secure context unavailable under iOS’s custom scheme. Ungranted writes reject for callers to report.
diff --git a/mobile/src/platform/native-clipboard.ts b/mobile/src/platform/clipboard/native-clipboard.ts
similarity index 91%
rename from mobile/src/platform/native-clipboard.ts
rename to mobile/src/platform/clipboard/native-clipboard.ts
index 48fb50817fa..4da246d4c27 100644
--- a/mobile/src/platform/native-clipboard.ts
+++ b/mobile/src/platform/clipboard/native-clipboard.ts
@@ -3,7 +3,7 @@ import {
   clipboardReadParamsSchema,
   clipboardWriteParamsSchema,
   type BridgeNativeVerb
-} from '../mobile-web-shell/bridge/bridge-native-verbs'
+} from '../../mobile-web-shell/bridge/bridge-native-verbs'
 
 // Text-only: images use staged media handles to stay below reply caps. Parse again at the device boundary for checked types without assertions.
 export async function serveNativeClipboardVerb(
diff --git a/mobile/src/platform/external-link.test.ts b/mobile/src/platform/external-link.test.ts
deleted file mode 100644
index 42c79d6b949..00000000000
--- a/mobile/src/platform/external-link.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-// Mirror RN 0.83.10 openURL’s synchronous empty-URL validation; a promise-only rejecting mock cannot expose throws that escape .catch.
-const linking = vi.hoisted(() => {
-  const validatingOpen = (url: string): Promise<boolean> => {
-    if (url === '') {
-      throw new Error('Invalid URL: cannot be empty')
-    }
-    return Promise.resolve(true)
-  }
-  return { validatingOpen, openURL: vi.fn(validatingOpen) }
-})
-
-vi.mock('react-native', () => ({ Linking: { openURL: linking.openURL } }))
-
-import { openExternalLink } from './external-link'
-
-beforeEach(() => {
-  linking.openURL.mockReset()
-  // Restore synchronous validation too so later tests can still reproduce the escaping throw.
-  linking.openURL.mockImplementation(linking.validatingOpen)
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
-describe('opening a URL from a phone screen', () => {
-  it('does not throw out of a tap handler when nothing can open the URL', async () => {
-    linking.openURL.mockImplementation(() => Promise.reject(new Error('no activity found')))
-    expect(() => openExternalLink('mailto:someone@example.com')).not.toThrow()
-    await Promise.resolve()
-  })
-})
-
-describe('a URL the platform refuses before it returns a promise', () => {
-  it('names the refusal rather than failing silently', () => {
-    const warned = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-    openExternalLink('')
-    expect(warned.mock.calls).toEqual([
-      [
-        '[platform] could not open a URL',
-        { url: '' },
-        expect.objectContaining({ message: 'Invalid URL: cannot be empty' })
-      ]
-    ])
-    warned.mockRestore()
-  })
-})
diff --git a/mobile/src/platform/external-link.web.test.ts b/mobile/src/platform/external-link.web.test.ts
deleted file mode 100644
index 537e5cb58dd..00000000000
--- a/mobile/src/platform/external-link.web.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { openExternalLink, publishExternalLinkOpener } from './external-link.web'
-
-let warned: ReturnType<typeof vi.spyOn>
-
-beforeEach(() => {
-  warned = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-})
-
-afterEach(() => {
-  warned.mockRestore()
-})
-
-describe('opening a URL from inside the shell', () => {
-  it('hands an allowed URL to whatever the entry published', () => {
-    const asked: string[] = []
-    publishExternalLinkOpener((url) => {
-      asked.push(url)
-      return true
-    })
-    openExternalLink('https://github.com/stablyai/orca')
-    expect(asked).toEqual(['https://github.com/stablyai/orca'])
-    expect(warned).not.toHaveBeenCalled()
-  })
-
-  it('names a scheme the grant does not cover and asks for nothing', () => {
-    const asked: string[] = []
-    publishExternalLinkOpener((url) => {
-      asked.push(url)
-      return true
-    })
-    for (const url of ['javascript:alert(1)', 'file:///etc/passwd', '/h/host-a/tasks']) {
-      expect(() => openExternalLink(url), url).not.toThrow()
-    }
-    expect(asked).toEqual([])
-    expect(warned).toHaveBeenCalledTimes(3)
-  })
-
-  it('names a shell that would not take it, rather than reporting a tap that did nothing', () => {
-    publishExternalLinkOpener(() => false)
-    openExternalLink('https://example.com')
-    expect(warned.mock.calls[0]?.[0]).toBe('[page] the shell did not take a URL to open')
-  })
-
-  it('refuses everything in a document that published no opener', async () => {
-    // Reload module state to test its unpublished default; assert the refusal reason too because not.toThrow alone proves no policy.
-    vi.resetModules()
-    const fresh: typeof import('./external-link.web') = await import('./external-link.web')
-    fresh.openExternalLink('https://example.com')
-    expect(warned.mock.calls).toEqual([
-      ['[page] the shell did not take a URL to open', { url: 'https://example.com' }]
-    ])
-  })
-})
diff --git a/mobile/src/platform/external-link.ts b/mobile/src/platform/external-links/external-link.ts
similarity index 100%
rename from mobile/src/platform/external-link.ts
rename to mobile/src/platform/external-links/external-link.ts
diff --git a/mobile/src/platform/external-links/external-link.web.test.ts b/mobile/src/platform/external-links/external-link.web.test.ts
new file mode 100644
index 00000000000..b850e254411
--- /dev/null
+++ b/mobile/src/platform/external-links/external-link.web.test.ts
@@ -0,0 +1,25 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { openExternalLink, publishExternalLinkOpener } from './external-link.web'
+
+let warned: ReturnType<typeof vi.spyOn>
+
+beforeEach(() => {
+  warned = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+})
+
+afterEach(() => {
+  warned.mockRestore()
+})
+
+describe('opening a URL from inside the shell', () => {
+  it('hands an allowed URL to whatever the entry published', () => {
+    const asked: string[] = []
+    publishExternalLinkOpener((url) => {
+      asked.push(url)
+      return true
+    })
+    openExternalLink('https://github.com/stablyai/orca')
+    expect(asked).toEqual(['https://github.com/stablyai/orca'])
+    expect(warned).not.toHaveBeenCalled()
+  })
+})
diff --git a/mobile/src/platform/external-link.web.ts b/mobile/src/platform/external-links/external-link.web.ts
similarity index 91%
rename from mobile/src/platform/external-link.web.ts
rename to mobile/src/platform/external-links/external-link.web.ts
index 487a99d565b..24df974543c 100644
--- a/mobile/src/platform/external-link.web.ts
+++ b/mobile/src/platform/external-links/external-link.web.ts
@@ -1,4 +1,4 @@
-import { readBridgeExternalLinkUrl } from '../mobile-web-shell/bridge/bridge-caps'
+import { readBridgeExternalLinkUrl } from '../../mobile-web-shell/bridge/bridge-caps'
 
 // Use shell linking because RN Web window.open reports success even though both native WebViews refuse new windows.
 // Publish outside React for plain-function callers; missing publication/invalid URLs log refusal without throwing from tap handlers.
diff --git a/mobile/src/platform/global-timer-receiver-test-fakes.ts b/mobile/src/platform/global-timer-receiver-test-fakes.ts
deleted file mode 100644
index 518cb4a834d..00000000000
--- a/mobile/src/platform/global-timer-receiver-test-fakes.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { vi } from 'vitest'
-
-// Mirror WebIDL timer receivers: omitted means global; explicit nonglobal receivers throw.
-function assertGlobalReceiver(receiver: unknown): void {
-  if (receiver !== undefined && receiver !== globalThis) {
-    throw new TypeError('Illegal invocation')
-  }
-}
-
-export type GuardedTimerHandles = {
-  scheduled: ReturnType<typeof setTimeout>[]
-  cleared: ReturnType<typeof setTimeout>[]
-}
-
-// Wrap current real/fake timers so virtual time still works; restore with vi.unstubAllGlobals().
-export function installIllegalInvocationTimerGuards(): GuardedTimerHandles {
-  const scheduleTimer = globalThis.setTimeout
-  const cancelTimer = globalThis.clearTimeout
-  const handles: GuardedTimerHandles = { scheduled: [], cleared: [] }
-  vi.stubGlobal('setTimeout', function (this: unknown, handler: () => void, ms?: number) {
-    assertGlobalReceiver(this)
-    const handle = scheduleTimer(handler, ms)
-    handles.scheduled.push(handle)
-    return handle
-  })
-  vi.stubGlobal('clearTimeout', function (this: unknown, handle: ReturnType<typeof setTimeout>) {
-    assertGlobalReceiver(this)
-    handles.cleared.push(handle)
-    cancelTimer(handle)
-  })
-  return handles
-}
diff --git a/mobile/src/platform/haptics.ts b/mobile/src/platform/haptics/haptics.ts
similarity index 100%
rename from mobile/src/platform/haptics.ts
rename to mobile/src/platform/haptics/haptics.ts
diff --git a/mobile/src/platform/haptics.web.ts b/mobile/src/platform/haptics/haptics.web.ts
similarity index 89%
rename from mobile/src/platform/haptics.web.ts
rename to mobile/src/platform/haptics/haptics.web.ts
index 8380772651c..ca12cb207ea 100644
--- a/mobile/src/platform/haptics.web.ts
+++ b/mobile/src/platform/haptics/haptics.web.ts
@@ -1,4 +1,4 @@
-import type { BridgeHapticsKind } from '../mobile-web-shell/bridge/bridge-haptics-notify'
+import type { BridgeHapticsKind } from '../../mobile-web-shell/bridge/bridge-haptics-notify'
 
 // Ask native through a notify: Expo’s web fallback clicks a hidden checkbox on iOS, disrupting long presses. No reply slot is needed.
 // Publish outside React for plain-function callers; ungranted haptics stay quiet to avoid logging every list tap.
diff --git a/mobile/src/platform/host-os.web.ts b/mobile/src/platform/host-os.web.ts
index 1fa67c726d6..fd88a823c88 100644
--- a/mobile/src/platform/host-os.web.ts
+++ b/mobile/src/platform/host-os.web.ts
@@ -1,7 +1,5 @@
 import type { HostOs } from './host-os'
 
-export type { HostOs } from './host-os'
-
 // Platform.OS is web here: read the phone OS for keyboard/inset arithmetic (iPadOS needs the Mac-plus-touch heuristic) and a desktop Mac for Cmd chords.
 export function hostOs(): HostOs {
   const agent = globalThis.navigator?.userAgent ?? ''
diff --git a/mobile/src/platform/image-actions-contract.ts b/mobile/src/platform/image-actions/image-actions-contract.ts
similarity index 87%
rename from mobile/src/platform/image-actions-contract.ts
rename to mobile/src/platform/image-actions/image-actions-contract.ts
index a1707cddbdc..d6bb66df92d 100644
--- a/mobile/src/platform/image-actions-contract.ts
+++ b/mobile/src/platform/image-actions/image-actions-contract.ts
@@ -1,4 +1,4 @@
-import type { BridgeImageOperation } from '../mobile-web-shell/bridge/bridge-image-verbs'
+import type { BridgeImageOperation } from '../../mobile-web-shell/bridge/bridge-image-verbs'
 
 export type ImageAction = (operation: BridgeImageOperation) => Promise<void>
 
diff --git a/mobile/src/platform/image-actions.ts b/mobile/src/platform/image-actions/image-actions.ts
similarity index 100%
rename from mobile/src/platform/image-actions.ts
rename to mobile/src/platform/image-actions/image-actions.ts
diff --git a/mobile/src/platform/image-actions.web.ts b/mobile/src/platform/image-actions/image-actions.web.ts
similarity index 87%
rename from mobile/src/platform/image-actions.web.ts
rename to mobile/src/platform/image-actions/image-actions.web.ts
index bb4127adc3c..ca56cf1f049 100644
--- a/mobile/src/platform/image-actions.web.ts
+++ b/mobile/src/platform/image-actions/image-actions.web.ts
@@ -2,20 +2,20 @@ import { useMemo } from 'react'
 import {
   agentSessionAttachmentAppends,
   base64DecodedByteLength
-} from '../../../src/shared/agent-session/agent-session-attachments'
-import { readRasterImageDataUri } from '../../../src/shared/file-preview/image-data-uri'
-import { isKnownRasterImageMimeType } from '../../../src/shared/file-preview/raster-image-preview-limits'
-import { isSvgFilePath } from '../../../src/shared/file-preview/svg-document'
+} from '../../../../src/shared/agent-session/agent-session-attachments'
+import { readRasterImageDataUri } from '../../../../src/shared/file-preview/image-data-uri'
+import { isKnownRasterImageMimeType } from '../../../../src/shared/file-preview/raster-image-preview-limits'
+import { isSvgFilePath } from '../../../../src/shared/file-preview/svg-document'
 import type {
   BridgeImageOperation,
   BridgeImageRunParams
-} from '../mobile-web-shell/bridge/bridge-image-verbs'
+} from '../../mobile-web-shell/bridge/bridge-image-verbs'
 import {
   NativeVerbError,
   useNativeVerbs,
   type NativeVerbReason,
   type NativeVerbs
-} from '../mobile-web-shell/bridge/use-native-verbs'
+} from '../../mobile-web-shell/bridge/use-native-verbs'
 import {
   ImageActionRefusedError,
   type ImageAction,
diff --git a/mobile/src/platform/native-image-actions.ts b/mobile/src/platform/image-actions/native-image-actions.ts
similarity index 88%
rename from mobile/src/platform/native-image-actions.ts
rename to mobile/src/platform/image-actions/native-image-actions.ts
index 4699fed8e1b..b5a3e193a17 100644
--- a/mobile/src/platform/native-image-actions.ts
+++ b/mobile/src/platform/image-actions/native-image-actions.ts
@@ -3,20 +3,20 @@ import { Platform } from 'react-native'
 import * as Clipboard from 'expo-clipboard'
 import { File as FsFile, type Directory, type FileHandle } from 'expo-file-system'
 import { useFocusEffect, useNavigation } from 'expo-router'
-import { saveImageToPhotos, shareImage } from '../../modules/orca-mobile-web-shell/src'
+import { saveImageToPhotos, shareImage } from '../../../modules/orca-mobile-web-shell/src/index'
 import {
   CLIPBOARD_IMAGE_MAX_SOURCE_BYTES,
   CLIPBOARD_IMAGE_TOO_LARGE_ERROR
-} from '../../../src/shared/clipboard-image'
-import { isKnownRasterImageMimeType } from '../../../src/shared/file-preview/raster-image-preview-limits'
+} from '../../../../src/shared/clipboard-image'
+import { isKnownRasterImageMimeType } from '../../../../src/shared/file-preview/raster-image-preview-limits'
 import {
   imageParamsSchema,
   type BridgeImageRunParams
-} from '../mobile-web-shell/bridge/bridge-image-verbs'
-import { BridgeNativeVerbRefusedError } from '../mobile-web-shell/bridge-host-errors'
-import { decodeCanonicalBase64Bytes } from '../transport/encryption/base64-byte-codec'
-import { mobileFileExtensionForMime } from './mobile-picked-file-name'
-import { freshCacheFolder } from './native-media-device'
+} from '../../mobile-web-shell/bridge/bridge-image-verbs'
+import { BridgeNativeVerbRefusedError } from '../../mobile-web-shell/bridge-host-errors'
+import { decodeCanonicalBase64Bytes } from '../../transport/encryption/base64-byte-codec'
+import { mobileFileExtensionForMime } from '../media-picking/mobile-picked-file-name'
+import { freshCacheFolder } from '../media-picking/native-media-device'
 
 type Staged = { folder: Directory; file: FsFile; handle: FileHandle; byteLength: number }
 
diff --git a/mobile/src/platform/keyboard-occlusion.test.tsx b/mobile/src/platform/keyboard-occlusion.test.tsx
deleted file mode 100644
index c2615f7fc63..00000000000
--- a/mobile/src/platform/keyboard-occlusion.test.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-type Listener = (event: {
-  endCoordinates: { height: number; screenY?: number }
-  duration: number
-}) => void
-
-type KeyboardHarness = {
-  listeners: Map<string, Listener>
-  removed: string[]
-  platform: 'ios' | 'android'
-  // Count all subscriptions, not just surviving listeners, to detect transient duplicate keyboard work.
-  addListenerCalls: number
-  metrics: { height: number } | undefined
-}
-
-const keyboard = vi.hoisted((): KeyboardHarness => ({
-  listeners: new Map(),
-  removed: [],
-  platform: 'ios',
-  addListenerCalls: 0,
-  metrics: undefined
-}))
-
-const regions = vi.hoisted(
-  (): { listener: ((value: { keyboardInset?: number }) => void) | null; removed: boolean } => ({
-    listener: null,
-    removed: false
-  })
-)
-vi.mock('../layout/reserved-regions', () => ({
-  subscribeReservedRegionChanges: (listener: (value: { keyboardInset?: number }) => void) => {
-    regions.listener = listener
-    return () => {
-      regions.listener = null
-      regions.removed = true
-    }
-  }
-}))
-
-vi.mock('react-native', () => ({
-  Keyboard: {
-    metrics: () => keyboard.metrics,
-    addListener: (name: string, listener: Listener) => {
-      keyboard.addListenerCalls += 1
-      keyboard.listeners.set(name, listener)
-      return {
-        remove: () => {
-          keyboard.removed.push(name)
-          keyboard.listeners.delete(name)
-        }
-      }
-    }
-  },
-  Dimensions: { get: () => ({ height: 951 }) },
-  Platform: {
-    get OS() {
-      return keyboard.platform
-    }
-  }
-}))
-
-import type * as KeyboardOcclusion from './keyboard-occlusion'
-let keyboardModule: typeof KeyboardOcclusion
-
-const subscribeSoftKeyboard: typeof KeyboardOcclusion.subscribeSoftKeyboard = (...args) =>
-  keyboardModule.subscribeSoftKeyboard(...args)
-
-describe('the keyboard the phone reports', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    keyboardModule = await import('./keyboard-occlusion')
-    keyboard.listeners.clear()
-    keyboard.removed.length = 0
-    keyboard.platform = 'ios'
-    keyboard.addListenerCalls = 0
-    keyboard.metrics = undefined
-    regions.listener = null
-    regions.removed = false
-  })
-
-  it.each(['before', 'after'])('ignores an offscreen frame %s hide without reopening', (order) => {
-    const calls: string[] = []
-    const unsubscribe = subscribeSoftKeyboard(
-      (height, duration) => calls.push(`show ${height} ${duration}`),
-      (duration) => calls.push(`hide ${duration}`)
-    )
-    keyboard.listeners.get('keyboardWillShow')?.({ endCoordinates: { height: 306 }, duration: 250 })
-    const frame = () =>
-      keyboard.listeners.get('keyboardWillChangeFrame')?.({
-        endCoordinates: { height: 253, screenY: 951 },
-        duration: 180
-      })
-    if (order === 'before') {
-      frame()
-    }
-    keyboard.listeners.get('keyboardWillHide')?.({ endCoordinates: { height: 253 }, duration: 180 })
-    if (order === 'after') {
-      frame()
-    }
-    // An overlapping transition's in-window frame must not override the explicit hide either.
-    keyboard.listeners.get('keyboardWillChangeFrame')?.({
-      endCoordinates: { height: 253, screenY: 698 },
-      duration: 180
-    })
-    expect(calls).toEqual(['show 306 250', 'hide 180'])
-    keyboard.listeners.get('keyboardWillShow')?.({ endCoordinates: { height: 306 }, duration: 250 })
-    keyboard.listeners.get('keyboardWillChangeFrame')?.({
-      endCoordinates: { height: 391, screenY: 560 },
-      duration: 120
-    })
-    expect(calls.slice(-2)).toEqual(['show 306 250', 'show 391 120'])
-    unsubscribe()
-    expect(keyboard.listeners.size).toBe(3)
-  })
-
-  it('follows native geometry without keyboard events and preserves explicit hide ordering', () => {
-    const calls: string[] = []
-    const unsubscribe = subscribeSoftKeyboard(
-      (height) => calls.push(`show ${height}`),
-      () => calls.push('hide')
-    )
-    regions.listener?.({ keyboardInset: 495.5 })
-    expect(calls).toEqual([])
-    keyboard.listeners.get('keyboardWillShow')?.({ endCoordinates: { height: 495.5 }, duration: 0 })
-    regions.listener?.({})
-    regions.listener?.({ keyboardInset: 0 })
-    expect(calls).toEqual(['show 495.5'])
-    regions.listener?.({ keyboardInset: 311 })
-    expect(calls).toEqual(['show 495.5', 'show 311'])
-    keyboard.listeners.get('keyboardWillHide')?.({ endCoordinates: { height: 311 }, duration: 180 })
-    regions.listener?.({ keyboardInset: 495.5 })
-    regions.listener?.({ keyboardInset: 0 })
-    expect(calls).toEqual(['show 495.5', 'show 311', 'hide'])
-    keyboard.listeners.get('keyboardWillShow')?.({ endCoordinates: { height: 0 }, duration: 0 })
-    regions.listener?.({ keyboardInset: 311 })
-    expect(calls.slice(-2)).toEqual(['show 0', 'show 311'])
-    unsubscribe()
-    expect(regions.removed).toBe(false)
-  })
-})
diff --git a/mobile/src/platform/keyboard-close-blur.web.test.ts b/mobile/src/platform/keyboard/keyboard-close-blur.web.test.ts
similarity index 68%
rename from mobile/src/platform/keyboard-close-blur.web.test.ts
rename to mobile/src/platform/keyboard/keyboard-close-blur.web.test.ts
index 3a7c7347956..f9a275733f0 100644
--- a/mobile/src/platform/keyboard-close-blur.web.test.ts
+++ b/mobile/src/platform/keyboard/keyboard-close-blur.web.test.ts
@@ -79,38 +79,4 @@ describe('a keyboard the phone closes', () => {
 
     expect(document.activeElement).toBe(field)
   })
-
-  it('keeps focus and reopens the keyboard when Chromium hides it for a tapped autocorrected word', () => {
-    const field = focusedField(ANDROID)
-    startBlurringOnKeyboardClose()
-
-    field.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true }))
-    TextInputState.focusTextInput(field)
-    shellReports(300)
-    const focusSessions = vi.fn()
-    field.addEventListener('focus', focusSessions)
-    vi.advanceTimersByTime(400)
-    shellReports(0)
-    vi.advanceTimersByTime(100)
-
-    expect(document.activeElement).toBe(field)
-    expect(focusSessions).toHaveBeenCalledOnce()
-  })
-
-  it.each([
-    ['a touch elsewhere', 'body', 400],
-    ['a Back long after a touch on the field', 'field', 5000]
-  ] as const)('still ends focus on a close after %s', (_case, touched, waitMs) => {
-    const field = focusedField(ANDROID)
-    startBlurringOnKeyboardClose()
-    shellReports(300)
-
-    const target = touched === 'field' ? field : document.body
-    target.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true }))
-    vi.advanceTimersByTime(waitMs)
-    shellReports(0)
-    vi.advanceTimersByTime(1000)
-
-    expect(document.activeElement).not.toBe(field)
-  })
 })
diff --git a/mobile/src/platform/keyboard-close-blur.web.ts b/mobile/src/platform/keyboard/keyboard-close-blur.web.ts
similarity index 97%
rename from mobile/src/platform/keyboard-close-blur.web.ts
rename to mobile/src/platform/keyboard/keyboard-close-blur.web.ts
index 54087c6929e..f33878a6672 100644
--- a/mobile/src/platform/keyboard-close-blur.web.ts
+++ b/mobile/src/platform/keyboard/keyboard-close-blur.web.ts
@@ -1,5 +1,5 @@
 import { Keyboard } from 'react-native'
-import { hostOs } from './host-os.web'
+import { hostOs } from '../host-os.web'
 import { subscribeSoftKeyboard } from './keyboard-occlusion.web'
 
 // Chromium hides the IME itself to show a tapped autocorrected word's menu; Back comes with no touch.
diff --git a/mobile/src/platform/keyboard-occlusion.ts b/mobile/src/platform/keyboard/keyboard-occlusion.ts
similarity index 96%
rename from mobile/src/platform/keyboard-occlusion.ts
rename to mobile/src/platform/keyboard/keyboard-occlusion.ts
index fcca29cad05..366efba1f7a 100644
--- a/mobile/src/platform/keyboard-occlusion.ts
+++ b/mobile/src/platform/keyboard/keyboard-occlusion.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
 import { Dimensions, Keyboard } from 'react-native'
-import { subscribeReservedRegionChanges } from '../layout/reserved-regions'
-import { hostOs } from './host-os'
+import { subscribeReservedRegionChanges } from '../../layout/reserved-regions'
+import { hostOs } from '../host-os'
 
 export type SoftKeyboardState = { readonly height: number; readonly visible: boolean }
 
diff --git a/mobile/src/platform/keyboard-occlusion.web.ts b/mobile/src/platform/keyboard/keyboard-occlusion.web.ts
similarity index 100%
rename from mobile/src/platform/keyboard-occlusion.web.ts
rename to mobile/src/platform/keyboard/keyboard-occlusion.web.ts
diff --git a/mobile/src/platform/keyboard-persisting-taps.ts b/mobile/src/platform/keyboard/keyboard-persisting-taps.ts
similarity index 100%
rename from mobile/src/platform/keyboard-persisting-taps.ts
rename to mobile/src/platform/keyboard/keyboard-persisting-taps.ts
diff --git a/mobile/src/platform/primary-modifier-key.ts b/mobile/src/platform/keyboard/primary-modifier-key.ts
similarity index 87%
rename from mobile/src/platform/primary-modifier-key.ts
rename to mobile/src/platform/keyboard/primary-modifier-key.ts
index 769305b0da6..6e95d561b1c 100644
--- a/mobile/src/platform/primary-modifier-key.ts
+++ b/mobile/src/platform/keyboard/primary-modifier-key.ts
@@ -1,4 +1,4 @@
-import { hostOs } from './host-os'
+import { hostOs } from '../host-os'
 
 /** The submit chord's modifier: Cmd on an Apple keyboard (iPhone, iPad, Mac), Ctrl elsewhere. */
 export function primaryModifierKey(): 'Meta' | 'Control' {
diff --git a/mobile/src/platform/media-picker-test-shell.ts b/mobile/src/platform/media-picker-test-shell.ts
deleted file mode 100644
index e73d091ec5e..00000000000
--- a/mobile/src/platform/media-picker-test-shell.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// Model only observable staging/read/eof/release behavior with real verb schemas; native-media tests own device and cache details.
-import {
-  BRIDGE_MEDIA_READ_MAX_BYTES,
-  mediaNameParamsSchema,
-  mediaPickParamsSchema,
-  mediaReadParamsSchema,
-  mediaReleaseParamsSchema,
-  type BridgeMediaItem
-} from '../mobile-web-shell/bridge/bridge-media-verbs'
-import type { BridgeNativeVerb } from '../mobile-web-shell/bridge/bridge-native-verbs'
-import { BridgeNativeVerbRefusedError } from '../mobile-web-shell/bridge-host-errors'
-
-export type StagedTestMedia = {
-  readonly bytes: Uint8Array
-  readonly mime?: string
-  readonly width?: number
-  readonly height?: number
-  readonly name?: string
-}
-
-export type MediaTestShell = {
-  readonly calls: string[]
-  readonly released: string[]
-  readonly serveNativeVerb: (verb: BridgeNativeVerb, params: unknown) => Promise<unknown>
-}
-
-// Offset-derived bytes expose reordered chunks and dropped boundaries without relying on length.
-export function stagedTestBytes(byteLength: number): Uint8Array {
-  const bytes = new Uint8Array(byteLength)
-  for (let index = 0; index < byteLength; index += 1) {
-    bytes[index] = (index * 31 + 7) % 251
-  }
-  return bytes
-}
-
-export function encodeTestBase64(bytes: Uint8Array): string {
-  let binary = ''
-  for (const byte of bytes) {
-    binary += String.fromCharCode(byte)
-  }
-  return btoa(binary)
-}
-
-export function createMediaTestShell(options: {
-  readonly staged: Readonly<Partial<Record<string, readonly StagedTestMedia[]>>>
-  readonly refusePick?: BridgeNativeVerbRefusedError
-  // Short reads are legal; only eof promises completion.
-  readonly chunkBytes?: number
-  // Simulate premature eof so callers cannot silently upload a truncated file.
-  readonly endAt?: number
-}): MediaTestShell {
-  const calls: string[] = []
-  const released: string[] = []
-  const live = new Map<string, StagedTestMedia>()
-  let minted = 0
-
-  function hold(handle: string): StagedTestMedia {
-    const record = live.get(handle)
-    if (record === undefined) {
-      throw new BridgeNativeVerbRefusedError(
-        'native_media_handle_unknown',
-        'this session holds no staged item under that handle'
-      )
-    }
-    return record
-  }
-
-  return {
-    calls,
-    released,
-    serveNativeVerb: (verb, params) => {
-      if (verb === 'native.media.pick') {
-        // Parse the real verb schema so this fake cannot accept params the device would refuse.
-        const { source, multiple } = mediaPickParamsSchema.parse(params)
-        calls.push(`pick ${source} ${multiple ? 'multiple' : 'single'}`)
-        if (options.refusePick) {
-          return Promise.reject(options.refusePick)
-        }
-        const items: BridgeMediaItem[] = (options.staged[source] ?? []).map((item) => {
-          minted += 1
-          const handle = `media-${minted}`
-          live.set(handle, item)
-          return {
-            handle,
-            mime: item.mime ?? 'image/png',
-            byteLength: item.bytes.byteLength,
-            ...(item.width === undefined ? {} : { width: item.width }),
-            ...(item.height === undefined ? {} : { height: item.height })
-          }
-        })
-        return Promise.resolve({ items })
-      }
-      if (verb === 'native.media.read') {
-        const { handle, offset, length } = mediaReadParamsSchema.parse(params)
-        calls.push(`read ${handle} ${offset}:${length}`)
-        const record = hold(handle)
-        const served = Math.min(length, BRIDGE_MEDIA_READ_MAX_BYTES, options.chunkBytes ?? length)
-        const last = options.endAt ?? record.bytes.byteLength
-        const end = Math.min(offset + served, last)
-        return Promise.resolve({
-          base64: encodeTestBase64(record.bytes.subarray(offset, end)),
-          eof: end >= last
-        })
-      }
-      if (verb === 'native.media.name') {
-        const { handle } = mediaNameParamsSchema.parse(params)
-        calls.push(`name ${handle}`)
-        return Promise.resolve({ name: hold(handle).name ?? null })
-      }
-      const { handle } = mediaReleaseParamsSchema.parse(params)
-      calls.push(`release ${handle}`)
-      const held = live.delete(handle)
-      if (held) {
-        released.push(handle)
-      }
-      return Promise.resolve({ released: held })
-    }
-  }
-}
diff --git a/mobile/src/platform/media-picker-contract.ts b/mobile/src/platform/media-picking/media-picker-contract.ts
similarity index 95%
rename from mobile/src/platform/media-picker-contract.ts
rename to mobile/src/platform/media-picking/media-picker-contract.ts
index 6108257ba3e..5f446f9e764 100644
--- a/mobile/src/platform/media-picker-contract.ts
+++ b/mobile/src/platform/media-picking/media-picker-contract.ts
@@ -1,4 +1,4 @@
-import { CLIPBOARD_IMAGE_MAX_SOURCE_BYTES } from '../../../src/shared/clipboard-image'
+import { CLIPBOARD_IMAGE_MAX_SOURCE_BYTES } from '../../../../src/shared/clipboard-image'
 
 // Keep contracts/errors free of Expo imports so a page-side instanceof cannot pull native picker code into the bundle.
 
diff --git a/mobile/src/platform/media-picker.ts b/mobile/src/platform/media-picking/media-picker.ts
similarity index 71%
rename from mobile/src/platform/media-picker.ts
rename to mobile/src/platform/media-picking/media-picker.ts
index 3d22a3e8d83..2065fd1922f 100644
--- a/mobile/src/platform/media-picker.ts
+++ b/mobile/src/platform/media-picking/media-picker.ts
@@ -1,5 +1,8 @@
-import { pickMobileImage, pickMobileImages } from '../files/attachments/mobile-image-source-picker'
-import { pickMobileFiles } from '../files/attachments/mobile-file-source-picker'
+import {
+  pickMobileImage,
+  pickMobileImages
+} from '../../files/attachments/mobile-image-source-picker'
+import { pickMobileFiles } from '../../files/attachments/mobile-file-source-picker'
 import type { MediaPicker } from './media-picker-contract'
 
 // Keep Expo picker imports in the native sibling: their codegen lookup throws in browsers.
diff --git a/mobile/src/platform/media-picker.web.ts b/mobile/src/platform/media-picking/media-picker.web.ts
similarity index 94%
rename from mobile/src/platform/media-picker.web.ts
rename to mobile/src/platform/media-picking/media-picker.web.ts
index a41d502bf5f..21140e3755d 100644
--- a/mobile/src/platform/media-picker.web.ts
+++ b/mobile/src/platform/media-picking/media-picker.web.ts
@@ -1,15 +1,15 @@
 import { useMemo } from 'react'
-import type { BridgeMediaItem } from '../mobile-web-shell/bridge/bridge-media-verbs'
+import type { BridgeMediaItem } from '../../mobile-web-shell/bridge/bridge-media-verbs'
 import {
   readStagedMediaItem,
   releaseAllStagedMedia,
   releaseStagedMedia
-} from '../mobile-web-shell/bridge/staged-media-bytes'
+} from '../../mobile-web-shell/bridge/staged-media-bytes'
 import {
   NativeVerbError,
   useNativeVerbs,
   type NativeVerbs
-} from '../mobile-web-shell/bridge/use-native-verbs'
+} from '../../mobile-web-shell/bridge/use-native-verbs'
 import {
   MobileFileTooLargeError,
   type MediaPicker,
diff --git a/mobile/src/platform/mobile-picked-file-name.ts b/mobile/src/platform/media-picking/mobile-picked-file-name.ts
similarity index 100%
rename from mobile/src/platform/mobile-picked-file-name.ts
rename to mobile/src/platform/media-picking/mobile-picked-file-name.ts
diff --git a/mobile/src/platform/native-media-device.ts b/mobile/src/platform/media-picking/native-media-device.ts
similarity index 94%
rename from mobile/src/platform/native-media-device.ts
rename to mobile/src/platform/media-picking/native-media-device.ts
index 539bd16e6fe..6daea70e19a 100644
--- a/mobile/src/platform/native-media-device.ts
+++ b/mobile/src/platform/media-picking/native-media-device.ts
@@ -2,8 +2,8 @@ import * as Clipboard from 'expo-clipboard'
 import * as DocumentPicker from 'expo-document-picker'
 import { Directory, File as FsFile, Paths } from 'expo-file-system'
 import * as ImagePicker from 'expo-image-picker'
-import { agentReadableLibraryImageOptions } from '../files/attachments/mobile-image-source-picker'
-import type { MediaHandleRegistry } from '../mobile-web-shell/media-handle-registry'
+import { agentReadableLibraryImageOptions } from '../../files/attachments/mobile-image-source-picker'
+import type { MediaHandleRegistry } from '../../mobile-web-shell/media-handle-registry'
 import type { NativeMediaDeps } from './native-media'
 
 // Isolate native imports so handlers can be tested with injected device calls.
diff --git a/mobile/src/platform/native-media-stage-cleanup.test.ts b/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts
similarity index 98%
rename from mobile/src/platform/native-media-stage-cleanup.test.ts
rename to mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts
index b29c17c0e44..ace030069a7 100644
--- a/mobile/src/platform/native-media-stage-cleanup.test.ts
+++ b/mobile/src/platform/media-picking/native-media-stage-cleanup.test.ts
@@ -83,7 +83,7 @@ vi.mock('expo-file-system', () => ({
   Paths: { cache: 'file:///cache' }
 }))
 
-import { MediaHandleRegistry } from '../mobile-web-shell/media-handle-registry'
+import { MediaHandleRegistry } from '../../mobile-web-shell/media-handle-registry'
 import { createNativeMediaVerbServer } from './native-media'
 import { copyPickedMediaIntoCache, nativeMediaDeviceDeps } from './native-media-device'
 
diff --git a/mobile/src/platform/native-media.test.ts b/mobile/src/platform/media-picking/native-media.test.ts
similarity index 54%
rename from mobile/src/platform/native-media.test.ts
rename to mobile/src/platform/media-picking/native-media.test.ts
index 5ee9410f0d5..c2f8683270a 100644
--- a/mobile/src/platform/native-media.test.ts
+++ b/mobile/src/platform/media-picking/native-media.test.ts
@@ -1,30 +1,23 @@
-import { Buffer } from 'node:buffer'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
   BRIDGE_MEDIA_MAX_LIVE_HANDLES,
-  BRIDGE_MEDIA_READ_MAX_BYTES,
   mediaPickResultSchema,
   mediaReadResultSchema
-} from '../mobile-web-shell/bridge/bridge-media-verbs'
-import { readShellRefusalCode } from '../mobile-web-shell/bridge-host-errors'
-import { MediaHandleRegistry } from '../mobile-web-shell/media-handle-registry'
+} from '../../mobile-web-shell/bridge/bridge-media-verbs'
+import { readShellRefusalCode } from '../../mobile-web-shell/bridge-host-errors'
+import { MediaHandleRegistry } from '../../mobile-web-shell/media-handle-registry'
 
-import type { BridgeNativeVerb } from '../mobile-web-shell/bridge/bridge-native-verbs'
+import type { BridgeNativeVerb } from '../../mobile-web-shell/bridge/bridge-native-verbs'
 import { createNativeMediaVerbServer, type NativeMediaFile } from './native-media'
 
 const CACHE = 'file:///cache'
 
-// Track closed handles explicitly because a fake otherwise hides native descriptor leaks.
-const handles: { closed: boolean }[] = []
-
 function fakeFile(bytes: Uint8Array): NativeMediaFile {
   return {
     size: bytes.byteLength,
     open: () => {
       let cursor = 0
-      const ledger = { closed: false }
-      handles.push(ledger)
       return {
         get offset() {
           return cursor
@@ -37,9 +30,7 @@ function fakeFile(bytes: Uint8Array): NativeMediaFile {
           cursor += slice.byteLength
           return slice
         },
-        close: () => {
-          ledger.closed = true
-        }
+        close: () => {}
       }
     }
   }
@@ -120,7 +111,6 @@ function refusalOf(error: unknown): string | null {
 }
 
 beforeEach(() => {
-  handles.length = 0
   vi.restoreAllMocks()
 })
 
@@ -158,36 +148,6 @@ describe('picking', () => {
     expect(probe.registry.liveCount()).toBe(0)
   })
 
-  it('discards every copy if cleanup runs between staging and minting', async () => {
-    const providerUris = ['content://media/1', 'content://media/2']
-    const probe = harness({
-      launchLibrary: () =>
-        Promise.resolve({
-          canceled: false,
-          assets: providerUris.map((uri) => ({ uri, mimeType: 'image/jpeg' }))
-        })
-    })
-    for (const uri of providerUris) {
-      probe.files.set(uri, bytesOf(4096))
-    }
-    const picked = probe.serve('native.media.pick', { source: 'library', multiple: true })
-    await Promise.resolve()
-    expect(probe.copied).toHaveLength(2)
-    expect(probe.registry.liveCount()).toBe(0)
-    probe.registry.releaseAll()
-    const [live] = probe.registry.mint([
-      { uri: `${CACHE}/successor.png`, byteLength: 64, mime: 'image/png' }
-    ])
-    await expect(picked).resolves.toEqual({ items: [] })
-    expect(probe.discarded).toEqual(probe.copied.map(({ to }) => to))
-    expect(probe.registry.liveCount()).toBe(1)
-    expect(probe.registry.read(live?.handle ?? '', 0, 64)).toMatchObject({
-      uri: `${CACHE}/successor.png`,
-      end: 64,
-      eof: true
-    })
-  })
-
   it('refuses a pick up front when nothing is left, before the OS copies a byte', async () => {
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
     const launches: number[] = []
@@ -246,106 +206,6 @@ describe('picking', () => {
     warn.mockRestore()
   })
 
-  it.each([0, 2])(
-    'deletes an over-cap Files result while preserving %i prior handles',
-    async (held) => {
-      const liveUris = Array.from({ length: held }, (_, index) => `${CACHE}/held-${index}.png`)
-      const returnedUris = Array.from(
-        { length: BRIDGE_MEDIA_MAX_LIVE_HANDLES - held + 1 },
-        (_, index) => `${CACHE}/doc-${index}.pdf`
-      )
-      const probe = harness({
-        launchFiles: () =>
-          Promise.resolve({
-            canceled: false,
-            assets: returnedUris.map((uri) => ({ uri, mimeType: 'application/pdf' }))
-          })
-      })
-      for (const uri of liveUris) {
-        probe.files.set(uri, new Uint8Array(4096))
-      }
-      probe.registry.mint(liveUris.map((uri) => ({ uri, mime: 'image/png', byteLength: 4096 })))
-      for (const uri of returnedUris) {
-        probe.files.set(uri, new Uint8Array(1024 * 1024))
-      }
-      const storedBytes = (): number =>
-        [...probe.files.values()].reduce((bytes, file) => bytes + file.byteLength, 0)
-      expect(storedBytes()).toBe(returnedUris.length * 1024 * 1024 + held * 4096)
-      await expect(
-        probe.serve('native.media.pick', { source: 'files', multiple: true })
-      ).rejects.toSatisfy((error) => refusalOf(error) === 'native_media_handle_cap')
-      expect(probe.registry.liveCount()).toBe(held)
-      expect(probe.discarded).toEqual(returnedUris)
-      expect([...probe.files.keys()]).toEqual(liveUris)
-      expect(storedBytes()).toBe(held * 4096)
-      expect(probe.copied).toEqual([])
-      expect(probe.written).toEqual([])
-      probe.registry.releaseAll()
-      expect(probe.files.size).toBe(0)
-    }
-  )
-
-  it('leaves provider originals intact when refusing an over-cap mixed result', async () => {
-    const providerUri = 'content://media/external/images/media/42'
-    const ownedUris = Array.from(
-      { length: BRIDGE_MEDIA_MAX_LIVE_HANDLES },
-      (_, index) => `${CACHE}/picked-${index}.png`
-    )
-    const probe = harness({
-      launchFiles: () =>
-        Promise.resolve({
-          canceled: false,
-          assets: [providerUri, ...ownedUris].map((uri) => ({ uri, mimeType: 'image/png' }))
-        })
-    })
-    for (const uri of [providerUri, ...ownedUris]) {
-      probe.files.set(uri, new Uint8Array(1024 * 1024))
-    }
-    await expect(
-      probe.serve('native.media.pick', { source: 'files', multiple: true })
-    ).rejects.toSatisfy((error) => refusalOf(error) === 'native_media_handle_cap')
-    expect(probe.discarded).toEqual(ownedUris)
-    expect([...probe.files.keys()]).toEqual([providerUri])
-    expect(probe.files.get(providerUri)?.byteLength).toBe(1024 * 1024)
-    expect(probe.registry.liveCount()).toBe(0)
-    expect(probe.copied).toEqual([])
-  })
-
-  it('continues sweeping refused copies when one file cannot be deleted', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const returnedUris = Array.from(
-      { length: BRIDGE_MEDIA_MAX_LIVE_HANDLES + 1 },
-      (_, index) => `${CACHE}/doc-${index}.pdf`
-    )
-    const probe = harness({
-      launchFiles: () =>
-        Promise.resolve({
-          canceled: false,
-          assets: returnedUris.map((uri) => ({ uri, mimeType: 'application/pdf' }))
-        }),
-      discard: (uri) => {
-        probe.discarded.push(uri)
-        if (uri === returnedUris[0]) {
-          throw new Error('cache file is busy')
-        }
-        probe.files.delete(uri)
-      }
-    })
-    try {
-      for (const uri of returnedUris) {
-        probe.files.set(uri, new Uint8Array(1024 * 1024))
-      }
-      await expect(
-        probe.serve('native.media.pick', { source: 'files', multiple: true })
-      ).rejects.toSatisfy((error) => refusalOf(error) === 'native_media_handle_cap')
-      expect(probe.discarded).toEqual(returnedUris)
-      expect([...probe.files.keys()]).toEqual([returnedUris[0]])
-      expect(probe.registry.liveCount()).toBe(0)
-    } finally {
-      warn.mockRestore()
-    }
-  })
-
   it('refuses an item bigger than the staging ceiling, and deletes what it picked', async () => {
     const probe = harness({
       openFile: () => ({ size: 64 * 1024 * 1024, open: () => fakeFile(new Uint8Array()).open() })
@@ -357,84 +217,6 @@ describe('picking', () => {
   })
 })
 
-describe('reading chunks', () => {
-  async function staged(byteLength: number): Promise<{ probe: Harness; handle: string }> {
-    const probe = harness()
-    probe.files.set(`${CACHE}/lib.png`, bytesOf(byteLength))
-    const result = mediaPickResultSchema.parse(
-      await probe.serve('native.media.pick', { source: 'library', multiple: false })
-    )
-    return { probe, handle: result.items[0]?.handle ?? '' }
-  }
-
-  it('reads a million-byte item in order to eof, and the bytes come back whole', async () => {
-    const total = 1_000_000
-    const { probe, handle } = await staged(total)
-    const source = bytesOf(total)
-    const collected = new Uint8Array(total)
-    let offset = 0
-    let reads = 0
-    for (;;) {
-      const chunk = mediaReadResultSchema.parse(
-        await probe.serve('native.media.read', {
-          handle,
-          offset,
-          length: BRIDGE_MEDIA_READ_MAX_BYTES
-        })
-      )
-      reads += 1
-      const bytes = atob(chunk.base64)
-      collected.set(Buffer.from(bytes, 'latin1'), offset)
-      offset += bytes.length
-      expect(chunk.eof).toBe(offset === total)
-      if (chunk.eof) {
-        break
-      }
-    }
-    expect(reads).toBe(Math.ceil(total / BRIDGE_MEDIA_READ_MAX_BYTES))
-    expect(offset).toBe(total)
-    expect(Buffer.compare(collected, source)).toBe(0)
-  })
-
-  it('closes the file handle it opened, on the way out and on the way through a throw', async () => {
-    const { probe, handle } = await staged(64)
-    await probe.serve('native.media.read', { handle, offset: 0, length: 16 })
-    expect(handles).toHaveLength(1)
-    expect(handles[0]?.closed).toBe(true)
-
-    const failing = harness({
-      openFile: () => ({
-        size: 64,
-        open: () => {
-          const ledger = { closed: false }
-          handles.push(ledger)
-          return {
-            offset: 0,
-            readBytesSync: (): Uint8Array => {
-              throw new Error('the device stopped reading')
-            },
-            close: () => {
-              ledger.closed = true
-            }
-          }
-        }
-      })
-    })
-    failing.files.set(`${CACHE}/lib.png`, bytesOf(64))
-    const picked = mediaPickResultSchema.parse(
-      await failing.serve('native.media.pick', { source: 'library', multiple: false })
-    )
-    await expect(
-      failing.serve('native.media.read', {
-        handle: picked.items[0]?.handle ?? '',
-        offset: 0,
-        length: 16
-      })
-    ).rejects.toThrow(/stopped reading/)
-    expect(handles.at(-1)?.closed).toBe(true)
-  })
-})
-
 describe('a provider uri the Android picker can answer', () => {
   it('copies it into the cache and mints the handle over the copy, bytes intact', async () => {
     // Android may return an uncopied provider URI when MIME resolution fails; adopt it rather than lose the selected photo.
diff --git a/mobile/src/platform/native-media.ts b/mobile/src/platform/media-picking/native-media.ts
similarity index 93%
rename from mobile/src/platform/native-media.ts
rename to mobile/src/platform/media-picking/native-media.ts
index f50af3d2b3c..60c175a6082 100644
--- a/mobile/src/platform/native-media.ts
+++ b/mobile/src/platform/media-picking/native-media.ts
@@ -6,15 +6,13 @@ import {
   mediaReadParamsSchema,
   mediaReleaseParamsSchema,
   type BridgeMediaSource
-} from '../mobile-web-shell/bridge/bridge-media-verbs'
-import type { BridgeNativeVerb } from '../mobile-web-shell/bridge/bridge-native-verbs'
-import { BridgeNativeVerbRefusedError } from '../mobile-web-shell/bridge-host-errors'
-import {
-  MEDIA_STAGED_MAX_BYTES,
-  type MediaHandleRegistry,
-  type StagedMedia
-} from '../mobile-web-shell/media-handle-registry'
-import { MobileImageBase64Accumulator } from '../files/attachments/mobile-image-base64-accumulator'
+} from '../../mobile-web-shell/bridge/bridge-media-verbs'
+import type { BridgeNativeVerb } from '../../mobile-web-shell/bridge/bridge-native-verbs'
+import { BridgeNativeVerbRefusedError } from '../../mobile-web-shell/bridge-host-errors'
+import '../../mobile-web-shell/media-handle-registry'
+import type { MediaHandleRegistry, StagedMedia } from '../../mobile-web-shell/media-handle-registry'
+import { CLIPBOARD_IMAGE_MAX_SOURCE_BYTES as MEDIA_STAGED_MAX_BYTES } from '../../../../src/shared/clipboard-image'
+import { MobileImageBase64Accumulator } from '../../files/attachments/mobile-image-base64-accumulator'
 
 // Stage native media behind handles because raw/base64 image sizes exceed reply caps; inject device calls to test provider/cancel/size failures.
 
diff --git a/mobile/src/platform/microphone-screen-lock.test.ts b/mobile/src/platform/microphone-screen-lock.test.ts
deleted file mode 100644
index cd6b41eda40..00000000000
--- a/mobile/src/platform/microphone-screen-lock.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Hold activation open across release to expose the race that leaves a screen awake after capture ends.
-import { describe, expect, it } from 'vitest'
-import { createMicrophoneScreenLock, type ScreenLockDevice } from './microphone-screen-lock'
-
-function createTestDevice() {
-  const calls: string[] = []
-  const settles: (() => void)[] = []
-  let holdOpen = false
-  const answer = (name: string): Promise<void> => {
-    calls.push(name)
-    if (!holdOpen) {
-      return Promise.resolve()
-    }
-    return new Promise<void>((resolve) => settles.push(resolve))
-  }
-  const device: ScreenLockDevice = {
-    activate: (tag) => answer(`+${tag}`),
-    deactivate: (tag) => answer(`-${tag}`)
-  }
-  return {
-    device,
-    calls,
-    holdCallsOpen: () => {
-      holdOpen = true
-    },
-    settleAll: () => {
-      holdOpen = false
-      for (const settle of settles.splice(0)) {
-        settle()
-      }
-    }
-  }
-}
-
-async function flush(): Promise<void> {
-  await new Promise((resolve) => setTimeout(resolve, 0))
-}
-
-describe('the lock a microphone holds', () => {
-  it('asks the device nothing for a hold it already has', async () => {
-    const { device, calls } = createTestDevice()
-    const lock = createMicrophoneScreenLock(device, 'orca-mic')
-    lock.hold()
-    lock.hold()
-    await flush()
-    expect(calls).toEqual(['+orca-mic'])
-  })
-
-  it('asks the device nothing for a release of a tag it never took', async () => {
-    const { device, calls } = createTestDevice()
-    const lock = createMicrophoneScreenLock(device, 'orca-mic')
-    lock.release()
-    await flush()
-    expect(calls).toEqual([])
-    lock.hold()
-    lock.release()
-    lock.release()
-    await flush()
-    expect(calls).toEqual(['+orca-mic', '-orca-mic'])
-  })
-
-  it('never lets a slow activate land after the release that followed it', async () => {
-    const { device, calls, holdCallsOpen, settleAll } = createTestDevice()
-    const lock = createMicrophoneScreenLock(device, 'orca-mic')
-    holdCallsOpen()
-    lock.hold()
-    await flush()
-    // Release before activation settles must still deactivate last.
-    lock.release()
-    await flush()
-    expect(calls).toEqual(['+orca-mic'])
-    settleAll()
-    await flush()
-    expect(calls).toEqual(['+orca-mic', '-orca-mic'])
-  })
-
-  it('keeps working after a call the device refused', async () => {
-    const calls: string[] = []
-    const device: ScreenLockDevice = {
-      activate: (tag) => {
-        calls.push(`+${tag}`)
-        return Promise.reject(new Error('no current activity'))
-      },
-      deactivate: (tag) => {
-        calls.push(`-${tag}`)
-        return Promise.resolve()
-      }
-    }
-    const lock = createMicrophoneScreenLock(device, 'orca-mic')
-    lock.hold()
-    lock.release()
-    await flush()
-    // Failed wake locks must neither fail dictation nor block queued cleanup.
-    expect(calls).toEqual(['+orca-mic', '-orca-mic'])
-    lock.hold()
-    await flush()
-    expect(calls).toEqual(['+orca-mic', '-orca-mic', '+orca-mic'])
-  })
-})
diff --git a/mobile/src/platform/native-media-device.test.ts b/mobile/src/platform/native-media-device.test.ts
deleted file mode 100644
index 4f5dc2c2c8a..00000000000
--- a/mobile/src/platform/native-media-device.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-const expo = vi.hoisted(() => ({
-  launchImageLibraryAsync: vi.fn((_options: Record<string, unknown>) =>
-    Promise.resolve({ canceled: true })
-  ),
-  requestMediaLibraryPermissionsAsync: vi.fn(() => Promise.resolve({ granted: true })),
-  getDocumentAsync: vi.fn(() => Promise.resolve({ canceled: true })),
-  getImageAsync: vi.fn(() => Promise.resolve(null)),
-  deleted: new Array<string>(),
-  copiedBytes: new Array<{ uri: string; bytes: number[] }>(),
-  sources: new Map<string, Uint8Array>()
-}))
-
-vi.mock('expo-clipboard', () => ({ getImageAsync: expo.getImageAsync }))
-vi.mock('expo-document-picker', () => ({ getDocumentAsync: expo.getDocumentAsync }))
-vi.mock('react-native', () => ({ Platform: { OS: 'ios' } }))
-vi.mock('expo-image-picker', () => ({
-  UIImagePickerPreferredAssetRepresentationMode: { Compatible: 'compatible' },
-  launchImageLibraryAsync: expo.launchImageLibraryAsync,
-  requestMediaLibraryPermissionsAsync: expo.requestMediaLibraryPermissionsAsync
-}))
-vi.mock('expo-file-system', () => ({
-  File: class {
-    readonly uri: string
-    readonly size = 7
-    constructor(...parts: string[]) {
-      this.uri = parts.join('/')
-    }
-    create(): void {}
-    writeSync(content: string | Uint8Array): void {
-      if (typeof content !== 'string') {
-        expo.copiedBytes.push({ uri: this.uri, bytes: [...content] })
-      }
-    }
-    bytesSync(): Uint8Array {
-      const bytes = expo.sources.get(this.uri)
-      if (bytes === undefined) {
-        throw new Error(`nothing readable at ${this.uri}`)
-      }
-      return bytes
-    }
-    delete(): void {
-      expo.deleted.push(this.uri)
-    }
-  },
-  Paths: { cache: 'file:///cache' }
-}))
-
-import { copyPickedMediaIntoCache } from './native-media-device'
-
-describe('copying a provider uri into the cache', () => {
-  it('deletes the file it created when the source could not be read', () => {
-    // Clean failed writes here because callers never learn the new file’s name.
-    const before = expo.deleted.length
-    expect(() => copyPickedMediaIntoCache('content://media/gone')).toThrow(/nothing readable/)
-    expect(expo.deleted.length).toBe(before + 1)
-    expect(expo.deleted.at(-1)?.startsWith('file:///cache/orca-media-')).toBe(true)
-  })
-})
diff --git a/mobile/src/platform/native-pdf-view.ts b/mobile/src/platform/pdf-viewing/native-pdf-view.ts
similarity index 79%
rename from mobile/src/platform/native-pdf-view.ts
rename to mobile/src/platform/pdf-viewing/native-pdf-view.ts
index 4f86f7c2771..25ee48cd393 100644
--- a/mobile/src/platform/native-pdf-view.ts
+++ b/mobile/src/platform/pdf-viewing/native-pdf-view.ts
@@ -2,23 +2,23 @@ import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
 import { Platform } from 'react-native'
 import { File as FsFile } from 'expo-file-system'
 import { useFocusEffect, useNavigation } from 'expo-router'
-import { presentPdf } from '../../modules/orca-mobile-web-shell/src'
-import { getRuntimePathBasename } from '../../../src/shared/cross-platform-path'
-import { PDF_MIME_TYPE } from '../files/mobile-file-media'
+import { presentPdf } from '../../../modules/orca-mobile-web-shell/src/index'
+import { getRuntimePathBasename } from '../../../../src/shared/cross-platform-path'
+import { PDF_MIME_TYPE } from '../../files/media/mobile-file-media'
 import {
   downloadMobileFileMedia,
   MobileMediaHostOutdatedError,
   type MobileMediaSink
-} from '../files/mobile-file-media-download'
+} from '../../files/media/mobile-file-media-download'
 import {
   pdfViewParamsSchema,
   type BridgePdfOpenParams
-} from '../mobile-web-shell/bridge/bridge-native-verbs'
-import { BridgeNativeVerbRefusedError } from '../mobile-web-shell/bridge-host-errors'
-import { scopeRpcClientToExecutionHost } from '../worktree/execution-host-scoped-rpc-client'
-import { useHostClient } from '../transport/connection/host-client-hooks'
-import { discardUnreturnedMediaFile, freshCacheFolder } from './native-media-device'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+} from '../../mobile-web-shell/bridge/bridge-native-verbs'
+import { BridgeNativeVerbRefusedError } from '../../mobile-web-shell/bridge-host-errors'
+import { scopeRpcClientToExecutionHost } from '../../worktree/execution-host-scoped-rpc-client'
+import { useHostClient } from '../../transport/connection/host-client-hooks'
+import { discardUnreturnedMediaFile, freshCacheFolder } from '../media-picking/native-media-device'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 
 function pdfFileSink(file: FsFile): MobileMediaSink {
   file.create({ overwrite: true })
diff --git a/mobile/src/platform/pdf-opener-contract.ts b/mobile/src/platform/pdf-viewing/pdf-opener-contract.ts
similarity index 100%
rename from mobile/src/platform/pdf-opener-contract.ts
rename to mobile/src/platform/pdf-viewing/pdf-opener-contract.ts
diff --git a/mobile/src/platform/pdf-opener.ts b/mobile/src/platform/pdf-viewing/pdf-opener.ts
similarity index 100%
rename from mobile/src/platform/pdf-opener.ts
rename to mobile/src/platform/pdf-viewing/pdf-opener.ts
diff --git a/mobile/src/platform/pdf-opener.web.ts b/mobile/src/platform/pdf-viewing/pdf-opener.web.ts
similarity index 84%
rename from mobile/src/platform/pdf-opener.web.ts
rename to mobile/src/platform/pdf-viewing/pdf-opener.web.ts
index 46b9203c639..0a87ea7d194 100644
--- a/mobile/src/platform/pdf-opener.web.ts
+++ b/mobile/src/platform/pdf-viewing/pdf-opener.web.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
-import { parseExecutionHostId } from '../../../src/shared/execution-host'
-import { NativeVerbError, useNativeVerbs } from '../mobile-web-shell/bridge/use-native-verbs'
-import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
+import { parseExecutionHostId } from '../../../../src/shared/execution-host'
+import { NativeVerbError, useNativeVerbs } from '../../mobile-web-shell/bridge/use-native-verbs'
+import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
 import { PdfOpenRefusedError, type PdfOpener } from './pdf-opener-contract'
 
 // Older shells lack the verbs, so callers get null and ask for an app update instead.
diff --git a/mobile/src/platform/shell-storage.ts b/mobile/src/platform/shell-storage/shell-storage.ts
similarity index 100%
rename from mobile/src/platform/shell-storage.ts
rename to mobile/src/platform/shell-storage/shell-storage.ts
diff --git a/mobile/src/platform/shell-storage.web.ts b/mobile/src/platform/shell-storage/shell-storage.web.ts
similarity index 77%
rename from mobile/src/platform/shell-storage.web.ts
rename to mobile/src/platform/shell-storage/shell-storage.web.ts
index ff88ce7f1ba..bd53c374a62 100644
--- a/mobile/src/platform/shell-storage.web.ts
+++ b/mobile/src/platform/shell-storage/shell-storage.web.ts
@@ -1,5 +1,5 @@
 import { useSyncExternalStore } from 'react'
-import { usePageBridgeClientIfPresent } from '../transport/connection/client-context.web'
+import { usePageBridgeClientIfPresent } from '../../transport/connection/client-context.web'
 
 export function useShellStorage(): Readonly<Record<string, string>> | null {
   const client = usePageBridgeClientIfPresent()
diff --git a/mobile/src/platform/native-speech-device.ts b/mobile/src/platform/speech/native-speech-device.ts
similarity index 81%
rename from mobile/src/platform/native-speech-device.ts
rename to mobile/src/platform/speech/native-speech-device.ts
index d2e46302426..b17a8632405 100644
--- a/mobile/src/platform/native-speech-device.ts
+++ b/mobile/src/platform/speech/native-speech-device.ts
@@ -5,8 +5,8 @@ import {
   speechFinish,
   speechStart
 } from '@orca/expo-two-way-audio'
-import { loadDictationEnginePreference } from '../storage/dictation-engine-preference'
-import { NATIVE_AUDIO_DEVICE_SAMPLE_RATE } from './native-audio-device'
+import { loadDictationEnginePreference } from '../../storage/dictation-engine-preference'
+import { NATIVE_AUDIO_DEVICE_SAMPLE_RATE } from '../audio-capture/native-audio-device'
 import type { NativeSpeechEngine } from './native-speech'
 
 // Isolate the device module so tests drive the server with a fake engine.
diff --git a/mobile/src/platform/native-speech.test.ts b/mobile/src/platform/speech/native-speech.test.ts
similarity index 97%
rename from mobile/src/platform/native-speech.test.ts
rename to mobile/src/platform/speech/native-speech.test.ts
index 62a5be12d16..af1eb75f40a 100644
--- a/mobile/src/platform/native-speech.test.ts
+++ b/mobile/src/platform/speech/native-speech.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { DictationEnginePreference } from '../mobile-web-shell/bridge/bridge-speech-verbs'
+import type { DictationEnginePreference } from '../../mobile-web-shell/bridge/bridge-speech-verbs'
 import { createNativeSpeechServer, type NativeSpeechEngine } from './native-speech'
 
 function engineWith(preference: DictationEnginePreference): NativeSpeechEngine {
diff --git a/mobile/src/platform/native-speech.ts b/mobile/src/platform/speech/native-speech.ts
similarity index 99%
rename from mobile/src/platform/native-speech.ts
rename to mobile/src/platform/speech/native-speech.ts
index 463132d9866..c3aeebe2579 100644
--- a/mobile/src/platform/native-speech.ts
+++ b/mobile/src/platform/speech/native-speech.ts
@@ -4,7 +4,7 @@ import {
   type BridgeSpeechFailure,
   type BridgeSpeechRead,
   type DictationEnginePreference
-} from '../mobile-web-shell/bridge/bridge-speech-verbs'
+} from '../../mobile-web-shell/bridge/bridge-speech-verbs'
 
 // The shell side of native.speech.act. The recognizer itself lives in the native audio module; this keeps its events between the page's polls.
 
diff --git a/mobile/src/platform/on-device-speech-contract.ts b/mobile/src/platform/speech/on-device-speech-contract.ts
similarity index 89%
rename from mobile/src/platform/on-device-speech-contract.ts
rename to mobile/src/platform/speech/on-device-speech-contract.ts
index 3fc61546b91..ea480c17585 100644
--- a/mobile/src/platform/on-device-speech-contract.ts
+++ b/mobile/src/platform/speech/on-device-speech-contract.ts
@@ -3,7 +3,7 @@ import type {
   BridgeSpeechRead,
   BridgeSpeechStartResult,
   BridgeSpeechStatusResult
-} from '../mobile-web-shell/bridge/bridge-speech-verbs'
+} from '../../mobile-web-shell/bridge/bridge-speech-verbs'
 
 // The phone's own recognizer as dictation sees it, in the phone's language. Any rejection means "use the computer".
 export type OnDeviceSpeech = {
diff --git a/mobile/src/platform/on-device-speech-locale.ts b/mobile/src/platform/speech/on-device-speech-locale.ts
similarity index 77%
rename from mobile/src/platform/on-device-speech-locale.ts
rename to mobile/src/platform/speech/on-device-speech-locale.ts
index cf5edb0684e..ce0bde3c208 100644
--- a/mobile/src/platform/on-device-speech-locale.ts
+++ b/mobile/src/platform/speech/on-device-speech-locale.ts
@@ -1,4 +1,4 @@
-import { readDeviceUiLocaleTags } from '../i18n/system-ui-locale'
+import { readDeviceUiLocaleTags } from '../../i18n/system-ui-locale'
 
 // The phone's first language, read the same way in the shell's settings and the page, so both ask the recognizer about one locale.
 export function onDeviceSpeechLocale(): string {
diff --git a/mobile/src/platform/on-device-speech-locale.web.ts b/mobile/src/platform/speech/on-device-speech-locale.web.ts
similarity index 100%
rename from mobile/src/platform/on-device-speech-locale.web.ts
rename to mobile/src/platform/speech/on-device-speech-locale.web.ts
diff --git a/mobile/src/platform/on-device-speech.ts b/mobile/src/platform/speech/on-device-speech.ts
similarity index 80%
rename from mobile/src/platform/on-device-speech.ts
rename to mobile/src/platform/speech/on-device-speech.ts
index b592de40404..6151b188895 100644
--- a/mobile/src/platform/on-device-speech.ts
+++ b/mobile/src/platform/speech/on-device-speech.ts
@@ -1,4 +1,4 @@
-import type { DictationTerm } from '../../../src/shared/dictation-dictionary'
+import type { DictationTerm } from '../../../../src/shared/dictation-dictionary'
 import type { OnDeviceSpeech } from './on-device-speech-contract'
 
 // The session screen is a page in the shell (on-device-speech.web.ts); native screens dictate through the computer.
diff --git a/mobile/src/platform/on-device-speech.web.test.tsx b/mobile/src/platform/speech/on-device-speech.web.test.tsx
similarity index 96%
rename from mobile/src/platform/on-device-speech.web.test.tsx
rename to mobile/src/platform/speech/on-device-speech.web.test.tsx
index 2bcf77019fa..efc8742c704 100644
--- a/mobile/src/platform/on-device-speech.web.test.tsx
+++ b/mobile/src/platform/speech/on-device-speech.web.test.tsx
@@ -4,7 +4,7 @@ import { act, create } from 'react-test-renderer'
 import { describe, expect, it, vi } from 'vitest'
 import type { OnDeviceSpeech } from './on-device-speech-contract'
 
-vi.mock('../mobile-web-shell/bridge/use-native-verbs', () => {
+vi.mock('../../mobile-web-shell/bridge/use-native-verbs', () => {
   const verbs = {
     canRecognizeSpeech: true,
     speechStatus: async () => ({ status: 'ready', locale: 'de-DE', preference: 'automatic' }),
diff --git a/mobile/src/platform/on-device-speech.web.ts b/mobile/src/platform/speech/on-device-speech.web.ts
similarity index 90%
rename from mobile/src/platform/on-device-speech.web.ts
rename to mobile/src/platform/speech/on-device-speech.web.ts
index fbaee133ffe..e9df5bb33ec 100644
--- a/mobile/src/platform/on-device-speech.web.ts
+++ b/mobile/src/platform/speech/on-device-speech.web.ts
@@ -1,7 +1,7 @@
 import { useLayoutEffect, useMemo, useRef } from 'react'
-import type { DictationTerm } from '../../../src/shared/dictation-dictionary'
-import { createDictationTextPipeline } from '../../../src/shared/dictation-text-pipeline'
-import { useNativeVerbs, type NativeVerbs } from '../mobile-web-shell/bridge/use-native-verbs'
+import type { DictationTerm } from '../../../../src/shared/dictation-dictionary'
+import { createDictationTextPipeline } from '../../../../src/shared/dictation-text-pipeline'
+import { useNativeVerbs, type NativeVerbs } from '../../mobile-web-shell/bridge/use-native-verbs'
 import type { OnDeviceSpeech } from './on-device-speech-contract'
 import { onDeviceSpeechLocale } from './on-device-speech-locale'
 
diff --git a/mobile/src/platform/live-input-composing-range.test.ts b/mobile/src/platform/text-input/live-input-composing-range.test.ts
similarity index 100%
rename from mobile/src/platform/live-input-composing-range.test.ts
rename to mobile/src/platform/text-input/live-input-composing-range.test.ts
diff --git a/mobile/src/platform/live-input-composing-range.ts b/mobile/src/platform/text-input/live-input-composing-range.ts
similarity index 100%
rename from mobile/src/platform/live-input-composing-range.ts
rename to mobile/src/platform/text-input/live-input-composing-range.ts
diff --git a/mobile/src/platform/text-input-content-height.ts b/mobile/src/platform/text-input/text-input-content-height.ts
similarity index 100%
rename from mobile/src/platform/text-input-content-height.ts
rename to mobile/src/platform/text-input/text-input-content-height.ts
diff --git a/mobile/src/platform/text-input-content-height.web.ts b/mobile/src/platform/text-input/text-input-content-height.web.ts
similarity index 100%
rename from mobile/src/platform/text-input-content-height.web.ts
rename to mobile/src/platform/text-input/text-input-content-height.web.ts
diff --git a/mobile/src/platform/text-input-font-size.ts b/mobile/src/platform/text-input/text-input-font-size.ts
similarity index 51%
rename from mobile/src/platform/text-input-font-size.ts
rename to mobile/src/platform/text-input/text-input-font-size.ts
index d82c626b43d..dabbc5a32d8 100644
--- a/mobile/src/platform/text-input-font-size.ts
+++ b/mobile/src/platform/text-input/text-input-font-size.ts
@@ -1,3 +1,3 @@
-import { typography } from '../theme/mobile-theme'
+import { typography } from '../../theme/mobile-theme'
 
 export const TEXT_INPUT_FONT_SIZE = typography.bodySize
diff --git a/mobile/src/platform/text-input-font-size.web.ts b/mobile/src/platform/text-input/text-input-font-size.web.ts
similarity index 87%
rename from mobile/src/platform/text-input-font-size.web.ts
rename to mobile/src/platform/text-input/text-input-font-size.web.ts
index 1cd340159d0..628738be7ea 100644
--- a/mobile/src/platform/text-input-font-size.web.ts
+++ b/mobile/src/platform/text-input/text-input-font-size.web.ts
@@ -1,4 +1,4 @@
-import { typography } from '../theme/mobile-theme'
+import { typography } from '../../theme/mobile-theme'
 
 // iOS zooms focused inputs below 16px; share this floor with the route-closure census.
 export const TEXT_INPUT_FONT_SIZE_FLOOR = 16
diff --git a/mobile/src/platform/text-input-handle.ts b/mobile/src/platform/text-input/text-input-handle.ts
similarity index 100%
rename from mobile/src/platform/text-input-handle.ts
rename to mobile/src/platform/text-input/text-input-handle.ts
diff --git a/mobile/src/platform/text-input-selection-reveal.web.ts b/mobile/src/platform/text-input/text-input-selection-reveal.web.ts
similarity index 100%
rename from mobile/src/platform/text-input-selection-reveal.web.ts
rename to mobile/src/platform/text-input/text-input-selection-reveal.web.ts
diff --git a/mobile/src/platform/use-native-device-verbs.ts b/mobile/src/platform/use-native-device-verbs.ts
index 647133dea35..68fb6c4575d 100644
--- a/mobile/src/platform/use-native-device-verbs.ts
+++ b/mobile/src/platform/use-native-device-verbs.ts
@@ -2,14 +2,17 @@ import { useEffect, useMemo } from 'react'
 import type { BridgeNativeVerb } from '../mobile-web-shell/bridge/bridge-native-verbs'
 import type { BRIDGE_STORE_VERB } from '../mobile-web-shell/bridge/bridge-store-verb'
 import { useMediaHandleRegistry } from '../mobile-web-shell/use-media-handle-registry'
-import { createNativeAudioCapture } from './native-audio'
-import { NATIVE_AUDIO_DEVICE_SAMPLE_RATE, nativeAudioDeviceEngine } from './native-audio-device'
-import { createNativeSpeechServer } from './native-speech'
-import { nativeSpeechDeviceEngine } from './native-speech-device'
-import { serveNativeClipboardVerb } from './native-clipboard'
-import { serveNativeAnnounceVerb } from './native-accessibility-announce'
-import { createNativeMediaVerbServer } from './native-media'
-import { discardStagedMedia, nativeMediaDeviceDeps } from './native-media-device'
+import { createNativeAudioCapture } from './audio-capture/native-audio'
+import {
+  NATIVE_AUDIO_DEVICE_SAMPLE_RATE,
+  nativeAudioDeviceEngine
+} from './audio-capture/native-audio-device'
+import { createNativeSpeechServer } from './speech/native-speech'
+import { nativeSpeechDeviceEngine } from './speech/native-speech-device'
+import { serveNativeClipboardVerb } from './clipboard/native-clipboard'
+import { serveNativeAnnounceVerb } from './accessibility/native-accessibility-announce'
+import { createNativeMediaVerbServer } from './media-picking/native-media'
+import { discardStagedMedia, nativeMediaDeviceDeps } from './media-picking/native-media-device'
 
 export type NativeDeviceVerb = Exclude<
   BridgeNativeVerb,
diff --git a/mobile/src/platform/view-measurement/page-box-contract.ts b/mobile/src/platform/view-measurement/page-box-contract.ts
new file mode 100644
index 00000000000..b485b0f65a5
--- /dev/null
+++ b/mobile/src/platform/view-measurement/page-box-contract.ts
@@ -0,0 +1 @@
+export type PageBox = { left: number; top: number; width: number; height: number }
diff --git a/mobile/src/platform/page-box.ts b/mobile/src/platform/view-measurement/page-box.ts
similarity index 80%
rename from mobile/src/platform/page-box.ts
rename to mobile/src/platform/view-measurement/page-box.ts
index 32d859854d7..1821533a492 100644
--- a/mobile/src/platform/page-box.ts
+++ b/mobile/src/platform/view-measurement/page-box.ts
@@ -1,6 +1,6 @@
 import type { HostInstance } from 'react-native'
 
-export type PageBox = { left: number; top: number; width: number; height: number }
+import type { PageBox } from './page-box-contract'
 
 // A view's box in page coordinates, the space touch events report pageX/pageY in; null when it has none.
 export function measurePageBox(target: HostInstance, onBox: (box: PageBox | null) => void): void {
diff --git a/mobile/src/platform/page-box.web.ts b/mobile/src/platform/view-measurement/page-box.web.ts
similarity index 89%
rename from mobile/src/platform/page-box.web.ts
rename to mobile/src/platform/view-measurement/page-box.web.ts
index 604e33f09fa..fe28a65be5f 100644
--- a/mobile/src/platform/page-box.web.ts
+++ b/mobile/src/platform/view-measurement/page-box.web.ts
@@ -1,7 +1,5 @@
 import type { View } from 'react-native'
-import type { PageBox } from './page-box'
-
-export type { PageBox } from './page-box'
+import type { PageBox } from './page-box-contract'
 
 function hasClientRect(node: unknown): node is { getBoundingClientRect: () => DOMRect } {
   return (
diff --git a/mobile/src/query/first-paint-query-keys.ts b/mobile/src/query/first-paint-query-keys.ts
index c36ff57d591..da7f079a74b 100644
--- a/mobile/src/query/first-paint-query-keys.ts
+++ b/mobile/src/query/first-paint-query-keys.ts
@@ -10,14 +10,14 @@ import {
   hostWorktreeCatalogKey,
   hostWorktreeCatalogQuery,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
-import { hostViewFamily, hostViewKey } from '../host-screen/host-view-memory'
-import { hostProjectSectionsQuery } from '../host-screen/use-host-project-sections'
+} from '../host-screen/catalog/host-list-queries'
+import { hostViewFamily, hostViewKey } from '../host-screen/view-settings/host-view-memory'
+import { hostProjectSectionsQuery } from '../host-screen/catalog/use-host-project-sections'
 import { sessionTabsFamily, sessionTabsKey } from '../session/tabs/mobile-session-last-tabs'
 import type { MobileSessionTab } from '../session/tabs/mobile-session-tabs'
 import { activeSessionTabOf } from '../session/tabs/active-session-tab'
 import { storedTabChatTranscriptIdentity } from '../session/native-chat/transcript/mobile-native-chat-transcript-store'
-import { gitStatusQuery } from '../source-control/mobile-git-status-query'
+import { gitStatusQuery } from '../source-control/changes/mobile-git-status-query'
 import { firstPaintTaskKeys } from '../tasks/screen-state/task-query-storage'
 import { hostQueryKey } from './host-query-key'
 import { persistedHostQueryKey, type PersistedHostQueryKey } from './host-query-persistence'
diff --git a/mobile/src/query/host-query-persistence.test.ts b/mobile/src/query/host-query-persistence.test.ts
index 4439806d94c..153cf64c71d 100644
--- a/mobile/src/query/host-query-persistence.test.ts
+++ b/mobile/src/query/host-query-persistence.test.ts
@@ -1,12 +1,11 @@
-import { hashKey, QueryClient } from '@tanstack/react-query'
+import { QueryClient } from '@tanstack/react-query'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { OrcaQueryStoreBackend } from '../device-store/query-storage'
-import { hostWorktreeCatalogKey, hostWorktreeCatalogQuery } from '../host-screen/host-list-queries'
 import {
-  createHostQueryPersistence,
-  holdsRestoredHostQueryData,
-  persistedHostQueryKey
-} from './host-query-persistence'
+  hostWorktreeCatalogKey,
+  hostWorktreeCatalogQuery
+} from '../host-screen/catalog/host-list-queries'
+import { createHostQueryPersistence, persistedHostQueryKey } from './host-query-persistence'
 
 vi.mock('react-native', () => ({ AppState: {} }))
 
@@ -123,44 +122,4 @@ describe('createHostQueryPersistence', () => {
 
     expect(relaunched.getQueryData(key)).toBe(live)
   })
-
-  it.each([
-    { replaceOnHearing: false, expected: [true, false] },
-    { replaceOnHearing: true, expected: [true, false, false] }
-  ])(
-    "marks restored data as an earlier launch's before anyone hears of it, until this launch's own answer (a listener's replacement: $replaceOnHearing)",
-    async ({ replaceOnHearing, expected }) => {
-      const store = memoryStore('host-a')
-      await storeFromEarlierLaunch(store, [liveRow])
-
-      const relaunched = new QueryClient()
-      const persistence = createHostQueryPersistence(relaunched, store.backend)
-      relaunched.getQueryCache().build(relaunched, {
-        queryKey: key,
-        meta: { persist: hostWorktreeCatalogQuery.persist }
-      })
-      const heard: boolean[] = []
-      const replacement = { snapshotId: 'snap-8', worktrees: [liveRow] }
-      relaunched.getQueryCache().subscribe((event) => {
-        if (event.type === 'updated' && event.action.type === 'success') {
-          heard.push(holdsRestoredHostQueryData(relaunched, hashKey(key)))
-          // A listener replacing the restored rows as it hears of them.
-          if (replaceOnHearing && heard.length === 1) {
-            relaunched.setQueryData(key, replacement, { updatedAt: SAVED_AT - 2 })
-          }
-        }
-      })
-      const restoring = persistence.restore(firstPaint)
-      await vi.runAllTimersAsync()
-      await restoring
-      // A live answer timed before the stored one, as after a clock correction, is still this launch's.
-      relaunched.setQueryData(
-        key,
-        { snapshotId: 'snap-8', worktrees: [liveRow] },
-        { updatedAt: SAVED_AT - 1 }
-      )
-
-      expect(heard).toEqual(expected)
-    }
-  )
 })
diff --git a/mobile/src/session/MobileSessionActiveContent.tsx b/mobile/src/session/MobileSessionActiveContent.tsx
index b23e9941286..26de5c97e3d 100644
--- a/mobile/src/session/MobileSessionActiveContent.tsx
+++ b/mobile/src/session/MobileSessionActiveContent.tsx
@@ -1,14 +1,14 @@
 import { useCallback, useMemo, useState } from 'react'
-import { computeActiveTerminalKeyboardLift } from '../terminal/terminal-keyboard-avoidance-lift'
+import { computeActiveTerminalKeyboardLift } from '../terminal/keyboard/terminal-keyboard-avoidance-lift'
 import {
   terminalPaneDirection,
   terminalPaneKeyboardLayout
-} from '../terminal/session/mobile-terminal-pane-layout'
+} from '../terminal/session/pane-layout/mobile-terminal-pane-layout'
 import { Animated, View, Text, Pressable, ActivityIndicator } from 'react-native'
 import { saveTerminalTextScale } from '../storage/preferences'
 import { MobileBrowserPane } from '../browser/MobileBrowserPane'
-import { TerminalPaneView } from '../terminal/session/TerminalPaneView'
-import { MountedTerminalPanes } from '../terminal/session/mounted-terminal-lru'
+import { TerminalPaneView } from '../terminal/session/pane-layout/TerminalPaneView'
+import { MountedTerminalPanes } from '../terminal/session/pane-layout/mounted-terminal-lru'
 import { MobileNativeChatOverlay } from './native-chat/MobileNativeChatOverlay'
 import { mobileSessionNativeChatHostOutage } from './native-chat/mobile-native-chat-host-outage'
 import { MobileAgentMessageProvider } from './native-chat/transcript/MobileAgentMessageProvider'
@@ -21,7 +21,7 @@ import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { styles } from './mobile-session-styles'
 import type { MobileSessionController } from './use-mobile-session-controller'
-import { useMobileSessionContentKeyboardLift } from '../terminal/session/use-mobile-session-keyboard-lift'
+import { useMobileSessionContentKeyboardLift } from '../terminal/session/input-controls/use-mobile-session-keyboard-lift'
 import { useOpenUrlInOrca } from '../browser/tab-navigation/use-open-url-in-orca'
 import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
 import { useOpenHostAccounts } from '../accounts/use-open-mobile-accounts'
@@ -32,7 +32,7 @@ import { MobileSessionContentState } from './MobileSessionContentState'
 import { MarkdownReader } from '../files/session-documents/MobileSessionMarkdownReader'
 import { markdownTabDraftKey } from '../drafts/document-edit-draft-rows'
 import { workspaceDraftRowKey } from '../drafts/durable-draft-rows'
-import { loadMarkdownPreviewImage } from '../files/mobile-markdown-image-source'
+import { loadMarkdownPreviewImage } from '../files/markdown/mobile-markdown-image-source'
 
 export function MobileSessionActiveContent({
   controller
diff --git a/mobile/src/session/MobileSessionCommandDock.tsx b/mobile/src/session/MobileSessionCommandDock.tsx
index b5bbdc7d216..0091ef31272 100644
--- a/mobile/src/session/MobileSessionCommandDock.tsx
+++ b/mobile/src/session/MobileSessionCommandDock.tsx
@@ -3,19 +3,19 @@ import { View, type HostInstance } from 'react-native'
 import { Keyboard as KeyboardIcon } from 'lucide-react-native'
 import { composerInputStyles as inputStyles } from '../components/composer-input/composer-input-styles'
 import { TextField } from '../components/composer-input/TextField'
-import { MobileTerminalLiveInputStatus } from '../terminal/session/MobileTerminalLiveInputStatus'
-import { MobileTerminalInputActions } from '../terminal/session/MobileTerminalInputActions'
-import { MobileSessionAccessoryKeys } from '../terminal/session/MobileSessionAccessoryKeys'
-import { MobileTerminalMoreKeysSheet } from '../terminal/session/MobileTerminalMoreKeysSheet'
+import { MobileTerminalLiveInputStatus } from '../terminal/session/input-controls/MobileTerminalLiveInputStatus'
+import { MobileTerminalInputActions } from '../terminal/session/input-controls/MobileTerminalInputActions'
+import { MobileSessionAccessoryKeys } from '../terminal/session/accessory-keys/MobileSessionAccessoryKeys'
+import { MobileTerminalMoreKeysSheet } from '../terminal/session/accessory-keys/MobileTerminalMoreKeysSheet'
 import { sessionCommandDockShown } from './mobile-session-command-dock-shown'
-import { useSessionTerminalKeyRail } from '../terminal/session/use-session-terminal-key-rail'
-import { terminalDockStyles as dockStyles } from '../terminal/session/terminal-dock-styles'
+import { useSessionTerminalKeyRail } from '../terminal/session/accessory-keys/use-session-terminal-key-rail'
+import { terminalDockStyles as dockStyles } from '../terminal/session/accessory-keys/terminal-dock-styles'
 import { colors } from '../theme/mobile-theme'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type { MobileSessionController } from './use-mobile-session-controller'
-import { useMobileSessionKeyboardLift } from '../terminal/session/use-mobile-session-keyboard-lift'
-import { useLiveInputCaptureText } from '../terminal/session/live-input-capture'
+import { useMobileSessionKeyboardLift } from '../terminal/session/input-controls/use-mobile-session-keyboard-lift'
+import { useLiveInputCaptureText } from '../terminal/session/input-controls/live-input-capture'
 
 // The key row above one live field: every letter typed goes straight to the terminal, shell or agent.
 export function MobileSessionCommandDock({ controller }: { controller: MobileSessionController }) {
diff --git a/mobile/src/session/MobileSessionSheets.tsx b/mobile/src/session/MobileSessionSheets.tsx
index 7cf3bf558db..5edccec5776 100644
--- a/mobile/src/session/MobileSessionSheets.tsx
+++ b/mobile/src/session/MobileSessionSheets.tsx
@@ -1,21 +1,21 @@
 import { Platform } from 'react-native'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { getRepoIdFromWorktreeId } from '../../../src/shared/worktree/id'
-import { useClipboardWriter } from '../platform/clipboard'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import { Copy, FileText, RefreshCw } from 'lucide-react-native'
-import { MobileSessionTerminalLayoutSheet } from '../terminal/session/MobileSessionTerminalLayoutSheet'
+import { MobileSessionTerminalLayoutSheet } from '../terminal/session/pane-layout/MobileSessionTerminalLayoutSheet'
 import { QuickCommandsSheet } from '../terminal/quick-commands/QuickCommandsSheet'
-import { triggerSuccess, triggerError } from '../platform/haptics'
+import { triggerSuccess, triggerError } from '../platform/haptics/haptics'
 import { ActionSheetModal } from '../components/ActionSheetModal'
 import { TextInputModal } from '../components/TextInputModal'
-import { MobileTerminalRenameModal } from '../terminal/session/MobileTerminalRenameModal'
+import { MobileTerminalRenameModal } from '../terminal/session/tab-actions/MobileTerminalRenameModal'
 import { ConfirmModal } from '../components/ConfirmModal'
 import { CustomKeyModal } from '../components/CustomKeyModal'
 import { MobileDictationSetupSheet } from '../components/MobileDictationSetupSheet'
 import { useWorkspaceOnPairedHost } from '../navigation/workspace-execution-host'
 import { MobileBrowserTabActionSheet } from './tabs/MobileBrowserTabActionSheet'
-import { getMobileTerminalActionSheetActions } from '../terminal/session/mobile-terminal-action-sheet-actions'
-import { isTerminalPhoneDisplayMode } from '../terminal/session/terminal-phone-display-mode'
+import { getMobileTerminalActionSheetActions } from '../terminal/session/tab-actions/mobile-terminal-action-sheet-actions'
+import { isTerminalPhoneDisplayMode } from '../terminal/session/pane-layout/terminal-phone-display-mode'
 import type { MobileSessionController } from './use-mobile-session-controller'
 import { useMobileAllowAutoCloseActions } from './tabs/mobile-worker-auto-close'
 import { MobileAgentSessionTabActionSheet } from './tabs/MobileAgentSessionTabActionSheet'
diff --git a/mobile/src/session/MobileSessionTitleBlock.tsx b/mobile/src/session/MobileSessionTitleBlock.tsx
index 59fe3bf8dc4..f1d0a9543d0 100644
--- a/mobile/src/session/MobileSessionTitleBlock.tsx
+++ b/mobile/src/session/MobileSessionTitleBlock.tsx
@@ -7,7 +7,7 @@ import type { ConnectionState } from '../transport/connection/connection-state'
 import { styles } from './mobile-session-styles'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { pressedStyle } from '../theme/mobile-theme'
-import { useKeyboardPersistingTaps } from '../platform/keyboard-persisting-taps'
+import { useKeyboardPersistingTaps } from '../platform/keyboard/keyboard-persisting-taps'
 
 /** The session's title and status line. A tap opens a card with the full name, where it lives
  *  and its host, as desktop's tab card does, because a sideways phone cuts the title short. */
diff --git a/mobile/src/session/MobileSourceControlButton.tsx b/mobile/src/session/MobileSourceControlButton.tsx
index 132e05fea14..b28abc798d0 100644
--- a/mobile/src/session/MobileSourceControlButton.tsx
+++ b/mobile/src/session/MobileSourceControlButton.tsx
@@ -6,7 +6,7 @@ import {
   HOST_LIST_TARGET,
   hostWorktreeCatalogQuery,
   NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { useHostQuery } from '../query/host-query'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/session/SessionDockPanelContent.tsx b/mobile/src/session/SessionDockPanelContent.tsx
index e4bcfd06bf6..0b776e20e40 100644
--- a/mobile/src/session/SessionDockPanelContent.tsx
+++ b/mobile/src/session/SessionDockPanelContent.tsx
@@ -1,6 +1,6 @@
 import { memo } from 'react'
 import { MobileSourceControlRoutePanel } from '../source-control/MobileSourceControlRoutePanel'
-import { MobileFileExplorerPanel } from '../files/MobileFileExplorerPanel'
+import { MobileFileExplorerPanel } from '../files/explorer/MobileFileExplorerPanel'
 import type { ActivePanel } from './session-panel-host'
 
 export type SessionDockPanelContentProps = {
diff --git a/mobile/src/session/__mocks__/mobile-prompt-render-mocks.ts b/mobile/src/session/__mocks__/mobile-prompt-render-mocks.ts
index b9ca8ec1ad5..5e4b4233439 100644
--- a/mobile/src/session/__mocks__/mobile-prompt-render-mocks.ts
+++ b/mobile/src/session/__mocks__/mobile-prompt-render-mocks.ts
@@ -67,7 +67,9 @@ vi.mock('../native-chat/transcript/MobileNativeChatRowOverlaysHost', () => ({
 vi.mock('../native-chat/visual/MobileNativeChatVisual', () => ({
   useMobileNativeChatVisualRenderer: () => null
 }))
-vi.mock('../../platform/use-reduced-motion', () => ({ useReducedMotionEnabled: () => null }))
+vi.mock('../../platform/accessibility/use-reduced-motion', () => ({
+  useReducedMotionEnabled: () => null
+}))
 vi.mock('../native-chat/transcript/MobileNativeChatLiveLine', () => ({
   MobileNativeChatLiveLine: 'LiveStatus'
 }))
diff --git a/mobile/src/session/agent-launch/new-tab-agent-host-launch.ts b/mobile/src/session/agent-launch/new-tab-agent-host-launch.ts
index 38438ae18ab..3527ee76738 100644
--- a/mobile/src/session/agent-launch/new-tab-agent-host-launch.ts
+++ b/mobile/src/session/agent-launch/new-tab-agent-host-launch.ts
@@ -1,9 +1,9 @@
-import type { MobileQuickCommandLaunch } from '../../terminal/quick-commands'
+import type { MobileQuickCommandLaunch } from '../../terminal/quick-commands/quick-commands'
 import type { MobileSessionTab } from '../tabs/mobile-session-tabs'
 import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
 import { AGENT_LAUNCH_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../src/shared/agent-launch/contracts/agent-launch-runtime-capability'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import {
   launchAgentInExistingWorkspace,
   reserveMobileAgentLaunch
diff --git a/mobile/src/session/mobile-dictation-session-outcomes.test.tsx b/mobile/src/session/mobile-dictation-session-outcomes.test.tsx
index 46d24d9a1d9..7b788142944 100644
--- a/mobile/src/session/mobile-dictation-session-outcomes.test.tsx
+++ b/mobile/src/session/mobile-dictation-session-outcomes.test.tsx
@@ -49,14 +49,14 @@ vi.mock('expo-router', () => {
   const router = { canGoBack: () => false, push: () => {}, dismissTo: () => {} }
   return { useFocusEffect: () => {}, useRouter: () => router, useNavigation: () => undefined }
 })
-vi.mock('../platform/haptics', () => ({
+vi.mock('../platform/haptics/haptics', () => ({
   triggerError: () => {
     seen.errorHaptics += 1
   },
   triggerEdgeBump: () => {},
   triggerSelection: () => {}
 }))
-vi.mock('../platform/clipboard', () => {
+vi.mock('../platform/clipboard/clipboard', () => {
   const writer = {
     writeText: async (text: string) => {
       seen.clipboard.push(text)
diff --git a/mobile/src/session/mobile-session-styles.ts b/mobile/src/session/mobile-session-styles.ts
index eb5214660fd..a93c7d35bec 100644
--- a/mobile/src/session/mobile-session-styles.ts
+++ b/mobile/src/session/mobile-session-styles.ts
@@ -1,4 +1,4 @@
-import { mobileSessionCommandInputStyles } from '../terminal/session/mobile-session-command-input-styles'
+import { mobileSessionCommandInputStyles } from '../terminal/session/input-controls/mobile-session-command-input-styles'
 import { mobileSessionFrameStyles } from './mobile-session-frame-styles'
 import { mobileSessionReaderStyles } from '../files/session-documents/mobile-session-reader-styles'
 import { mobileSessionReviewCommentStyles } from '../source-control/review/mobile-session-review-comment-styles'
diff --git a/mobile/src/session/mobile-structured-chat-fork.ts b/mobile/src/session/mobile-structured-chat-fork.ts
index 009bde60332..88d422a22b1 100644
--- a/mobile/src/session/mobile-structured-chat-fork.ts
+++ b/mobile/src/session/mobile-structured-chat-fork.ts
@@ -1,5 +1,5 @@
 import { translate } from '../i18n/mobile-i18n'
-import { triggerError } from '../platform/haptics'
+import { triggerError } from '../platform/haptics/haptics'
 import { TUI_AGENT_DISPLAY_NAMES } from '../../../src/shared/agent-launch/catalog/tui-agent-display-names'
 import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent'
 import type {
@@ -13,7 +13,7 @@ import {
   withLaunchReply,
   withoutUnansweredLaunch
 } from './tabs/pending-session-selection'
-import { releaseTerminalCreateLock } from '../terminal/session/terminal-create-lock'
+import { releaseTerminalCreateLock } from '../terminal/session/creation/terminal-create-lock'
 import type { MobileSessionAttachmentsModel } from '../files/attachments/use-mobile-session-attachments'
 
 type ForkScope = Pick<
diff --git a/mobile/src/session/native-chat/MobileNativeChatFloatingControls.tsx b/mobile/src/session/native-chat/MobileNativeChatFloatingControls.tsx
index a7b69265afa..8f6194c3e25 100644
--- a/mobile/src/session/native-chat/MobileNativeChatFloatingControls.tsx
+++ b/mobile/src/session/native-chat/MobileNativeChatFloatingControls.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef } from 'react'
 import { Animated, Easing, Platform, Pressable, View } from 'react-native'
 import { ArrowDown } from 'lucide-react-native'
 import { SHEET_CURVE } from '../../components/sheet-motion-values'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
 import { colors, feedback } from '../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { styles } from './mobile-native-chat-view-styles'
diff --git a/mobile/src/session/native-chat/agent-session/mobile-native-chat-page-read-operations.ts b/mobile/src/session/native-chat/agent-session/mobile-native-chat-page-read-operations.ts
index f7a712d7aba..b354cdb0e04 100644
--- a/mobile/src/session/native-chat/agent-session/mobile-native-chat-page-read-operations.ts
+++ b/mobile/src/session/native-chat/agent-session/mobile-native-chat-page-read-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../../transport/rpc/rpc-operation-result-reader'
-import '../../../terminal/terminal-reply-schema'
+import '../../../terminal/host-operations/terminal-reply-schema'
 import { sessionForwardedReplySchema } from '../../../transport/rpc/rpc-uninterpreted-reply-schemas'
 
 // Retain the live window on refusal and let the caller offer retry; read the whole legacy error/window union before selecting messages.
diff --git a/mobile/src/session/native-chat/agent-session/mobile-structured-agent-session-send.ts b/mobile/src/session/native-chat/agent-session/mobile-structured-agent-session-send.ts
index 6fd2d8fda9a..619c24d1b87 100644
--- a/mobile/src/session/native-chat/agent-session/mobile-structured-agent-session-send.ts
+++ b/mobile/src/session/native-chat/agent-session/mobile-structured-agent-session-send.ts
@@ -5,7 +5,7 @@ import {
   structuredAgentSessionSendBody,
   type StructuredAgentSessionAttachment
 } from '../../../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
-import { structuredAgentSessionBlocksTooLarge } from '../../../../../src/shared/rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksTooLarge } from '../../../../../src/shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { AGENT_SESSION_MESSAGE_TOO_LARGE_PARTS } from '../../../../../src/shared/agent-session/failures/agent-session-refusal-notice'
 import { mobileAgentSessionWriteNoticeText } from './agent-session-write-notice-copy'
 import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
diff --git a/mobile/src/session/native-chat/agent-session/mobile-structured-create-operations.ts b/mobile/src/session/native-chat/agent-session/mobile-structured-create-operations.ts
index a6a263cd543..10274054a00 100644
--- a/mobile/src/session/native-chat/agent-session/mobile-structured-create-operations.ts
+++ b/mobile/src/session/native-chat/agent-session/mobile-structured-create-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../../transport/rpc/rpc-operation-result-reader'
-import '../../../files/mobile-file-preview-operations'
+import '../../../files/preview/mobile-file-preview-operations'
 import { sessionLaunchUnreadReplySchema } from '../../../transport/rpc/rpc-uninterpreted-reply-schemas'
 import '../../../agent-history/mobile-ai-vault-resume-reply-schema'
 import '../../../browser/tab-navigation/mobile-session-browser-reply-schema'
diff --git a/mobile/src/session/native-chat/composer/MobileNativeChatComposerAttachments.tsx b/mobile/src/session/native-chat/composer/MobileNativeChatComposerAttachments.tsx
index f55e60f05ce..1fea9f8088f 100644
--- a/mobile/src/session/native-chat/composer/MobileNativeChatComposerAttachments.tsx
+++ b/mobile/src/session/native-chat/composer/MobileNativeChatComposerAttachments.tsx
@@ -14,7 +14,7 @@ import { FileText, Image as ImageIcon, X } from 'lucide-react-native'
 import { colors, concentricRadius, radii, spacing, pressedStyle } from '../../../theme/mobile-theme'
 import { themedStyleSheet } from '../../../theme/themed-styles'
 import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
-import { formatPreviewByteLength } from '../../../files/mobile-file-preview-response'
+import { formatPreviewByteLength } from '../../../files/preview/mobile-file-preview-response'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import type { PendingNativeChatFile } from './mobile-native-chat-file-attachment'
 import { useMobileNativeChatOpenFile } from '../mobile-native-chat-open-file-context'
diff --git a/mobile/src/session/native-chat/composer/MobileNativeChatComposerField.web.tsx b/mobile/src/session/native-chat/composer/MobileNativeChatComposerField.web.tsx
index 0cf471bfc88..68dc976db86 100644
--- a/mobile/src/session/native-chat/composer/MobileNativeChatComposerField.web.tsx
+++ b/mobile/src/session/native-chat/composer/MobileNativeChatComposerField.web.tsx
@@ -7,10 +7,10 @@ import {
   useWindowDimensions,
   type TextInputInstance
 } from 'react-native'
-import { useKeyboardOcclusion } from '../../../platform/keyboard-occlusion'
-import { primaryModifierKey } from '../../../platform/primary-modifier-key'
-import { useTextInputContentHeight } from '../../../platform/text-input-content-height'
-import { useTextInputSelectionReveal } from '../../../platform/text-input-selection-reveal.web'
+import { useKeyboardOcclusion } from '../../../platform/keyboard/keyboard-occlusion'
+import { primaryModifierKey } from '../../../platform/keyboard/primary-modifier-key'
+import { useTextInputContentHeight } from '../../../platform/text-input/text-input-content-height'
+import { useTextInputSelectionReveal } from '../../../platform/text-input/text-input-selection-reveal.web'
 import { colors } from '../../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
 import {
diff --git a/mobile/src/session/native-chat/composer/MobileNativeChatComposerMenuLayer.web.tsx b/mobile/src/session/native-chat/composer/MobileNativeChatComposerMenuLayer.web.tsx
index bde29deb099..71a3f75b91e 100644
--- a/mobile/src/session/native-chat/composer/MobileNativeChatComposerMenuLayer.web.tsx
+++ b/mobile/src/session/native-chat/composer/MobileNativeChatComposerMenuLayer.web.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { View } from 'react-native'
-import { useKeyboardOcclusion } from '../../../platform/keyboard-occlusion'
-import { useKeyboardPersistingTaps } from '../../../platform/keyboard-persisting-taps'
+import { useKeyboardOcclusion } from '../../../platform/keyboard/keyboard-occlusion'
+import { useKeyboardPersistingTaps } from '../../../platform/keyboard/keyboard-persisting-taps'
 import { useMobileNativeChatLowerRegion } from '../mobile-native-chat-lower-region-context'
 import { useMobileNativeChatComposerAllocation } from './MobileNativeChatComposerAllocation'
 import type { ComposerMenuLayerProps } from './MobileNativeChatComposerMenuLayer'
diff --git a/mobile/src/session/native-chat/composer/MobileNativeChatContextUsageRing.tsx b/mobile/src/session/native-chat/composer/MobileNativeChatContextUsageRing.tsx
index 34a2162a2f2..5c408b1a510 100644
--- a/mobile/src/session/native-chat/composer/MobileNativeChatContextUsageRing.tsx
+++ b/mobile/src/session/native-chat/composer/MobileNativeChatContextUsageRing.tsx
@@ -24,8 +24,8 @@ import {
   COMPOSER_CONTROL_HIT_SLOP,
   composerInputStyles as inputStyles
 } from '../../../components/composer-input/composer-input-styles'
-import { useKeyboardPersistingTaps } from '../../../platform/keyboard-persisting-taps'
-import { useKeyboardOcclusion } from '../../../platform/keyboard-occlusion'
+import { useKeyboardPersistingTaps } from '../../../platform/keyboard/keyboard-persisting-taps'
+import { useKeyboardOcclusion } from '../../../platform/keyboard/keyboard-occlusion'
 import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 import { colors, radii, spacing, typography } from '../../../theme/mobile-theme'
 import { themedStyleSheet } from '../../../theme/themed-styles'
diff --git a/mobile/src/session/native-chat/composer/MobileNativeChatSendButton.tsx b/mobile/src/session/native-chat/composer/MobileNativeChatSendButton.tsx
index 66c1ba3b1db..b2b3336b0cc 100644
--- a/mobile/src/session/native-chat/composer/MobileNativeChatSendButton.tsx
+++ b/mobile/src/session/native-chat/composer/MobileNativeChatSendButton.tsx
@@ -13,7 +13,7 @@ import {
   composerInputStyles as inputStyles
 } from '../../../components/composer-input/composer-input-styles'
 import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
-import { useKeyboardPersistingTaps } from '../../../platform/keyboard-persisting-taps'
+import { useKeyboardPersistingTaps } from '../../../platform/keyboard/keyboard-persisting-taps'
 import { colors } from '../../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
 import type { MobileNativeChatSendIntent } from './mobile-native-chat-send'
diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-composer-paste.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-composer-paste.ts
index f4708ea1c3a..ff4d644b36f 100644
--- a/mobile/src/session/native-chat/composer/mobile-native-chat-composer-paste.ts
+++ b/mobile/src/session/native-chat/composer/mobile-native-chat-composer-paste.ts
@@ -4,8 +4,8 @@ import {
   type ClipboardEventDataLike
 } from '../../../../../src/shared/native-chat/input/native-chat-clipboard-event'
 import { isNativeChatLongPaste } from '../../../../../src/shared/native-chat/input/native-chat-long-paste'
-import type { ClipboardReader } from '../../../platform/clipboard'
-import type { PickedMobileImage } from '../../../platform/media-picker-contract'
+import type { ClipboardReader } from '../../../platform/clipboard/clipboard'
+import type { PickedMobileImage } from '../../../platform/media-picking/media-picker-contract'
 import { encodeBase64Bytes } from '../../../transport/encryption/base64-byte-codec'
 
 /** One paste's image: the event's file, or null when WebKit left the bytes out and the shell clipboard holds them. */
diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.ts
index 261aff9b11e..fe7cb9e6520 100644
--- a/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.ts
+++ b/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.ts
@@ -3,7 +3,7 @@ import { chatTextAttachmentName } from '../../../../../src/shared/native-chat-te
 import {
   MobileFileTooLargeError,
   type PickedMobileFile
-} from '../../../platform/media-picker-contract'
+} from '../../../platform/media-picking/media-picker-contract'
 import type { AgentSessionAttachmentUploadCommitResult } from '../../../../../src/shared/agent-session/agent-session-attachments'
 
 export type PendingNativeChatFile = {
diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-image-attachment.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-image-attachment.ts
index 31fd7ceaed1..15d699faf9b 100644
--- a/mobile/src/session/native-chat/composer/mobile-native-chat-image-attachment.ts
+++ b/mobile/src/session/native-chat/composer/mobile-native-chat-image-attachment.ts
@@ -1,7 +1,10 @@
 import { saveMobileClipboardImageAsTempFile } from '../../../files/attachments/mobile-clipboard-image'
 import type { MobileClipboardImageRpcSender } from '../../../files/attachments/mobile-clipboard-image-operations'
 // Keep picker dependencies type-only so this upload module stays free of Expo/React Native at runtime.
-import type { MobileImageSource, PickedMobileImage } from '../../../platform/media-picker-contract'
+import type {
+  MobileImageSource,
+  PickedMobileImage
+} from '../../../platform/media-picking/media-picker-contract'
 
 // path belongs to the host for sending; previewUri belongs to the phone for display.
 export type PendingNativeChatImage = {
diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-skill-operations.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-skill-operations.ts
index de98372945e..5dcf7e9329a 100644
--- a/mobile/src/session/native-chat/composer/mobile-native-chat-skill-operations.ts
+++ b/mobile/src/session/native-chat/composer/mobile-native-chat-skill-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../../transport/rpc/rpc-operation-result-reader'
-import '../../../terminal/terminal-reply-schema'
+import '../../../terminal/host-operations/terminal-reply-schema'
 import { skillDiscoveryReplySchema } from './mobile-native-chat-skill-reply-schema'
 
 // Mobile names the workspace and lets the host resolve and scan it; see SKILL_DISCOVER_WORKSPACE_CAPABILITY.
diff --git a/mobile/src/session/native-chat/composer/mobile-structured-composer-command.ts b/mobile/src/session/native-chat/composer/mobile-structured-composer-command.ts
index 55c0ea4432f..a6c8a59b1fd 100644
--- a/mobile/src/session/native-chat/composer/mobile-structured-composer-command.ts
+++ b/mobile/src/session/native-chat/composer/mobile-structured-composer-command.ts
@@ -21,6 +21,7 @@ import { translate } from '../../../i18n/mobile-i18n'
 import { sayMobileAgentSessionFailure } from '../agent-session/agent-session-failure-copy'
 import type { MobileNativeChatSendOutcome } from './mobile-native-chat-send'
 import { requestStructuredAgentSessionMutation } from '../agent-session/mobile-structured-agent-session-rpc'
+import { structuredAgentSessionCommandWriteRefusalCause } from '../../../../../src/shared/agent-session/failures/structured-agent-session-command-refusal-cause'
 import type { MobileNativeChatSendErrorReporter } from './use-mobile-native-chat-send-error'
 
 /** What the phone shows at keypress that holds a command; `background` also counts the strip mid-turn. */
@@ -82,6 +83,7 @@ export async function dispatchMobileStructuredCommand(input: {
       const shown = input.holds()
       const waitsInLine = input.waitsInLine(command)
       const hold = structuredConversationCommandHold({
+        command,
         waitsInLine,
         agentWorking: shown.working,
         promptPending: shown.prompt,
@@ -129,8 +131,17 @@ export async function dispatchMobileStructuredCommand(input: {
             )
           }
         }
+        // A refusal names its cause only when the phone showed it, as on desktop.
+        const refusedWhile = (cause: StructuredAgentSessionCommandRefusalCause | undefined) =>
+          cause !== undefined && cause !== 'retry' && shown[cause] ? { refusedWhile: cause } : {}
         if (result.status !== 'accepted') {
-          return { accepted: false, error: result.message }
+          return {
+            accepted: false,
+            error: result.message,
+            ...(result.status === 'refused'
+              ? refusedWhile(structuredAgentSessionCommandWriteRefusalCause(result.failure))
+              : {})
+          }
         }
         const reply = conversationCommandReply(result.value, {
           agentName: input.agentName,
@@ -138,16 +149,10 @@ export async function dispatchMobileStructuredCommand(input: {
           say: sayMobileAgentSessionFailure
         })
         accepted = reply.accepted
-        // A refusal names its cause only when the phone showed it, as on desktop.
         return {
           accepted: reply.accepted,
           error: reply.error,
-          ...(reply.error &&
-          reply.cause !== undefined &&
-          reply.cause !== 'retry' &&
-          shown[reply.cause]
-            ? { refusedWhile: reply.cause }
-            : {})
+          ...(reply.error ? refusedWhile(reply.cause) : {})
         }
       } finally {
         input.pending.current = false
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-attachments.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-attachments.ts
index 4a2db329673..49eee09a2d3 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-attachments.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-attachments.ts
@@ -7,8 +7,8 @@ import {
 } from './mobile-native-chat-draft-inputs'
 import { useCallback } from 'react'
 import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
-import { useMediaPicker } from '../../../platform/media-picker'
-import type { PickedMobileFile } from '../../../platform/media-picker-contract'
+import { useMediaPicker } from '../../../platform/media-picking/media-picker'
+import type { PickedMobileFile } from '../../../platform/media-picking/media-picker-contract'
 import { encodeBase64Bytes } from '../../../transport/encryption/base64-byte-codec'
 import { agentSessionPastedTextName } from '../../../../../src/shared/agent-session/agent-session-attachments'
 import { uploadMobileAgentSessionAttachment } from '../../../files/attachments/mobile-agent-session-attachment-upload'
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-search.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-search.ts
index 642420bd6ed..1de6d1ac320 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-search.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-file-search.ts
@@ -7,7 +7,7 @@ import {
 import {
   nativeChatFileInventoryRead,
   nativeChatFileSearchRead
-} from '../../../files/native-chat-file-search-operations'
+} from '../../../files/explorer/native-chat-file-search-operations'
 import {
   getPreparedQuickOpenFiles,
   rankQuickOpenFiles
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-attachments.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-attachments.ts
index c5533f5492d..a6d88dae41b 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-attachments.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-attachments.ts
@@ -10,7 +10,7 @@ import {
 import { useCallback, useMemo } from 'react'
 import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../../transport/connection/connection-state'
-import type { MobileImageSource } from '../../../platform/media-picker-contract'
+import type { MobileImageSource } from '../../../platform/media-picking/media-picker-contract'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import type { MobilePastedImages } from './mobile-native-chat-composer-paste'
 import {
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-upload.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-upload.ts
index 9e3fd851eef..8c1fe664371 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-upload.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-image-upload.ts
@@ -8,11 +8,11 @@ import { translate } from '../../../i18n/mobile-i18n'
 import { CLIPBOARD_IMAGE_TOO_LARGE_ERROR } from '../../../../../src/shared/clipboard-image'
 import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../../transport/connection/connection-state'
-import { useMediaPicker } from '../../../platform/media-picker'
+import { useMediaPicker } from '../../../platform/media-picking/media-picker'
 import {
   ImageLibraryPermissionError,
   type MobileImageSource
-} from '../../../platform/media-picker-contract'
+} from '../../../platform/media-picking/media-picker-contract'
 import {
   uploadMobileNativeChatImages,
   type PendingNativeChatImage
@@ -21,7 +21,7 @@ import {
   readMobilePastedImages,
   type MobilePastedImages
 } from './mobile-native-chat-composer-paste'
-import { useClipboardReader } from '../../../platform/clipboard'
+import { useClipboardReader } from '../../../platform/clipboard/clipboard'
 import { fitMobileAgentImage } from '../../../files/attachments/mobile-agent-image-fit'
 
 type CurrentRef<T> = { readonly current: T }
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-steer-chord-preview.web.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-steer-chord-preview.web.ts
index 57fb8783602..635b7b3004c 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-steer-chord-preview.web.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-steer-chord-preview.web.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { primaryModifierKey } from '../../../platform/primary-modifier-key'
+import { primaryModifierKey } from '../../../platform/keyboard/primary-modifier-key'
 import { createNativeChatSteerChordPreviewHook } from '../../../../../src/shared/native-chat/input/use-native-chat-steer-chord-preview'
 import type { MobileNativeChatSteerChordPreviewInput } from './use-mobile-native-chat-steer-chord-preview'
 
diff --git a/mobile/src/session/native-chat/composer/use-mobile-structured-send-with-outcome.ts b/mobile/src/session/native-chat/composer/use-mobile-structured-send-with-outcome.ts
index 5adf512760d..964b0b703bd 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-structured-send-with-outcome.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-structured-send-with-outcome.ts
@@ -14,7 +14,7 @@ import {
   type StructuredAgentSessionSendControl
 } from '../../../../../src/shared/agent-session/requests/structured-agent-session-send-mutation'
 import type { AgentJournalSkillRef } from '../../../../../src/shared/agent-session/journal/agent-session-journal-types'
-import { MAX_SKILL_REFS } from '../../../../../src/shared/rpc-contract/structured-agent-session-message-params'
+import { MAX_SKILL_REFS } from '../../../../../src/shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import {
   structuredAgentSessionGoalObjective,
   type StructuredAgentSessionComposerOptions
diff --git a/mobile/src/session/native-chat/input/MobileNativeChatPromptCard.tsx b/mobile/src/session/native-chat/input/MobileNativeChatPromptCard.tsx
index 794f8f4287a..23827476e79 100644
--- a/mobile/src/session/native-chat/input/MobileNativeChatPromptCard.tsx
+++ b/mobile/src/session/native-chat/input/MobileNativeChatPromptCard.tsx
@@ -10,7 +10,7 @@ import {
   type LayoutChangeEvent
 } from 'react-native'
 import { SHEET_CURVE, SHEET_HEIGHT_DURATION_MS } from '../../../components/sheet-motion-values'
-import { useReducedMotionEnabled } from '../../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../../platform/accessibility/use-reduced-motion'
 import { colors, pressedStyle, radii, spacing, typography } from '../../../theme/mobile-theme'
 import { themedStyleSheet } from '../../../theme/themed-styles'
 import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
diff --git a/mobile/src/session/native-chat/input/mobile-native-chat-control-swap.tsx b/mobile/src/session/native-chat/input/mobile-native-chat-control-swap.tsx
index 4cd554e5c88..a7d1cd1fc87 100644
--- a/mobile/src/session/native-chat/input/mobile-native-chat-control-swap.tsx
+++ b/mobile/src/session/native-chat/input/mobile-native-chat-control-swap.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from 'react'
 import { Animated, Easing, Platform, StyleSheet, View } from 'react-native'
 import { SHEET_CURVE } from '../../../components/sheet-motion-values'
-import { useReducedMotionEnabled } from '../../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../../platform/accessibility/use-reduced-motion'
 
 const SWAP_MS = 150
 const REDUCED_SWAP_MS = 100
diff --git a/mobile/src/session/native-chat/input/mobile-native-chat-options-operations.ts b/mobile/src/session/native-chat/input/mobile-native-chat-options-operations.ts
index 51337993088..fea9c439707 100644
--- a/mobile/src/session/native-chat/input/mobile-native-chat-options-operations.ts
+++ b/mobile/src/session/native-chat/input/mobile-native-chat-options-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../../transport/rpc/rpc-operation-result-reader'
-import '../../../files/mobile-file-preview-operations'
+import '../../../files/preview/mobile-file-preview-operations'
 import { sessionLaunchUnreadReplySchema } from '../../../transport/rpc/rpc-uninterpreted-reply-schemas'
 import '../../../agent-history/mobile-ai-vault-resume-reply-schema'
 import '../../../browser/tab-navigation/mobile-session-browser-reply-schema'
diff --git a/mobile/src/session/native-chat/input/use-mobile-native-chat-reply-scroll.ts b/mobile/src/session/native-chat/input/use-mobile-native-chat-reply-scroll.ts
index b8434307178..bf70d53ada8 100644
--- a/mobile/src/session/native-chat/input/use-mobile-native-chat-reply-scroll.ts
+++ b/mobile/src/session/native-chat/input/use-mobile-native-chat-reply-scroll.ts
@@ -1,6 +1,6 @@
 import { useRef } from 'react'
 import type { LayoutChangeEvent, ScrollViewInstance } from 'react-native'
-import type { MobileTextInputHandle } from '../../../platform/text-input-handle'
+import type { MobileTextInputHandle } from '../../../platform/text-input/text-input-handle'
 
 // Keep a focused reply in view when its card shrinks above the keyboard.
 export function useMobileNativeChatReplyScroll() {
diff --git a/mobile/src/session/native-chat/transcript/MobileLinkActionSheet.tsx b/mobile/src/session/native-chat/transcript/MobileLinkActionSheet.tsx
index 6ab27dc905c..6650453c091 100644
--- a/mobile/src/session/native-chat/transcript/MobileLinkActionSheet.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileLinkActionSheet.tsx
@@ -1,9 +1,9 @@
 import { useState } from 'react'
 import { Copy, ExternalLink, Globe } from 'lucide-react-native'
 import { ActionSheetModal, type ActionSheetAction } from '../../../components/ActionSheetModal'
-import { openExternalLink } from '../../../platform/external-link'
-import { useClipboardWriter } from '../../../platform/clipboard'
-import { triggerError, triggerSuccess } from '../../../platform/haptics'
+import { openExternalLink } from '../../../platform/external-links/external-link'
+import { useClipboardWriter } from '../../../platform/clipboard/clipboard'
+import { triggerError, triggerSuccess } from '../../../platform/haptics/haptics'
 import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 
 // Choices for a tapped chat link: Orca's browser on the host, the phone's browser, or the clipboard.
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatMessageActionsSheet.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatMessageActionsSheet.tsx
index 56289faf059..4498fdfe8f3 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatMessageActionsSheet.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatMessageActionsSheet.tsx
@@ -4,7 +4,7 @@ import { Copy, TextSelect, X } from 'lucide-react-native'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
 import { ActionSheetContent } from '../../../components/ActionSheetModal'
 import { BottomDrawer } from '../../../components/bottom-drawer/BottomDrawer'
-import { useClipboardWriter } from '../../../platform/clipboard'
+import { useClipboardWriter } from '../../../platform/clipboard/clipboard'
 import { useWindowSafeAreaInsets } from '../../../layout/side-safe-area'
 import { colors, spacing, typography, pressedStyle } from '../../../theme/mobile-theme'
 import { themedStyleSheet } from '../../../theme/themed-styles'
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.test.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.test.tsx
index c6a5a70f8f6..4744881acfb 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.test.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.test.tsx
@@ -24,7 +24,7 @@ vi.mock('react-native-safe-area-context', () => ({
   useSafeAreaInsets: () => ({ top: 0, bottom: 0, left: 0, right: 0 })
 }))
 vi.mock('lucide-react-native', () => ({ X: 'X' }))
-vi.mock('../../../platform/haptics', () => ({ triggerMediumImpact: vi.fn() }))
+vi.mock('../../../platform/haptics/haptics', () => ({ triggerMediumImpact: vi.fn() }))
 vi.mock('./MobileNativeChatRewindDialog', () => ({ MobileNativeChatRewindDialog: () => null }))
 vi.mock('./MobileNativeChatMessageActionsSheet', () => ({
   MobileNativeChatMessageActionsSheet: 'MessageActionsSheet'
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.tsx
index 49f233a0224..feed20159c7 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatRowOverlaysHost.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react'
 import type { AgentSessionRewindSurface } from '../../../../../src/shared/agent-session/lifecycle/agent-session-rewind-request'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
-import { triggerMediumImpact } from '../../../platform/haptics'
+import { triggerMediumImpact } from '../../../platform/haptics/haptics'
 import { MobileNativeChatImageViewer } from '../visual/MobileNativeChatImageViewer'
 import { MobileImageViewerActions } from '../visual/MobileImageViewerActions'
 import { MobileNativeChatMessageActionsSheet } from './MobileNativeChatMessageActionsSheet'
diff --git a/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx b/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx
index 5bd9a52d583..2971bcbcc83 100644
--- a/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx
+++ b/mobile/src/session/native-chat/transcript/MobileNativeChatToolRun.test.tsx
@@ -63,7 +63,7 @@ vi.mock('lucide-react-native', () => ({
 vi.mock('../../../components/MobileSourceCopyButton', () => ({
   MobileSourceCopyButton: 'CopyButton'
 }))
-vi.mock('../../../platform/external-link', () => ({ openExternalLink: vi.fn() }))
+vi.mock('../../../platform/external-links/external-link', () => ({ openExternalLink: vi.fn() }))
 vi.mock('../../../components/inline-text-selection', () => ({ INLINE_TEXT_SELECTION: false }))
 import { ToolRun } from './MobileNativeChatToolRun'
 import {
@@ -79,12 +79,6 @@ describe('ToolRun', () => {
     renderer = null
   })
 
-  function openRun(tree: ReactTestRenderer): void {
-    act(() => {
-      tree.root.findAll((node) => String(node.type) === 'Pressable')[0]!.props.onPress()
-    })
-  }
-
   const textIn = (node: ReactTestInstance): string[] =>
     node
       .findAll((node) => String(node.type) === 'Text')
@@ -138,62 +132,5 @@ describe('ToolRun', () => {
       show({ mounted: true })
       expect(textIn(renderer!.root)).toContain('a.ts')
     })
-
-    const box = (): ReactTestInstance =>
-      renderer!.root.findAll((node) => String(node.type) === 'ScrollView')[0]!
-    const scrolled = (top: number) => ({
-      nativeEvent: {
-        contentOffset: { y: top },
-        contentSize: { height: 1_000 },
-        layoutMeasurement: { height: 300 }
-      }
-    })
-
-    it('comes back where the reader left its box after the row is recycled', () => {
-      show({ mounted: true })
-      press('ls')
-      act(() => {
-        box().props.onScroll(scrolled(120))
-      })
-      show({ mounted: false })
-      show({ mounted: true })
-      scrolls.to.mockClear()
-      act(() => {
-        box().props.onContentSizeChange()
-      })
-      expect(scrolls.to).toHaveBeenCalledWith({ y: 120, animated: false })
-    })
-  })
-
-  it('does not save a follow for a later row opening when new work left the height unchanged', () => {
-    const live = (blocks: NativeChatBlock[]) =>
-      createElement(ToolRun, {
-        blocks,
-        activeTurnIsWorking: true,
-        trailing: true
-      })
-    const call: NativeChatBlock = { type: 'tool-call', name: 'Bash', input: { command: 'ls' } }
-    act(() => {
-      renderer = create(live([call]))
-    })
-    openRun(renderer!)
-    const box = () => renderer!.root.findAll((node) => String(node.type) === 'ScrollView')[0]!
-    act(() => {
-      box().props.onContentSizeChange()
-    })
-    act(() => {
-      renderer!.update(live([call, { type: 'tool-result', output: 'a.ts' }]))
-    })
-    scrolls.toEnd.mockClear()
-    act(() => {
-      renderer!.root
-        .findAll((node) => String(node.type) === 'Pressable')
-        .findLast((node) => textIn(node).includes('ls'))!
-        .props.onPress()
-    })
-    act(() => {
-      box().props.onContentSizeChange()
-    })
-    expect(scrolls.toEnd).not.toHaveBeenCalled()
   })
 })
diff --git a/mobile/src/session/native-chat/transcript/mobile-agent-message-context.ts b/mobile/src/session/native-chat/transcript/mobile-agent-message-context.ts
index 87ba5588139..430ef8c106b 100644
--- a/mobile/src/session/native-chat/transcript/mobile-agent-message-context.ts
+++ b/mobile/src/session/native-chat/transcript/mobile-agent-message-context.ts
@@ -8,7 +8,7 @@ import {
   agentMessageSenderView,
   type AgentMessageSenderView
 } from '../../../../../src/shared/agent-session/agent-message-presentation'
-import { resolveMobileTerminalTabAgentId } from '../../../terminal/session/mobile-terminal-tab-agent'
+import { resolveMobileTerminalTabAgentId } from '../../tabs/mobile-terminal-tab-agent'
 import { agentDotState } from '../../../worktree/agent-row-display'
 
 type Sender = AgentMessageSource['senders'][number]
diff --git a/mobile/src/session/native-chat/transcript/mobile-native-chat-reply-reveals.ts b/mobile/src/session/native-chat/transcript/mobile-native-chat-reply-reveals.ts
index 793f68d1995..e30f74ed60b 100644
--- a/mobile/src/session/native-chat/transcript/mobile-native-chat-reply-reveals.ts
+++ b/mobile/src/session/native-chat/transcript/mobile-native-chat-reply-reveals.ts
@@ -6,7 +6,7 @@ import {
   trackNativeChatReplyRows,
   type NativeChatReplyReveals
 } from '../../../../../src/shared/native-chat/transcript/native-chat-reply-reveals'
-import { useReducedMotionEnabled } from '../../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../../platform/accessibility/use-reduced-motion'
 
 // Retain reveal state above list remounts/view toggles so replies resume instead of replaying.
 export type MobileNativeChatReplyReveals = NativeChatReplyReveals & { reducedMotion: boolean }
diff --git a/mobile/src/session/native-chat/transcript/mobile-native-chat-transcript-cache.ts b/mobile/src/session/native-chat/transcript/mobile-native-chat-transcript-cache.ts
index 6a913f955b1..9ed3a22e0ff 100644
--- a/mobile/src/session/native-chat/transcript/mobile-native-chat-transcript-cache.ts
+++ b/mobile/src/session/native-chat/transcript/mobile-native-chat-transcript-cache.ts
@@ -1,6 +1,6 @@
 import { setBoundedScopeCacheEntry } from '../../../../../src/shared/native-chat/native-chat-scope-cache'
 import type { NativeChatMessage } from '../../../../../src/shared/native-chat/native-chat-types'
-import type { NativeChatResumePoint } from '../../../../../src/shared/rpc-contract/native-chat-params'
+import type { NativeChatResumePoint } from '../../../../../src/shared/rpc-contract/native-chat/native-chat-params'
 import { peekStoredChatTranscript } from './mobile-native-chat-transcript-store'
 
 const MAX_CACHED_TRANSCRIPTS = 8
diff --git a/mobile/src/session/native-chat/visual/MobileImageViewerActions.tsx b/mobile/src/session/native-chat/visual/MobileImageViewerActions.tsx
index 388794ede2e..6a2712ac632 100644
--- a/mobile/src/session/native-chat/visual/MobileImageViewerActions.tsx
+++ b/mobile/src/session/native-chat/visual/MobileImageViewerActions.tsx
@@ -9,8 +9,8 @@ import {
   BRIDGE_IMAGE_OPERATIONS,
   type BridgeImageOperation
 } from '../../../mobile-web-shell/bridge/bridge-image-verbs'
-import { useImageActions } from '../../../platform/image-actions'
-import { ImageActionRefusedError } from '../../../platform/image-actions-contract'
+import { useImageActions } from '../../../platform/image-actions/image-actions'
+import { ImageActionRefusedError } from '../../../platform/image-actions/image-actions-contract'
 import { colors, feedback } from '../../../theme/mobile-theme'
 import type { ImageViewerActionsProps } from './MobileNativeChatImageViewer'
 
diff --git a/mobile/src/session/native-chat/visual/MobileNativeChatImageViewer.tsx b/mobile/src/session/native-chat/visual/MobileNativeChatImageViewer.tsx
index 89a6486544d..ca0f1eee382 100644
--- a/mobile/src/session/native-chat/visual/MobileNativeChatImageViewer.tsx
+++ b/mobile/src/session/native-chat/visual/MobileNativeChatImageViewer.tsx
@@ -17,7 +17,7 @@ import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 import type { PanZoomSize } from '../../../../../src/shared/pan-zoom-view'
 import { MobilePanZoomImage } from '../../../components/MobilePanZoomImage'
 import { REDUCED_MOTION_FADE_MS, SHEET_CURVE } from '../../../components/sheet-motion-values'
-import { useReducedMotionEnabled } from '../../../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../../../platform/accessibility/use-reduced-motion'
 
 const VIEWER_EASING = Easing.bezier(...SHEET_CURVE)
 const VIEWER_OPEN_MS = 250
diff --git a/mobile/src/session/native-chat/visual/mobile-native-chat-image-preview.ts b/mobile/src/session/native-chat/visual/mobile-native-chat-image-preview.ts
index 715293a1ed7..f07eafa7db5 100644
--- a/mobile/src/session/native-chat/visual/mobile-native-chat-image-preview.ts
+++ b/mobile/src/session/native-chat/visual/mobile-native-chat-image-preview.ts
@@ -1,7 +1,7 @@
 import { buildImageDataUri } from '../../../../../src/shared/file-preview/image-data-uri'
 import { isAgentSessionAttachmentStorePath } from '../../../../../src/shared/agent-session/agent-session-attachments'
 import { PrioritySemaphore } from '../../../../../src/shared/priority-semaphore'
-import { filePreviewImageSchema } from '../../../files/file-preview-reply-schema'
+import { filePreviewImageSchema } from '../../../files/preview/file-preview-reply-schema'
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../../transport/rpc/rpc-operation-result-reader'
 import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
diff --git a/mobile/src/session/tabs/MobileBrowserTabActionSheet.tsx b/mobile/src/session/tabs/MobileBrowserTabActionSheet.tsx
index dc5d1dbf78d..38e6d254249 100644
--- a/mobile/src/session/tabs/MobileBrowserTabActionSheet.tsx
+++ b/mobile/src/session/tabs/MobileBrowserTabActionSheet.tsx
@@ -1,7 +1,7 @@
 import { ChevronLeft, ChevronRight, RefreshCw } from 'lucide-react-native'
 import type { MobileSessionTab } from './mobile-session-tabs'
 import { ActionSheetModal, type ActionSheetAction } from '../../components/ActionSheetModal'
-import { getMobileSessionTabTitle } from '../../terminal/session/mobile-terminal-tab-agent'
+import { getMobileSessionTabTitle } from './mobile-terminal-tab-agent'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 
 type BrowserTab = Extract<MobileSessionTab, { type: 'browser' }>
diff --git a/mobile/src/session/tabs/MobileSessionTabBar.tsx b/mobile/src/session/tabs/MobileSessionTabBar.tsx
index bd630336b30..324de33fd37 100644
--- a/mobile/src/session/tabs/MobileSessionTabBar.tsx
+++ b/mobile/src/session/tabs/MobileSessionTabBar.tsx
@@ -10,14 +10,14 @@ import Animated, {
   withSequence,
   withTiming
 } from 'react-native-reanimated'
-import { triggerMediumImpact, triggerSelection } from '../../platform/haptics'
+import { triggerMediumImpact, triggerSelection } from '../../platform/haptics/haptics'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { AgentStateDot } from '../../components/AgentStateDot'
 import { ArrivalFade } from '../../components/ArrivalFade'
 import { useDrawerReducedMotion } from '../../components/bottom-drawer/bottom-drawer-constants'
 import { SHEET_CURVE } from '../../components/sheet-motion-values'
-import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
-import { useKeyboardPersistingTaps } from '../../platform/keyboard-persisting-taps'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
+import { useKeyboardPersistingTaps } from '../../platform/keyboard/keyboard-persisting-taps'
 import { useNow } from '../../hooks/use-now'
 import { agentStateLabel, type AgentDotState } from '../../worktree/agent-row-display'
 import { colors, feedback, radii, spacing } from '../../theme/mobile-theme'
diff --git a/mobile/src/terminal/session/mobile-agent-message-terminal.ts b/mobile/src/session/tabs/mobile-agent-message-terminal.ts
similarity index 94%
rename from mobile/src/terminal/session/mobile-agent-message-terminal.ts
rename to mobile/src/session/tabs/mobile-agent-message-terminal.ts
index 2fc7ab97e0f..7ea09763869 100644
--- a/mobile/src/terminal/session/mobile-agent-message-terminal.ts
+++ b/mobile/src/session/tabs/mobile-agent-message-terminal.ts
@@ -6,8 +6,8 @@ import {
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { SendRequestOptions } from '../../transport/rpc/unvalidated-rpc-request-port'
 import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
-import { sessionTerminalFocus } from './mobile-session-terminal-operations'
-import { sessionTabsListRead } from '../../session/tabs/mobile-session-tab-read-operations'
+import { sessionTerminalFocus } from '../../terminal/session/mobile-session-terminal-operations'
+import { sessionTabsListRead } from './mobile-session-tab-read-operations'
 
 const focusSchema = z.object({ focus: z.object({ worktreeId: z.string().min(1) }) })
 const tabsSchema = z.object({
diff --git a/mobile/src/session/tabs/mobile-session-tab-read-operations.ts b/mobile/src/session/tabs/mobile-session-tab-read-operations.ts
index c1a9bb6ffc8..afebcd5c86d 100644
--- a/mobile/src/session/tabs/mobile-session-tab-read-operations.ts
+++ b/mobile/src/session/tabs/mobile-session-tab-read-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../../terminal/terminal-reply-schema'
+import '../../terminal/host-operations/terminal-reply-schema'
 import { sessionForwardedReplySchema } from '../../transport/rpc/rpc-uninterpreted-reply-schemas'
 
 // Leave replies raw until the controller’s generation, barrier and application-revision guards pass.
diff --git a/mobile/src/session/tabs/mobile-session-tab-rows.ts b/mobile/src/session/tabs/mobile-session-tab-rows.ts
index e667bbc4b16..d4ecf807219 100644
--- a/mobile/src/session/tabs/mobile-session-tab-rows.ts
+++ b/mobile/src/session/tabs/mobile-session-tab-rows.ts
@@ -5,7 +5,7 @@ import {
   getMobileSessionTabTitle,
   getMobileTerminalTabHostAgentIdentity,
   resolveMobileTerminalTabAgentId
-} from '../../terminal/session/mobile-terminal-tab-agent'
+} from './mobile-terminal-tab-agent'
 import {
   agentDotState,
   agentRowTimeAt,
diff --git a/mobile/src/session/tabs/mobile-session-tab-write-operations.ts b/mobile/src/session/tabs/mobile-session-tab-write-operations.ts
index 856c3323fa8..3797cee2530 100644
--- a/mobile/src/session/tabs/mobile-session-tab-write-operations.ts
+++ b/mobile/src/session/tabs/mobile-session-tab-write-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../../terminal/terminal-reply-schema'
+import '../../terminal/host-operations/terminal-reply-schema'
 import { sessionCreatedTerminalTabSchema } from '../../terminal/session/mobile-session-terminal-reply-schema'
 import { sessionTabCloseReplySchema } from './mobile-session-tab-write-reply-schema'
 import { sessionWriteUnreadReplySchema } from '../../transport/rpc/rpc-uninterpreted-reply-schemas'
diff --git a/mobile/src/terminal/session/mobile-terminal-tab-agent.ts b/mobile/src/session/tabs/mobile-terminal-tab-agent.ts
similarity index 98%
rename from mobile/src/terminal/session/mobile-terminal-tab-agent.ts
rename to mobile/src/session/tabs/mobile-terminal-tab-agent.ts
index 5928f799546..ab8f501e1e9 100644
--- a/mobile/src/terminal/session/mobile-terminal-tab-agent.ts
+++ b/mobile/src/session/tabs/mobile-terminal-tab-agent.ts
@@ -13,7 +13,7 @@ import {
 } from '../../../../src/shared/terminal/input/agent-smart-keys'
 import { isBlankBrowserUrl } from '../../browser/pane-view/browser-url'
 import { translate } from '../../i18n/mobile-i18n'
-import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
+import type { MobileSessionTab } from './mobile-session-tabs'
 
 export type MobileTerminalTabAgentIdentity = Partial<
   Pick<
diff --git a/mobile/src/session/tabs/use-mobile-session-close-actions.ts b/mobile/src/session/tabs/use-mobile-session-close-actions.ts
index ae88a77563b..1684c67b7f7 100644
--- a/mobile/src/session/tabs/use-mobile-session-close-actions.ts
+++ b/mobile/src/session/tabs/use-mobile-session-close-actions.ts
@@ -9,7 +9,7 @@ import {
   sessionTerminalRename
 } from '../../terminal/session/mobile-session-terminal-operations'
 import type { MobileSessionTab } from './mobile-session-tabs'
-import type { Terminal } from '../../terminal/session/mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../../terminal/session/inventory/mobile-terminal-records'
 import type { MobileSessionContentCreateActionsModel } from '../use-mobile-session-content-create-actions'
 import { mobileNativeChatScopeKey } from '../native-chat/mobile-native-chat-scope-key'
 import { closeMobileNativeChatTabDraft } from '../native-chat/composer/mobile-native-chat-draft-store'
diff --git a/mobile/src/session/tabs/use-mobile-session-tab-action-targets.ts b/mobile/src/session/tabs/use-mobile-session-tab-action-targets.ts
index 3bc70e5e482..6f53c0a1754 100644
--- a/mobile/src/session/tabs/use-mobile-session-tab-action-targets.ts
+++ b/mobile/src/session/tabs/use-mobile-session-tab-action-targets.ts
@@ -6,7 +6,7 @@ import {
   type SetStateAction
 } from 'react'
 import type { MobileSessionTab } from './mobile-session-tabs'
-import type { Terminal } from '../../terminal/session/mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../../terminal/session/inventory/mobile-terminal-records'
 
 type MarkdownTab = Extract<MobileSessionTab, { type: 'markdown' }>
 type FileTab = Extract<MobileSessionTab, { type: 'file' }>
diff --git a/mobile/src/session/tabs/use-mobile-session-tab-application.ts b/mobile/src/session/tabs/use-mobile-session-tab-application.ts
index 4693d890330..6dc55cccd2d 100644
--- a/mobile/src/session/tabs/use-mobile-session-tab-application.ts
+++ b/mobile/src/session/tabs/use-mobile-session-tab-application.ts
@@ -1,4 +1,4 @@
-import { keepsTerminalPaneVisible } from '../../terminal/session/mobile-terminal-pane-layout'
+import { keepsTerminalPaneVisible } from '../../terminal/session/pane-layout/mobile-terminal-pane-layout'
 import { orphanedMarkdownDraftTabs } from '../../files/session-documents/orphaned-markdown-draft-tabs'
 import {
   pendingSelectionHandle,
@@ -14,7 +14,7 @@ import {
   mobileFileTabsReadSameDocument,
   mobileSessionTabsEqual,
   terminalRecordsEqual
-} from '../../terminal/session/mobile-terminal-records'
+} from '../../terminal/session/inventory/mobile-terminal-records'
 import {
   acceptSessionSnapshot,
   applyClosedTabTombstones,
@@ -24,11 +24,11 @@ import type { SessionTabsApplyOutcome } from './mobile-session-tabs-stream-healt
 import { getActiveTabIdForHandle } from './terminal-tab-selection'
 import { resolveActiveSessionTab } from './active-session-tab'
 import { activateMobileSessionTab } from './mobile-session-tab-activation'
-import { releaseTerminalCreateLock } from '../../terminal/session/terminal-create-lock'
+import { releaseTerminalCreateLock } from '../../terminal/session/creation/terminal-create-lock'
 import { withSessionTabStatusReceipts } from './mobile-session-tab-status-clock'
 import { withRememberedNativeChatIdentity } from '../native-chat/mobile-native-chat-eligibility'
 import type { MobileSessionTab, SessionTabsResult } from './mobile-session-tabs'
-import type { MobileSessionTerminalListModel } from '../../terminal/session/use-mobile-session-terminal-list'
+import type { MobileSessionTerminalListModel } from '../../terminal/session/inventory/use-mobile-session-terminal-list'
 import { pruneMobileNativeChatTabDrafts } from '../native-chat/composer/mobile-native-chat-draft-store'
 import {
   trackPhoneOwnedDraftTabs,
diff --git a/mobile/src/session/tabs/use-mobile-session-tab-reconciliation.ts b/mobile/src/session/tabs/use-mobile-session-tab-reconciliation.ts
index 5d3e7d7d66b..77a14ac14bb 100644
--- a/mobile/src/session/tabs/use-mobile-session-tab-reconciliation.ts
+++ b/mobile/src/session/tabs/use-mobile-session-tab-reconciliation.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useCallback, useMemo, useState } from 'react'
 import { startRuntimeCapabilityProbe } from '../../transport/connection/runtime-capability-probe'
-import { supportsMobileQuickCommands } from '../../terminal/quick-commands'
+import { supportsMobileQuickCommands } from '../../terminal/quick-commands/quick-commands'
 import { terminalQuickCommandAgentPromptMaxLength } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
 import { MOBILE_AI_VAULT_CAPABILITY } from '../../agent-history/agent-history-capability'
 import '../../../../src/shared/protocol-version'
@@ -11,8 +11,8 @@ import { runAcceptedMobileSessionTabsEffects } from './mobile-session-tabs-accep
 import type { SessionTabsStreamSource } from './mobile-session-tabs-stream-health'
 import { useMobileSessionTabsFetchReporting } from './use-mobile-session-tabs-fetch-reporting'
 import { useMobileSessionTabsReconciliation } from './use-mobile-session-tabs-reconciliation'
-import { PendingTerminalHandleRecoveryContextCache } from '../../terminal/session/pending-terminal-handle-recovery'
-import { hasConnectedTerminalAbsentFromSessionTabs } from '../../terminal/session/mobile-terminal-records'
+import { PendingTerminalHandleRecoveryContextCache } from '../../terminal/session/inventory/pending-terminal-handle-recovery'
+import { hasConnectedTerminalAbsentFromSessionTabs } from '../../terminal/session/inventory/mobile-terminal-records'
 import type { MobileSessionTab, SessionTabsResult } from './mobile-session-tabs'
 import type { MobileSessionMarkdownActionsModel } from '../../files/session-documents/use-mobile-session-markdown-actions'
 import { withoutSessionTabHostOwnership } from './mobile-session-tab-status-clock'
diff --git a/mobile/src/session/tabs/use-mobile-session-tab-switching.ts b/mobile/src/session/tabs/use-mobile-session-tab-switching.ts
index 56472266ef8..1776a241370 100644
--- a/mobile/src/session/tabs/use-mobile-session-tab-switching.ts
+++ b/mobile/src/session/tabs/use-mobile-session-tab-switching.ts
@@ -1,13 +1,13 @@
-import { keepsTerminalPaneVisible } from '../../terminal/session/mobile-terminal-pane-layout'
+import { keepsTerminalPaneVisible } from '../../terminal/session/pane-layout/mobile-terminal-pane-layout'
 import { useCallback } from 'react'
 import { STARTUP_CWD_FALLBACK_SENTENCE } from '../../../../src/shared/startup-cwd-fallback'
-import { triggerSelection } from '../../platform/haptics'
+import { triggerSelection } from '../../platform/haptics/haptics'
 import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import { isCachedActiveDocumentRetap } from '../../files/session-documents/mobile-session-active-document-retap'
 import { activateMobileSessionTab } from './mobile-session-tab-activation'
 import { activatedAtWorkspaceRoot } from '../../terminal/session/mobile-session-terminal-reply-schema'
 import type { MobileSessionTab } from './mobile-session-tabs'
-import type { MobileSessionKeyboardStateModel } from '../../terminal/session/use-mobile-session-keyboard-state'
+import type { MobileSessionKeyboardStateModel } from '../../terminal/session/input-controls/use-mobile-session-keyboard-state'
 
 export function useMobileSessionTabSwitching(scope: MobileSessionKeyboardStateModel) {
   const {
diff --git a/mobile/src/session/tabs/use-mobile-session-tabs-reconciliation.ts b/mobile/src/session/tabs/use-mobile-session-tabs-reconciliation.ts
index 8354a8dd864..d8db37e397c 100644
--- a/mobile/src/session/tabs/use-mobile-session-tabs-reconciliation.ts
+++ b/mobile/src/session/tabs/use-mobile-session-tabs-reconciliation.ts
@@ -8,11 +8,11 @@ import {
   type SessionTabsApplyOutcome,
   type SessionTabsStreamSource
 } from './mobile-session-tabs-stream-health'
-import { PendingTerminalHandleRecoveryBudget } from '../../terminal/session/pending-terminal-handle-recovery'
+import { PendingTerminalHandleRecoveryBudget } from '../../terminal/session/inventory/pending-terminal-handle-recovery'
 import {
   useMobileTerminalInventoryRecovery,
   type MobileTerminalInventoryRefreshOptions
-} from '../../terminal/session/use-mobile-terminal-inventory-recovery'
+} from '../../terminal/session/inventory/use-mobile-terminal-inventory-recovery'
 
 type Params<Result, Tab> = {
   client: RpcClient | null
diff --git a/mobile/src/session/use-mobile-agent-message-navigation.ts b/mobile/src/session/use-mobile-agent-message-navigation.ts
index fc4916220ae..96b674859c4 100644
--- a/mobile/src/session/use-mobile-agent-message-navigation.ts
+++ b/mobile/src/session/use-mobile-agent-message-navigation.ts
@@ -9,8 +9,8 @@ import {
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 import { mobileStructuredSessionOpenMessage } from './native-chat/agent-session/mobile-structured-session-open-message'
 import { openMobileStructuredSession } from './native-chat/agent-session/open-mobile-structured-session'
-import { openMobileAgentMessageTerminal } from '../terminal/session/mobile-agent-message-terminal'
-import type { MobileSessionKeyboardStateModel } from '../terminal/session/use-mobile-session-keyboard-state'
+import { openMobileAgentMessageTerminal } from './tabs/mobile-agent-message-terminal'
+import type { MobileSessionKeyboardStateModel } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 
 export function useMobileAgentMessageNavigation(
   client: RpcClient | null,
diff --git a/mobile/src/session/use-mobile-session-content-create-actions.ts b/mobile/src/session/use-mobile-session-content-create-actions.ts
index cec20da1636..40c10816a55 100644
--- a/mobile/src/session/use-mobile-session-content-create-actions.ts
+++ b/mobile/src/session/use-mobile-session-content-create-actions.ts
@@ -1,19 +1,19 @@
 import { normalizeBrowserUrl } from '../browser/pane-view/browser-url'
 import { translate } from '../i18n/mobile-i18n'
-import { captureMobileFileMutationOwnership } from '../files/mobile-file-mutation-ownership'
+import { captureMobileFileMutationOwnership } from '../files/mutation-ownership/mobile-file-mutation-ownership'
 import {
   browserGoBack,
   browserGoForward,
   browserReload
 } from '../browser/page-interaction/mobile-browser-command-operations'
-import { sourceFileOpenRun } from '../source-control/mobile-source-file-open-operations'
+import { sourceFileOpenRun } from '../files/session-documents/mobile-source-file-open-operations'
 import { sessionBrowserTabCreate } from '../browser/tab-navigation/mobile-session-browser-operations'
 import { sessionMarkdownNoteCreate } from '../files/session-documents/mobile-markdown-tab-operations'
 import { interpretOrThrowRefusalMessage } from '../transport/rpc/rpc-refusal-message'
 import type { MobileBrowserNavigationMethod } from './tabs/MobileBrowserTabActionSheet'
-import { isFileExistsErrorMessage } from '../files/file-exists-error'
+import { isFileExistsErrorMessage } from '../files/mutation-ownership/file-exists-error'
 import type { MobileSessionTab } from './tabs/mobile-session-tabs'
-import type { MobileSessionTerminalCreateActionsModel } from '../terminal/session/use-mobile-session-terminal-create-actions'
+import type { MobileSessionTerminalCreateActionsModel } from '../terminal/session/creation/use-mobile-session-terminal-create-actions'
 
 const BROWSER_NAVIGATION_COMMANDS = {
   'browser.back': browserGoBack,
diff --git a/mobile/src/session/use-mobile-session-controller.ts b/mobile/src/session/use-mobile-session-controller.ts
index fc11f3af02d..c9a02519f83 100644
--- a/mobile/src/session/use-mobile-session-controller.ts
+++ b/mobile/src/session/use-mobile-session-controller.ts
@@ -6,28 +6,28 @@ import { useMobileSessionScreenState } from './use-mobile-session-screen-state'
 import { useMobileSessionTerminalRuntime } from '../terminal/session/use-mobile-session-terminal-runtime'
 import { useMobileSessionFeedbackCapabilities } from './use-mobile-session-feedback-capabilities'
 import { useMobileSessionNativeChatDictation } from './use-mobile-session-native-chat-dictation'
-import { useMobileSessionTerminalSubscriptionFoundation } from '../terminal/session/use-mobile-session-terminal-subscription-foundation'
-import { useMobileSessionTerminalSubscription } from '../terminal/session/use-mobile-session-terminal-subscription'
-import { useMobileSessionTerminalStreamDisplay } from '../terminal/session/use-mobile-session-terminal-stream-display'
-import { useMobileSessionTerminalList } from '../terminal/session/use-mobile-session-terminal-list'
+import { useMobileSessionTerminalSubscriptionFoundation } from '../terminal/session/streaming/use-mobile-session-terminal-subscription-foundation'
+import { useMobileSessionTerminalSubscription } from '../terminal/session/streaming/use-mobile-session-terminal-subscription'
+import { useMobileSessionTerminalStreamDisplay } from '../terminal/session/streaming/use-mobile-session-terminal-stream-display'
+import { useMobileSessionTerminalList } from '../terminal/session/inventory/use-mobile-session-terminal-list'
 import { useMobileSessionTabApplication } from './tabs/use-mobile-session-tab-application'
 import { useMobileSessionDocumentReaders } from '../files/session-documents/use-mobile-session-document-readers'
 import { useMobileSessionDiffComments } from '../source-control/review/use-mobile-session-diff-comments'
 import { useMobileSessionMarkdownActions } from '../files/session-documents/use-mobile-session-markdown-actions'
 import { useMobileSessionTabReconciliation } from './tabs/use-mobile-session-tab-reconciliation'
 import { useMobileSessionLifecycle } from './use-mobile-session-lifecycle'
-import { useMobileSessionKeyboardState } from '../terminal/session/use-mobile-session-keyboard-state'
+import { useMobileSessionKeyboardState } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 import { useMobileSessionStartup } from './use-mobile-session-startup'
 import { useMobileSessionPreferenceFocus } from './use-mobile-session-preference-focus'
 import { useMobileSessionTabSwitching } from './tabs/use-mobile-session-tab-switching'
 import { useMobileSessionTerminalWebview } from '../terminal/session/use-mobile-session-terminal-webview'
-import { useMobileSessionTerminalSendActions } from '../terminal/session/use-mobile-session-terminal-send-actions'
+import { useMobileSessionTerminalSendActions } from '../terminal/session/input-controls/use-mobile-session-terminal-send-actions'
 import { useMobileSessionFileActions } from '../files/session-documents/use-mobile-session-file-actions'
-import { useMobileSessionTerminalInput } from '../terminal/session/use-mobile-session-terminal-input'
-import { useMobileSessionAccessorySelection } from '../terminal/session/use-mobile-session-accessory-selection'
-import { useTerminalDockKeys } from '../terminal/session/use-terminal-dock-keys'
+import { useMobileSessionTerminalInput } from '../terminal/session/input-controls/use-mobile-session-terminal-input'
+import { useMobileSessionAccessorySelection } from '../terminal/session/accessory-keys/use-mobile-session-accessory-selection'
+import { useTerminalDockKeys } from '../terminal/session/accessory-keys/use-terminal-dock-keys'
 import { useMobileSessionAttachments } from '../files/attachments/use-mobile-session-attachments'
-import { useMobileSessionTerminalCreateActions } from '../terminal/session/use-mobile-session-terminal-create-actions'
+import { useMobileSessionTerminalCreateActions } from '../terminal/session/creation/use-mobile-session-terminal-create-actions'
 import { useMobileSessionContentCreateActions } from './use-mobile-session-content-create-actions'
 import { useMobileSessionCloseActions } from './tabs/use-mobile-session-close-actions'
 import { useMobileSessionBulkClose } from './tabs/use-mobile-session-bulk-close'
diff --git a/mobile/src/session/use-mobile-session-dictation.ts b/mobile/src/session/use-mobile-session-dictation.ts
index 4bbdfad37d7..578646a336d 100644
--- a/mobile/src/session/use-mobile-session-dictation.ts
+++ b/mobile/src/session/use-mobile-session-dictation.ts
@@ -9,8 +9,8 @@ import {
 import { useFocusEffect, useNavigation } from 'expo-router'
 import { HOST_SESSION_ROUTE } from '../navigation/host-stack-navigation'
 import { useMobileSessionDictationSetup } from './use-mobile-session-dictation-setup'
-import { triggerError } from '../platform/haptics'
-import { useClipboardWriter } from '../platform/clipboard'
+import { triggerError } from '../platform/haptics/haptics'
+import { useClipboardWriter } from '../platform/clipboard/clipboard'
 import {
   useMobileDictationDestination,
   useMobileDictationPreviews
diff --git a/mobile/src/session/use-mobile-session-lifecycle.ts b/mobile/src/session/use-mobile-session-lifecycle.ts
index a86475eeda6..dfd7c343030 100644
--- a/mobile/src/session/use-mobile-session-lifecycle.ts
+++ b/mobile/src/session/use-mobile-session-lifecycle.ts
@@ -1,4 +1,4 @@
-import { useShellStorage } from '../platform/shell-storage'
+import { useShellStorage } from '../platform/shell-storage/shell-storage'
 import { useDirectionPadAvailable } from '../layout/use-shell-side-rail'
 import { settleSessionPreferenceRead } from './session-preference-read'
 import { useEffect, useRef, useCallback, useState } from 'react'
@@ -9,12 +9,15 @@ import { loadHosts } from '../host-catalog/host-store'
 import {
   loadTerminalAccessoryLayout,
   saveTerminalSmartRail
-} from '../terminal/terminal-accessory-layout'
+} from '../terminal/key-input/terminal-accessory-layout'
 import {
   recoverActiveTerminalAfterForeground,
   shouldRecoverTerminalOnAppStateChange
-} from '../terminal/terminal-foreground-recovery'
-import { loadCustomKeys, subscribeStoredCustomKeys } from '../terminal/terminal-custom-keys'
+} from '../terminal/webview/terminal-foreground-recovery'
+import {
+  loadCustomKeys,
+  subscribeStoredCustomKeys
+} from '../terminal/key-input/terminal-custom-keys'
 import type { MobileSessionTabReconciliationModel } from './tabs/use-mobile-session-tab-reconciliation'
 
 export function useMobileSessionLifecycle(scope: MobileSessionTabReconciliationModel) {
diff --git a/mobile/src/session/use-mobile-session-preference-focus.ts b/mobile/src/session/use-mobile-session-preference-focus.ts
index c58786ee2b1..b408816ba5f 100644
--- a/mobile/src/session/use-mobile-session-preference-focus.ts
+++ b/mobile/src/session/use-mobile-session-preference-focus.ts
@@ -1,9 +1,9 @@
-import { useShellStorage } from '../platform/shell-storage'
+import { useShellStorage } from '../platform/shell-storage/shell-storage'
 import { settleSessionPreferenceRead } from './session-preference-read'
 import { useCallback, useState } from 'react'
 import { useFocusEffect } from 'expo-router'
 import { loadTerminalLinkOpenMode, loadTerminalTextScale } from '../storage/preferences'
-import type { MobileSessionKeyboardStateModel } from '../terminal/session/use-mobile-session-keyboard-state'
+import type { MobileSessionKeyboardStateModel } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 
 export function useMobileSessionPreferenceFocus(
   scope: Pick<
diff --git a/mobile/src/session/use-mobile-session-presentation.ts b/mobile/src/session/use-mobile-session-presentation.ts
index bb0c0901ab6..68fc44a46e5 100644
--- a/mobile/src/session/use-mobile-session-presentation.ts
+++ b/mobile/src/session/use-mobile-session-presentation.ts
@@ -6,10 +6,10 @@ import {
   verdictDisplayLabel
 } from '../transport/connection/connection-health'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useInitialSessionTerminalAutoCreate } from '../terminal/session/use-initial-session-terminal-autocreate'
+import { useInitialSessionTerminalAutoCreate } from '../terminal/session/creation/use-initial-session-terminal-autocreate'
 import { MOBILE_SESSION_STATUS_LABELS } from '../transport/connection/mobile-session-connection-copy'
 import type { MobileSessionBulkCloseModel } from './tabs/use-mobile-session-bulk-close'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
+import { useReducedMotionEnabled } from '../platform/accessibility/use-reduced-motion'
 import { useDirectionPadAvailable, useShellSideRail } from '../layout/use-shell-side-rail'
 import { useCalmConnectionState } from '../transport/connection/calm-connection-state'
 
diff --git a/mobile/src/session/use-mobile-session-screen-state.ts b/mobile/src/session/use-mobile-session-screen-state.ts
index 85aeb382700..e19e8f2ea43 100644
--- a/mobile/src/session/use-mobile-session-screen-state.ts
+++ b/mobile/src/session/use-mobile-session-screen-state.ts
@@ -1,17 +1,17 @@
 import { useState, useRef, useMemo } from 'react'
-import { useTerminalSplitLayout } from '../terminal/session/use-terminal-split-layout'
-import { createLiveInputCapture } from '../terminal/session/live-input-capture'
+import { useTerminalSplitLayout } from '../terminal/session/pane-layout/use-terminal-split-layout'
+import { createLiveInputCapture } from '../terminal/session/input-controls/live-input-capture'
 import { Animated } from 'react-native'
 import type { MobileAnimatedValue } from '../platform/animated-handles'
 import type { MobileTerminalLinkOpenMode } from '../storage/preferences'
-import type { TerminalKeyboardAvoidanceMetrics } from '../terminal/terminal-webview-contract'
+import type { TerminalKeyboardAvoidanceMetrics } from '../terminal/webview/terminal-webview-contract'
 import {
   getDefaultTerminalAccessoryBuiltInIds,
   getVisibleTerminalAccessoryKeys
-} from '../terminal/terminal-accessory-layout'
-import type { CustomKey } from '../terminal/terminal-custom-keys'
+} from '../terminal/key-input/terminal-accessory-layout'
+import type { CustomKey } from '../terminal/key-input/terminal-custom-keys'
 import type { AppliedSnapshotMarker } from './tabs/session-tab-snapshot-gate'
-import { useWorktreeSessionTabsLoaded } from '../terminal/session/use-initial-session-terminal-autocreate'
+import { useWorktreeSessionTabsLoaded } from '../terminal/session/creation/use-initial-session-terminal-autocreate'
 import { createMobileSessionCreateWarningState } from './tabs/mobile-session-create-warning-state'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
 import type { DiffNotesDelivery } from '../source-control/review/mobile-review-comment-state'
@@ -20,7 +20,8 @@ import type {
   FileDocState,
   MarkdownDocState
 } from '../files/session-documents/session-document-state'
-import type { MobileDisplayMode, Terminal } from '../terminal/session/mobile-terminal-model'
+import type { MobileDisplayMode } from '../terminal/session/mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../terminal/session/inventory/mobile-terminal-records'
 import type { MobileSessionTab } from './tabs/mobile-session-tabs'
 import { useMobileSessionTabActionTargets } from './tabs/use-mobile-session-tab-action-targets'
 import type { MobileSessionFoundationModel } from './use-mobile-session-foundation'
diff --git a/mobile/src/session/use-mobile-session-startup.ts b/mobile/src/session/use-mobile-session-startup.ts
index d7ab9aa5d50..addc4f27b92 100644
--- a/mobile/src/session/use-mobile-session-startup.ts
+++ b/mobile/src/session/use-mobile-session-startup.ts
@@ -2,8 +2,8 @@ import { useEffect } from 'react'
 import { translate } from '../i18n/mobile-i18n'
 import { worktreeActivate } from '../host-screen/host-screen-operations'
 import { headlessActivationNeedsHostRenderer } from '../worktree/worktree-activation-result'
-import { createInitialSessionAutoCreateState } from '../terminal/session/use-initial-session-terminal-autocreate'
-import type { MobileSessionKeyboardStateModel } from '../terminal/session/use-mobile-session-keyboard-state'
+import { createInitialSessionAutoCreateState } from '../terminal/session/creation/use-initial-session-terminal-autocreate'
+import type { MobileSessionKeyboardStateModel } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 import { withoutSessionTabHostOwnership } from './tabs/mobile-session-tab-status-clock'
 import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
 
diff --git a/mobile/src/session/use-mobile-session-stored-chat-tab.ts b/mobile/src/session/use-mobile-session-stored-chat-tab.ts
index 1c17a2c0a94..fefc8f8b058 100644
--- a/mobile/src/session/use-mobile-session-stored-chat-tab.ts
+++ b/mobile/src/session/use-mobile-session-stored-chat-tab.ts
@@ -8,7 +8,7 @@ import {
   readStoredChatTranscript,
   storedTabChatTranscriptIdentity
 } from './native-chat/transcript/mobile-native-chat-transcript-store'
-import type { MobileSessionKeyboardStateModel } from '../terminal/session/use-mobile-session-keyboard-state'
+import type { MobileSessionKeyboardStateModel } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 
 /**
  * A relaunch opens on the chat the stored strip had active when the phone holds a copy of it, until the
diff --git a/mobile/src/session/use-mobile-structured-session-opening.ts b/mobile/src/session/use-mobile-structured-session-opening.ts
index d3f03a6e134..992fef887be 100644
--- a/mobile/src/session/use-mobile-structured-session-opening.ts
+++ b/mobile/src/session/use-mobile-structured-session-opening.ts
@@ -11,7 +11,7 @@ import { mobileStructuredSessionOpenMessage } from './native-chat/agent-session/
 import { isStructuredAgentId } from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
 import type { MobileSessionTab } from './tabs/mobile-session-tabs'
 import type { useMobileSessionTabSwitching } from './tabs/use-mobile-session-tab-switching'
-import type { MobileSessionKeyboardStateModel } from '../terminal/session/use-mobile-session-keyboard-state'
+import type { MobileSessionKeyboardStateModel } from '../terminal/session/input-controls/use-mobile-session-keyboard-state'
 
 export function useMobileStructuredSessionOpening(
   scope: Pick<
diff --git a/mobile/src/settings/settings-screen-state.test.tsx b/mobile/src/settings/settings-screen-state.test.tsx
index 0bcef5862e3..6bd21b6b58c 100644
--- a/mobile/src/settings/settings-screen-state.test.tsx
+++ b/mobile/src/settings/settings-screen-state.test.tsx
@@ -55,36 +55,6 @@ afterEach(() => {
   act(() => renderer?.unmount())
 })
 describe('shared settings screen state', () => {
-  it('shows a desktop on Auto as Auto and switches it to plain Toggle', async () => {
-    const operations: VoiceSettingsOperations = {
-      load: vi.fn<VoiceSettingsOperations['load']>().mockResolvedValue({
-        enabled: true,
-        dictationMode: 'toggle',
-        dictationHoldToRecord: true,
-        selectedModelId: '',
-        models: []
-      }),
-      configure: vi.fn<VoiceSettingsOperations['configure']>(() => new Promise(() => {})),
-      download: vi.fn(),
-      delete: vi.fn()
-    }
-    await act(async () => {
-      renderer = create(
-        createElement(VoiceSettingsScreen, { operations, focused: true, onBack: vi.fn() })
-      )
-    })
-    const modeProps = () => renderer.root.findByProps({ testIDPrefix: 'voice-mode-' }).props
-    expect(modeProps().selected).toBe('auto')
-
-    await act(async () => {
-      modeProps().onSelect('toggle')
-    })
-    expect(operations.configure).toHaveBeenCalledWith({
-      dictationMode: 'toggle',
-      dictationHoldToRecord: false
-    })
-    expect(modeProps().selected).toBe('toggle')
-  })
   it('flips the Voice switch before the desktop replies and surfaces a rejected save', async () => {
     const loaded = {
       enabled: true,
diff --git a/mobile/src/settings/voice-transcribe-on-section.tsx b/mobile/src/settings/voice-transcribe-on-section.tsx
index d12f0073842..695a122e19b 100644
--- a/mobile/src/settings/voice-transcribe-on-section.tsx
+++ b/mobile/src/settings/voice-transcribe-on-section.tsx
@@ -12,8 +12,8 @@ import type { Translate } from '../i18n/mobile-i18n'
 import { getUiIntlLocale } from '../i18n/ui-intl-locale'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import type { DictationEnginePreference } from '../mobile-web-shell/bridge/bridge-speech-verbs'
-import { isSpeechBusyError } from '../platform/native-speech'
-import { onDeviceSpeechLocale } from '../platform/on-device-speech-locale'
+import { isSpeechBusyError } from '../platform/speech/native-speech'
+import { onDeviceSpeechLocale } from '../platform/speech/on-device-speech-locale'
 import {
   DEFAULT_DICTATION_ENGINE_PREFERENCE,
   loadDictationEnginePreference,
diff --git a/mobile/src/source-control/MobileSourceControlPanel.tsx b/mobile/src/source-control/MobileSourceControlPanel.tsx
index 381347edbd8..164f093a361 100644
--- a/mobile/src/source-control/MobileSourceControlPanel.tsx
+++ b/mobile/src/source-control/MobileSourceControlPanel.tsx
@@ -12,29 +12,29 @@ import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { connectionRetryAction } from '../transport/connection/connection-retry-action'
 import { useMobileSourceControlState } from './use-mobile-source-control-state'
-import { useMobileSourceControlRefresh } from './use-mobile-source-control-refresh'
-import { useMobileSourceControlActionSheet } from './use-mobile-source-control-action-sheet'
-import { MobileSourceControlHeader } from './MobileSourceControlHeader'
-import { MobileSourceControlContent } from './MobileSourceControlContent'
+import { useMobileSourceControlRefresh } from './panel/use-mobile-source-control-refresh'
+import { useMobileSourceControlActionSheet } from './workflows/use-mobile-source-control-action-sheet'
+import { MobileSourceControlHeader } from './panel/MobileSourceControlHeader'
+import { MobileSourceControlContent } from './changes/MobileSourceControlContent'
 import {
   buildMobileSourceControlPrimaryAction,
   resolveMobileSourceControlReviewInputs
-} from './mobile-source-control-primary-action'
-import { MobileSourceControlModals } from './MobileSourceControlModals'
+} from './workflows/mobile-source-control-primary-action'
+import { MobileSourceControlModals } from './panel/MobileSourceControlModals'
 import { MobileSegmentedControl } from '../components/MobileSegmentedControl'
-import { MobileSourceControlHubCommitsPage } from './MobileSourceControlHubCommitsPage'
-import { MobileSourceControlNextStepBar } from './MobileSourceControlNextStepBar'
-import { useMobileSourceControlNextStep } from './use-mobile-source-control-next-step'
+import { MobileSourceControlHubCommitsPage } from './panel/MobileSourceControlHubCommitsPage'
+import { MobileSourceControlNextStepBar } from './panel/MobileSourceControlNextStepBar'
+import { useMobileSourceControlNextStep } from './panel/use-mobile-source-control-next-step'
 import { OptionPager } from '../components/bottom-drawer/BottomDrawer'
-import { useSourceControlHubNavigation } from './use-source-control-hub-navigation'
+import { useSourceControlHubNavigation } from './panel/use-source-control-hub-navigation'
 import { styles } from './mobile-source-control-styles'
-import { hubStyles } from './mobile-source-control-hub-styles'
+import { hubStyles } from './panel/mobile-source-control-hub-styles'
 import {
   SOURCE_CONTROL_HUB_TABS,
   SOURCE_CONTROL_HUB_TAB_LABELS,
   type SourceControlHubRouteTab
-} from './mobile-source-control-hub-tab'
-import { groupMobileSourceControlMenu } from './mobile-source-control-actions'
+} from './panel/mobile-source-control-hub-tab'
+import { groupMobileSourceControlMenu } from './workflows/mobile-source-control-actions'
 import { useMobilePrSidebarController } from './review/use-mobile-pr-sidebar-controller'
 import { MobilePrTabBody } from '../components/MobilePRSidebar'
 import { MobilePrTabSheets } from '../components/pr-sidebar/MobilePrTabSheets'
@@ -42,8 +42,8 @@ import { PrTabScreenView } from '../components/pr-sidebar/PrTabScreenView'
 import {
   useMobileSourceControlPrTab,
   type MobilePrTabOpeners
-} from './use-mobile-source-control-pr-tab'
-import { openMobilePrUrl } from '../components/mobile-pr-url'
+} from './panel/use-mobile-source-control-pr-tab'
+import { openExternalLink as openMobilePrUrl } from '../platform/external-links/external-link'
 
 export type MobileSourceControlPanelProps = {
   hostId: string
diff --git a/mobile/src/source-control/git-compare-reply-schema.ts b/mobile/src/source-control/branches/git-compare-reply-schema.ts
similarity index 98%
rename from mobile/src/source-control/git-compare-reply-schema.ts
rename to mobile/src/source-control/branches/git-compare-reply-schema.ts
index 7763e9662fa..eda6c4808b7 100644
--- a/mobile/src/source-control/git-compare-reply-schema.ts
+++ b/mobile/src/source-control/branches/git-compare-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { openEnum, salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
+import { openEnum, salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
 
 const GIT_BRANCH_CHANGE_STATUS = ['modified', 'added', 'deleted', 'renamed', 'copied'] as const
 const GIT_BRANCH_COMPARE_STATUS = [
diff --git a/mobile/src/source-control/mobile-branch-base-ref.ts b/mobile/src/source-control/branches/mobile-branch-base-ref.ts
similarity index 87%
rename from mobile/src/source-control/mobile-branch-base-ref.ts
rename to mobile/src/source-control/branches/mobile-branch-base-ref.ts
index af5338c8344..fddc0429104 100644
--- a/mobile/src/source-control/mobile-branch-base-ref.ts
+++ b/mobile/src/source-control/branches/mobile-branch-base-ref.ts
@@ -1,15 +1,15 @@
-import { translate } from '../i18n/mobile-i18n'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
-import { getRepoIdFromWorktreeId } from '../../../src/shared/worktree/id'
-import { isMobileGitUnavailableReply } from './mobile-git-status'
+import { translate } from '../../i18n/mobile-i18n'
+import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
+import { getRepoIdFromWorktreeId } from '../../../../src/shared/worktree/id'
+import { isMobileGitUnavailableReply } from '../changes/mobile-git-status'
 import { repoBaseRefListRead, repoDefaultBaseRefRead } from './mobile-repo-base-ref-operations'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import { worktreeSummaryRead } from './mobile-worktree-metadata-operations'
 import {
   resolveSourceControlBaseRef,
   resolveSourceControlCompareBaseRef
-} from '../../../src/shared/source-control/decisions/source-control-base-ref-resolution'
+} from '../../../../src/shared/source-control/decisions/source-control-base-ref-resolution'
 
 // The branch compare also honours desktop's compare-against-upstream setting.
 export type MobileBranchCompareTarget = {
diff --git a/mobile/src/source-control/mobile-branch-compare-outcome.ts b/mobile/src/source-control/branches/mobile-branch-compare-outcome.ts
similarity index 87%
rename from mobile/src/source-control/mobile-branch-compare-outcome.ts
rename to mobile/src/source-control/branches/mobile-branch-compare-outcome.ts
index d7294be1806..31154bcadaa 100644
--- a/mobile/src/source-control/mobile-branch-compare-outcome.ts
+++ b/mobile/src/source-control/branches/mobile-branch-compare-outcome.ts
@@ -1,13 +1,13 @@
-import { translate } from '../i18n/mobile-i18n'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
+import { translate } from '../../i18n/mobile-i18n'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
+import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import {
   resolveMobileBranchBaseRefs,
   type MobileBranchBaseRefs,
   type MobileBranchCompareTarget
 } from './mobile-branch-base-ref'
-import { gitBranchCompareRead } from './mobile-git-read-operations'
-import { isMobileGitUnavailableReply } from './mobile-git-status'
+import { gitBranchCompareRead } from '../git/mobile-git-read-operations'
+import { isMobileGitUnavailableReply } from '../changes/mobile-git-status'
 import type { MobileGitBranchCompareReply } from './git-compare-reply-schema'
 
 export type BranchCompareOutcome =
diff --git a/mobile/src/source-control/mobile-branch-compare.ts b/mobile/src/source-control/branches/mobile-branch-compare.ts
similarity index 73%
rename from mobile/src/source-control/mobile-branch-compare.ts
rename to mobile/src/source-control/branches/mobile-branch-compare.ts
index 4203ec29e4f..d09c4e2b4a2 100644
--- a/mobile/src/source-control/mobile-branch-compare.ts
+++ b/mobile/src/source-control/branches/mobile-branch-compare.ts
@@ -1,14 +1,10 @@
-import { compareFileNames } from '../../../src/shared/file-listing/file-name-sort'
-import { translate } from '../i18n/mobile-i18n'
+import { compareFileNames } from '../../../../src/shared/file-listing/file-name-sort'
+import { translate } from '../../i18n/mobile-i18n'
 import type {
   MobileGitBranchChangeEntry,
-  MobileGitBranchCompareReply,
   MobileGitBranchCompareSummary
 } from './git-compare-reply-schema'
 
-export type { MobileGitBranchChangeEntry, MobileGitBranchCompareSummary }
-export type MobileGitBranchCompareResult = MobileGitBranchCompareReply
-
 export type MobileBranchCompareSection<
   TEntry extends MobileGitBranchChangeEntry = MobileGitBranchChangeEntry
 > = {
diff --git a/mobile/src/source-control/mobile-repo-base-ref-operations.ts b/mobile/src/source-control/branches/mobile-repo-base-ref-operations.ts
similarity index 90%
rename from mobile/src/source-control/mobile-repo-base-ref-operations.ts
rename to mobile/src/source-control/branches/mobile-repo-base-ref-operations.ts
index ed020127427..09082ecdc07 100644
--- a/mobile/src/source-control/mobile-repo-base-ref-operations.ts
+++ b/mobile/src/source-control/branches/mobile-repo-base-ref-operations.ts
@@ -1,8 +1,8 @@
 import * as z from 'zod'
-import { salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import type { RpcCompatibleReader } from '../transport/rpc/rpc-operation-contract'
+import { salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
+import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
 
 export type MobileRepoBaseRefSummary = {
   readonly id: string
diff --git a/mobile/src/source-control/mobile-worktree-metadata-operations.ts b/mobile/src/source-control/branches/mobile-worktree-metadata-operations.ts
similarity index 91%
rename from mobile/src/source-control/mobile-worktree-metadata-operations.ts
rename to mobile/src/source-control/branches/mobile-worktree-metadata-operations.ts
index 716454597b6..c663c27fc7d 100644
--- a/mobile/src/source-control/mobile-worktree-metadata-operations.ts
+++ b/mobile/src/source-control/branches/mobile-worktree-metadata-operations.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import type { GitPushTarget } from '../../../src/shared/worktree/types'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
+import type { GitPushTarget } from '../../../../src/shared/worktree/types'
 import { worktreeSummaryReplySchema } from './worktree-metadata-reply-schema'
 
 export type MobileWorktreeSummary = {
diff --git a/mobile/src/source-control/worktree-metadata-reply-schema.ts b/mobile/src/source-control/branches/worktree-metadata-reply-schema.ts
similarity index 92%
rename from mobile/src/source-control/worktree-metadata-reply-schema.ts
rename to mobile/src/source-control/branches/worktree-metadata-reply-schema.ts
index 14c54f3ab74..0af7cc4b02d 100644
--- a/mobile/src/source-control/worktree-metadata-reply-schema.ts
+++ b/mobile/src/source-control/branches/worktree-metadata-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../src/shared/zod-salvage'
 
 // Base-ref and PR-link consumers fall back on absent hints; salvage those fields without requiring unrelated host metadata.
 export const worktreeSummaryReplySchema = z.object({
diff --git a/mobile/src/source-control/MobileSourceControlChangesHeader.tsx b/mobile/src/source-control/changes/MobileSourceControlChangesHeader.tsx
similarity index 92%
rename from mobile/src/source-control/MobileSourceControlChangesHeader.tsx
rename to mobile/src/source-control/changes/MobileSourceControlChangesHeader.tsx
index 5c3efd72050..2363adc2234 100644
--- a/mobile/src/source-control/MobileSourceControlChangesHeader.tsx
+++ b/mobile/src/source-control/changes/MobileSourceControlChangesHeader.tsx
@@ -6,17 +6,17 @@ import {
   GitCommitHorizontal,
   TriangleAlert
 } from 'lucide-react-native'
-import { colors } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { GitConflictOperation } from '../../../src/shared/git/status/git-status-types'
+import { colors } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { GitConflictOperation } from '../../../../src/shared/git/status/git-status-types'
 import {
   isMobileConflictAborting,
   mobileConflictAbortLabel
-} from './mobile-source-control-conflict-abort'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
-import { styles } from './mobile-source-control-styles'
+} from '../conflicts/mobile-source-control-conflict-abort'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
+import { styles } from '../mobile-source-control-styles'
 
 type HeaderState = Pick<
   MobileSourceControlState,
diff --git a/mobile/src/source-control/MobileSourceControlContent.tsx b/mobile/src/source-control/changes/MobileSourceControlContent.tsx
similarity index 89%
rename from mobile/src/source-control/MobileSourceControlContent.tsx
rename to mobile/src/source-control/changes/MobileSourceControlContent.tsx
index 70aed9111f6..37038197fcb 100644
--- a/mobile/src/source-control/MobileSourceControlContent.tsx
+++ b/mobile/src/source-control/changes/MobileSourceControlContent.tsx
@@ -1,16 +1,16 @@
 import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
 import { ActivityIndicator, Animated, Easing, Text, View } from 'react-native'
-import { colors, spacing } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useReducedMotionEnabled } from '../platform/use-reduced-motion'
-import { SHEET_CURVE } from '../components/sheet-motion-values'
+import { colors, spacing } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { useReducedMotionEnabled } from '../../platform/accessibility/use-reduced-motion'
+import { SHEET_CURVE } from '../../components/sheet-motion-values'
 import { MobileSourceControlChangesHeader } from './MobileSourceControlChangesHeader'
-import { MobileCommitFailurePanel } from './MobileCommitFailurePanel'
+import { MobileCommitFailurePanel } from '../commits/MobileCommitFailurePanel'
 import { MobileSourceControlFileList } from './MobileSourceControlFileList'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
-import { styles } from './mobile-source-control-styles'
-import { hubStyles } from './mobile-source-control-hub-styles'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
+import { styles } from '../mobile-source-control-styles'
+import { hubStyles } from '../panel/mobile-source-control-hub-styles'
 
 const CLEAN_FADE_MS = 240
 const REDUCED_CLEAN_FADE_MS = 150
diff --git a/mobile/src/source-control/MobileSourceControlFileList.tsx b/mobile/src/source-control/changes/MobileSourceControlFileList.tsx
similarity index 93%
rename from mobile/src/source-control/MobileSourceControlFileList.tsx
rename to mobile/src/source-control/changes/MobileSourceControlFileList.tsx
index e6818e1eb6f..8f4c7249f68 100644
--- a/mobile/src/source-control/MobileSourceControlFileList.tsx
+++ b/mobile/src/source-control/changes/MobileSourceControlFileList.tsx
@@ -1,17 +1,17 @@
 import type { ReactNode } from 'react'
 import { ActivityIndicator, Pressable, SectionList, Text, View } from 'react-native'
-import { SectionHeader } from '../components/list/ListGroup'
-import { colors } from '../theme/mobile-theme'
+import { SectionHeader } from '../../components/list/ListGroup'
+import { colors } from '../../theme/mobile-theme'
 import { BranchFileRow, ChangeFileRow, type FileRowState } from './MobileSourceControlFileRows'
 import type {
   MobileBranchEntryView,
   MobileGitStatusEntryView
 } from './mobile-source-control-screen-state'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { styles } from './mobile-source-control-styles'
-import { hubStyles } from './mobile-source-control-hub-styles'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { styles } from '../mobile-source-control-styles'
+import { hubStyles } from '../panel/mobile-source-control-hub-styles'
 
 type FileEntry = MobileGitStatusEntryView | MobileBranchEntryView
 function isWorkingTreeEntry(entry: FileEntry): entry is MobileGitStatusEntryView {
diff --git a/mobile/src/source-control/MobileSourceControlFileRows.tsx b/mobile/src/source-control/changes/MobileSourceControlFileRows.tsx
similarity index 92%
rename from mobile/src/source-control/MobileSourceControlFileRows.tsx
rename to mobile/src/source-control/changes/MobileSourceControlFileRows.tsx
index 71e04ff4603..76aeffa0749 100644
--- a/mobile/src/source-control/MobileSourceControlFileRows.tsx
+++ b/mobile/src/source-control/changes/MobileSourceControlFileRows.tsx
@@ -1,24 +1,24 @@
 import type { ReactNode } from 'react'
 import { ActivityIndicator, Pressable, Text, View } from 'react-native'
-import { SwipeRowActions } from '../components/SwipeRowActions'
+import { SwipeRowActions } from '../../components/SwipeRowActions'
 import { Minus, Plus, Undo2 } from 'lucide-react-native'
-import { colors } from '../theme/mobile-theme'
-import { STATUS_LABELS } from '../../../src/shared/git/status/git-status-labels'
+import { colors } from '../../theme/mobile-theme'
+import { STATUS_LABELS } from '../../../../src/shared/git/status/git-status-labels'
 import type {
   GitConflictKind,
   GitFileStatus
-} from '../../../src/shared/git/status/git-status-types'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { MobileDiffLineStats } from '../components/MobileDiffReviewFileSummary'
+} from '../../../../src/shared/git/status/git-status-types'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { MobileDiffLineStats } from '../../components/MobileDiffReviewFileSummary'
 import type {
   MobileBranchEntryView,
   MobileGitStatusEntryView
 } from './mobile-source-control-screen-state'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
-import { styles } from './mobile-source-control-styles'
-import { mobileConflictResolutionLabel } from './mobile-source-control-conflict-actions'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
+import { styles } from '../mobile-source-control-styles'
+import { mobileConflictResolutionLabel } from '../conflicts/mobile-source-control-conflict-actions'
 import { getUnstageablePaths, statusColor } from './mobile-git-status'
 
 export type FileRowState = Pick<
diff --git a/mobile/src/source-control/mobile-git-status-query.ts b/mobile/src/source-control/changes/mobile-git-status-query.ts
similarity index 90%
rename from mobile/src/source-control/mobile-git-status-query.ts
rename to mobile/src/source-control/changes/mobile-git-status-query.ts
index 986a262e7f1..2ed251bdf63 100644
--- a/mobile/src/source-control/mobile-git-status-query.ts
+++ b/mobile/src/source-control/changes/mobile-git-status-query.ts
@@ -1,17 +1,17 @@
 import * as z from 'zod'
 import { hashKey, type QueryClient } from '@tanstack/react-query'
-import { translate } from '../i18n/mobile-i18n'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../src/shared/execution-host'
-import { getRepoIdFromWorktreeId, worktreeIdsEqual } from '../../../src/shared/worktree/id'
-import { defineHostQuery, type HostSignalEvent } from '../query/host-query'
-import { hostQueryKey, type HostQueryTarget } from '../query/host-query-key'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import { translate } from '../../i18n/mobile-i18n'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../src/shared/execution-host'
+import { getRepoIdFromWorktreeId, worktreeIdsEqual } from '../../../../src/shared/worktree/id'
+import { defineHostQuery, type HostSignalEvent } from '../../query/host-query'
+import { hostQueryKey, type HostQueryTarget } from '../../query/host-query-key'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import {
   gitStatusHostPayloadSchema,
   type MobileGitStatusHostPayload
-} from './git-status-reply-schema'
-import { gitStatusHostPayloadRead } from './mobile-git-read-operations'
-import { holdsRestoredHostQueryData } from '../query/host-query-persistence'
+} from '../git/git-status-reply-schema'
+import { gitStatusHostPayloadRead } from '../git/mobile-git-read-operations'
+import { holdsRestoredHostQueryData } from '../../query/host-query-persistence'
 import {
   isMobileGitTransientRefreshError,
   isMobileGitUnavailableReply,
diff --git a/mobile/src/source-control/mobile-git-status.ts b/mobile/src/source-control/changes/mobile-git-status.ts
similarity index 83%
rename from mobile/src/source-control/mobile-git-status.ts
rename to mobile/src/source-control/changes/mobile-git-status.ts
index 38842647b5e..090f89c5199 100644
--- a/mobile/src/source-control/mobile-git-status.ts
+++ b/mobile/src/source-control/changes/mobile-git-status.ts
@@ -1,34 +1,29 @@
-import { translate } from '../i18n/mobile-i18n'
-import { colors } from '../theme/mobile-theme'
-import type { GitFileStatus, GitStagingArea } from '../../../src/shared/git/status/git-status-types'
+import type {
+  GitFileStatus as MobileGitFileStatus,
+  GitStagingArea as MobileGitStagingArea
+} from '../../../../src/shared/git/status/git-status-types'
+
+import { translate } from '../../i18n/mobile-i18n'
+import { colors } from '../../theme/mobile-theme'
+
 import {
   buildSourceControlDisplaySections,
   groupSourceControlEntries,
   resolveSourceControlGroupOrder,
   type SourceControlDisplaySectionArea,
   type SourceControlDisplaySectionId
-} from '../../../src/shared/source-control/listing/source-control-section-order'
-import { getUnstageAllPaths } from '../../../src/shared/source-control/listing/source-control-discard-all-sequence'
+} from '../../../../src/shared/source-control/listing/source-control-section-order'
+import { getUnstageAllPaths } from '../../../../src/shared/source-control/listing/source-control-discard-all-sequence'
 import {
   canDiscardStatusEntry,
   canStageStatusEntry,
   canUnstageStatusEntry,
   getConflictResolutions,
   type ConflictResolution
-} from '../../../src/shared/source-control/listing/source-control-entry-actions'
-import type { SourceControlGroupOrder } from '../../../src/shared/ui-chrome-types'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
-import type {
-  MobileGitStatusEntry,
-  MobileGitStatusHostPayload,
-  MobileGitUpstreamStatus
-} from './git-status-reply-schema'
-
-export type MobileGitFileStatus = GitFileStatus
-export type MobileGitStagingArea = GitStagingArea
-export type { MobileGitStatusEntry, MobileGitUpstreamStatus }
-
-export type MobileGitStatusResult = MobileGitStatusHostPayload
+} from '../../../../src/shared/source-control/listing/source-control-entry-actions'
+import type { SourceControlGroupOrder } from '../../../../src/shared/ui-chrome-types'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
+import type { MobileGitStatusEntry } from '../git/git-status-reply-schema'
 
 type KnownAreaEntry<TEntry extends MobileGitStatusEntry> = TEntry & { area: MobileGitStagingArea }
 
diff --git a/mobile/src/source-control/mobile-source-control-diff-styles.ts b/mobile/src/source-control/changes/mobile-source-control-diff-styles.ts
similarity index 94%
rename from mobile/src/source-control/mobile-source-control-diff-styles.ts
rename to mobile/src/source-control/changes/mobile-source-control-diff-styles.ts
index c7d2222ac8d..0956c94745a 100644
--- a/mobile/src/source-control/mobile-source-control-diff-styles.ts
+++ b/mobile/src/source-control/changes/mobile-source-control-diff-styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native'
-import { colors, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
+import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
 
 export const diffStyles = themedStyleSheet(() => ({
   state: {
diff --git a/mobile/src/source-control/mobile-source-control-list-styles.ts b/mobile/src/source-control/changes/mobile-source-control-list-styles.ts
similarity index 95%
rename from mobile/src/source-control/mobile-source-control-list-styles.ts
rename to mobile/src/source-control/changes/mobile-source-control-list-styles.ts
index 2ee25cc000c..159c620af77 100644
--- a/mobile/src/source-control/mobile-source-control-list-styles.ts
+++ b/mobile/src/source-control/changes/mobile-source-control-list-styles.ts
@@ -1,7 +1,7 @@
 import { StyleSheet } from 'react-native'
-import { colors, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { COMPOSER_CONTROL_SIZE } from '../components/composer-input/composer-input-styles'
+import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { COMPOSER_CONTROL_SIZE } from '../../components/composer-input/composer-input-styles'
 
 export const listStyles = themedStyleSheet(() => ({
   listContent: {
diff --git a/mobile/src/source-control/mobile-source-control-screen-state.ts b/mobile/src/source-control/changes/mobile-source-control-screen-state.ts
similarity index 86%
rename from mobile/src/source-control/mobile-source-control-screen-state.ts
rename to mobile/src/source-control/changes/mobile-source-control-screen-state.ts
index e8a6eecca10..d2af4f78fa8 100644
--- a/mobile/src/source-control/mobile-source-control-screen-state.ts
+++ b/mobile/src/source-control/changes/mobile-source-control-screen-state.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 import {
   ArrowDown,
   ArrowDownUp,
@@ -11,20 +11,22 @@ import {
   RefreshCw,
   type LucideIcon
 } from 'lucide-react-native'
-import type { MobileSourceControlActionIcon } from './mobile-source-control-actions'
+import type { MobileSourceControlActionIcon } from '../workflows/mobile-source-control-actions'
 import type {
   MobileGitBranchChangeEntry,
   MobileGitBranchCompareReply
-} from './git-compare-reply-schema'
-import type { MobileGitStatusHostPayload } from './git-status-reply-schema'
-import type { ConflictResolution } from '../../../src/shared/source-control/listing/source-control-entry-actions'
+} from '../branches/git-compare-reply-schema'
+import type {
+  MobileGitStatusHostPayload,
+  MobileGitStatusEntry
+} from '../git/git-status-reply-schema'
+import type { ConflictResolution } from '../../../../src/shared/source-control/listing/source-control-entry-actions'
 import {
   canOpenMobileGitStatusEntry,
   getMobileConflictResolutions,
   isMobileGitDiscardableEntry,
   isMobileGitStageableEntry,
-  isMobileGitUnstageableEntry,
-  type MobileGitStatusEntry
+  isMobileGitUnstageableEntry
 } from './mobile-git-status'
 
 export type ScreenState =
diff --git a/mobile/src/source-control/mobile-source-control-sections.ts b/mobile/src/source-control/changes/mobile-source-control-sections.ts
similarity index 56%
rename from mobile/src/source-control/mobile-source-control-sections.ts
rename to mobile/src/source-control/changes/mobile-source-control-sections.ts
index b2ba4ca7050..e89d2fb8c09 100644
--- a/mobile/src/source-control/mobile-source-control-sections.ts
+++ b/mobile/src/source-control/changes/mobile-source-control-sections.ts
@@ -1,7 +1,8 @@
 import { useMemo } from 'react'
-import type { SourceControlGroupOrder } from '../../../src/shared/ui-chrome-types'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { buildMobileSourceControlSections, type MobileGitStatusEntry } from './mobile-git-status'
+import type { SourceControlGroupOrder } from '../../../../src/shared/ui-chrome-types'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { buildMobileSourceControlSections } from './mobile-git-status'
+import type { MobileGitStatusEntry } from '../git/git-status-reply-schema'
 
 export function useMobileSourceControlSections<TEntry extends MobileGitStatusEntry>(
   entries: readonly TEntry[],
diff --git a/mobile/src/source-control/use-mobile-source-control-loaders.test.ts b/mobile/src/source-control/changes/use-mobile-source-control-loaders.test.ts
similarity index 86%
rename from mobile/src/source-control/use-mobile-source-control-loaders.test.ts
rename to mobile/src/source-control/changes/use-mobile-source-control-loaders.test.ts
index 8a548d0cba1..f990a183691 100644
--- a/mobile/src/source-control/use-mobile-source-control-loaders.test.ts
+++ b/mobile/src/source-control/changes/use-mobile-source-control-loaders.test.ts
@@ -1,30 +1,30 @@
 import { createElement } from 'react'
-import { hashKey, QueryClientProvider, type QueryClient } from '@tanstack/react-query'
+import { QueryClientProvider, type QueryClient } from '@tanstack/react-query'
 
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import { useMobileSourceControlLoaders } from './use-mobile-source-control-loaders'
-import { stubRpcClient } from '../transport/rpc/rpc-client-test-stub'
-import { prefetchHostQuery } from '../query/host-query'
-import { hostQueryKey } from '../query/host-query-key'
+import { stubRpcClient } from '../../transport/rpc/rpc-client-test-stub'
+import { prefetchHostQuery } from '../../query/host-query'
+import { hostQueryKey } from '../../query/host-query-key'
 import {
   gitStatusQuery,
   gitStatusSummaryQuery,
   serverGitStatusSummaryQuery,
   type GitStatusRead
 } from './mobile-git-status-query'
-import { gitStatusHostPayloadSchema } from './git-status-reply-schema'
-import { createOrcaQueryClient } from '../query/orca-query-client'
-import { createHostQueryPersistence } from '../query/host-query-persistence'
-import type { OrcaQueryStoreBackend } from '../device-store/query-storage'
+import { gitStatusHostPayloadSchema } from '../git/git-status-reply-schema'
+import { createOrcaQueryClient } from '../../query/orca-query-client'
+import { createHostQueryPersistence } from '../../query/host-query-persistence'
+import type { OrcaQueryStoreBackend } from '../../device-store/query-storage'
 
 import {
   documentQueryClient,
   settleQueryNotifications
-} from '../test-support/rpc-recording/hook-mount'
+} from '../../test-support/rpc-recording/hook-mount'
 
 // Changes under Review is unfocused; flipping this and re-rendering models the push and the return.
 const focus = vi.hoisted(() => ({ current: true }))
@@ -244,22 +244,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
     const client = fakeClient(calls)
     const documentClient = createOrcaQueryClient()
     queryClient = documentClient
-    // Successful writes to each summary entry: its own reads and publications.
-    const summaryWrites = new Map<string, number>()
-    documentClient.getQueryCache().subscribe((event) => {
-      const family = event.query.queryKey[2]
-      if (
-        event.type === 'updated' &&
-        event.action.type === 'success' &&
-        typeof family === 'string' &&
-        family.startsWith('git.statusSummary')
-      ) {
-        summaryWrites.set(
-          event.query.queryHash,
-          (summaryWrites.get(event.query.queryHash) ?? 0) + 1
-        )
-      }
-    })
     const read: { loaders: ReturnType<typeof useMobileSourceControlLoaders> | null } = {
       loaders: null
     }
@@ -278,8 +262,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
       client,
       queryClient: documentClient,
       read,
-      writesTo: (key: readonly unknown[]) => summaryWrites.get(hashKey(key)) ?? 0,
-      clearWrites: () => summaryWrites.clear(),
       readSummary: () =>
         void prefetchHostQuery(
           documentClient,
@@ -298,7 +280,7 @@ describe('useMobileSourceControlLoaders status summary', () => {
     }
   }
 
-  it('hands each accepted status read to the matching summary once, over an earlier summary read', async () => {
+  it('hands accepted status reads to the matching summary over an earlier summary read', async () => {
     vi.useFakeTimers({ toFake: ['Date'] })
     const calls: PendingCall[] = []
     const child = setup(calls)
@@ -311,7 +293,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
     )
     const elsewhereData = { kind: 'unavailable' as const }
     child.queryClient.setQueryData(elsewhereKey, elsewhereData)
-    child.clearWrites()
     await child.mount()
     child.readSummary()
     const stale = takeRead(calls, true)
@@ -330,7 +311,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
     expect(child.queryClient.getQueryData(summaryKey)).toMatchObject({
       status: { branch: 'opened' }
     })
-    expect(child.writesTo(summaryKey)).toBe(1)
 
     // An action's forced reread.
     const reread = child.read.loaders!.loadStatus({ force: true })
@@ -343,10 +323,7 @@ describe('useMobileSourceControlLoaders status summary', () => {
     expect(child.queryClient.getQueryData(summaryKey)).toMatchObject({
       status: { branch: 'after' }
     })
-    expect(child.writesTo(summaryKey)).toBe(2)
     expect(child.queryClient.getQueryData(elsewhereKey)).toBe(elsewhereData)
-    expect(child.writesTo(elsewhereKey)).toBe(0)
-    expect(calls.filter((call) => call.method === 'git.status')).toHaveLength(0)
   })
 
   // Summary read at 100, detail cached at 200, child opened at 400.
@@ -362,7 +339,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
       await child.queryClient.invalidateQueries({ queryKey: summaryKey }, { cancelRefetch: false })
       child.readSummary()
     }
-    child.clearWrites()
     vi.setSystemTime(400)
     await child.mount()
     await settleQueryNotifications()
@@ -371,7 +347,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
 
   it('leaves a summary read out to answer when the child opens over an older cached read', async () => {
     const { calls, child } = await cachedDetailOpened(true)
-    expect(child.writesTo(summaryKey)).toBe(0)
     await act(async () => takeRead(calls, true).settle(statusReply('refresh')))
     await settleQueryNotifications()
     expect(child.queryClient.getQueryData(summaryKey)).toMatchObject({
@@ -379,12 +354,10 @@ describe('useMobileSourceControlLoaders status summary', () => {
     })
   })
 
-  it('catches an idle older summary up to the cached read once, keeping its time', async () => {
-    const { calls, child } = await cachedDetailOpened(false)
-    expect(child.writesTo(summaryKey)).toBe(1)
+  it('catches an idle older summary up to the cached read, keeping its time', async () => {
+    const { child } = await cachedDetailOpened(false)
     expect(child.queryClient.getQueryData(summaryKey)).toEqual(readOf('cached'))
     expect(child.queryClient.getQueryState(summaryKey)?.dataUpdatedAt).toBe(200)
-    expect(calls.filter((call) => call.method === 'git.status')).toHaveLength(0)
   })
 
   it("never hands an earlier launch's status to the summary, nor cancels its live read", async () => {
@@ -410,7 +383,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
     release()
     await settleQueryNotifications()
     expect(child.queryClient.getQueryData(detailKey)).toEqual(readOf('saved'))
-    expect(child.writesTo(summaryKey)).toBe(0)
 
     await act(async () => takeRead(calls, true).settle(statusReply('live')))
     await settleQueryNotifications()
@@ -421,7 +393,6 @@ describe('useMobileSourceControlLoaders status summary', () => {
     expect(child.queryClient.getQueryData(summaryKey)).toMatchObject({
       status: { branch: 'newer' }
     })
-    expect(child.writesTo(summaryKey)).toBe(2)
   })
 })
 
diff --git a/mobile/src/source-control/use-mobile-source-control-loaders.ts b/mobile/src/source-control/changes/use-mobile-source-control-loaders.ts
similarity index 91%
rename from mobile/src/source-control/use-mobile-source-control-loaders.ts
rename to mobile/src/source-control/changes/use-mobile-source-control-loaders.ts
index 132198c3d7e..f94d27802cb 100644
--- a/mobile/src/source-control/use-mobile-source-control-loaders.ts
+++ b/mobile/src/source-control/changes/use-mobile-source-control-loaders.ts
@@ -1,27 +1,27 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type MutableRefObject } from 'react'
 import { hashKey, useQueryClient } from '@tanstack/react-query'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { MobileSourceControlSettings } from './mobile-source-control-settings-operations'
-import { useMobileSourceControlSettings } from './mobile-source-control-settings'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { MobileSourceControlSettings } from '../settings/mobile-source-control-settings-operations'
+import { useMobileSourceControlSettings } from '../settings/mobile-source-control-settings'
 import { useFocusEffect } from 'expo-router'
 import type { HostInstance } from 'react-native'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
-import { isSyntheticWorkspaceRoute } from '../session/synthetic-workspace-route'
-import { defineHostQuery, readHostQueryLive, useHostQuery } from '../query/host-query'
-import { hostScreenState } from '../query/host-query-screen-state'
-import { useLastShownData } from '../query/use-last-shown-data'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
+import { isSyntheticWorkspaceRoute } from '../../session/synthetic-workspace-route'
+import { defineHostQuery, readHostQueryLive, useHostQuery } from '../../query/host-query'
+import { hostScreenState } from '../../query/host-query-screen-state'
+import { useLastShownData } from '../../query/use-last-shown-data'
 import {
   readBranchCompareOutcome,
   type BranchCompareAttempt
-} from './mobile-branch-compare-outcome'
+} from '../branches/mobile-branch-compare-outcome'
 import {
   gitStatusQuery,
   publishGitStatusSummary,
   type GitStatusRead
 } from './mobile-git-status-query'
-import { hostQueryKey } from '../query/host-query-key'
+import { hostQueryKey } from '../../query/host-query-key'
 import type {
   LoadStatusOptions,
   MobileBranchCompareState,
diff --git a/mobile/src/source-control/MobileCommitFailurePanel.tsx b/mobile/src/source-control/commits/MobileCommitFailurePanel.tsx
similarity index 92%
rename from mobile/src/source-control/MobileCommitFailurePanel.tsx
rename to mobile/src/source-control/commits/MobileCommitFailurePanel.tsx
index 2bc4f063f34..4f512cabe0c 100644
--- a/mobile/src/source-control/MobileCommitFailurePanel.tsx
+++ b/mobile/src/source-control/commits/MobileCommitFailurePanel.tsx
@@ -1,13 +1,13 @@
 import { useState } from 'react'
 import { ActivityIndicator, Pressable, Text, View } from 'react-native'
 import { ChevronDown, ChevronRight, Sparkles } from 'lucide-react-native'
-import { colors } from '../theme/mobile-theme'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { AgentLaunchNotice } from '../components/AgentLaunchNotice'
+import { colors } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { AgentLaunchNotice } from '../../components/AgentLaunchNotice'
 import type { MobileCommitFailureRecovery } from './mobile-commit-failure-recovery'
 import type { MobileCommitFailureRecoveryAction } from './use-mobile-commit-failure-recovery'
-import { styles } from './mobile-source-control-styles'
+import { styles } from '../mobile-source-control-styles'
 
 type Props = {
   failure: MobileCommitFailureRecovery
diff --git a/mobile/src/source-control/agent-output-failure-copy.ts b/mobile/src/source-control/commits/agent-output-failure-copy.ts
similarity index 98%
rename from mobile/src/source-control/agent-output-failure-copy.ts
rename to mobile/src/source-control/commits/agent-output-failure-copy.ts
index 02b2ea2c0a0..29b3dda99f3 100644
--- a/mobile/src/source-control/agent-output-failure-copy.ts
+++ b/mobile/src/source-control/commits/agent-output-failure-copy.ts
@@ -1,5 +1,5 @@
-import type { AgentOutputFailureCode } from '../../../src/shared/agent-output-failure-copy'
-import { translate } from '../i18n/mobile-i18n'
+import type { AgentOutputFailureCode } from '../../../../src/shared/agent-output-failure-copy'
+import { translate } from '../../i18n/mobile-i18n'
 
 export const AGENT_OUTPUT_FAILURE_COPY: Record<
   AgentOutputFailureCode,
diff --git a/mobile/src/source-control/dictation-cleanup-failure-copy.ts b/mobile/src/source-control/commits/dictation-cleanup-failure-copy.ts
similarity index 86%
rename from mobile/src/source-control/dictation-cleanup-failure-copy.ts
rename to mobile/src/source-control/commits/dictation-cleanup-failure-copy.ts
index b343d74f474..c0ccd27762b 100644
--- a/mobile/src/source-control/dictation-cleanup-failure-copy.ts
+++ b/mobile/src/source-control/commits/dictation-cleanup-failure-copy.ts
@@ -1,5 +1,5 @@
-import type { TextGenerationFailureCode } from '../../../src/shared/text-generation-failure-copy'
-import { translate } from '../i18n/mobile-i18n'
+import type { TextGenerationFailureCode } from '../../../../src/shared/text-generation-failure-copy'
+import { translate } from '../../i18n/mobile-i18n'
 
 export const DICTATION_CLEANUP_FAILURE_COPY = {
   commandTemplateEmptyDictationCleanup: (values) =>
diff --git a/mobile/src/source-control/mobile-commit-failure-recovery.ts b/mobile/src/source-control/commits/mobile-commit-failure-recovery.ts
similarity index 91%
rename from mobile/src/source-control/mobile-commit-failure-recovery.ts
rename to mobile/src/source-control/commits/mobile-commit-failure-recovery.ts
index 57bf90c8748..3f22c7a335e 100644
--- a/mobile/src/source-control/mobile-commit-failure-recovery.ts
+++ b/mobile/src/source-control/commits/mobile-commit-failure-recovery.ts
@@ -1,4 +1,4 @@
-import type { MobileGitStatusEntry } from './mobile-git-status'
+import type { MobileGitStatusEntry } from '../git/git-status-reply-schema'
 
 export type MobileCommitFailureStagedEntry = Pick<MobileGitStatusEntry, 'path' | 'status'> & {
   area: 'staged'
diff --git a/mobile/src/source-control/mobile-commit-message-ai.ts b/mobile/src/source-control/commits/mobile-commit-message-ai.ts
similarity index 77%
rename from mobile/src/source-control/mobile-commit-message-ai.ts
rename to mobile/src/source-control/commits/mobile-commit-message-ai.ts
index 11521f5e667..3e8b339816b 100644
--- a/mobile/src/source-control/mobile-commit-message-ai.ts
+++ b/mobile/src/source-control/commits/mobile-commit-message-ai.ts
@@ -1,13 +1,11 @@
-import { translate } from '../i18n/mobile-i18n'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
+import { translate } from '../../i18n/mobile-i18n'
+import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import {
   gitCancelGenerateCommitMessageRun,
   gitGenerateCommitMessageRun,
   type MobileGenerateCommitMessageResult
-} from './mobile-git-mutation-operations'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
-
-export type { MobileGenerateCommitMessageResult }
+} from '../git/mobile-git-mutation-operations'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 
 // Collapse refusals and malformed payloads to the same failed-generation verdict.
 export async function requestMobileCommitMessage(
diff --git a/mobile/src/source-control/text-generation-failure-copy.ts b/mobile/src/source-control/commits/text-generation-failure-copy.ts
similarity index 98%
rename from mobile/src/source-control/text-generation-failure-copy.ts
rename to mobile/src/source-control/commits/text-generation-failure-copy.ts
index c50f7eada9e..ef0ac4de90e 100644
--- a/mobile/src/source-control/text-generation-failure-copy.ts
+++ b/mobile/src/source-control/commits/text-generation-failure-copy.ts
@@ -1,8 +1,8 @@
 import {
   TEXT_GENERATION_FAILURE_COPY as EN,
   type TextGenerationFailureCode
-} from '../../../src/shared/text-generation-failure-copy'
-import { translate } from '../i18n/mobile-i18n'
+} from '../../../../src/shared/text-generation-failure-copy'
+import { translate } from '../../i18n/mobile-i18n'
 import { AGENT_OUTPUT_FAILURE_COPY } from './agent-output-failure-copy'
 import { TEXT_GENERATION_PLAN_FAILURE_COPY } from './text-generation-plan-failure-copy'
 import { DICTATION_CLEANUP_FAILURE_COPY } from './dictation-cleanup-failure-copy'
diff --git a/mobile/src/source-control/text-generation-plan-failure-copy.ts b/mobile/src/source-control/commits/text-generation-plan-failure-copy.ts
similarity index 88%
rename from mobile/src/source-control/text-generation-plan-failure-copy.ts
rename to mobile/src/source-control/commits/text-generation-plan-failure-copy.ts
index 370b9e1dd0e..404e8271598 100644
--- a/mobile/src/source-control/text-generation-plan-failure-copy.ts
+++ b/mobile/src/source-control/commits/text-generation-plan-failure-copy.ts
@@ -1,5 +1,5 @@
-import type { TextGenerationFailureCode } from '../../../src/shared/text-generation-failure-copy'
-import { translate } from '../i18n/mobile-i18n'
+import type { TextGenerationFailureCode } from '../../../../src/shared/text-generation-failure-copy'
+import { translate } from '../../i18n/mobile-i18n'
 
 export const TEXT_GENERATION_PLAN_FAILURE_COPY = {
   planCustomCommandEmpty: (values) =>
diff --git a/mobile/src/source-control/use-mobile-commit-failure-recovery.ts b/mobile/src/source-control/commits/use-mobile-commit-failure-recovery.ts
similarity index 86%
rename from mobile/src/source-control/use-mobile-commit-failure-recovery.ts
rename to mobile/src/source-control/commits/use-mobile-commit-failure-recovery.ts
index 3defee675d8..10e14e42539 100644
--- a/mobile/src/source-control/use-mobile-commit-failure-recovery.ts
+++ b/mobile/src/source-control/commits/use-mobile-commit-failure-recovery.ts
@@ -1,17 +1,17 @@
 import { useCallback, useMemo, useRef, useState } from 'react'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import { translate } from '../i18n/mobile-i18n'
-import { useHostProtocolGates } from '../components/host-protocol-gates-context'
-import { launchAgentWithPrompt, promptedLaunchNotice } from './review/pr-ai-triage-launch'
-import type { LaunchedAgentOpens } from '../session/agent-launch/launched-agent-opener'
-import { resolveMobileAgentLaunchAvailability } from '../session/agent-launch/mobile-agent-launch-availability'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import { translate } from '../../i18n/mobile-i18n'
+import { useHostProtocolGates } from '../../components/host-protocol-gates-context'
+import { launchAgentWithPrompt, promptedLaunchNotice } from '../review/pr-ai-triage-launch'
+import type { LaunchedAgentOpens } from '../../session/agent-launch/launched-agent-opener'
+import { resolveMobileAgentLaunchAvailability } from '../../session/agent-launch/mobile-agent-launch-availability'
 import {
   buildFixCommitFailurePrompt,
   hasExpandedCommitFailureDetails,
   summarizeCommitFailure
-} from '../../../src/shared/source-control/recovery/source-control-commit-failure'
+} from '../../../../src/shared/source-control/recovery/source-control-commit-failure'
 import type { MobileCommitFailureRecovery } from './mobile-commit-failure-recovery'
 
 type Params = {
diff --git a/mobile/src/source-control/use-mobile-commit-message-generation.test.ts b/mobile/src/source-control/commits/use-mobile-commit-message-generation.test.ts
similarity index 93%
rename from mobile/src/source-control/use-mobile-commit-message-generation.test.ts
rename to mobile/src/source-control/commits/use-mobile-commit-message-generation.test.ts
index 6714b1255c7..6d79b20ee58 100644
--- a/mobile/src/source-control/use-mobile-commit-message-generation.test.ts
+++ b/mobile/src/source-control/commits/use-mobile-commit-message-generation.test.ts
@@ -1,9 +1,12 @@
 import { createElement, startTransition, Suspense, useRef, useState } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { MobileGenerateCommitMessageResult } from './mobile-commit-message-ai'
+import type { MobileGenerateCommitMessageResult } from '../git/mobile-git-mutation-operations'
 
-vi.mock('../platform/haptics', () => ({ triggerError: vi.fn(), triggerSuccess: vi.fn() }))
+vi.mock('../../platform/haptics/haptics', () => ({
+  triggerError: vi.fn(),
+  triggerSuccess: vi.fn()
+}))
 const reply = vi.hoisted(() => {
   const held: {
     resolve: ((result: MobileGenerateCommitMessageResult) => void) | null
@@ -22,7 +25,7 @@ vi.mock('./mobile-commit-message-ai', () => ({
 }))
 
 import { useMobileCommitMessageGeneration } from './use-mobile-commit-message-generation'
-import { stubRpcClient } from '../transport/rpc/rpc-client-test-stub'
+import { stubRpcClient } from '../../transport/rpc/rpc-client-test-stub'
 
 const client = stubRpcClient()
 const view: {
diff --git a/mobile/src/source-control/use-mobile-commit-message-generation.ts b/mobile/src/source-control/commits/use-mobile-commit-message-generation.ts
similarity index 94%
rename from mobile/src/source-control/use-mobile-commit-message-generation.ts
rename to mobile/src/source-control/commits/use-mobile-commit-message-generation.ts
index c6e31b7c1c8..cbcc46b6975 100644
--- a/mobile/src/source-control/use-mobile-commit-message-generation.ts
+++ b/mobile/src/source-control/commits/use-mobile-commit-message-generation.ts
@@ -6,9 +6,9 @@ import {
   type MutableRefObject,
   type SetStateAction
 } from 'react'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import { translate } from '../i18n/mobile-i18n'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import { translate } from '../../i18n/mobile-i18n'
 import { cancelMobileCommitMessage, requestMobileCommitMessage } from './mobile-commit-message-ai'
 import { textGenerationErrorText } from './text-generation-failure-copy'
 
diff --git a/mobile/src/source-control/use-mobile-source-control-commit-failure.ts b/mobile/src/source-control/commits/use-mobile-source-control-commit-failure.ts
similarity index 87%
rename from mobile/src/source-control/use-mobile-source-control-commit-failure.ts
rename to mobile/src/source-control/commits/use-mobile-source-control-commit-failure.ts
index 3c425edaa8a..a49bef2a210 100644
--- a/mobile/src/source-control/use-mobile-source-control-commit-failure.ts
+++ b/mobile/src/source-control/commits/use-mobile-source-control-commit-failure.ts
@@ -1,6 +1,6 @@
 import { useState } from 'react'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type {
   MobileCommitFailureRecovery,
   RecordMobileCommitFailure
diff --git a/mobile/src/source-control/use-mobile-source-control-commit-runners.ts b/mobile/src/source-control/commits/use-mobile-source-control-commit-runners.ts
similarity index 96%
rename from mobile/src/source-control/use-mobile-source-control-commit-runners.ts
rename to mobile/src/source-control/commits/use-mobile-source-control-commit-runners.ts
index 48bcfadf5bd..d8f6a8f9e52 100644
--- a/mobile/src/source-control/use-mobile-source-control-commit-runners.ts
+++ b/mobile/src/source-control/commits/use-mobile-source-control-commit-runners.ts
@@ -1,7 +1,7 @@
 import { useCallback, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
-import { translate } from '../i18n/mobile-i18n'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import type { LoadStatusOptions } from './mobile-source-control-screen-state'
+import { translate } from '../../i18n/mobile-i18n'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import type { LoadStatusOptions } from '../changes/mobile-source-control-screen-state'
 import type {
   MobileCommitFailureRecovery,
   RecordMobileCommitFailure
diff --git a/mobile/src/source-control/mobile-source-control-conflict-abort.ts b/mobile/src/source-control/conflicts/mobile-source-control-conflict-abort.ts
similarity index 94%
rename from mobile/src/source-control/mobile-source-control-conflict-abort.ts
rename to mobile/src/source-control/conflicts/mobile-source-control-conflict-abort.ts
index 58ecff370e9..b95397336a5 100644
--- a/mobile/src/source-control/mobile-source-control-conflict-abort.ts
+++ b/mobile/src/source-control/conflicts/mobile-source-control-conflict-abort.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 
 export function isMobileConflictAborting(
   busyAction: string | null,
diff --git a/mobile/src/source-control/mobile-source-control-conflict-actions.ts b/mobile/src/source-control/conflicts/mobile-source-control-conflict-actions.ts
similarity index 80%
rename from mobile/src/source-control/mobile-source-control-conflict-actions.ts
rename to mobile/src/source-control/conflicts/mobile-source-control-conflict-actions.ts
index 60600740dbe..53903aefbc2 100644
--- a/mobile/src/source-control/mobile-source-control-conflict-actions.ts
+++ b/mobile/src/source-control/conflicts/mobile-source-control-conflict-actions.ts
@@ -1,5 +1,5 @@
-import type { ConflictResolution } from '../../../src/shared/source-control/listing/source-control-entry-actions'
-import { translate, type Translate } from '../i18n/mobile-i18n'
+import type { ConflictResolution } from '../../../../src/shared/source-control/listing/source-control-entry-actions'
+import { translate, type Translate } from '../../i18n/mobile-i18n'
 
 export const MOBILE_COMPLETE_MERGE_ACTION_ID = 'complete-merge'
 
diff --git a/mobile/src/source-control/use-mobile-conflict-runners.test.ts b/mobile/src/source-control/conflicts/use-mobile-conflict-runners.test.ts
similarity index 100%
rename from mobile/src/source-control/use-mobile-conflict-runners.test.ts
rename to mobile/src/source-control/conflicts/use-mobile-conflict-runners.test.ts
diff --git a/mobile/src/source-control/use-mobile-conflict-runners.ts b/mobile/src/source-control/conflicts/use-mobile-conflict-runners.ts
similarity index 90%
rename from mobile/src/source-control/use-mobile-conflict-runners.ts
rename to mobile/src/source-control/conflicts/use-mobile-conflict-runners.ts
index a29cb8a9f04..bea7c8bedfd 100644
--- a/mobile/src/source-control/use-mobile-conflict-runners.ts
+++ b/mobile/src/source-control/conflicts/use-mobile-conflict-runners.ts
@@ -1,12 +1,12 @@
 import { useCallback } from 'react'
-import type { ConflictResolution } from '../../../src/shared/source-control/listing/source-control-entry-actions'
-import { isMobileGitUnavailable } from './mobile-git-status'
-import { translate } from '../i18n/mobile-i18n'
+import type { ConflictResolution } from '../../../../src/shared/source-control/listing/source-control-entry-actions'
+import { isMobileGitUnavailable } from '../changes/mobile-git-status'
+import { translate } from '../../i18n/mobile-i18n'
 import {
   MOBILE_COMPLETE_MERGE_ACTION_ID,
   mobileConflictNeedsNewerHostMessage
 } from './mobile-source-control-conflict-actions'
-import type { MobileGitStatusEntryView } from './mobile-source-control-screen-state'
+import type { MobileGitStatusEntryView } from '../changes/mobile-source-control-screen-state'
 
 type SendGitRequest = (method: string, params?: Record<string, unknown>) => Promise<unknown>
 
diff --git a/mobile/src/source-control/folder/MobileFolderSourceControlPanel.tsx b/mobile/src/source-control/folder/MobileFolderSourceControlPanel.tsx
index e3d21ea0539..7075d2737f8 100644
--- a/mobile/src/source-control/folder/MobileFolderSourceControlPanel.tsx
+++ b/mobile/src/source-control/folder/MobileFolderSourceControlPanel.tsx
@@ -21,7 +21,7 @@ import { themedStyleSheet } from '../../theme/themed-styles'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import type { FolderListRow } from './mobile-folder-attached-worktrees'
 import { getWorktreeRowIdentity } from '../../worktree/worktree-host-row-identity'
-import { MobileSourceControlHeader } from '../MobileSourceControlHeader'
+import { MobileSourceControlHeader } from '../panel/MobileSourceControlHeader'
 import { MobileSourceControlPanel } from '../MobileSourceControlPanel'
 import { styles as sourceControlStyles } from '../mobile-source-control-styles'
 import { MobileFolderEmptyState } from './MobileFolderEmptyState'
diff --git a/mobile/src/source-control/folder/MobileFolderWorktreeRow.tsx b/mobile/src/source-control/folder/MobileFolderWorktreeRow.tsx
index d28e6b0c362..ad1d70fa0ae 100644
--- a/mobile/src/source-control/folder/MobileFolderWorktreeRow.tsx
+++ b/mobile/src/source-control/folder/MobileFolderWorktreeRow.tsx
@@ -4,7 +4,7 @@ import { ListRow } from '../../components/list/ListGroup'
 import { useHostClient } from '../../transport/connection/host-client-hooks'
 import { workspaceRouteExecutionHost } from '../../worktree/execution-host-scoped-rpc-client'
 import type { FolderListRow } from './mobile-folder-attached-worktrees'
-import { formatBranchLabel } from '../mobile-source-control-screen-state'
+import { formatBranchLabel } from '../changes/mobile-source-control-screen-state'
 import { useFolderWorktreeStatus } from './use-folder-worktree-status'
 
 type Props = {
diff --git a/mobile/src/source-control/folder/use-folder-create-flow.test.tsx b/mobile/src/source-control/folder/use-folder-create-flow.test.tsx
index 91ec50c2ecd..94ddbd94cc8 100644
--- a/mobile/src/source-control/folder/use-folder-create-flow.test.tsx
+++ b/mobile/src/source-control/folder/use-folder-create-flow.test.tsx
@@ -38,11 +38,11 @@ vi.mock('../../components/TransientToast', () => ({
     showToast: (text: string) => seen.toasts.push(text)
   })
 }))
-vi.mock('../../platform/haptics', () => ({
+vi.mock('../../platform/haptics/haptics', () => ({
   triggerSuccess: () => (seen.haptics += 1),
   triggerError: () => (seen.haptics += 1)
 }))
-vi.mock('../../platform/external-link', () => ({ openExternalLink: () => {} }))
+vi.mock('../../platform/external-links/external-link', () => ({ openExternalLink: () => {} }))
 vi.mock('../../transport/connection/host-client-hooks', () => ({
   useHostClient: () => ({ client: null, state: 'connected' })
 }))
diff --git a/mobile/src/source-control/folder/use-folder-create-flow.tsx b/mobile/src/source-control/folder/use-folder-create-flow.tsx
index 899a510ea38..c2e4651e615 100644
--- a/mobile/src/source-control/folder/use-folder-create-flow.tsx
+++ b/mobile/src/source-control/folder/use-folder-create-flow.tsx
@@ -6,8 +6,8 @@ import { NewWorktreeModalController } from '../../components/NewWorktreeModalCon
 import type { MobileWorkspaceRepo } from '../../components/new-worktree-modal-types'
 import { TransientToast, useTransientToast } from '../../components/TransientToast'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { openExternalLink } from '../../platform/external-link'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { openExternalLink } from '../../platform/external-links/external-link'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { useHostClient } from '../../transport/connection/host-client-hooks'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { FolderListRow } from './mobile-folder-attached-worktrees'
diff --git a/mobile/src/source-control/folder/use-folder-worktree-status.ts b/mobile/src/source-control/folder/use-folder-worktree-status.ts
index c8c8f19673d..d36388f36ca 100644
--- a/mobile/src/source-control/folder/use-folder-worktree-status.ts
+++ b/mobile/src/source-control/folder/use-folder-worktree-status.ts
@@ -3,7 +3,10 @@ import type { ExecutionHostId } from '../../../../src/shared/execution-host'
 import { useHostQuery } from '../../query/host-query'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import { scopeRpcClientToExecutionHost } from '../../worktree/execution-host-scoped-rpc-client'
-import { gitStatusSummaryQuery, serverGitStatusSummaryQuery } from '../mobile-git-status-query'
+import {
+  gitStatusSummaryQuery,
+  serverGitStatusSummaryQuery
+} from '../changes/mobile-git-status-query'
 
 const NO_INPUT = {}
 
diff --git a/mobile/src/source-control/folder/use-mobile-folder-attached-worktrees.ts b/mobile/src/source-control/folder/use-mobile-folder-attached-worktrees.ts
index 027e2836d1a..0f5d3fce4ce 100644
--- a/mobile/src/source-control/folder/use-mobile-folder-attached-worktrees.ts
+++ b/mobile/src/source-control/folder/use-mobile-folder-attached-worktrees.ts
@@ -8,7 +8,7 @@ import {
   hostServerWorkspacesQuery,
   hostWorktreeCatalogQuery,
   NO_HOST_LIST_INPUT
-} from '../../host-screen/host-list-queries'
+} from '../../host-screen/catalog/host-list-queries'
 import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
 import { useHostQuery } from '../../query/host-query'
 import { useHostClient } from '../../transport/connection/host-client-hooks'
diff --git a/mobile/src/source-control/git-status-reply-schema.ts b/mobile/src/source-control/git/git-status-reply-schema.ts
similarity index 99%
rename from mobile/src/source-control/git-status-reply-schema.ts
rename to mobile/src/source-control/git/git-status-reply-schema.ts
index fd7f0592b3a..e861367885c 100644
--- a/mobile/src/source-control/git-status-reply-schema.ts
+++ b/mobile/src/source-control/git/git-status-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { openEnum, salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
+import { openEnum, salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
 
 // Require only unguarded consumer fields; unread host metadata must not become a compatibility gate.
 
diff --git a/mobile/src/source-control/mobile-git-mutation-operations.ts b/mobile/src/source-control/git/mobile-git-mutation-operations.ts
similarity index 96%
rename from mobile/src/source-control/mobile-git-mutation-operations.ts
rename to mobile/src/source-control/git/mobile-git-mutation-operations.ts
index d7f6c601a5d..6927f124322 100644
--- a/mobile/src/source-control/mobile-git-mutation-operations.ts
+++ b/mobile/src/source-control/git/mobile-git-mutation-operations.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod'
-import type { TextGenerationFailureFields } from '../../../src/shared/text-generation-failure-copy'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import type { TextGenerationFailureFields } from '../../../../src/shared/text-generation-failure-copy'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 
 export type MobileGenerateCommitMessageResult =
   | { success: true; message: string }
diff --git a/mobile/src/source-control/mobile-git-read-operations.ts b/mobile/src/source-control/git/mobile-git-read-operations.ts
similarity index 85%
rename from mobile/src/source-control/mobile-git-read-operations.ts
rename to mobile/src/source-control/git/mobile-git-read-operations.ts
index 56b536da66d..ba3df7765da 100644
--- a/mobile/src/source-control/mobile-git-read-operations.ts
+++ b/mobile/src/source-control/git/mobile-git-read-operations.ts
@@ -1,14 +1,14 @@
 import * as z from 'zod'
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import type { RpcCompatibleReader } from '../transport/rpc/rpc-operation-contract'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import {
   gitBranchCompareResultSchema,
   gitCommitCompareResultSchema
-} from './git-compare-reply-schema'
-import { gitHistoryResultSchema } from './git-history-reply-schema'
+} from '../branches/git-compare-reply-schema'
+import { gitHistoryResultSchema } from '../history/git-history-reply-schema'
 import { gitStatusHostPayloadSchema, gitStatusProjectionSchema } from './git-status-reply-schema'
-import type { MobileGitStatusResult } from './mobile-git-status'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from './git-status-reply-schema'
 
 // Changes keeps the host payload; the normalized reader drops rows/nulls malformed status and would alter its display.
 export const gitStatusHostPayloadRead = bindDeferredRpcOperation(
diff --git a/mobile/src/source-control/use-mobile-git-requests.test.ts b/mobile/src/source-control/git/use-mobile-git-requests.test.ts
similarity index 58%
rename from mobile/src/source-control/use-mobile-git-requests.test.ts
rename to mobile/src/source-control/git/use-mobile-git-requests.test.ts
index bd9a3948866..dd479536257 100644
--- a/mobile/src/source-control/use-mobile-git-requests.test.ts
+++ b/mobile/src/source-control/git/use-mobile-git-requests.test.ts
@@ -14,23 +14,6 @@ function hostReplying(replies: Record<string, unknown>) {
 const unavailable = Object.assign(new Error('not available'), { code: 'method_not_found' })
 
 describe('runMobileGitSyncSteps', () => {
-  it('pushes when the host reports commits ahead', async () => {
-    const send = hostReplying({ 'git.upstreamStatus': { hasUpstream: true, ahead: 2, behind: 0 } })
-    await runMobileGitSyncSteps(send)
-    expect(send.mock.calls.map(([method]) => method)).toEqual([
-      'git.fetch',
-      'git.pull',
-      'git.upstreamStatus',
-      'git.push'
-    ])
-  })
-
-  it('does not push when nothing is ahead', async () => {
-    const send = hostReplying({ 'git.upstreamStatus': { hasUpstream: true, ahead: 0, behind: 0 } })
-    await runMobileGitSyncSteps(send)
-    expect(send).not.toHaveBeenCalledWith('git.push')
-  })
-
   it.each([
     ['missing ahead', { hasUpstream: true, behind: 0 }],
     ['non-numeric ahead', { hasUpstream: true, ahead: '2', behind: 0 }],
@@ -41,15 +24,6 @@ describe('runMobileGitSyncSteps', () => {
     expect(send).not.toHaveBeenCalledWith('git.push')
   })
 
-  it('falls back to git.status on hosts without git.upstreamStatus', async () => {
-    const send = hostReplying({
-      'git.upstreamStatus': unavailable,
-      'git.status': { entries: [], upstreamStatus: { hasUpstream: true, ahead: 1, behind: 0 } }
-    })
-    await runMobileGitSyncSteps(send)
-    expect(send).toHaveBeenCalledWith('git.push')
-  })
-
   it('fails when the git.status fallback has an unreadable upstream', async () => {
     const send = hostReplying({
       'git.upstreamStatus': unavailable,
diff --git a/mobile/src/source-control/use-mobile-git-requests.ts b/mobile/src/source-control/git/use-mobile-git-requests.ts
similarity index 86%
rename from mobile/src/source-control/use-mobile-git-requests.ts
rename to mobile/src/source-control/git/use-mobile-git-requests.ts
index 3ac5f75ebd5..18d5edcf811 100644
--- a/mobile/src/source-control/use-mobile-git-requests.ts
+++ b/mobile/src/source-control/git/use-mobile-git-requests.ts
@@ -1,11 +1,15 @@
 import { useCallback } from 'react'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcSuccess } from '../transport/rpc/rpc-wire-types'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { translate } from '../i18n/mobile-i18n'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcSuccess } from '../../transport/rpc/rpc-wire-types'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { translate } from '../../i18n/mobile-i18n'
 import { gitStatusHostPayloadSchema, gitUpstreamStatusSchema } from './git-status-reply-schema'
-import { isMobileGitUnavailable, type MobileGitUpstreamStatus } from './mobile-git-status'
-import type { GitCommitResult, GitRequestError } from './mobile-source-control-screen-state'
+import { isMobileGitUnavailable } from '../changes/mobile-git-status'
+import type { MobileGitUpstreamStatus } from './git-status-reply-schema'
+import type {
+  GitCommitResult,
+  GitRequestError
+} from '../changes/mobile-source-control-screen-state'
 
 type Params = {
   client: RpcClient | null
diff --git a/mobile/src/source-control/MobileCommitDetailPage.tsx b/mobile/src/source-control/history/MobileCommitDetailPage.tsx
similarity index 89%
rename from mobile/src/source-control/MobileCommitDetailPage.tsx
rename to mobile/src/source-control/history/MobileCommitDetailPage.tsx
index 043836947d0..3e73f40ff99 100644
--- a/mobile/src/source-control/MobileCommitDetailPage.tsx
+++ b/mobile/src/source-control/history/MobileCommitDetailPage.tsx
@@ -8,25 +8,25 @@ import {
   type HostInstance
 } from 'react-native'
 import { ChevronLeft, Copy, ExternalLink, MoreHorizontal } from 'lucide-react-native'
-import { NavBar } from '../components/nav-bar/NavBar'
-import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { PullDownMenu } from '../components/nav-bar/PullDownMenu'
-import type { ActionSheetAction } from '../components/ActionSheetModal'
-import { ListGroup, ListRow, SectionHeader } from '../components/list/ListGroup'
-import { colors, pressedStyle, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { translate } from '../i18n/mobile-i18n'
-import { useClipboardWriter } from '../platform/clipboard'
-import { openExternalLink } from '../platform/external-link'
-import { triggerSuccess } from '../platform/haptics'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { STATUS_LABELS } from '../../../src/shared/git/status/git-status-labels'
-import { statusColor } from './mobile-git-status'
-import { gitCommitCompareRead, gitRemoteCommitUrlRead } from './mobile-git-read-operations'
-import type { MobileGitChangedFile } from './git-compare-reply-schema'
+import { NavBar } from '../../components/nav-bar/NavBar'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import { PullDownMenu } from '../../components/nav-bar/PullDownMenu'
+import type { ActionSheetAction } from '../../components/ActionSheetModal'
+import { ListGroup, ListRow, SectionHeader } from '../../components/list/ListGroup'
+import { colors, pressedStyle, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { translate } from '../../i18n/mobile-i18n'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { openExternalLink } from '../../platform/external-links/external-link'
+import { triggerSuccess } from '../../platform/haptics/haptics'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { STATUS_LABELS } from '../../../../src/shared/git/status/git-status-labels'
+import { statusColor } from '../changes/mobile-git-status'
+import { gitCommitCompareRead, gitRemoteCommitUrlRead } from '../git/mobile-git-read-operations'
+import type { MobileGitChangedFile } from '../branches/git-compare-reply-schema'
 import type { MobileGitHistoryItem } from './git-history-reply-schema'
 import { buildMobileCommitDetail } from './mobile-git-history'
 import { CommitLineStat } from './MobileCommitListRows'
diff --git a/mobile/src/source-control/MobileCommitListRows.tsx b/mobile/src/source-control/history/MobileCommitListRows.tsx
similarity index 96%
rename from mobile/src/source-control/MobileCommitListRows.tsx
rename to mobile/src/source-control/history/MobileCommitListRows.tsx
index 6d72c7a0da1..7a39803e1f8 100644
--- a/mobile/src/source-control/MobileCommitListRows.tsx
+++ b/mobile/src/source-control/history/MobileCommitListRows.tsx
@@ -1,10 +1,10 @@
 import { ActivityIndicator, Pressable, Text, View } from 'react-native'
 import { ChevronRight } from 'lucide-react-native'
-import { SectionHeader } from '../components/list/ListGroup'
-import { colors, radii, spacing, typography, pressedStyle } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { SectionHeader } from '../../components/list/ListGroup'
+import { colors, radii, spacing, typography, pressedStyle } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import type { MobileCommitsListItem } from './mobile-git-history'
 
 type RowAction = { busy: boolean; disabled: boolean; onPress: () => void }
diff --git a/mobile/src/source-control/MobileCommitsScreen.test.tsx b/mobile/src/source-control/history/MobileCommitsScreen.test.tsx
similarity index 85%
rename from mobile/src/source-control/MobileCommitsScreen.test.tsx
rename to mobile/src/source-control/history/MobileCommitsScreen.test.tsx
index 579ab21745b..9c233110899 100644
--- a/mobile/src/source-control/MobileCommitsScreen.test.tsx
+++ b/mobile/src/source-control/history/MobileCommitsScreen.test.tsx
@@ -2,9 +2,9 @@ import { createElement, type ReactElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import { MobileCommitsScreen } from './MobileCommitsScreen'
 
 vi.mock('react-native', () => ({
@@ -48,7 +48,7 @@ vi.mock('lucide-react-native', () => ({
   WifiOff: 'Icon'
 }))
 // The pager's slide is Reanimated; render the main list and the open page side by side.
-vi.mock('../components/bottom-drawer/BottomDrawer', async () => {
+vi.mock('../../components/bottom-drawer/BottomDrawer', async () => {
   const { createElement: h, useCallback, useState } = await import('react')
   return {
     useOptionPager: () => {
@@ -65,15 +65,15 @@ const backClaim = vi.hoisted(() => {
   const holder: { current: (() => boolean) | null } = { current: null }
   return holder
 })
-vi.mock('../navigation/use-back-claim', () => ({
+vi.mock('../../navigation/use-back-claim', () => ({
   useBackClaim: (claim: (() => boolean) | null) => {
     backClaim.current = claim
   }
 }))
-vi.mock('../components/nav-bar/NavBar', () => ({ NavBar: () => null }))
-vi.mock('../components/nav-bar/NavBarButton', () => ({ NavBarButton: () => null }))
-vi.mock('../components/nav-bar/PullDownMenu', () => ({ PullDownMenu: () => null }))
-vi.mock('../components/list/ListGroup', async () => {
+vi.mock('../../components/nav-bar/NavBar', () => ({ NavBar: () => null }))
+vi.mock('../../components/nav-bar/NavBarButton', () => ({ NavBarButton: () => null }))
+vi.mock('../../components/nav-bar/PullDownMenu', () => ({ PullDownMenu: () => null }))
+vi.mock('../../components/list/ListGroup', async () => {
   const { createElement: h } = await import('react')
   return {
     ListGroup: ({ children }: { children: ReactElement }) => h('View', null, children),
@@ -81,15 +81,17 @@ vi.mock('../components/list/ListGroup', async () => {
     SectionHeader: ({ title }: { title: string }) => h('Text', null, title)
   }
 })
-vi.mock('../platform/clipboard', () => ({ useClipboardWriter: () => ({ writeText: vi.fn() }) }))
-vi.mock('../platform/external-link', () => ({ openExternalLink: vi.fn() }))
-vi.mock('../platform/haptics', () => ({ triggerSuccess: vi.fn() }))
+vi.mock('../../platform/clipboard/clipboard', () => ({
+  useClipboardWriter: () => ({ writeText: vi.fn() })
+}))
+vi.mock('../../platform/external-links/external-link', () => ({ openExternalLink: vi.fn() }))
+vi.mock('../../platform/haptics/haptics', () => ({ triggerSuccess: vi.fn() }))
 const transport = vi.hoisted(
   (): { forceReconnect: ((hostId: string) => Promise<void>) | null } => ({
     forceReconnect: () => Promise.resolve()
   })
 )
-vi.mock('../transport/connection/host-client-hooks', () => ({
+vi.mock('../../transport/connection/host-client-hooks', () => ({
   useForceReconnect: () => transport.forceReconnect
 }))
 
diff --git a/mobile/src/source-control/MobileCommitsScreen.tsx b/mobile/src/source-control/history/MobileCommitsScreen.tsx
similarity index 88%
rename from mobile/src/source-control/MobileCommitsScreen.tsx
rename to mobile/src/source-control/history/MobileCommitsScreen.tsx
index 10facc7f01d..a3aaf9d440b 100644
--- a/mobile/src/source-control/MobileCommitsScreen.tsx
+++ b/mobile/src/source-control/history/MobileCommitsScreen.tsx
@@ -1,14 +1,14 @@
 import { memo, useCallback, useState, type ReactNode } from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { useBackClaim } from '../navigation/use-back-claim'
-import { OptionPager, useOptionPager } from '../components/bottom-drawer/BottomDrawer'
-import { colors } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import { useBackClaim } from '../../navigation/use-back-claim'
+import { OptionPager, useOptionPager } from '../../components/bottom-drawer/BottomDrawer'
+import { colors } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { MobileGitHistoryItem } from './git-history-reply-schema'
 import { MobileCommitDetailPage } from './MobileCommitDetailPage'
-import type { MobileDiffFileTarget } from './use-mobile-source-control-openers'
+import type { MobileDiffFileTarget } from '../panel/use-mobile-source-control-openers'
 import { MobileGitHistoryList, type MobileGitHistoryListProps } from './MobileGitHistoryList'
 
 type OpenCommit = (commit: MobileGitHistoryItem) => void
diff --git a/mobile/src/source-control/MobileGitHistoryList.tsx b/mobile/src/source-control/history/MobileGitHistoryList.tsx
similarity index 92%
rename from mobile/src/source-control/MobileGitHistoryList.tsx
rename to mobile/src/source-control/history/MobileGitHistoryList.tsx
index 2fdcdf71801..575c04a875d 100644
--- a/mobile/src/source-control/MobileGitHistoryList.tsx
+++ b/mobile/src/source-control/history/MobileGitHistoryList.tsx
@@ -5,19 +5,19 @@ import {
   MobileLoadErrorState,
   MobileOfflineState,
   MobileStateView
-} from '../components/MobileStateView'
-import { NavBar } from '../components/nav-bar/NavBar'
-import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { colors, spacing, typography, pressedStyle } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { useForceReconnect } from '../transport/connection/host-client-hooks'
-import { connectionRetryAction } from '../transport/connection/connection-retry-action'
-import { resolveMobileBranchBaseRefs } from './mobile-branch-base-ref'
+} from '../../components/MobileStateView'
+import { NavBar } from '../../components/nav-bar/NavBar'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import { colors, spacing, typography, pressedStyle } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { useForceReconnect } from '../../transport/connection/host-client-hooks'
+import { connectionRetryAction } from '../../transport/connection/connection-retry-action'
+import { resolveMobileBranchBaseRefs } from '../branches/mobile-branch-base-ref'
 import {
   appendMobileGitHistoryPage,
   buildMobileCommitsListItems,
diff --git a/mobile/src/source-control/git-history-reply-schema.ts b/mobile/src/source-control/history/git-history-reply-schema.ts
similarity index 95%
rename from mobile/src/source-control/git-history-reply-schema.ts
rename to mobile/src/source-control/history/git-history-reply-schema.ts
index 1caf05f6ad0..5372eda54c9 100644
--- a/mobile/src/source-control/git-history-reply-schema.ts
+++ b/mobile/src/source-control/history/git-history-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional, salvagingArray } from '../../../src/shared/zod-salvage'
+import { salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
 
 // Require only consumed fields so older hosts can omit unread history metadata.
 
diff --git a/mobile/src/source-control/mobile-git-history.ts b/mobile/src/source-control/history/mobile-git-history.ts
similarity index 96%
rename from mobile/src/source-control/mobile-git-history.ts
rename to mobile/src/source-control/history/mobile-git-history.ts
index e1a5bf7ce2c..d8e9ed28ec6 100644
--- a/mobile/src/source-control/mobile-git-history.ts
+++ b/mobile/src/source-control/history/mobile-git-history.ts
@@ -1,13 +1,13 @@
-import { translate } from '../i18n/mobile-i18n'
-import { getUiIntlLocale } from '../i18n/ui-intl-locale'
+import { translate } from '../../i18n/mobile-i18n'
+import { getUiIntlLocale } from '../../i18n/ui-intl-locale'
 import type {
   MobileGitHistoryBranchRange,
   MobileGitHistoryItem,
   MobileGitHistoryResult
 } from './git-history-reply-schema'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
-import { gitHistoryRead } from './mobile-git-read-operations'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
+import { gitHistoryRead } from '../git/mobile-git-read-operations'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 
 export const MOBILE_GIT_HISTORY_PAGE_SIZE = 50
 
diff --git a/mobile/src/source-control/mobile-history-screen-state.ts b/mobile/src/source-control/history/mobile-history-screen-state.ts
similarity index 100%
rename from mobile/src/source-control/mobile-history-screen-state.ts
rename to mobile/src/source-control/history/mobile-history-screen-state.ts
diff --git a/mobile/src/source-control/mobile-source-control-oversized-stage-all.test.tsx b/mobile/src/source-control/mobile-source-control-oversized-stage-all.test.tsx
deleted file mode 100644
index 680730b022a..00000000000
--- a/mobile/src/source-control/mobile-source-control-oversized-stage-all.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { createElement, useRef } from 'react'
-import { act, create } from 'react-test-renderer'
-import { describe, expect, it, vi } from 'vitest'
-import { createFakeBridgePortPair } from '../mobile-web-shell/bridge/bridge-port-pair-test-harness'
-// Mock native Flow/haptics imports; retain the real bridge-to-error path.
-vi.mock('react-native', () => ({
-  Platform: { OS: 'ios', select: (options: Record<string, unknown>) => options.ios },
-  StyleSheet: { create: (value: unknown) => value, hairlineWidth: 1 }
-}))
-// Mock expo-router through the native routing seam to obtain a checked RouteHandoff.
-vi.mock('expo-router', () => ({
-  useRouter: () => ({
-    back: () => undefined,
-    push: () => undefined,
-    replace: () => undefined,
-    navigate: () => undefined,
-    dismissTo: () => undefined,
-    prefetch: () => undefined,
-    canGoBack: () => false,
-    setParams: () => undefined
-  })
-}))
-vi.mock('../platform/haptics', () => ({
-  triggerSuccess: () => undefined,
-  triggerError: () => undefined,
-  triggerSelection: () => undefined,
-  triggerWarning: () => undefined,
-  triggerImpact: () => undefined
-}))
-
-import { useRouteHandoff } from '../navigation/route-handoff'
-import { useMobileGitRequests } from './use-mobile-git-requests'
-import { useMobileSourceControlRunners } from './use-mobile-source-control-runners'
-
-// Exercise the real oversized-frame refusal through the screen’s runner: the old shell silently dropped it and left busy state forever.
-// Checking only the bridge or only a hand-thrown runner error would miss whether the screen actually displays this refusal.
-
-const PATH_COUNT = 12_000
-const STAGEABLE_PATHS = Array.from(
-  { length: PATH_COUNT },
-  (_, index) => `packages/app/src/features/some/deeply/nested/module/file-${index}-abcdefghij.ts`
-)
-
-function idleRunnerParams() {
-  return {
-    hostId: 'host-a',
-    worktreeId: 'wt-1',
-    status: null,
-    branchLabel: 'main',
-    commitMessage: '',
-    stagedEntries: [],
-    generatingMessage: false,
-    unstageablePaths: [],
-    sendCommitRequest: vi.fn(),
-    runGitSyncSteps: vi.fn(),
-    loadStatus: vi.fn().mockResolvedValue(true),
-    setBusyAction: vi.fn(),
-    setCommitMessage: vi.fn(),
-    setGeneratingMessage: vi.fn(),
-    setShowActionSheet: vi.fn(),
-    setLocalBranches: vi.fn(),
-    setShowBranchPicker: vi.fn(),
-    setCreatedPrUrl: vi.fn(),
-    setCreatedPrWarning: vi.fn(),
-    recordCommitFailure: vi.fn()
-  }
-}
-
-describe('stage-all over the outbound frame cap', () => {
-  it('reports the oversized action and suggests fewer files, then stops being busy', async () => {
-    const pair = createFakeBridgePortPair()
-    await pair.flush()
-    const setActionError = vi.fn()
-    const setBusyAction = vi.fn()
-
-    // Use a holder: TypeScript cannot prove Probe ran and would keep a local binding narrowed to null.
-    const captured: { stageAll: (() => Promise<void>) | null } = { stageAll: null }
-    function Probe(): null {
-      const router = useRouteHandoff()
-      const mountedRef = useRef(true)
-      const busyActionRef = useRef<string | null>(null)
-      const { sendGitRequest } = useMobileGitRequests({
-        client: pair.client,
-        connState: 'connected',
-        worktreeId: 'wt-1'
-      })
-      captured.stageAll = useMobileSourceControlRunners({
-        ...idleRunnerParams(),
-        client: pair.client,
-        router,
-        stageablePaths: STAGEABLE_PATHS,
-        sendGitRequest,
-        mountedRef,
-        busyActionRef,
-        setBusyAction,
-        setActionError
-      }).stageAll
-      return null
-    }
-    await act(async () => {
-      create(createElement(Probe))
-    })
-    const run = captured.stageAll
-    if (!run) {
-      throw new Error('the runners hook never rendered')
-    }
-    await act(async () => {
-      await run()
-    })
-
-    const message = setActionError.mock.calls.map(([value]) => value).findLast(Boolean)
-    expect(message).toBeTruthy()
-    expect(message).toMatch(/[a-z]{4}/)
-    expect(message).not.toMatch(/^bridge_/)
-    expect(message).toContain('fewer files')
-    expect(setBusyAction.mock.calls.map(([value]) => value)).toEqual(['stage-all', null])
-  })
-})
diff --git a/mobile/src/source-control/mobile-source-control-styles.ts b/mobile/src/source-control/mobile-source-control-styles.ts
index 5c84eaf35f2..70cc59b2a44 100644
--- a/mobile/src/source-control/mobile-source-control-styles.ts
+++ b/mobile/src/source-control/mobile-source-control-styles.ts
@@ -1,8 +1,8 @@
 import { StyleSheet } from 'react-native'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet, themedStyles } from '../theme/themed-styles'
-import { diffStyles } from './mobile-source-control-diff-styles'
-import { listStyles } from './mobile-source-control-list-styles'
+import { diffStyles } from './changes/mobile-source-control-diff-styles'
+import { listStyles } from './changes/mobile-source-control-list-styles'
 
 const baseStyles = themedStyleSheet(() => ({
   container: {
diff --git a/mobile/src/source-control/MobileSourceControlHeader.tsx b/mobile/src/source-control/panel/MobileSourceControlHeader.tsx
similarity index 90%
rename from mobile/src/source-control/MobileSourceControlHeader.tsx
rename to mobile/src/source-control/panel/MobileSourceControlHeader.tsx
index 232809bb3b0..cabfed80f7d 100644
--- a/mobile/src/source-control/MobileSourceControlHeader.tsx
+++ b/mobile/src/source-control/panel/MobileSourceControlHeader.tsx
@@ -1,12 +1,12 @@
 import { useRef, useState, type ReactNode } from 'react'
 import type { HostInstance } from 'react-native'
 import { ChevronLeft, ExternalLink, MoreHorizontal, RefreshCw, X } from 'lucide-react-native'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { ActionSheetAction } from '../components/ActionSheetModal'
-import { NavBar } from '../components/nav-bar/NavBar'
-import { NavBarButton } from '../components/nav-bar/NavBarButton'
-import { PullDownMenu } from '../components/nav-bar/PullDownMenu'
-import { useRefreshHint } from '../query/refresh-hint'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { ActionSheetAction } from '../../components/ActionSheetModal'
+import { NavBar } from '../../components/nav-bar/NavBar'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import { PullDownMenu } from '../../components/nav-bar/PullDownMenu'
+import { useRefreshHint } from '../../query/refresh-hint'
 
 type Props = {
   embedded: boolean
diff --git a/mobile/src/source-control/MobileSourceControlHubCommitsPage.tsx b/mobile/src/source-control/panel/MobileSourceControlHubCommitsPage.tsx
similarity index 87%
rename from mobile/src/source-control/MobileSourceControlHubCommitsPage.tsx
rename to mobile/src/source-control/panel/MobileSourceControlHubCommitsPage.tsx
index 4b71607ff21..dfb7bb100fe 100644
--- a/mobile/src/source-control/MobileSourceControlHubCommitsPage.tsx
+++ b/mobile/src/source-control/panel/MobileSourceControlHubCommitsPage.tsx
@@ -1,11 +1,11 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { MobileCommitsScreen } from './MobileCommitsScreen'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { MobileCommitsScreen } from '../history/MobileCommitsScreen'
 import {
   buildMobileBranchRemoteAction,
   type MobileSourceControlReviewInputs
-} from './mobile-source-control-primary-action'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
+} from '../workflows/mobile-source-control-primary-action'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
 
 type Props = {
   state: MobileSourceControlState
diff --git a/mobile/src/source-control/MobileSourceControlModals.tsx b/mobile/src/source-control/panel/MobileSourceControlModals.tsx
similarity index 88%
rename from mobile/src/source-control/MobileSourceControlModals.tsx
rename to mobile/src/source-control/panel/MobileSourceControlModals.tsx
index 85dd3de09de..c9d6c599244 100644
--- a/mobile/src/source-control/MobileSourceControlModals.tsx
+++ b/mobile/src/source-control/panel/MobileSourceControlModals.tsx
@@ -1,8 +1,8 @@
-import { ConfirmModal } from '../components/ConfirmModal'
-import { PickerModal } from '../components/PickerModal'
-import { openMobilePrUrl } from '../components/mobile-pr-url'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
+import { ConfirmModal } from '../../components/ConfirmModal'
+import { PickerModal } from '../../components/PickerModal'
+import { openExternalLink as openMobilePrUrl } from '../../platform/external-links/external-link'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
 
 type Props = {
   state: MobileSourceControlState
diff --git a/mobile/src/source-control/MobileSourceControlNextStepBar.tsx b/mobile/src/source-control/panel/MobileSourceControlNextStepBar.tsx
similarity index 91%
rename from mobile/src/source-control/MobileSourceControlNextStepBar.tsx
rename to mobile/src/source-control/panel/MobileSourceControlNextStepBar.tsx
index 6a524717c3e..77b8741fa07 100644
--- a/mobile/src/source-control/MobileSourceControlNextStepBar.tsx
+++ b/mobile/src/source-control/panel/MobileSourceControlNextStepBar.tsx
@@ -10,27 +10,27 @@ import {
   Sparkles,
   type LucideIcon
 } from 'lucide-react-native'
-import { colors, feedback, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { MessageBox } from '../components/composer-input/MessageBox'
-import { composerInputStyles } from '../components/composer-input/composer-input-styles'
-import { KEYBOARD_COMMIT_BAR_CLEARANCE } from './mobile-source-control-screen-state'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
-import type { MobileSourceControlPrimaryAction } from './mobile-source-control-primary-action'
-import { AgentLaunchNotice } from '../components/AgentLaunchNotice'
-import { ConfirmModal } from '../components/ConfirmModal'
+import { colors, feedback, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { MessageBox } from '../../components/composer-input/MessageBox'
+import { composerInputStyles } from '../../components/composer-input/composer-input-styles'
+import { KEYBOARD_COMMIT_BAR_CLEARANCE } from '../changes/mobile-source-control-screen-state'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
+import type { MobileSourceControlPrimaryAction } from '../workflows/mobile-source-control-primary-action'
+import { AgentLaunchNotice } from '../../components/AgentLaunchNotice'
+import { ConfirmModal } from '../../components/ConfirmModal'
 import type { MobileMergeConfirm } from './use-mobile-source-control-next-step'
-import type { MobileAgentLaunchAvailability } from '../session/agent-launch/mobile-agent-launch-availability'
-import type { PrAiTriageLaunchNotice } from './review/use-mobile-pr-ai-triage'
+import type { MobileAgentLaunchAvailability } from '../../session/agent-launch/mobile-agent-launch-availability'
+import type { PrAiTriageLaunchNotice } from '../review/use-mobile-pr-ai-triage'
 import type {
   MobileNextStepBarView,
   MobileNextStepIcon,
   MobileNextStepTone
 } from './mobile-source-control-next-step'
-import { styles as sourceControlStyles } from './mobile-source-control-styles'
-import { useMobileDictationClearance } from '../dictation/mobile-dictation-host-context'
+import { styles as sourceControlStyles } from '../mobile-source-control-styles'
+import { useMobileDictationClearance } from '../../dictation/mobile-dictation-host-context'
 
 const ICONS: Record<MobileNextStepIcon, LucideIcon> = {
   push: ArrowUp,
diff --git a/mobile/src/source-control/mobile-source-control-hub-styles.ts b/mobile/src/source-control/panel/mobile-source-control-hub-styles.ts
similarity index 93%
rename from mobile/src/source-control/mobile-source-control-hub-styles.ts
rename to mobile/src/source-control/panel/mobile-source-control-hub-styles.ts
index 679f7f18262..f006a941c76 100644
--- a/mobile/src/source-control/mobile-source-control-hub-styles.ts
+++ b/mobile/src/source-control/panel/mobile-source-control-hub-styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native'
-import { colors, radii, spacing, typography } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
+import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
 
 export const hubStyles = themedStyleSheet(() => ({
   // Inset like the Tasks and Agent History switches in their NavBar accessory rows.
diff --git a/mobile/src/source-control/mobile-source-control-hub-tab.ts b/mobile/src/source-control/panel/mobile-source-control-hub-tab.ts
similarity index 94%
rename from mobile/src/source-control/mobile-source-control-hub-tab.ts
rename to mobile/src/source-control/panel/mobile-source-control-hub-tab.ts
index 39994ee7902..15588e73a27 100644
--- a/mobile/src/source-control/mobile-source-control-hub-tab.ts
+++ b/mobile/src/source-control/panel/mobile-source-control-hub-tab.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 
 export type SourceControlHubTab = 'changes' | 'pr'
 
diff --git a/mobile/src/source-control/mobile-source-control-next-step.ts b/mobile/src/source-control/panel/mobile-source-control-next-step.ts
similarity index 90%
rename from mobile/src/source-control/mobile-source-control-next-step.ts
rename to mobile/src/source-control/panel/mobile-source-control-next-step.ts
index e0588541413..e4191e714c4 100644
--- a/mobile/src/source-control/mobile-source-control-next-step.ts
+++ b/mobile/src/source-control/panel/mobile-source-control-next-step.ts
@@ -1,12 +1,12 @@
-import { translate } from '../i18n/mobile-i18n'
-import type { PRInfo } from '../../../src/shared/github/pull-requests/pull-request-types'
-import { resolveGitHubPRMergeMethods } from '../../../src/shared/github/pull-requests/merge/pull-request-merge-methods'
-import { getGitHubPRPrimaryReviewer } from '../../../src/shared/github/pull-requests/pr-reviewer-display'
-import type { GitHubWorkItemDetails } from '../../../src/shared/github/work-items/work-item-types'
-import type { SourceControlNextStep } from '../../../src/shared/source-control/decisions/source-control-next-step-decision'
-import { presentPrMerge } from '../components/pr-sidebar/pr-actions-state'
-import type { MobileCreatePrAction } from './mobile-create-pr-action'
-import type { MobileSourceControlPrimaryAction } from './mobile-source-control-primary-action'
+import { translate } from '../../i18n/mobile-i18n'
+import type { PRInfo } from '../../../../src/shared/github/pull-requests/pull-request-types'
+import { resolveGitHubPRMergeMethods } from '../../../../src/shared/github/pull-requests/merge/pull-request-merge-methods'
+import { getGitHubPRPrimaryReviewer } from '../../../../src/shared/github/pull-requests/pr-reviewer-display'
+import type { GitHubWorkItemDetails } from '../../../../src/shared/github/work-items/work-item-types'
+import type { SourceControlNextStep } from '../../../../src/shared/source-control/decisions/source-control-next-step-decision'
+import { presentPrMerge } from '../../components/pr-sidebar/pr-actions-state'
+import type { MobileCreatePrAction } from '../review/creation/mobile-create-pr-action'
+import type { MobileSourceControlPrimaryAction } from '../workflows/mobile-source-control-primary-action'
 
 // String keys keep native lucide imports out of this module.
 export type MobileNextStepIcon =
diff --git a/mobile/src/source-control/use-mobile-source-control-agent-name.ts b/mobile/src/source-control/panel/use-mobile-source-control-agent-name.ts
similarity index 60%
rename from mobile/src/source-control/use-mobile-source-control-agent-name.ts
rename to mobile/src/source-control/panel/use-mobile-source-control-agent-name.ts
index 9613f0b7af7..e920e8deee6 100644
--- a/mobile/src/source-control/use-mobile-source-control-agent-name.ts
+++ b/mobile/src/source-control/panel/use-mobile-source-control-agent-name.ts
@@ -1,7 +1,7 @@
-import type { SourceControlLaunchActionId } from '../../../src/shared/source-control/ai/recipes/source-control-ai-actions'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import { useMobileLaunchAgentLabel } from '../session/agent-launch/use-mobile-launch-agent-label'
+import type { SourceControlLaunchActionId } from '../../../../src/shared/source-control/ai/recipes/source-control-ai-actions'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import { useMobileLaunchAgentLabel } from '../../session/agent-launch/use-mobile-launch-agent-label'
 
 /**
  * Names the agent an AI action in this workspace would launch, so the button can say "Fix with Claude".
diff --git a/mobile/src/source-control/use-mobile-source-control-next-step.ts b/mobile/src/source-control/panel/use-mobile-source-control-next-step.ts
similarity index 83%
rename from mobile/src/source-control/use-mobile-source-control-next-step.ts
rename to mobile/src/source-control/panel/use-mobile-source-control-next-step.ts
index a845e1f421c..4ba41f23690 100644
--- a/mobile/src/source-control/use-mobile-source-control-next-step.ts
+++ b/mobile/src/source-control/panel/use-mobile-source-control-next-step.ts
@@ -1,37 +1,37 @@
 import { useCallback, useMemo, useState } from 'react'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { useHostProtocolGates } from '../components/host-protocol-gates-context'
-import { presentPrMerge } from '../components/pr-sidebar/pr-actions-state'
-import { useMobilePrActions } from './review/use-mobile-pr-actions'
-import './review/pr-actions-engine'
-import type { PrActionBusyKey } from './review/pr-actions-engine'
-import { prActionSlices, type PrSlice } from './review/mobile-pr-queries'
-import { useMobilePrAiTriage, type PrAiTriageKey } from './review/use-mobile-pr-ai-triage'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { useHostProtocolGates } from '../../components/host-protocol-gates-context'
+import { presentPrMerge } from '../../components/pr-sidebar/pr-actions-state'
+import { useMobilePrActions } from '../review/use-mobile-pr-actions'
+import '../review/pr-actions-engine'
+import type { PrActionBusyKey } from '../review/pr-actions-engine'
+import { prActionSlices, type PrSlice } from '../review/mobile-pr-queries'
+import { useMobilePrAiTriage, type PrAiTriageKey } from '../review/use-mobile-pr-ai-triage'
 import {
   buildPrFixChecksPrompt,
   buildResolveConflictsPrompt as buildReviewConflictsPrompt
-} from './review/pr-ai-triage-prompt'
-import type { PrSidebarState } from './review/mobile-pr-sidebar-state'
-import { buildResolveConflictsPrompt } from '../../../src/shared/source-control/recovery/source-control-conflict-prompts'
-import { resolveGitHubPRMergeMethods } from '../../../src/shared/github/pull-requests/merge/pull-request-merge-methods'
-import type { GitHubPRMergeMethod } from '../../../src/shared/github/pull-requests/pull-request-types'
-import { summarizeProviderChecks } from '../../../src/shared/source-control/checks/provider-check-summary'
-import { getBrokenChecks } from '../../../src/shared/source-control/checks/pr-checks-fix-prompt'
-import { resolveSourceControlCommitAreaPrimaryActionDecision } from '../../../src/shared/source-control/decisions/source-control-primary-action-decision'
+} from '../review/pr-ai-triage-prompt'
+import type { PrSidebarState } from '../review/mobile-pr-sidebar-state'
+import { buildResolveConflictsPrompt } from '../../../../src/shared/source-control/recovery/source-control-conflict-prompts'
+import { resolveGitHubPRMergeMethods } from '../../../../src/shared/github/pull-requests/merge/pull-request-merge-methods'
+import type { GitHubPRMergeMethod } from '../../../../src/shared/github/pull-requests/pull-request-types'
+import { summarizeProviderChecks } from '../../../../src/shared/source-control/checks/provider-check-summary'
+import { getBrokenChecks } from '../../../../src/shared/source-control/checks/pr-checks-fix-prompt'
+import { resolveSourceControlCommitAreaPrimaryActionDecision } from '../../../../src/shared/source-control/decisions/source-control-primary-action-decision'
 import {
   resolveSourceControlNextStep,
   type SourceControlNextStepReview
-} from '../../../src/shared/source-control/decisions/source-control-next-step-decision'
-import { splitWorktreeIdForFilesystem } from '../../../src/shared/worktree/id'
-import { MOBILE_COMPLETE_MERGE_ACTION_ID } from './mobile-source-control-conflict-actions'
+} from '../../../../src/shared/source-control/decisions/source-control-next-step-decision'
+import { splitWorktreeIdForFilesystem } from '../../../../src/shared/worktree/id'
+import { MOBILE_COMPLETE_MERGE_ACTION_ID } from '../conflicts/mobile-source-control-conflict-actions'
 import {
   buildMobileSourceControlDecisionInputs,
   type MobileSourceControlPrimaryAction,
   type MobileSourceControlReviewInputs
-} from './mobile-source-control-primary-action'
+} from '../workflows/mobile-source-control-primary-action'
 import { buildMobileNextStepBar } from './mobile-source-control-next-step'
 import { useMobileSourceControlAgentName } from './use-mobile-source-control-agent-name'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
 
 type Params = {
   worktreeId: string
diff --git a/mobile/src/source-control/use-mobile-source-control-openers.ts b/mobile/src/source-control/panel/use-mobile-source-control-openers.ts
similarity index 87%
rename from mobile/src/source-control/use-mobile-source-control-openers.ts
rename to mobile/src/source-control/panel/use-mobile-source-control-openers.ts
index fda05f27f00..6314ad5e482 100644
--- a/mobile/src/source-control/use-mobile-source-control-openers.ts
+++ b/mobile/src/source-control/panel/use-mobile-source-control-openers.ts
@@ -1,6 +1,9 @@
 import { useCallback } from 'react'
-import { useWorkspaceRouteHandoff } from '../navigation/workspace-route-handoff'
-import { buildMobileReviewFileRoute, type MobileReviewRouteArea } from './mobile-review-route'
+import { useWorkspaceRouteHandoff } from '../../navigation/workspace-route-handoff'
+import {
+  buildMobileReviewFileRoute,
+  type MobileReviewRouteArea
+} from '../review/mobile-review-route'
 
 // A changed file in the worktree or on the branch, or a file in one commit (diffed against its parent).
 export type MobileDiffFileTarget =
diff --git a/mobile/src/source-control/use-mobile-source-control-pr-tab.ts b/mobile/src/source-control/panel/use-mobile-source-control-pr-tab.ts
similarity index 88%
rename from mobile/src/source-control/use-mobile-source-control-pr-tab.ts
rename to mobile/src/source-control/panel/use-mobile-source-control-pr-tab.ts
index 69a4b9c82da..ef65413866f 100644
--- a/mobile/src/source-control/use-mobile-source-control-pr-tab.ts
+++ b/mobile/src/source-control/panel/use-mobile-source-control-pr-tab.ts
@@ -1,19 +1,19 @@
 import { useCallback, useLayoutEffect, useRef, type MutableRefObject } from 'react'
-import type { HostConnectionInputs } from '../transport/connection/client-context-connection-metrics'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { PrSidebarState } from './review/mobile-pr-sidebar-state'
-import type { MobilePrSidebarController } from './review/use-mobile-pr-sidebar-controller'
+import type { HostConnectionInputs } from '../../transport/connection/client-context-connection-metrics'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { PrSidebarState } from '../review/mobile-pr-sidebar-state'
+import type { MobilePrSidebarController } from '../review/use-mobile-pr-sidebar-controller'
 import {
   useMobilePrTab,
   type MobilePrCreateSettled,
   type PrTabScreen
-} from '../components/pr-sidebar/use-mobile-pr-tab'
-import { usePrTabMenuGroups } from '../components/pr-sidebar/use-pr-tab-menu'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
+} from '../../components/pr-sidebar/use-mobile-pr-tab'
+import { usePrTabMenuGroups } from '../../components/pr-sidebar/use-pr-tab-menu'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
 import type { SourceControlHubTab } from './mobile-source-control-hub-tab'
 import type { SourceControlHubScreen } from './use-source-control-hub-navigation'
-import type { MobilePrActions } from './review/use-mobile-pr-actions'
-import type { MobilePrAiTriage } from './review/use-mobile-pr-ai-triage'
+import type { MobilePrActions } from '../review/use-mobile-pr-actions'
+import type { MobilePrAiTriage } from '../review/use-mobile-pr-ai-triage'
 
 /** The hub's way into the PR tab's sheets, filled once the tab exists. */
 export type MobilePrTabOpeners = { createPr: () => void; merge: () => void }
diff --git a/mobile/src/source-control/use-mobile-source-control-refresh.ts b/mobile/src/source-control/panel/use-mobile-source-control-refresh.ts
similarity index 79%
rename from mobile/src/source-control/use-mobile-source-control-refresh.ts
rename to mobile/src/source-control/panel/use-mobile-source-control-refresh.ts
index e02d51ac521..586332ea9d8 100644
--- a/mobile/src/source-control/use-mobile-source-control-refresh.ts
+++ b/mobile/src/source-control/panel/use-mobile-source-control-refresh.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import type { MobilePrSidebarController } from './review/use-mobile-pr-sidebar-controller'
-import type { MobileSourceControlLoaders } from './use-mobile-source-control-loaders'
+import type { MobilePrSidebarController } from '../review/use-mobile-pr-sidebar-controller'
+import type { MobileSourceControlLoaders } from '../changes/use-mobile-source-control-loaders'
 
 type Params = {
   loadStatus: MobileSourceControlLoaders['loadStatus']
diff --git a/mobile/src/source-control/use-source-control-hub-navigation.ts b/mobile/src/source-control/panel/use-source-control-hub-navigation.ts
similarity index 89%
rename from mobile/src/source-control/use-source-control-hub-navigation.ts
rename to mobile/src/source-control/panel/use-source-control-hub-navigation.ts
index 76ccfbb3ebe..f259d561cb8 100644
--- a/mobile/src/source-control/use-source-control-hub-navigation.ts
+++ b/mobile/src/source-control/panel/use-source-control-hub-navigation.ts
@@ -1,8 +1,8 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { useOptionPager } from '../components/bottom-drawer/BottomDrawer'
-import { useBackClaim } from '../navigation/use-back-claim'
+import { useOptionPager } from '../../components/bottom-drawer/BottomDrawer'
+import { useBackClaim } from '../../navigation/use-back-claim'
 import type { SourceControlHubRouteTab, SourceControlHubTab } from './mobile-source-control-hub-tab'
-import type { PrTabScreen } from '../components/pr-sidebar/use-mobile-pr-tab'
+import type { PrTabScreen } from '../../components/pr-sidebar/use-mobile-pr-tab'
 
 // Screens pushed over the hub: Commits, and the PR tab's Checks and Comments.
 export type SourceControlHubScreen = 'commits' | PrTabScreen
diff --git a/mobile/src/source-control/hosted-review-copy.ts b/mobile/src/source-control/review/creation/hosted-review-copy.ts
similarity index 97%
rename from mobile/src/source-control/hosted-review-copy.ts
rename to mobile/src/source-control/review/creation/hosted-review-copy.ts
index f12c3034711..238fdc219b0 100644
--- a/mobile/src/source-control/hosted-review-copy.ts
+++ b/mobile/src/source-control/review/creation/hosted-review-copy.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../../i18n/mobile-i18n'
 import type { MobileHostedReviewCreateIntentProgress } from './mobile-hosted-review-create-intent'
 
 // Use the desktop provider vocabulary: GitLab says Merge Request.
diff --git a/mobile/src/source-control/hosted-review-reply-schema.ts b/mobile/src/source-control/review/creation/hosted-review-reply-schema.ts
similarity index 95%
rename from mobile/src/source-control/hosted-review-reply-schema.ts
rename to mobile/src/source-control/review/creation/hosted-review-reply-schema.ts
index af643cd66ab..c52b8fe3064 100644
--- a/mobile/src/source-control/hosted-review-reply-schema.ts
+++ b/mobile/src/source-control/review/creation/hosted-review-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../../src/shared/zod-salvage'
 
 // Require provider for compose routing; preserve unknown tokens that newer hosts may publish.
 // Provider round-trips on create, so enum fallback would corrupt the host’s token; gate support at the UI.
diff --git a/mobile/src/source-control/mobile-create-pr-action.ts b/mobile/src/source-control/review/creation/mobile-create-pr-action.ts
similarity index 94%
rename from mobile/src/source-control/mobile-create-pr-action.ts
rename to mobile/src/source-control/review/creation/mobile-create-pr-action.ts
index e0425a2933f..591d27e247a 100644
--- a/mobile/src/source-control/mobile-create-pr-action.ts
+++ b/mobile/src/source-control/review/creation/mobile-create-pr-action.ts
@@ -1,7 +1,7 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../../i18n/mobile-i18n'
 import type { MobileHostedReviewEligibilityReply } from './hosted-review-reply-schema'
-import { supportsHostedReviewCreation } from '../../../src/shared/source-control/hosted-review/hosted-review-creation-providers'
-import { resolveCreateReviewIntentEligibility } from '../../../src/shared/source-control/decisions/source-control-create-review-intent'
+import { supportsHostedReviewCreation } from '../../../../../src/shared/source-control/hosted-review/hosted-review-creation-providers'
+import { resolveCreateReviewIntentEligibility } from '../../../../../src/shared/source-control/decisions/source-control-create-review-intent'
 import { hostedReviewCopy } from './hosted-review-copy'
 import { getMobilePrCreateBlockMessage } from './mobile-pr-create'
 
diff --git a/mobile/src/source-control/mobile-hosted-review-create-intent-runner.test.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.test.ts
similarity index 89%
rename from mobile/src/source-control/mobile-hosted-review-create-intent-runner.test.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.test.ts
index 27bdba288de..6a48e773717 100644
--- a/mobile/src/source-control/mobile-hosted-review-create-intent-runner.test.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
-import { gitStatusHostPayloadSchema } from './git-status-reply-schema'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { RpcFailure, RpcResponse, RpcSuccess } from '../transport/rpc/rpc-wire-types'
+import { gitStatusHostPayloadSchema } from '../../git/git-status-reply-schema'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { RpcFailure, RpcResponse, RpcSuccess } from '../../../transport/rpc/rpc-wire-types'
 import { runMobileHostedReviewCreateIntent } from './mobile-hosted-review-create-intent-runner'
 
 function ok(result: unknown): RpcSuccess {
diff --git a/mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts
similarity index 82%
rename from mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts
index f57c7d4f0e2..54561177855 100644
--- a/mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts
@@ -1,16 +1,15 @@
-import type { MobileGitStatusResult } from './mobile-git-status'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
+import { getMobilePrCreateBlockMessage, getMobilePrCreateSuccessWarning } from './mobile-pr-create'
 import {
-  createMobilePr,
-  getMobilePrCreateBlockMessage,
-  getMobilePrCreateSuccessWarning,
-  shouldPushBeforeMobilePrCreate,
-  type MobilePrPrefill
-} from './mobile-pr-create'
+  createMobileHostedReview as createMobilePr,
+  shouldPushBeforeMobileHostedReviewCreate as shouldPushBeforeMobilePrCreate
+} from './mobile-hosted-review-service'
+import type { MobileHostedReviewPrefill as MobilePrPrefill } from './mobile-hosted-review-service'
 import {
   prepareMobileHostedReviewCreateIntent,
   type MobileHostedReviewCreateIntentProgress
 } from './mobile-hosted-review-create-intent'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
 
 type RunInput = {
   branch: string
diff --git a/mobile/src/source-control/mobile-hosted-review-create-intent.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent.ts
similarity index 92%
rename from mobile/src/source-control/mobile-hosted-review-create-intent.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-create-intent.ts
index 00e33f2943d..72bcb46429a 100644
--- a/mobile/src/source-control/mobile-hosted-review-create-intent.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-create-intent.ts
@@ -1,9 +1,12 @@
-import { translate } from '../i18n/mobile-i18n'
-import { requestMobileCommitMessage } from './mobile-commit-message-ai'
-import { getStageablePaths, type MobileGitStatusResult } from './mobile-git-status'
+import { translate } from '../../../i18n/mobile-i18n'
+import { requestMobileCommitMessage } from '../../commits/mobile-commit-message-ai'
+import { getStageablePaths } from '../../changes/mobile-git-status'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
 import { getMobilePrEligibilityReadiness } from './mobile-open-pr-prefill'
-import { resolveMobilePrPrefill, type MobilePrPrefill } from './mobile-pr-create'
-import { isBehindOnlyUpstream } from '../../../src/shared/git/remotes/git-upstream-status'
+import './mobile-pr-create'
+import { resolveMobileHostedReviewPrefill as resolveMobilePrPrefill } from './mobile-hosted-review-service'
+import type { MobileHostedReviewPrefill as MobilePrPrefill } from './mobile-hosted-review-service'
+import { isBehindOnlyUpstream } from '../../../../../src/shared/git/remotes/git-upstream-status'
 import {
   commitMobileHostedReviewStagedChanges,
   fastForwardMobileHostedReviewBranch,
@@ -12,9 +15,9 @@ import {
   stageMobileHostedReviewPaths
 } from './mobile-hosted-review-git-preparation'
 import { applyMobileHostedReviewRemotePrerequisite } from './mobile-hosted-review-remote-prerequisite'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
 
-export { mobileHostedReviewCreateIntentProgressMessage } from './hosted-review-copy'
+import './hosted-review-copy'
 
 export type MobileHostedReviewCreateIntentProgress =
   | 'fast_forwarding'
diff --git a/mobile/src/source-control/mobile-hosted-review-git-preparation.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts
similarity index 87%
rename from mobile/src/source-control/mobile-hosted-review-git-preparation.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts
index b6d1c40d04c..ce0899ad76b 100644
--- a/mobile/src/source-control/mobile-hosted-review-git-preparation.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts
@@ -1,19 +1,19 @@
-import { translate } from '../i18n/mobile-i18n'
-import type { RpcSendParams } from '../../../src/shared/rpc-contract/rpc-send-params'
+import { translate } from '../../../i18n/mobile-i18n'
+import type { RpcSendParams } from '../../../../../src/shared/rpc-contract/rpc-send-params'
 import {
   hostReplyErrorTextOrFallback,
   refusedRpcMessageOrFallback
-} from '../transport/rpc/rpc-refusal-message'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+} from '../../../transport/rpc/rpc-refusal-message'
+import type { RpcResponse } from '../../../transport/rpc/rpc-wire-types'
 import {
   gitBulkStageRun,
   gitCommitRun,
   gitFastForwardRun,
   gitPushRun
-} from './mobile-git-mutation-operations'
-import { gitStatusProjectionRead } from './mobile-git-read-operations'
-import type { MobileGitStatusResult } from './mobile-git-status'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+} from '../../git/mobile-git-mutation-operations'
+import { gitStatusProjectionRead } from '../../git/mobile-git-read-operations'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
 
 export type MobileHostedReviewStatusReadResult =
   | { ok: true; status: MobileGitStatusResult | null }
diff --git a/mobile/src/source-control/mobile-hosted-review-operations.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-operations.ts
similarity index 90%
rename from mobile/src/source-control/mobile-hosted-review-operations.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-operations.ts
index d09c1ba3609..3c084d21c07 100644
--- a/mobile/src/source-control/mobile-hosted-review-operations.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-operations.ts
@@ -1,5 +1,8 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant, rpcResultVariants } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../../transport/rpc/rpc-operation'
+import {
+  rpcResultVariant,
+  rpcResultVariants
+} from '../../../transport/rpc/rpc-operation-result-reader'
 import {
   hostedReviewCreateFailedSchema,
   hostedReviewCreateOkSchema,
diff --git a/mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts
similarity index 82%
rename from mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts
index d44b7a8acc9..11ed2811639 100644
--- a/mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts
@@ -1,14 +1,14 @@
-import { translate } from '../i18n/mobile-i18n'
-import { resolveCreatePrIntentRemoteStep } from '../../../src/shared/source-control/decisions/source-control-create-review-intent'
-import type { MobileGitStatusResult } from './mobile-git-status'
+import { translate } from '../../../i18n/mobile-i18n'
+import { resolveCreatePrIntentRemoteStep } from '../../../../../src/shared/source-control/decisions/source-control-create-review-intent'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
 import type { MobileHostedReviewCreateIntentProgress } from './mobile-hosted-review-create-intent'
-import type { MobilePrPrefill } from './mobile-pr-create'
+import type { MobileHostedReviewPrefill as MobilePrPrefill } from './mobile-hosted-review-service'
 import {
   fastForwardMobileHostedReviewBranch,
   pushMobileHostedReviewBranch
 } from './mobile-hosted-review-git-preparation'
-import { readBranchCompareOutcome } from './mobile-branch-compare-outcome'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { readBranchCompareOutcome } from '../../branches/mobile-branch-compare-outcome'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
 
 type RemotePrerequisiteInput = {
   status: MobileGitStatusResult | null
diff --git a/mobile/src/source-control/mobile-hosted-review-service.ts b/mobile/src/source-control/review/creation/mobile-hosted-review-service.ts
similarity index 95%
rename from mobile/src/source-control/mobile-hosted-review-service.ts
rename to mobile/src/source-control/review/creation/mobile-hosted-review-service.ts
index 34c5d7111f6..bcb2ea2eb9c 100644
--- a/mobile/src/source-control/mobile-hosted-review-service.ts
+++ b/mobile/src/source-control/review/creation/mobile-hosted-review-service.ts
@@ -1,8 +1,8 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../../i18n/mobile-i18n'
 import type { MobileHostedReviewEligibilityReply } from './hosted-review-reply-schema'
-import { getRepoIdFromWorktreeId } from '../../../src/shared/worktree/id'
-import type { RpcSendParams } from '../../../src/shared/rpc-contract/rpc-send-params'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
+import { getRepoIdFromWorktreeId } from '../../../../../src/shared/worktree/id'
+import type { RpcSendParams } from '../../../../../src/shared/rpc-contract/rpc-send-params'
+import { refusedRpcMessageOrFallback } from '../../../transport/rpc/rpc-refusal-message'
 import { hostedReviewCopy } from './hosted-review-copy'
 import {
   hostedReviewCreateRun,
@@ -10,8 +10,8 @@ import {
   type MobileHostedReviewCreateReply
 } from './mobile-hosted-review-operations'
 import { pushMobileHostedReviewBranch } from './mobile-hosted-review-git-preparation'
-import { linkMobileHostedReview } from './mobile-pr-link'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { linkMobileHostedReview } from '../mobile-pr-link'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
 
 // Mobile ids combine repo::path; hosted-review RPCs need separate selectors.
 export function mobileRepoSelectorFromWorktreeId(worktreeId: string): string {
diff --git a/mobile/src/source-control/mobile-open-pr-prefill.ts b/mobile/src/source-control/review/creation/mobile-open-pr-prefill.ts
similarity index 84%
rename from mobile/src/source-control/mobile-open-pr-prefill.ts
rename to mobile/src/source-control/review/creation/mobile-open-pr-prefill.ts
index 1d50d894b00..854781e8ecf 100644
--- a/mobile/src/source-control/mobile-open-pr-prefill.ts
+++ b/mobile/src/source-control/review/creation/mobile-open-pr-prefill.ts
@@ -1,5 +1,5 @@
-import { readMobileGitStatusResult } from './review/mobile-diff-review-rpc'
-import type { MobileGitStatusResult } from './mobile-git-status'
+import { readMobileGitStatusResult } from '../mobile-diff-review-rpc'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
 
 export async function readFreshGitStatus(
   worktreeId: string,
diff --git a/mobile/src/source-control/mobile-git-history.test.ts b/mobile/src/source-control/review/creation/mobile-pr-create-draft.test.ts
similarity index 100%
rename from mobile/src/source-control/mobile-git-history.test.ts
rename to mobile/src/source-control/review/creation/mobile-pr-create-draft.test.ts
diff --git a/mobile/src/source-control/mobile-pr-create-draft.ts b/mobile/src/source-control/review/creation/mobile-pr-create-draft.ts
similarity index 75%
rename from mobile/src/source-control/mobile-pr-create-draft.ts
rename to mobile/src/source-control/review/creation/mobile-pr-create-draft.ts
index ae5f965dc7e..1693db56c26 100644
--- a/mobile/src/source-control/mobile-pr-create-draft.ts
+++ b/mobile/src/source-control/review/creation/mobile-pr-create-draft.ts
@@ -1,29 +1,33 @@
-import { legacyBaseRefSearchResult } from '../../../src/shared/base-ref-search-result'
-import { translate } from '../i18n/mobile-i18n'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
-import { resolveCreateReviewSeedFromCommits } from '../../../src/shared/source-control/hosted-review/hosted-review-create-seed'
+import { legacyBaseRefSearchResult } from '../../../../../src/shared/base-ref-search-result'
+import { translate } from '../../../i18n/mobile-i18n'
+import { refusedRpcMessageOrFallback } from '../../../transport/rpc/rpc-refusal-message'
+import type { UnvalidatedRpcRequestPort } from '../../../transport/rpc/unvalidated-rpc-request-port'
+import { resolveCreateReviewSeedFromCommits } from '../../../../../src/shared/source-control/hosted-review/hosted-review-create-seed'
 import {
   normalizeCreateReviewBaseSearchResults,
   normalizeHostedReviewBaseRef
-} from '../../../src/shared/source-control/hosted-review/hosted-review-refs'
-import { TEXT_GENERATION_CLIENT_TIMEOUT_MS } from '../../../src/shared/text-generation-client-timeout'
-import type { HostedReviewProvider } from '../../../src/shared/source-control/hosted-review/hosted-review-contracts'
-import type { MobileGitStatusResult } from './mobile-git-status'
-import { fetchMobileGitHistory } from './mobile-git-history'
-import type { MobileGitHistoryItem, MobileGitHistoryResult } from './git-history-reply-schema'
+} from '../../../../../src/shared/source-control/hosted-review/hosted-review-refs'
+import { TEXT_GENERATION_CLIENT_TIMEOUT_MS } from '../../../../../src/shared/text-generation-client-timeout'
+import type { HostedReviewProvider } from '../../../../../src/shared/source-control/hosted-review/hosted-review-contracts'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../../git/git-status-reply-schema'
+import { fetchMobileGitHistory } from '../../history/mobile-git-history'
+import type {
+  MobileGitHistoryItem,
+  MobileGitHistoryResult
+} from '../../history/git-history-reply-schema'
 import { getMobilePrEligibilityReadiness } from './mobile-open-pr-prefill'
+import './mobile-pr-create'
 import {
   mobileRepoSelectorFromWorktreeId,
-  resolveMobilePrPrefill,
-  type MobilePrPrefill
-} from './mobile-pr-create'
+  resolveMobileHostedReviewPrefill as resolveMobilePrPrefill
+} from './mobile-hosted-review-service'
+import type { MobileHostedReviewPrefill as MobilePrPrefill } from './mobile-hosted-review-service'
 import {
   gitCancelGeneratePullRequestFieldsRun,
   gitGeneratePullRequestFieldsRun,
   type MobileGeneratePullRequestFieldsResult
-} from './mobile-git-mutation-operations'
-import { repoBaseRefSearchRead } from './mobile-repo-base-ref-operations'
+} from '../../git/mobile-git-mutation-operations'
+import { repoBaseRefSearchRead } from '../../branches/mobile-repo-base-ref-operations'
 
 export type MobilePrCreateDraft = {
   prefill: MobilePrPrefill
diff --git a/mobile/src/source-control/mobile-pr-create-flow.test.ts b/mobile/src/source-control/review/creation/mobile-pr-create-flow.test.ts
similarity index 81%
rename from mobile/src/source-control/mobile-pr-create-flow.test.ts
rename to mobile/src/source-control/review/creation/mobile-pr-create-flow.test.ts
index b9074db4d7d..87f8be2e68e 100644
--- a/mobile/src/source-control/mobile-pr-create-flow.test.ts
+++ b/mobile/src/source-control/review/creation/mobile-pr-create-flow.test.ts
@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { RpcFailure, RpcResponse, RpcSuccess } from '../transport/rpc/rpc-wire-types'
-import { createMobilePr } from './mobile-pr-create'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { RpcFailure, RpcResponse, RpcSuccess } from '../../../transport/rpc/rpc-wire-types'
+import './mobile-pr-create'
+import { createMobileHostedReview as createMobilePr } from './mobile-hosted-review-service'
 
 function ok(result: unknown): RpcSuccess {
   return { id: 'r', ok: true, result, _meta: { runtimeId: 'rt' } }
diff --git a/mobile/src/source-control/mobile-pr-create.ts b/mobile/src/source-control/review/creation/mobile-pr-create.ts
similarity index 82%
rename from mobile/src/source-control/mobile-pr-create.ts
rename to mobile/src/source-control/review/creation/mobile-pr-create.ts
index 2a81efac6b5..44b003e3fbe 100644
--- a/mobile/src/source-control/mobile-pr-create.ts
+++ b/mobile/src/source-control/review/creation/mobile-pr-create.ts
@@ -1,30 +1,12 @@
-import { translate } from '../i18n/mobile-i18n'
-import { isHostedReviewCreateEligibilityConfirmable } from '../../../src/shared/source-control/hosted-review/hosted-review-create-confirmation'
-import { hostedReviewCopy } from './hosted-review-copy'
-import {
-  buildMobileHostedReviewCreateParams,
-  createMobileHostedReview,
-  mobileRepoSelectorFromWorktreeId,
-  resolveMobileHostedReviewPrefill,
-  shouldPushBeforeMobileHostedReviewCreate,
-  type MobileHostedReviewCreateInput,
-  type MobileHostedReviewCreateOutcome,
-  type MobileHostedReviewEligibilityInput,
-  type MobileHostedReviewPrefill
+import type {
+  MobileHostedReviewPrefill as MobilePrPrefill,
+  MobileHostedReviewCreateOutcome as MobilePrCreateOutcome
 } from './mobile-hosted-review-service'
 
-export type MobilePrEligibilityInput = MobileHostedReviewEligibilityInput
-export type MobilePrPrefill = MobileHostedReviewPrefill
-export type MobilePrCreateInput = MobileHostedReviewCreateInput
-export type MobilePrCreateOutcome = MobileHostedReviewCreateOutcome
-
-export {
-  buildMobileHostedReviewCreateParams as buildMobilePrCreateParams,
-  createMobileHostedReview as createMobilePr,
-  mobileRepoSelectorFromWorktreeId,
-  resolveMobileHostedReviewPrefill as resolveMobilePrPrefill,
-  shouldPushBeforeMobileHostedReviewCreate as shouldPushBeforeMobilePrCreate
-}
+import { translate } from '../../../i18n/mobile-i18n'
+import { isHostedReviewCreateEligibilityConfirmable } from '../../../../../src/shared/source-control/hosted-review/hosted-review-create-confirmation'
+import { hostedReviewCopy } from './hosted-review-copy'
+import './mobile-hosted-review-service'
 
 export function getMobilePrCreateSuccessWarning(
   outcome: Extract<MobilePrCreateOutcome, { ok: true }>,
diff --git a/mobile/src/source-control/use-mobile-hosted-review-eligibility.test.ts b/mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.test.ts
similarity index 99%
rename from mobile/src/source-control/use-mobile-hosted-review-eligibility.test.ts
rename to mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.test.ts
index db7dfcc8304..42ae5c435a1 100644
--- a/mobile/src/source-control/use-mobile-hosted-review-eligibility.test.ts
+++ b/mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.test.ts
@@ -149,7 +149,6 @@ describe('eligibility request ordering', () => {
       renderer?.update(createElement(Harness, { dirty: true }))
       await Promise.resolve()
     })
-    expect(requests).toHaveLength(2)
 
     await act(async () => {
       requests[1]!.resolve({ ok: true, result: newest })
diff --git a/mobile/src/source-control/use-mobile-hosted-review-eligibility.ts b/mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.ts
similarity index 96%
rename from mobile/src/source-control/use-mobile-hosted-review-eligibility.ts
rename to mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.ts
index d5c0b6f03b4..1590df797cc 100644
--- a/mobile/src/source-control/use-mobile-hosted-review-eligibility.ts
+++ b/mobile/src/source-control/review/creation/use-mobile-hosted-review-eligibility.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
 import type { MobileHostedReviewEligibilityReply } from './hosted-review-reply-schema'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../../transport/connection/connection-state'
 import {
   fetchMobileHostedReviewEligibility,
   type MobileHostedReviewEligibilityInput
diff --git a/mobile/src/source-control/use-mobile-source-control-create-pr-action.ts b/mobile/src/source-control/review/creation/use-mobile-source-control-create-pr-action.ts
similarity index 93%
rename from mobile/src/source-control/use-mobile-source-control-create-pr-action.ts
rename to mobile/src/source-control/review/creation/use-mobile-source-control-create-pr-action.ts
index 3ed89e2a359..0a81a1085c3 100644
--- a/mobile/src/source-control/use-mobile-source-control-create-pr-action.ts
+++ b/mobile/src/source-control/review/creation/use-mobile-source-control-create-pr-action.ts
@@ -1,11 +1,11 @@
 import { useMemo } from 'react'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 import { buildMobileCreatePrAction } from './mobile-create-pr-action'
 import { useMobileHostedReviewEligibility } from './use-mobile-hosted-review-eligibility'
 import {
   getMobileBranchCommitsAhead,
   type MobileSourceControlPrimaryActionArgs
-} from './mobile-source-control-primary-action'
+} from '../../workflows/mobile-source-control-primary-action'
 
 type Params = {
   client: Parameters<typeof useMobileHostedReviewEligibility>[0]['client']
diff --git a/mobile/src/source-control/review/diff-review-reply-schema.ts b/mobile/src/source-control/review/diff-review-reply-schema.ts
index f3382e4f967..d5f6bf7bc27 100644
--- a/mobile/src/source-control/review/diff-review-reply-schema.ts
+++ b/mobile/src/source-control/review/diff-review-reply-schema.ts
@@ -1,7 +1,9 @@
 import * as z from 'zod'
 import { salvagedOptional, salvagingArray } from '../../../../src/shared/zod-salvage'
-import type { MobileGitBranchCompareResult } from '../mobile-branch-compare'
-import type { MobileGitBranchCompareSummary } from '../git-compare-reply-schema'
+import type {
+  MobileGitBranchCompareReply as MobileGitBranchCompareResult,
+  MobileGitBranchCompareSummary
+} from '../branches/git-compare-reply-schema'
 
 // These review projections normalize host payloads; the Changes screen’s readers preserve them verbatim.
 
diff --git a/mobile/src/source-control/review/github-pr-repo-slug.ts b/mobile/src/source-control/review/github-pr-repo-slug.ts
index cd13ef7c742..2fa41b45620 100644
--- a/mobile/src/source-control/review/github-pr-repo-slug.ts
+++ b/mobile/src/source-control/review/github-pr-repo-slug.ts
@@ -1,7 +1,7 @@
 import type { RpcMethodName } from '../../../../src/shared/rpc-contract/rpc-params-catalog.generated'
 import type { RpcSendParams } from '../../../../src/shared/rpc-contract/rpc-send-params'
-import '../mobile-pr-create'
-import { mobileRepoSelectorFromWorktreeId } from '../mobile-hosted-review-service'
+import './creation/mobile-pr-create'
+import { mobileRepoSelectorFromWorktreeId } from './creation/mobile-hosted-review-service'
 
 // Preserve fork owner/repo and GHES host across RPC or actions may target a same-named github.com repository.
 export type GitHubPrRepoSlug = { owner: string; repo: string; host?: string }
diff --git a/mobile/src/source-control/review/github-pr-rpc.ts b/mobile/src/source-control/review/github-pr-rpc.ts
index 99e0e2b281b..f7c32c9522a 100644
--- a/mobile/src/source-control/review/github-pr-rpc.ts
+++ b/mobile/src/source-control/review/github-pr-rpc.ts
@@ -17,8 +17,8 @@ import type { GitHubWorkItemDetails } from '../../../../src/shared/github/work-i
 import type { HostedReviewInfo } from '../../../../src/shared/source-control/hosted-review/hosted-review-contracts'
 import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
-import '../mobile-pr-create'
-import { mobileRepoSelectorFromWorktreeId } from '../mobile-hosted-review-service'
+import './creation/mobile-pr-create'
+import { mobileRepoSelectorFromWorktreeId } from './creation/mobile-hosted-review-service'
 import type { GitHubPrForBranchOutcome } from './github-pr-read-reply-schema'
 import {
   githubPrAssignableUsersRead,
diff --git a/mobile/src/source-control/mobile-diff-format.ts b/mobile/src/source-control/review/mobile-diff-format.ts
similarity index 83%
rename from mobile/src/source-control/mobile-diff-format.ts
rename to mobile/src/source-control/review/mobile-diff-format.ts
index 6ddc570d96a..4260b63ee49 100644
--- a/mobile/src/source-control/mobile-diff-format.ts
+++ b/mobile/src/source-control/review/mobile-diff-format.ts
@@ -1,4 +1,4 @@
-import type { MobileDiffLine } from './review/mobile-diff-lines'
+import type { MobileDiffLine } from './mobile-diff-lines'
 
 export function mobileDiffLinePrefix(kind: MobileDiffLine['kind']): string {
   if (kind === 'add') {
diff --git a/mobile/src/source-control/review/mobile-diff-review-branch-compare-cache.ts b/mobile/src/source-control/review/mobile-diff-review-branch-compare-cache.ts
index afa29ec9504..b1c2a16dd74 100644
--- a/mobile/src/source-control/review/mobile-diff-review-branch-compare-cache.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-branch-compare-cache.ts
@@ -2,7 +2,7 @@ import type { QueryClient } from '@tanstack/react-query'
 import { defineHostQuery, fetchHostQuery } from '../../query/host-query'
 import { hostQueryKey, type HostQueryTarget } from '../../query/host-query-key'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { gitStatusQuery } from '../mobile-git-status-query'
+import { gitStatusQuery } from '../changes/mobile-git-status-query'
 import type {
   BranchCompareLoadResult,
   MobileBranchCompareCache
diff --git a/mobile/src/source-control/review/mobile-diff-review-commit-loader.ts b/mobile/src/source-control/review/mobile-diff-review-commit-loader.ts
index 07f9f2fe59e..20d1f682426 100644
--- a/mobile/src/source-control/review/mobile-diff-review-commit-loader.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-commit-loader.ts
@@ -1,5 +1,5 @@
 import { translate } from '../../i18n/mobile-i18n'
-import { gitCommitCompareRead } from '../mobile-git-read-operations'
+import { gitCommitCompareRead } from '../git/mobile-git-read-operations'
 import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { ReviewScreenState } from './mobile-diff-review-screen-model'
diff --git a/mobile/src/source-control/review/mobile-diff-review-loaders.ts b/mobile/src/source-control/review/mobile-diff-review-loaders.ts
index f8a9d48e2c2..129ee570312 100644
--- a/mobile/src/source-control/review/mobile-diff-review-loaders.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-loaders.ts
@@ -10,12 +10,12 @@ import {
   reviewFileDiffRead
 } from './mobile-diff-review-operations'
 import type { MobileReviewGitDiffResult } from './diff-review-reply-schema'
-import type { MobileGitBranchCompareResult } from '../mobile-branch-compare'
+import type { MobileGitBranchCompareReply as MobileGitBranchCompareResult } from '../branches/git-compare-reply-schema'
 import {
   resolveMobileBranchCompareBaseRef,
   type MobileBranchCompareTarget
-} from '../mobile-branch-base-ref'
-import { isMobileGitUnavailable } from '../mobile-git-status'
+} from '../branches/mobile-branch-base-ref'
+import { isMobileGitUnavailable } from '../changes/mobile-git-status'
 import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
diff --git a/mobile/src/source-control/review/mobile-diff-review-operations.ts b/mobile/src/source-control/review/mobile-diff-review-operations.ts
index 36e52274f8c..b1245dc76eb 100644
--- a/mobile/src/source-control/review/mobile-diff-review-operations.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-operations.ts
@@ -1,8 +1,8 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import type { MobileGitBranchCompareResult } from '../mobile-branch-compare'
-import { gitStatusProjectionReader } from '../mobile-git-read-operations'
+import type { MobileGitBranchCompareReply as MobileGitBranchCompareResult } from '../branches/git-compare-reply-schema'
+import { gitStatusProjectionReader } from '../git/mobile-git-read-operations'
 import {
   branchCompareProjectionSchema,
   reviewGitDiffSchema,
diff --git a/mobile/src/source-control/review/mobile-diff-review-positioning.ts b/mobile/src/source-control/review/mobile-diff-review-positioning.ts
index 4763e34a9d3..a414ba20057 100644
--- a/mobile/src/source-control/review/mobile-diff-review-positioning.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-positioning.ts
@@ -1,4 +1,4 @@
-import type { MobileGitStagingArea } from '../mobile-git-status'
+import type { GitStagingArea as MobileGitStagingArea } from '../../../../src/shared/git/status/git-status-types'
 import {
   createMobileDiffReviewFileKey,
   type MobileDiffReviewQueueItem,
diff --git a/mobile/src/source-control/review/mobile-diff-review-queue.test.ts b/mobile/src/source-control/review/mobile-diff-review-queue.test.ts
index 3eec3dc9e1d..224e589b64b 100644
--- a/mobile/src/source-control/review/mobile-diff-review-queue.test.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-queue.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import type { DiffComment, MobileDiffReviewState } from '../../../../src/shared/diff-comment-types'
-import type { MobileGitBranchChangeEntry } from '../git-compare-reply-schema'
-import type { MobileGitStatusEntry } from '../git-status-reply-schema'
+import type { MobileGitBranchChangeEntry } from '../branches/git-compare-reply-schema'
+import type { MobileGitStatusEntry } from '../git/git-status-reply-schema'
 import { buildMobileDiffReviewQueue } from './mobile-diff-review-queue'
 
 const emptyReviewState: MobileDiffReviewState = { version: 1, files: {} }
diff --git a/mobile/src/source-control/review/mobile-diff-review-queue.ts b/mobile/src/source-control/review/mobile-diff-review-queue.ts
index 245347385b3..4a0ae027b51 100644
--- a/mobile/src/source-control/review/mobile-diff-review-queue.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-queue.ts
@@ -5,16 +5,18 @@ import type {
   DiffReviewScope,
   MobileDiffReviewState
 } from '../../../../src/shared/diff-comment-types'
-import type { MobileGitBranchChangeEntry, MobileGitChangedFile } from '../git-compare-reply-schema'
+import type {
+  MobileGitBranchChangeEntry,
+  MobileGitChangedFile
+} from '../branches/git-compare-reply-schema'
 import {
   isMobileGitDiscardableEntry,
   isMobileGitStageableEntry,
-  isMobileGitUnstageableEntry,
-  type MobileGitFileStatus,
-  type MobileGitStagingArea
-} from '../mobile-git-status'
-import '../git-status-reply-schema'
-import type { MobileGitStatusEntry } from '../git-status-reply-schema'
+  isMobileGitUnstageableEntry
+} from '../changes/mobile-git-status'
+import type * as GitStatus from '../../../../src/shared/git/status/git-status-types'
+import '../git/git-status-reply-schema'
+import type { MobileGitStatusEntry } from '../git/git-status-reply-schema'
 import {
   buildMobileDiffIdentity,
   didMobileDiffReviewFileChangeSinceReview,
@@ -28,10 +30,10 @@ export type MobileDiffReviewQueueFilter = 'all' | MobileDiffReviewSection
 export type MobileDiffReviewQueueItem = {
   key: string
   scope: MobileDiffReviewSection
-  area: MobileGitStagingArea | 'branch' | 'commit'
+  area: GitStatus.GitStagingArea | 'branch' | 'commit'
   filePath: string
   oldPath?: string
-  status: MobileGitFileStatus
+  status: GitStatus.GitFileStatus
   title: string
   subtitle: string
   added?: number
@@ -68,7 +70,7 @@ const SCOPE_SORT_ORDER: Record<MobileDiffReviewSection, number> = {
   commit: 3
 }
 
-function scopeForStatusArea(area: MobileGitStagingArea): DiffReviewScope {
+function scopeForStatusArea(area: GitStatus.GitStagingArea): DiffReviewScope {
   return area === 'staged' ? 'staged' : 'unstaged'
 }
 
@@ -170,7 +172,7 @@ function queueNoteCounts(
   return { noteCount, unsentNoteCount, staleNoteCount }
 }
 
-type PlaceableStatusEntry = MobileGitStatusEntry & { area: MobileGitStagingArea }
+type PlaceableStatusEntry = MobileGitStatusEntry & { area: GitStatus.GitStagingArea }
 
 function isPlaceableStatusEntry(entry: MobileGitStatusEntry): entry is PlaceableStatusEntry {
   return entry.area !== undefined
diff --git a/mobile/src/source-control/review/mobile-diff-review-rpc.ts b/mobile/src/source-control/review/mobile-diff-review-rpc.ts
index ed7bbb052cc..8b8faccbe5b 100644
--- a/mobile/src/source-control/review/mobile-diff-review-rpc.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-rpc.ts
@@ -1,9 +1,12 @@
 import type {
-  MobileGitFileStatus,
-  MobileGitStagingArea,
-  MobileGitStatusResult
-} from '../mobile-git-status'
-import type { MobileGitStatusEntry, MobileGitUpstreamStatus } from '../git-status-reply-schema'
+  GitFileStatus as MobileGitFileStatus,
+  GitStagingArea as MobileGitStagingArea
+} from '../../../../src/shared/git/status/git-status-types'
+import type {
+  MobileGitStatusHostPayload as MobileGitStatusResult,
+  MobileGitStatusEntry,
+  MobileGitUpstreamStatus
+} from '../git/git-status-reply-schema'
 
 // Normalize the status value already in hand for PR prefill; reply boundaries use schema readers.
 
diff --git a/mobile/src/source-control/review/mobile-diff-review-screen-model.ts b/mobile/src/source-control/review/mobile-diff-review-screen-model.ts
index 24985907e80..5dfac31d632 100644
--- a/mobile/src/source-control/review/mobile-diff-review-screen-model.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-screen-model.ts
@@ -1,7 +1,10 @@
 import type { DiffComment, MobileDiffReviewState } from '../../../../src/shared/diff-comment-types'
-import type { MobileGitBranchCompareResult } from '../mobile-branch-compare'
-import type { MobileGitStatusResult } from '../mobile-git-status'
-import type { MobileGitChangedFile } from '../git-compare-reply-schema'
+import type {
+  MobileGitBranchCompareReply as MobileGitBranchCompareResult,
+  MobileGitChangedFile
+} from '../branches/git-compare-reply-schema'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../git/git-status-reply-schema'
+
 import type { MobileDiffLine } from './mobile-diff-lines'
 import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
 import type { MobileDiffReviewFileDescriptor } from './mobile-diff-review-state'
diff --git a/mobile/src/source-control/review/mobile-diff-review-snapshot-loader.ts b/mobile/src/source-control/review/mobile-diff-review-snapshot-loader.ts
index e62346c902c..fb9c583844a 100644
--- a/mobile/src/source-control/review/mobile-diff-review-snapshot-loader.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-snapshot-loader.ts
@@ -5,9 +5,9 @@ import {
 } from './mobile-diff-review-state'
 import { normalizeMobileDiffComments } from './mobile-diff-comments'
 import { reviewWorktreeMetadataRead } from './mobile-diff-review-operations'
-import { canOpenMobileBranchCompareDiff } from '../mobile-branch-compare'
-import type { MobileBranchCompareTarget } from '../mobile-branch-base-ref'
-import type { GitStatusRead } from '../mobile-git-status-query'
+import { canOpenMobileBranchCompareDiff } from '../branches/mobile-branch-compare'
+import type { MobileBranchCompareTarget } from '../branches/mobile-branch-base-ref'
+import type { GitStatusRead } from '../changes/mobile-git-status-query'
 import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
diff --git a/mobile/src/source-control/mobile-pr-link.ts b/mobile/src/source-control/review/mobile-pr-link.ts
similarity index 92%
rename from mobile/src/source-control/mobile-pr-link.ts
rename to mobile/src/source-control/review/mobile-pr-link.ts
index 90b7673f6b8..d2ad7f5e9f3 100644
--- a/mobile/src/source-control/mobile-pr-link.ts
+++ b/mobile/src/source-control/review/mobile-pr-link.ts
@@ -1,13 +1,13 @@
-import { translate } from '../i18n/mobile-i18n'
-import type { RpcSendParams } from '../../../src/shared/rpc-contract/rpc-send-params'
-import { CLEARED_HOSTED_REVIEW_SELECTION_UPDATES } from '../../../src/shared/worktree/hosted-review-links'
-import { refusedRpcMessageOrFallback } from '../transport/rpc/rpc-refusal-message'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { translate } from '../../i18n/mobile-i18n'
+import type { RpcSendParams } from '../../../../src/shared/rpc-contract/rpc-send-params'
+import { CLEARED_HOSTED_REVIEW_SELECTION_UPDATES } from '../../../../src/shared/worktree/hosted-review-links'
+import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 import {
   worktreeLinkSet,
   worktreeSummaryRead,
   type MobileWorktreeSummary
-} from './mobile-worktree-metadata-operations'
+} from '../branches/mobile-worktree-metadata-operations'
 
 // Use the desktop worktree metadata fields so follow-up reads share authoritative review hints.
 
diff --git a/mobile/src/source-control/review/mobile-pr-queries.ts b/mobile/src/source-control/review/mobile-pr-queries.ts
index 358c53055fa..1b0a4b11b83 100644
--- a/mobile/src/source-control/review/mobile-pr-queries.ts
+++ b/mobile/src/source-control/review/mobile-pr-queries.ts
@@ -24,7 +24,7 @@ import {
   type HostQueryTarget
 } from '../../query/host-query-key'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { clearMobileWorktreeReviewLink, fetchWorktreeGitHubPRLink } from '../mobile-pr-link'
+import { clearMobileWorktreeReviewLink, fetchWorktreeGitHubPRLink } from './mobile-pr-link'
 import {
   fetchAssignableUsers,
   fetchGithubRepoSlug,
diff --git a/mobile/src/source-control/review/mobile-pr-sidebar-state.ts b/mobile/src/source-control/review/mobile-pr-sidebar-state.ts
index 40e8dd0c50d..5cad3b43b13 100644
--- a/mobile/src/source-control/review/mobile-pr-sidebar-state.ts
+++ b/mobile/src/source-control/review/mobile-pr-sidebar-state.ts
@@ -20,8 +20,8 @@ import {
   shouldClearBranchMismatchedLinkedOpenPR,
   shouldClearDivergedLinkedMergedPR
 } from '../../../../src/shared/github/pull-requests/refresh/linked-pr-staleness'
-import type { MobileWorktreeSummary } from '../mobile-worktree-metadata-operations'
-import type { WorktreeGitHubPRLink } from '../mobile-pr-link'
+import type { MobileWorktreeSummary } from '../branches/mobile-worktree-metadata-operations'
+import type { WorktreeGitHubPRLink } from './mobile-pr-link'
 import { translate } from '../../i18n/mobile-i18n'
 
 export type PrSidebarData = {
diff --git a/mobile/src/source-control/review/mobile-review-notes-operations.ts b/mobile/src/source-control/review/mobile-review-notes-operations.ts
index 3a70976f334..ac19df188b4 100644
--- a/mobile/src/source-control/review/mobile-review-notes-operations.ts
+++ b/mobile/src/source-control/review/mobile-review-notes-operations.ts
@@ -1,7 +1,7 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import { sessionWorktreeRecordSchema } from '../../worktree/session-worktree-record-reply-schema'
-import '../../terminal/terminal-reply-schema'
+import '../../terminal/host-operations/terminal-reply-schema'
 import '../../terminal/quick-commands/mobile-quick-command-operations'
 
 // Preserve host refusal text for optimistic rollback; the reply's record carries the host's merged notes.
diff --git a/mobile/src/source-control/mobile-review-route.ts b/mobile/src/source-control/review/mobile-review-route.ts
similarity index 89%
rename from mobile/src/source-control/mobile-review-route.ts
rename to mobile/src/source-control/review/mobile-review-route.ts
index e037c0c9c73..afaf490b945 100644
--- a/mobile/src/source-control/mobile-review-route.ts
+++ b/mobile/src/source-control/review/mobile-review-route.ts
@@ -1,4 +1,4 @@
-import type { MobileGitStagingArea } from './mobile-git-status'
+import type { GitStagingArea as MobileGitStagingArea } from '../../../../src/shared/git/status/git-status-types'
 
 export type MobileReviewRouteArea = MobileGitStagingArea | 'branch'
 
diff --git a/mobile/src/source-control/review/review-terminal-reply-schema.ts b/mobile/src/source-control/review/review-terminal-reply-schema.ts
index ebd787d7a4f..f301a8f2936 100644
--- a/mobile/src/source-control/review/review-terminal-reply-schema.ts
+++ b/mobile/src/source-control/review/review-terminal-reply-schema.ts
@@ -5,7 +5,7 @@ import { isTuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agen
 import {
   isMobileTerminalTabRunningAgent,
   resolveMobileTerminalTabOwnedAgentId
-} from '../../terminal/session/mobile-terminal-tab-agent'
+} from '../../session/tabs/mobile-terminal-tab-agent'
 
 // Require addressable terminal rows; salvage/drop other tab kinds rather than inventing send targets.
 const reviewTerminalTabSchema = z
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-comment-actions.ts b/mobile/src/source-control/review/use-mobile-diff-review-comment-actions.ts
index a9d92e9dfd2..fc3e699a3d8 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-comment-actions.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-comment-actions.ts
@@ -1,7 +1,7 @@
 import { useCallback, useRef, type Dispatch, type SetStateAction } from 'react'
 import { translate } from '../../i18n/mobile-i18n'
 import type { DiffComment, MobileDiffReviewState } from '../../../../src/shared/diff-comment-types'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import { interpretOrThrowRefusalMessage } from '../../transport/rpc/rpc-refusal-message'
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-controller.ts b/mobile/src/source-control/review/use-mobile-diff-review-controller.ts
index 8ee31adcf5d..1a37f695a0a 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-controller.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-controller.ts
@@ -14,7 +14,7 @@ import { useMobileDiffReviewSelection } from './use-mobile-diff-review-selection
 import type { MobileDiffReviewInitialTarget } from './mobile-diff-review-positioning'
 import { useMobileDiffReviewSnapshot } from './use-mobile-diff-review-snapshot'
 import { useMobileDiffReviewDiffLoading } from './use-mobile-diff-review-diff-loading'
-import { canOpenMobileBranchCompareDiff } from '../mobile-branch-compare'
+import { canOpenMobileBranchCompareDiff } from '../branches/mobile-branch-compare'
 import {
   NO_REVIEW_SHEETS,
   reduceReviewSheets,
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-diff-loading.ts b/mobile/src/source-control/review/use-mobile-diff-review-diff-loading.ts
index ecac259d6ce..0ab167fefb0 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-diff-loading.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-diff-loading.ts
@@ -9,7 +9,7 @@ import {
   type MobileReviewDiffInput
 } from './mobile-diff-review-loaders'
 import { shouldIgnoreTrimWhitespace } from '../../../../src/shared/diff-whitespace'
-import { useMobileSourceControlSettings } from '../mobile-source-control-settings'
+import { useMobileSourceControlSettings } from '../settings/mobile-source-control-settings'
 import { defineHostQuery, prefetchHostQuery, useHostQuery } from '../../query/host-query'
 import type { HostQueryTarget } from '../../query/host-query-key'
 import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-git-actions.ts b/mobile/src/source-control/review/use-mobile-diff-review-git-actions.ts
index 4096bdeec05..c415a3ccd91 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-git-actions.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-git-actions.ts
@@ -7,8 +7,8 @@ import {
   MOBILE_DIFF_REVIEW_GIT_MUTATIONS,
   reviewGitBulkUnstage
 } from './mobile-diff-review-git-operations'
-import { getUnstageablePaths } from '../mobile-git-status'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { getUnstageablePaths } from '../changes/mobile-git-status'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
 import type { GitMutationMethod } from './mobile-diff-review-screen-model'
 
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-github.ts b/mobile/src/source-control/review/use-mobile-diff-review-github.ts
index 7b3ad054e98..a21650f7e12 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-github.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-github.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import { translate } from '../../i18n/mobile-i18n'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { fetchSetPRFileViewed } from './github-pr-review-line-mutations'
 import { useHostMutation } from '../../query/host-mutation'
 import { prCommentTarget, prCommentWrite } from './pr-comment-writes'
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-interactions.ts b/mobile/src/source-control/review/use-mobile-diff-review-interactions.ts
index 10bbfc7a0d6..d7616151ece 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-interactions.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-interactions.ts
@@ -7,7 +7,7 @@ import type { ComposerState, ReviewScreenState } from './mobile-diff-review-scre
 import type { ReviewSheet, ReviewSheetIntents } from './mobile-diff-review-sheets'
 import type { MobileReviewTerminalTab } from './review-terminal-reply-schema'
 import type { MobileDiffReviewNoteDraft } from './use-mobile-diff-review-note-draft'
-import { sourceFileDiffOpenRun } from '../mobile-source-file-open-operations'
+import { sourceFileDiffOpenRun } from '../../files/session-documents/mobile-source-file-open-operations'
 import { refusedRpcMessageOrFallback } from '../../transport/rpc/rpc-refusal-message'
 import { useMobileDiffReviewCommentActions } from './use-mobile-diff-review-comment-actions'
 import { useMobileDiffReviewGitActions } from './use-mobile-diff-review-git-actions'
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-send-actions.ts b/mobile/src/source-control/review/use-mobile-diff-review-send-actions.ts
index 503eec21acc..d2317edbbcf 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-send-actions.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-send-actions.ts
@@ -3,8 +3,8 @@ import { translate } from '../../i18n/mobile-i18n'
 import type { DiffComment, MobileDiffReviewState } from '../../../../src/shared/diff-comment-types'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { useClipboardWriter } from '../../platform/clipboard'
-import { triggerSuccess } from '../../platform/haptics'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerSuccess } from '../../platform/haptics/haptics'
 import { formatDiffComments } from '../../../../src/shared/diff-comments-format'
 import { clearSentMobileDiffComments, markMobileDiffCommentsSent } from './mobile-diff-comment-edit'
 import { reviewTerminalListRead, reviewTerminalSendRun } from './mobile-review-terminal-operations'
diff --git a/mobile/src/source-control/review/use-mobile-diff-review-snapshot.ts b/mobile/src/source-control/review/use-mobile-diff-review-snapshot.ts
index 8122c702baf..5f9fa5639a6 100644
--- a/mobile/src/source-control/review/use-mobile-diff-review-snapshot.ts
+++ b/mobile/src/source-control/review/use-mobile-diff-review-snapshot.ts
@@ -4,8 +4,8 @@ import { translate } from '../../i18n/mobile-i18n'
 import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
 import { readHostQueryLive, useHostQuery } from '../../query/host-query'
 import { hostQueryKey } from '../../query/host-query-key'
-import { gitStatusQuery, type GitStatusRead } from '../mobile-git-status-query'
-import { useMobileSourceControlSettings } from '../mobile-source-control-settings'
+import { gitStatusQuery, type GitStatusRead } from '../changes/mobile-git-status-query'
+import { useMobileSourceControlSettings } from '../settings/mobile-source-control-settings'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import { loadMobileDiffReviewCommitSnapshot } from './mobile-diff-review-commit-loader'
diff --git a/mobile/src/source-control/review/use-mobile-pr-ai-triage.ts b/mobile/src/source-control/review/use-mobile-pr-ai-triage.ts
index 27b9135a907..74a89e7c149 100644
--- a/mobile/src/source-control/review/use-mobile-pr-ai-triage.ts
+++ b/mobile/src/source-control/review/use-mobile-pr-ai-triage.ts
@@ -1,7 +1,7 @@
 import { useCallback, useRef, useState } from 'react'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { launchAgentWithPrompt, promptedLaunchNotice } from './pr-ai-triage-launch'
 import type { LaunchedAgentOpens } from '../../session/agent-launch/launched-agent-opener'
diff --git a/mobile/src/source-control/review/use-mobile-pr-branch-context.ts b/mobile/src/source-control/review/use-mobile-pr-branch-context.ts
index cb0c6d344ee..3b95aa87c12 100644
--- a/mobile/src/source-control/review/use-mobile-pr-branch-context.ts
+++ b/mobile/src/source-control/review/use-mobile-pr-branch-context.ts
@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react'
 import type { ConnectionState } from '../../transport/connection/connection-state'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import type { MobileGitBranchCompareResult } from '../mobile-branch-compare'
-import type { MobileGitStatusResult } from '../mobile-git-status'
-import { resolveMobileBranchCompareBaseRef } from '../mobile-branch-base-ref'
+import type { MobileGitBranchCompareReply as MobileGitBranchCompareResult } from '../branches/git-compare-reply-schema'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../git/git-status-reply-schema'
+import { resolveMobileBranchCompareBaseRef } from '../branches/mobile-branch-base-ref'
 import { fetchGithubRepoSlug } from './github-pr-rpc'
 import { branchContextCompareRead, branchContextStatusRead } from './mobile-diff-review-operations'
 
diff --git a/mobile/src/source-control/review/use-mobile-pr-comment-actions.ts b/mobile/src/source-control/review/use-mobile-pr-comment-actions.ts
index de7ca0658c3..ca7c5efd7c3 100644
--- a/mobile/src/source-control/review/use-mobile-pr-comment-actions.ts
+++ b/mobile/src/source-control/review/use-mobile-pr-comment-actions.ts
@@ -4,7 +4,7 @@ import type { ConnectionState } from '../../transport/connection/connection-stat
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { GitHubPrRepoSlug } from './github-pr-repo-slug'
 import { useHostMutation } from '../../query/host-mutation'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import {
   buildAddRootCommentParams,
diff --git a/mobile/src/source-control/review/use-mobile-pr-text-action.ts b/mobile/src/source-control/review/use-mobile-pr-text-action.ts
index c77b49bc46f..94b992bea8f 100644
--- a/mobile/src/source-control/review/use-mobile-pr-text-action.ts
+++ b/mobile/src/source-control/review/use-mobile-pr-text-action.ts
@@ -6,7 +6,7 @@ import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { GitHubPrRepoSlug } from './github-pr-repo-slug'
 import { defineHostMutation, useHostMutation } from '../../query/host-mutation'
 import { fetchUpdatePRBody, fetchUpdatePRTitle } from './github-pr-mutations'
-import { triggerError, triggerSuccess } from '../../platform/haptics'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import {
   buildUpdatePRBodyParams,
diff --git a/mobile/src/source-control/review/use-mobile-session-diff-comments.ts b/mobile/src/source-control/review/use-mobile-session-diff-comments.ts
index 451d6c0a667..bcd6c9efbff 100644
--- a/mobile/src/source-control/review/use-mobile-session-diff-comments.ts
+++ b/mobile/src/source-control/review/use-mobile-session-diff-comments.ts
@@ -1,12 +1,12 @@
 import { useEffect, useCallback, useMemo, useRef, useState } from 'react'
 import { formatDiffComments } from '../../../../src/shared/diff-comments-format'
 import { translate } from '../../i18n/mobile-i18n'
-import { useClipboardWriter } from '../../platform/clipboard'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
 import { interpretOrThrowRefusalMessage } from '../../transport/rpc/rpc-refusal-message'
 import type { SendRequestOptions } from '../../transport/rpc/unvalidated-rpc-request-port'
 import { sessionWorktreeRecordRead } from '../../worktree/session-worktree-record-operations'
 import { sessionWorktreeNotesWrite } from './mobile-review-notes-operations'
-import { triggerSelection, triggerSuccess, triggerError } from '../../platform/haptics'
+import { triggerSelection, triggerSuccess, triggerError } from '../../platform/haptics/haptics'
 import {
   addMobileDiffComment,
   normalizeMobileDiffComments,
diff --git a/mobile/src/source-control/mobile-source-control-settings-operations.ts b/mobile/src/source-control/settings/mobile-source-control-settings-operations.ts
similarity index 79%
rename from mobile/src/source-control/mobile-source-control-settings-operations.ts
rename to mobile/src/source-control/settings/mobile-source-control-settings-operations.ts
index 7bd2839f597..a1bab6ee8ea 100644
--- a/mobile/src/source-control/mobile-source-control-settings-operations.ts
+++ b/mobile/src/source-control/settings/mobile-source-control-settings-operations.ts
@@ -1,8 +1,8 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import type { RpcCompatibleReader } from '../transport/rpc/rpc-operation-contract'
-import { normalizeSourceControlGroupOrder } from '../../../src/shared/source-control/listing/source-control-group-order'
-import type { SourceControlGroupOrder } from '../../../src/shared/ui-chrome-types'
-import { settingsMember, settingsField } from '../settings/mobile-settings-projection'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
+import { normalizeSourceControlGroupOrder } from '../../../../src/shared/source-control/listing/source-control-group-order'
+import type { SourceControlGroupOrder } from '../../../../src/shared/ui-chrome-types'
+import { settingsMember, settingsField } from '../../settings/mobile-settings-projection'
 
 export type MobileSourceControlSettings = {
   groupOrder: SourceControlGroupOrder
diff --git a/mobile/src/source-control/mobile-source-control-settings.ts b/mobile/src/source-control/settings/mobile-source-control-settings.ts
similarity index 79%
rename from mobile/src/source-control/mobile-source-control-settings.ts
rename to mobile/src/source-control/settings/mobile-source-control-settings.ts
index 4355ad1f9eb..e9d0cce5794 100644
--- a/mobile/src/source-control/mobile-source-control-settings.ts
+++ b/mobile/src/source-control/settings/mobile-source-control-settings.ts
@@ -1,17 +1,17 @@
 import { useCallback } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { DEFAULT_SOURCE_CONTROL_GROUP_ORDER } from '../../../src/shared/source-control/listing/source-control-group-order'
-import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
-import { defineHostQuery, useHostQuery } from '../query/host-query'
-import { hostQueryKey } from '../query/host-query-key'
-import { settingsSignal, useHostSettingsChangeSignal } from '../query/settings-change-signal'
+import { DEFAULT_SOURCE_CONTROL_GROUP_ORDER } from '../../../../src/shared/source-control/listing/source-control-group-order'
+import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
+import { defineHostQuery, useHostQuery } from '../../query/host-query'
+import { hostQueryKey } from '../../query/host-query-key'
+import { settingsSignal, useHostSettingsChangeSignal } from '../../query/settings-change-signal'
 import {
   SOURCE_CONTROL_SETTINGS_KEYS,
   sourceControlSettingsRead,
   type MobileSourceControlSettings
 } from './mobile-source-control-settings-operations'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 
 const DESKTOP_DEFAULTS: MobileSourceControlSettings = {
   groupOrder: DEFAULT_SOURCE_CONTROL_GROUP_ORDER,
diff --git a/mobile/src/source-control/use-mobile-source-control-keyboard-lift.ts b/mobile/src/source-control/use-mobile-source-control-keyboard-lift.ts
deleted file mode 100644
index 233d4cb078c..00000000000
--- a/mobile/src/source-control/use-mobile-source-control-keyboard-lift.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useKeyboardOcclusion } from '../platform/keyboard-occlusion'
-
-// Use the platform occlusion seam: react-native-web Keyboard never fires, so pages measure visualViewport.
-export function useMobileSourceControlKeyboardLift(): number {
-  return useKeyboardOcclusion()
-}
diff --git a/mobile/src/source-control/use-mobile-source-control-state.ts b/mobile/src/source-control/use-mobile-source-control-state.ts
index 7b1a96b3edd..ec94bf4ec36 100644
--- a/mobile/src/source-control/use-mobile-source-control-state.ts
+++ b/mobile/src/source-control/use-mobile-source-control-state.ts
@@ -7,34 +7,34 @@ import { getWorktreeLabel } from '../worktree/worktree-label'
 import { workspaceDraftRowKey } from '../drafts/durable-draft-rows'
 import { useDurableDraftField } from '../drafts/durable-draft-fields'
 import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
-import { useMobileGitRequests } from './use-mobile-git-requests'
-import { useMobileSourceControlLoaders } from './use-mobile-source-control-loaders'
-import { useMobileSourceControlOpeners } from './use-mobile-source-control-openers'
-import type { MobileSourceControlPrimaryActionArgs } from './mobile-source-control-primary-action'
-import { useMobileSourceControlSections } from './mobile-source-control-sections'
-import { useMobileSourceControlRunners } from './use-mobile-source-control-runners'
-import { useMobileSourceControlCreatePrAction } from './use-mobile-source-control-create-pr-action'
-import { useMobileSourceControlKeyboardLift } from './use-mobile-source-control-keyboard-lift'
-import type { RuntimeGitLocalBranches } from '../../../src/shared/runtime-types'
+import { useMobileGitRequests } from './git/use-mobile-git-requests'
+import { useMobileSourceControlLoaders } from './changes/use-mobile-source-control-loaders'
+import { useMobileSourceControlOpeners } from './panel/use-mobile-source-control-openers'
+import type { MobileSourceControlPrimaryActionArgs } from './workflows/mobile-source-control-primary-action'
+import { useMobileSourceControlSections } from './changes/mobile-source-control-sections'
+import { useMobileSourceControlRunners } from './workflows/use-mobile-source-control-runners'
+import { useMobileSourceControlCreatePrAction } from './review/creation/use-mobile-source-control-create-pr-action'
+import { useKeyboardOcclusion as useMobileSourceControlKeyboardLift } from '../platform/keyboard/keyboard-occlusion'
+import type { RuntimeGitLocalBranches } from '../../../src/shared/runtime-worktree-contracts'
 import {
   buildMobileBranchCompareSection,
   canOpenMobileBranchCompareDiff
-} from './mobile-branch-compare'
+} from './branches/mobile-branch-compare'
 
 import {
   countStagedEntries,
   countUnstagedEntries,
   getStageablePaths,
-  getUnstageablePaths,
-  type MobileGitStatusEntry
-} from './mobile-git-status'
-import { getMobileCommitFailureStagedEntries } from './mobile-commit-failure-recovery'
-import { useMobileSourceControlCommitFailure } from './use-mobile-source-control-commit-failure'
+  getUnstageablePaths
+} from './changes/mobile-git-status'
+import type { MobileGitStatusEntry } from './git/git-status-reply-schema'
+import { getMobileCommitFailureStagedEntries } from './commits/mobile-commit-failure-recovery'
+import { useMobileSourceControlCommitFailure } from './commits/use-mobile-source-control-commit-failure'
 import {
   buildMobileGitStatusEntryViews,
   formatBranchLabel,
   type MobileBranchEntryView
-} from './mobile-source-control-screen-state'
+} from './changes/mobile-source-control-screen-state'
 
 export type MobileSourceControlStateParams = {
   hostId: string
diff --git a/mobile/src/source-control/mobile-commit-dropdown-copy.ts b/mobile/src/source-control/workflows/mobile-commit-dropdown-copy.ts
similarity index 95%
rename from mobile/src/source-control/mobile-commit-dropdown-copy.ts
rename to mobile/src/source-control/workflows/mobile-commit-dropdown-copy.ts
index 7cc182bde00..9d7efb4a1fc 100644
--- a/mobile/src/source-control/mobile-commit-dropdown-copy.ts
+++ b/mobile/src/source-control/workflows/mobile-commit-dropdown-copy.ts
@@ -1,5 +1,5 @@
-import type { CommitDropdownCopy } from '../../../src/shared/source-control/dropdown/source-control-dropdown-commit-items'
-import type { Translate } from '../i18n/mobile-i18n'
+import type { CommitDropdownCopy } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-commit-items'
+import type { Translate } from '../../i18n/mobile-i18n'
 
 export function mobileCommitDropdownCopy(t: Translate): CommitDropdownCopy {
   return {
diff --git a/mobile/src/source-control/mobile-remote-dropdown-copy.ts b/mobile/src/source-control/workflows/mobile-remote-dropdown-copy.ts
similarity index 97%
rename from mobile/src/source-control/mobile-remote-dropdown-copy.ts
rename to mobile/src/source-control/workflows/mobile-remote-dropdown-copy.ts
index 8f5e9a55ecf..1b63e6810c5 100644
--- a/mobile/src/source-control/mobile-remote-dropdown-copy.ts
+++ b/mobile/src/source-control/workflows/mobile-remote-dropdown-copy.ts
@@ -1,5 +1,5 @@
-import type { RemoteDropdownCopy } from '../../../src/shared/source-control/dropdown/source-control-dropdown-remote-copy'
-import type { Translate } from '../i18n/mobile-i18n'
+import type { RemoteDropdownCopy } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-remote-copy'
+import type { Translate } from '../../i18n/mobile-i18n'
 import {
   localizedPushCount,
   localizedPullCount,
diff --git a/mobile/src/source-control/mobile-source-control-actions.ts b/mobile/src/source-control/workflows/mobile-source-control-actions.ts
similarity index 92%
rename from mobile/src/source-control/mobile-source-control-actions.ts
rename to mobile/src/source-control/workflows/mobile-source-control-actions.ts
index c4c453ddea4..32160ea70b7 100644
--- a/mobile/src/source-control/mobile-source-control-actions.ts
+++ b/mobile/src/source-control/workflows/mobile-source-control-actions.ts
@@ -1,16 +1,16 @@
-import { translate, type Translate } from '../i18n/mobile-i18n'
+import { translate, type Translate } from '../../i18n/mobile-i18n'
 
 import { mobileCommitDropdownCopy } from './mobile-commit-dropdown-copy'
 import { mobileRemoteDropdownCopy } from './mobile-remote-dropdown-copy'
-import type { GitConflictOperation } from '../../../src/shared/git/status/git-status-types'
-import { deriveDropdownActionContext } from '../../../src/shared/source-control/dropdown/source-control-dropdown-action-context'
-import { buildCommitDropdownItems } from '../../../src/shared/source-control/dropdown/source-control-dropdown-commit-items'
-import type { DropdownItem } from '../../../src/shared/source-control/dropdown/source-control-dropdown-item-types'
-import { buildRemoteDropdownItems } from '../../../src/shared/source-control/dropdown/source-control-dropdown-remote-items'
+import type { GitConflictOperation } from '../../../../src/shared/git/status/git-status-types'
+import { deriveDropdownActionContext } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-action-context'
+import { buildCommitDropdownItems } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-commit-items'
+import type { DropdownItem } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-item-types'
+import { buildRemoteDropdownItems } from '../../../../src/shared/source-control/dropdown/source-control-dropdown-remote-items'
 import type {
   SourceControlCommitAreaPrimaryActionDecision,
   SourceControlPrimaryActionDecisionInputs
-} from '../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
+} from '../../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
 
 // String identifiers keep native lucide imports out of this module.
 export type MobileSourceControlActionIcon =
diff --git a/mobile/src/source-control/mobile-source-control-count-copy.ts b/mobile/src/source-control/workflows/mobile-source-control-count-copy.ts
similarity index 98%
rename from mobile/src/source-control/mobile-source-control-count-copy.ts
rename to mobile/src/source-control/workflows/mobile-source-control-count-copy.ts
index 22ebdc77bce..8aac98099bd 100644
--- a/mobile/src/source-control/mobile-source-control-count-copy.ts
+++ b/mobile/src/source-control/workflows/mobile-source-control-count-copy.ts
@@ -1,4 +1,4 @@
-import { translate, type Translate } from '../i18n/mobile-i18n'
+import { translate, type Translate } from '../../i18n/mobile-i18n'
 
 export function localizedPushCount(count: number, t: Translate = translate): string {
   return count === 1
diff --git a/mobile/src/source-control/mobile-source-control-primary-action-label.ts b/mobile/src/source-control/workflows/mobile-source-control-primary-action-label.ts
similarity index 94%
rename from mobile/src/source-control/mobile-source-control-primary-action-label.ts
rename to mobile/src/source-control/workflows/mobile-source-control-primary-action-label.ts
index 72bb2f30388..30cf4b7d3fd 100644
--- a/mobile/src/source-control/mobile-source-control-primary-action-label.ts
+++ b/mobile/src/source-control/workflows/mobile-source-control-primary-action-label.ts
@@ -1,5 +1,5 @@
-import { translate } from '../i18n/mobile-i18n'
-import type { SourceControlCommitAreaPrimaryActionDecision } from '../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
+import { translate } from '../../i18n/mobile-i18n'
+import type { SourceControlCommitAreaPrimaryActionDecision } from '../../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
 
 // "Commit 2 files", "Push 3 commits": the commit area's action named with its count.
 export function getMobilePrimaryActionLabel(
diff --git a/mobile/src/source-control/mobile-source-control-primary-action.ts b/mobile/src/source-control/workflows/mobile-source-control-primary-action.ts
similarity index 92%
rename from mobile/src/source-control/mobile-source-control-primary-action.ts
rename to mobile/src/source-control/workflows/mobile-source-control-primary-action.ts
index 7e0e77f4e1f..b452fb7142a 100644
--- a/mobile/src/source-control/mobile-source-control-primary-action.ts
+++ b/mobile/src/source-control/workflows/mobile-source-control-primary-action.ts
@@ -5,20 +5,18 @@ import type {
   SourceControlPrimaryActionDecisionInputs,
   SourceControlCommitAreaPrimaryActionDecision,
   SourceControlRemoteOpKind
-} from '../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
-import { resolveSourceControlCommitAreaPrimaryActionDecision } from '../../../src/shared/source-control/decisions/source-control-primary-action-decision'
+} from '../../../../src/shared/source-control/decisions/source-control-primary-action-decision-types'
+import { resolveSourceControlCommitAreaPrimaryActionDecision } from '../../../../src/shared/source-control/decisions/source-control-primary-action-decision'
 
 import {
   hasResolvableHostedReviewPushTargetLink,
   resolveHostedReviewPushTargetForActions
-} from '../../../src/shared/source-control/hosted-review/hosted-review-push-target'
-import type { PRState } from '../../../src/shared/github/pull-requests/pull-request-types'
-import type { GitPushTarget } from '../../../src/shared/worktree/types'
-import type { PrSidebarState } from './review/mobile-pr-sidebar-state'
-import type { MobileGitBranchCompareResult } from './mobile-branch-compare'
-import type { MobileGitStatusResult } from './mobile-git-status'
-
-export { getMobileForcePushBlockedReason } from './mobile-source-control-review-copy'
+} from '../../../../src/shared/source-control/hosted-review/hosted-review-push-target'
+import type { PRState } from '../../../../src/shared/github/pull-requests/pull-request-types'
+import type { GitPushTarget } from '../../../../src/shared/worktree/types'
+import type { PrSidebarState } from '../review/mobile-pr-sidebar-state'
+import type { MobileGitBranchCompareReply as MobileGitBranchCompareResult } from '../branches/git-compare-reply-schema'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../git/git-status-reply-schema'
 
 type GitStep = { method: string; params?: Record<string, unknown> }
 
diff --git a/mobile/src/source-control/mobile-source-control-review-copy.ts b/mobile/src/source-control/workflows/mobile-source-control-review-copy.ts
similarity index 91%
rename from mobile/src/source-control/mobile-source-control-review-copy.ts
rename to mobile/src/source-control/workflows/mobile-source-control-review-copy.ts
index a4b3b7b754b..24f9eb67191 100644
--- a/mobile/src/source-control/mobile-source-control-review-copy.ts
+++ b/mobile/src/source-control/workflows/mobile-source-control-review-copy.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 import type { MobileSourceControlReviewInputs } from './mobile-source-control-primary-action'
 
 // Mobile pushes without a review's saved push target, so a force push there could overwrite the wrong branch.
diff --git a/mobile/src/source-control/use-mobile-source-control-action-sheet-runners.ts b/mobile/src/source-control/workflows/use-mobile-source-control-action-sheet-runners.ts
similarity index 96%
rename from mobile/src/source-control/use-mobile-source-control-action-sheet-runners.ts
rename to mobile/src/source-control/workflows/use-mobile-source-control-action-sheet-runners.ts
index d5d03d8a24a..a3b19db12e4 100644
--- a/mobile/src/source-control/use-mobile-source-control-action-sheet-runners.ts
+++ b/mobile/src/source-control/workflows/use-mobile-source-control-action-sheet-runners.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import { translate } from '../i18n/mobile-i18n'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
+import { translate } from '../../i18n/mobile-i18n'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 
 type GitStep = { method: string; params?: Record<string, unknown> }
 type SendGitRequest = <T>(method: string, params?: Record<string, unknown>) => Promise<T>
diff --git a/mobile/src/source-control/use-mobile-source-control-action-sheet.ts b/mobile/src/source-control/workflows/use-mobile-source-control-action-sheet.ts
similarity index 89%
rename from mobile/src/source-control/use-mobile-source-control-action-sheet.ts
rename to mobile/src/source-control/workflows/use-mobile-source-control-action-sheet.ts
index dc56cf995d6..54acebc46f0 100644
--- a/mobile/src/source-control/use-mobile-source-control-action-sheet.ts
+++ b/mobile/src/source-control/workflows/use-mobile-source-control-action-sheet.ts
@@ -1,15 +1,15 @@
 import { useMemo } from 'react'
 import { mobileCommitDropdownCopy } from './mobile-commit-dropdown-copy'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import { buildMobileSourceControlActions } from './mobile-source-control-actions'
-import type { ActionSheetAction } from '../components/ActionSheetModal'
-import { SOURCE_CONTROL_ACTION_ICONS } from './mobile-source-control-screen-state'
-import type { MobileSourceControlState } from './use-mobile-source-control-state'
+import type { ActionSheetAction } from '../../components/ActionSheetModal'
+import { SOURCE_CONTROL_ACTION_ICONS } from '../changes/mobile-source-control-screen-state'
+import type { MobileSourceControlState } from '../use-mobile-source-control-state'
 import {
   buildMobileSourceControlDecisionInputs,
-  getMobileForcePushBlockedReason,
   type MobileSourceControlReviewInputs
 } from './mobile-source-control-primary-action'
+import { getMobileForcePushBlockedReason } from './mobile-source-control-review-copy'
 
 export function useMobileSourceControlActionSheet(
   state: MobileSourceControlState,
diff --git a/mobile/src/source-control/use-mobile-source-control-runners.ts b/mobile/src/source-control/workflows/use-mobile-source-control-runners.ts
similarity index 90%
rename from mobile/src/source-control/use-mobile-source-control-runners.ts
rename to mobile/src/source-control/workflows/use-mobile-source-control-runners.ts
index 956899af2a6..87aaebfd0ea 100644
--- a/mobile/src/source-control/use-mobile-source-control-runners.ts
+++ b/mobile/src/source-control/workflows/use-mobile-source-control-runners.ts
@@ -1,20 +1,20 @@
 import { useCallback, type Dispatch, type MutableRefObject, type SetStateAction } from 'react'
-import { translate } from '../i18n/mobile-i18n'
-import type { RouteHandoff } from '../navigation/route-handoff'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { triggerError, triggerSuccess } from '../platform/haptics'
-import { useMobileCommitMessageGeneration } from './use-mobile-commit-message-generation'
-import { useMobileSourceControlCommitRunners } from './use-mobile-source-control-commit-runners'
+import { translate } from '../../i18n/mobile-i18n'
+import type { RouteHandoff } from '../../navigation/route-handoff'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { triggerError, triggerSuccess } from '../../platform/haptics/haptics'
+import { useMobileCommitMessageGeneration } from '../commits/use-mobile-commit-message-generation'
+import { useMobileSourceControlCommitRunners } from '../commits/use-mobile-source-control-commit-runners'
 import { useMobileSourceControlActionSheetRunners } from './use-mobile-source-control-action-sheet-runners'
 import { useMobileStageAllRunner } from './use-mobile-stage-all-runner'
-import { useMobileConflictRunners } from './use-mobile-conflict-runners'
-import type { RuntimeGitLocalBranches } from '../../../src/shared/runtime-types'
-import type { MobileGitStatusResult } from './mobile-git-status'
-import type { LoadStatusOptions } from './mobile-source-control-screen-state'
+import { useMobileConflictRunners } from '../conflicts/use-mobile-conflict-runners'
+import type { RuntimeGitLocalBranches } from '../../../../src/shared/runtime-worktree-contracts'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../git/git-status-reply-schema'
+import type { LoadStatusOptions } from '../changes/mobile-source-control-screen-state'
 import type {
   MobileCommitFailureRecovery,
   RecordMobileCommitFailure
-} from './mobile-commit-failure-recovery'
+} from '../commits/mobile-commit-failure-recovery'
 
 type GitStep = { method: string; params?: Record<string, unknown> }
 type SendGitRequest = <T>(method: string, params?: Record<string, unknown>) => Promise<T>
diff --git a/mobile/src/source-control/use-mobile-stage-all-runner.ts b/mobile/src/source-control/workflows/use-mobile-stage-all-runner.ts
similarity index 85%
rename from mobile/src/source-control/use-mobile-stage-all-runner.ts
rename to mobile/src/source-control/workflows/use-mobile-stage-all-runner.ts
index 4bbe4f41b1a..973615a555b 100644
--- a/mobile/src/source-control/use-mobile-stage-all-runner.ts
+++ b/mobile/src/source-control/workflows/use-mobile-stage-all-runner.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import { requireGitStageWorktreeScopeReceipt } from '../../../src/shared/git/paths/git-stage-worktree-scope'
-import type { MobileGitStatusResult } from './mobile-git-status'
+import { requireGitStageWorktreeScopeReceipt } from '../../../../src/shared/git/paths/git-stage-worktree-scope'
+import type { MobileGitStatusHostPayload as MobileGitStatusResult } from '../git/git-status-reply-schema'
 
 type Params = {
   status: MobileGitStatusResult | null
diff --git a/mobile/src/stats/home-stats-summary-read.ts b/mobile/src/stats/home-stats-summary-read.ts
index e1ee4807167..07fc222ce15 100644
--- a/mobile/src/stats/home-stats-summary-read.ts
+++ b/mobile/src/stats/home-stats-summary-read.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { salvagedOptional } from '../../../src/shared/zod-salvage'
-import { HOST_LIST_TARGET, NO_HOST_LIST_INPUT } from '../host-screen/host-list-queries'
+import { HOST_LIST_TARGET, NO_HOST_LIST_INPUT } from '../host-screen/catalog/host-list-queries'
 import { defineHostQuery } from '../query/host-query'
 import { hostQueryKey } from '../query/host-query-key'
 import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
diff --git a/mobile/src/storage/preferences.ts b/mobile/src/storage/preferences.ts
index 3e578f45a38..fbb1ee53f58 100644
--- a/mobile/src/storage/preferences.ts
+++ b/mobile/src/storage/preferences.ts
@@ -1,6 +1,6 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { persistMirrored } from './mirrored-storage-keys'
-import { TERMINAL_TEXT_SCALES } from '../terminal/terminal-text-scales'
+import { TERMINAL_TEXT_SCALES } from '../terminal/preferences/terminal-text-scales'
 
 const PINS_PREFIX = 'orca:pins:'
 // Push-service consent is independent of legacy socket notifications.
@@ -69,7 +69,7 @@ export async function saveRemotePushHostRegistrations(
 const TEXT_SCALE_KEY = 'orca:terminalTextScale'
 
 // Keep definitions in the bundled terminal document so it need not import storage.
-export { TERMINAL_TEXT_SCALES } from '../terminal/terminal-text-scales'
+
 const DEFAULT_TEXT_SCALE = 1
 
 export async function loadTerminalTextScale(): Promise<number> {
diff --git a/mobile/src/tasks/item-detail/mobile-tasks-item-actions.tsx b/mobile/src/tasks/item-detail/mobile-tasks-item-actions.tsx
index 0e8cc216012..6626aa1e05d 100644
--- a/mobile/src/tasks/item-detail/mobile-tasks-item-actions.tsx
+++ b/mobile/src/tasks/item-detail/mobile-tasks-item-actions.tsx
@@ -12,7 +12,7 @@ import {
   MoreHorizontal
 } from 'lucide-react-native'
 import { colors } from '../../theme/mobile-theme'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { styles } from '../mobile-tasks-legacy-styles'
 import {
   taskExternalOpenLabel,
diff --git a/mobile/src/tasks/item-detail/mobile-tasks-item-detail-content.tsx b/mobile/src/tasks/item-detail/mobile-tasks-item-detail-content.tsx
index 0885b5550e4..5b0bf1b61b7 100644
--- a/mobile/src/tasks/item-detail/mobile-tasks-item-detail-content.tsx
+++ b/mobile/src/tasks/item-detail/mobile-tasks-item-detail-content.tsx
@@ -3,7 +3,7 @@ import { translate } from '../../i18n/mobile-i18n'
 import { isBrokenCheck } from '../../../../src/shared/source-control/checks/pr-checks-fix-prompt'
 import { View, Text, Pressable } from 'react-native'
 import { colors, pressedStyle } from '../../theme/mobile-theme'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { ExternalLink } from 'lucide-react-native'
 import { TextField } from '../../components/composer-input/TextField'
 import { styles, getGitLabPipelineStatusStyle } from '../mobile-tasks-legacy-styles'
diff --git a/mobile/src/tasks/item-detail/use-mobile-tasks-hosted-comment-review-actions.tsx b/mobile/src/tasks/item-detail/use-mobile-tasks-hosted-comment-review-actions.tsx
index ecbac3e8f7b..afbd07cb4f1 100644
--- a/mobile/src/tasks/item-detail/use-mobile-tasks-hosted-comment-review-actions.tsx
+++ b/mobile/src/tasks/item-detail/use-mobile-tasks-hosted-comment-review-actions.tsx
@@ -1,6 +1,6 @@
 import { refreshMobileTaskPRChecks } from '../hosted-review/mobile-task-pr-check-refresh'
 import { githubTaskKey, sameGitHubTask, requireGitHubTaskTarget } from './github-task-identity'
-import { useClipboardWriter } from '../../platform/clipboard'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
 import type { HostedMetadataActionsModel } from './use-mobile-tasks-hosted-metadata-actions'
 import { scheduleMobileTaskCopyFeedbackReset } from '../screen/mobile-task-copy-feedback-timer'
 import { useCallback } from 'react'
diff --git a/mobile/src/tasks/project-board/mobile-tasks-project-detail-drawer.tsx b/mobile/src/tasks/project-board/mobile-tasks-project-detail-drawer.tsx
index 134bddf4bed..900c88630b5 100644
--- a/mobile/src/tasks/project-board/mobile-tasks-project-detail-drawer.tsx
+++ b/mobile/src/tasks/project-board/mobile-tasks-project-detail-drawer.tsx
@@ -2,7 +2,7 @@ import type { ConnectionPresentationModel } from '../screen-state/use-mobile-tas
 import { translate } from '../../i18n/mobile-i18n'
 import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
 import { View, Text, Pressable, ActivityIndicator } from 'react-native'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { ExternalLink, Copy, Plus, RefreshCw, X, GitBranch } from 'lucide-react-native'
 import { colors, pressedStyle } from '../../theme/mobile-theme'
 import { TaskProviderLogo } from '../../components/TaskProviderLogo'
diff --git a/mobile/src/tasks/project-board/mobile-tasks-project-review-panels.tsx b/mobile/src/tasks/project-board/mobile-tasks-project-review-panels.tsx
index dabf6ac39af..c175c4c7c6a 100644
--- a/mobile/src/tasks/project-board/mobile-tasks-project-review-panels.tsx
+++ b/mobile/src/tasks/project-board/mobile-tasks-project-review-panels.tsx
@@ -13,7 +13,7 @@ import { View, Text, ActivityIndicator, Pressable } from 'react-native'
 import { colors, pressedStyle } from '../../theme/mobile-theme'
 import { Check, ExternalLink } from 'lucide-react-native'
 import { TextField } from '../../components/composer-input/TextField'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { styles } from '../mobile-tasks-legacy-styles'
 
 export function renderMobileTasksProjectReviewPanels(model: ConnectionPresentationModel) {
diff --git a/mobile/src/tasks/screen/mobile-tasks-filter-sheet.tsx b/mobile/src/tasks/screen/mobile-tasks-filter-sheet.tsx
index d0e8ed6e75b..ceedb8f0816 100644
--- a/mobile/src/tasks/screen/mobile-tasks-filter-sheet.tsx
+++ b/mobile/src/tasks/screen/mobile-tasks-filter-sheet.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from 'react'
 import type { ConnectionPresentationModel } from '../screen-state/use-mobile-tasks-connection-presentation'
 import { translate as t } from '../../i18n/mobile-i18n'
 import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { Text, View } from 'react-native'
 import type { PickerOption } from '../../components/PickerModal'
 import { styles } from '../mobile-tasks-legacy-styles'
diff --git a/mobile/src/tasks/task-list/mobile-tasks-provider-item-list.tsx b/mobile/src/tasks/task-list/mobile-tasks-provider-item-list.tsx
index 1bc3efbaa89..4b00a279a8b 100644
--- a/mobile/src/tasks/task-list/mobile-tasks-provider-item-list.tsx
+++ b/mobile/src/tasks/task-list/mobile-tasks-provider-item-list.tsx
@@ -3,7 +3,7 @@ import { translate } from '../../i18n/mobile-i18n'
 import { View, ActivityIndicator, Text, FlatList, Pressable } from 'react-native'
 import { colors, spacing, type MobileColorScheme, pressedStyle } from '../../theme/mobile-theme'
 import { ChevronLeft, ChevronRight, ExternalLink, GitBranch } from 'lucide-react-native'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import {
   getHostedReviewSignalTone,
   getHostedReviewLabel,
diff --git a/mobile/src/tasks/workspace-creation/mobile-tasks-create-drawers.tsx b/mobile/src/tasks/workspace-creation/mobile-tasks-create-drawers.tsx
index a12ace81ec4..429c44e20ed 100644
--- a/mobile/src/tasks/workspace-creation/mobile-tasks-create-drawers.tsx
+++ b/mobile/src/tasks/workspace-creation/mobile-tasks-create-drawers.tsx
@@ -8,7 +8,7 @@ import { ChevronDown, ExternalLink, Lock } from 'lucide-react-native'
 import { MessageBox } from '../../components/composer-input/MessageBox'
 import { TextField } from '../../components/composer-input/TextField'
 import { PickerModal } from '../../components/PickerModal'
-import { openExternalLink } from '../../platform/external-link'
+import { openExternalLink } from '../../platform/external-links/external-link'
 import { styles } from '../mobile-tasks-legacy-styles'
 import { getRepoBadgeColor } from '../repositories/mobile-tasks-repository-presentation'
 import type { RepoSummary, LinearTeam } from '../mobile-tasks-provider-detail-types'
diff --git a/mobile/src/tasks/workspace-creation/use-mobile-tasks-workspace-source-effects.tsx b/mobile/src/tasks/workspace-creation/use-mobile-tasks-workspace-source-effects.tsx
index 05e74fc0319..663733436cc 100644
--- a/mobile/src/tasks/workspace-creation/use-mobile-tasks-workspace-source-effects.tsx
+++ b/mobile/src/tasks/workspace-creation/use-mobile-tasks-workspace-source-effects.tsx
@@ -3,7 +3,7 @@ import type { WorkspaceCreateProjectionModel } from '../project-board/use-mobile
 import type { SparsePreset } from '../../../../src/shared/worktree/create-types'
 import { useEffect } from 'react'
 import { repoSparsePresetListRead } from '../../new-workspace/creation/mobile-workspace-source-operations'
-import { repoBaseRefSearchRead } from '../../source-control/mobile-repo-base-ref-operations'
+import { repoBaseRefSearchRead } from '../../source-control/branches/mobile-repo-base-ref-operations'
 
 export type WorkspaceSourceEffectsInput = Pick<
   WorkspaceCreateProjectionModel,
diff --git a/mobile/src/terminal/document/document-scope.ts b/mobile/src/terminal/document/document-scope.ts
index 19589fd942a..a2ecece1c09 100644
--- a/mobile/src/terminal/document/document-scope.ts
+++ b/mobile/src/terminal/document/document-scope.ts
@@ -1,5 +1,5 @@
 import { TerminalKittyKeyboardModeTracker } from '../../../../src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker'
-import type { TerminalLaidOutCellBox } from '../terminal-cell-box'
+import type { TerminalLaidOutCellBox } from '../viewport/terminal-cell-box'
 import { DEFAULT_TERMINAL_THEME } from '../terminal-webview-html/theme'
 import {
   createEngineTerminal,
diff --git a/mobile/src/terminal/document/native-document-bundle.test.ts b/mobile/src/terminal/document/native-document-bundle.test.ts
index 25b2c77ade4..34ce6fd6c46 100644
--- a/mobile/src/terminal/document/native-document-bundle.test.ts
+++ b/mobile/src/terminal/document/native-document-bundle.test.ts
@@ -1,7 +1,8 @@
 // @vitest-environment happy-dom
 import { afterEach, describe, expect, it } from 'vitest'
-import { TERMINAL_DOCUMENT_SCRIPT } from '../terminal-webview-document-script.generated'
-import { TERMINAL_DOCUMENT_MARKUP } from '../terminal-webview-html'
+import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
+import './native-terminal-html'
+import { TERMINAL_DOCUMENT_MARKUP } from '../terminal-webview-html/document-markup'
 // Execute the shipped bundle through native message transport; structural module checks cannot prove the WebView entry runs.
 function engineDouble() {
   const opened: HTMLElement[] = []
diff --git a/mobile/src/terminal/terminal-webview-html.ts b/mobile/src/terminal/document/native-terminal-html.ts
similarity index 59%
rename from mobile/src/terminal/terminal-webview-html.ts
rename to mobile/src/terminal/document/native-terminal-html.ts
index 304e18d9344..67454edb2d7 100644
--- a/mobile/src/terminal/terminal-webview-html.ts
+++ b/mobile/src/terminal/document/native-terminal-html.ts
@@ -1,14 +1,8 @@
 import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
-import { TERMINAL_HTML_DOCUMENT_CLOSE } from './terminal-webview-html/document-close'
-import { TERMINAL_HTML_DOCUMENT_SHELL } from './terminal-webview-html/document-shell'
+import { TERMINAL_HTML_DOCUMENT_CLOSE } from '../terminal-webview-html/document-close'
+import { TERMINAL_HTML_DOCUMENT_SHELL } from '../terminal-webview-html/document-shell'
 
-export { MOBILE_TERMINAL_CARET_OPTIONS } from './terminal-webview-html/theme'
-// Re-export markup/style on both platforms so the web sibling can omit native script strings.
-export { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html/document-markup'
-export {
-  TERMINAL_DOCUMENT_ELEMENT_STYLE,
-  TERMINAL_DOCUMENT_STYLE
-} from './terminal-webview-html/document-style'
+import '../terminal-webview-html/theme'
 
 // Generate native script from the same modules embedded pages import.
 export const XTERM_HTML = [
diff --git a/mobile/src/terminal/terminal-web-document-mount.ts b/mobile/src/terminal/document/terminal-web-document-mount.ts
similarity index 90%
rename from mobile/src/terminal/terminal-web-document-mount.ts
rename to mobile/src/terminal/document/terminal-web-document-mount.ts
index eb7c3d1eb33..bd7fed7c22b 100644
--- a/mobile/src/terminal/terminal-web-document-mount.ts
+++ b/mobile/src/terminal/document/terminal-web-document-mount.ts
@@ -1,18 +1,20 @@
 import { Terminal } from '@xterm/xterm'
 import { Unicode11Addon } from '@xterm/addon-unicode11'
 import { WebglAddon } from '@xterm/addon-webgl'
-import type { TerminalDocumentTerminal } from './document/document-terminal-shape'
-import type { TerminalDocumentStart, TerminalViewportChange } from './document/document-host-seams'
-import { TERMINAL_DOCUMENT_ELEMENT_STYLE, TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
-import { scopeStyleToHost } from '../style-scoping/document-style-scoping'
+import type { TerminalDocumentTerminal } from './document-terminal-shape'
+import type { TerminalDocumentStart, TerminalViewportChange } from './document-host-seams'
+import '../terminal-webview-html/theme'
+import { TERMINAL_DOCUMENT_MARKUP } from '../terminal-webview-html/document-markup'
+import { TERMINAL_DOCUMENT_ELEMENT_STYLE } from '../terminal-webview-html/document-style'
+import { scopeStyleToHost } from '../../style-scoping/document-style-scoping'
 import {
   TERMINAL_SYMBOLS_FONT_CSS,
   XTERM_ENGINE_CSS
 } from './terminal-webview-engine-css.generated'
-import terminalNerdFontUrl from '../../assets/fonts/SymbolsNerdFontMono-Regular.woff2'
-import { terminalNerdFontCss } from './terminal-font-face-css.mjs'
-import { createTerminalDocument } from './document/create-terminal-document'
-import type { TerminalWebViewCommand } from './terminal-webview-messages'
+import terminalNerdFontUrl from '../../../assets/fonts/SymbolsNerdFontMono-Regular.woff2'
+import { terminalNerdFontCss } from '../fonts/terminal-font-face-css.mjs'
+import { createTerminalDocument } from './create-terminal-document'
+import type { TerminalWebViewCommand } from '../webview/terminal-webview-messages'
 
 // Mount the native document factory with page-owned seams and fresh scope so overlapping terminals cannot share state.
 
diff --git a/mobile/src/terminal/document/viewport/laid-out-cell-box.ts b/mobile/src/terminal/document/viewport/laid-out-cell-box.ts
index ce33657cc83..7f2d87fe693 100644
--- a/mobile/src/terminal/document/viewport/laid-out-cell-box.ts
+++ b/mobile/src/terminal/document/viewport/laid-out-cell-box.ts
@@ -1,4 +1,4 @@
-import { sameCellBox, type TerminalLaidOutCellBox } from '../../terminal-cell-box'
+import { sameCellBox, type TerminalLaidOutCellBox } from '../../viewport/terminal-cell-box'
 import type { TerminalDocumentScope } from '../document-scope'
 import { notify } from '../host-bridge/host-notify'
 
diff --git a/mobile/src/terminal/document/viewport/text-scaling.ts b/mobile/src/terminal/document/viewport/text-scaling.ts
index 9b2ed5e7482..20b46075bbb 100644
--- a/mobile/src/terminal/document/viewport/text-scaling.ts
+++ b/mobile/src/terminal/document/viewport/text-scaling.ts
@@ -1,10 +1,10 @@
 import { getCellHeight, getCellWidth } from './cell-metrics'
 import { elementInRoot } from '../document-host-seams'
-import { TERMINAL_TEXT_SCALES } from '../../terminal-text-scales'
+import { TERMINAL_TEXT_SCALES } from '../../preferences/terminal-text-scales'
 import type { TerminalDocumentScope } from '../document-scope'
 import { scheduleDocumentFrame } from '../document-frame-registry'
 import { applyFitScale } from './fit-scale'
-import { fitDimensionsFromCell } from '../../terminal-grid-fit'
+import { fitDimensionsFromCell } from '../../viewport/terminal-grid-fit'
 
 // Re-init temporarily clears ready; latch prior readiness so width reflow cannot turn a transient error fatal.
 
diff --git a/mobile/src/terminal/terminal-font-asset.d.ts b/mobile/src/terminal/fonts/terminal-font-asset.d.ts
similarity index 100%
rename from mobile/src/terminal/terminal-font-asset.d.ts
rename to mobile/src/terminal/fonts/terminal-font-asset.d.ts
diff --git a/mobile/src/terminal/terminal-font-face-css.mjs b/mobile/src/terminal/fonts/terminal-font-face-css.mjs
similarity index 100%
rename from mobile/src/terminal/terminal-font-face-css.mjs
rename to mobile/src/terminal/fonts/terminal-font-face-css.mjs
diff --git a/mobile/src/terminal/mobile-terminal-operations.ts b/mobile/src/terminal/host-operations/mobile-terminal-operations.ts
similarity index 95%
rename from mobile/src/terminal/mobile-terminal-operations.ts
rename to mobile/src/terminal/host-operations/mobile-terminal-operations.ts
index bd679a76587..0ce6e0d5b77 100644
--- a/mobile/src/terminal/mobile-terminal-operations.ts
+++ b/mobile/src/terminal/host-operations/mobile-terminal-operations.ts
@@ -1,5 +1,5 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
 import {
   terminalAutoRestoreFitSchema,
   terminalBufferClearedSchema,
diff --git a/mobile/src/terminal/mobile-terminal-query-reply.ts b/mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts
similarity index 84%
rename from mobile/src/terminal/mobile-terminal-query-reply.ts
rename to mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts
index 7273a2225db..c4c5f5be958 100644
--- a/mobile/src/terminal/mobile-terminal-query-reply.ts
+++ b/mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts
@@ -1,6 +1,6 @@
-import { isTerminalQueryReply } from '../../../src/shared/terminal/protocol/queries/terminal-query-reply'
-import { PROGRAM_STATUS_OSC_PREFIX } from '../../../src/shared/program-status/protocol'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
+import { isTerminalQueryReply } from '../../../../src/shared/terminal/protocol/queries/terminal-query-reply'
+import { PROGRAM_STATUS_OSC_PREFIX } from '../../../../src/shared/program-status/protocol'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
 import { terminalInputSend } from './mobile-terminal-operations'
 
 type TerminalSubscriptionRegistry = {
diff --git a/mobile/src/terminal/mock-server-terminal-stream-cancellation.test.ts b/mobile/src/terminal/host-operations/mock-server-terminal-stream-cancellation.test.ts
similarity index 95%
rename from mobile/src/terminal/mock-server-terminal-stream-cancellation.test.ts
rename to mobile/src/terminal/host-operations/mock-server-terminal-stream-cancellation.test.ts
index e7b4f7fe90c..d69ff003f57 100644
--- a/mobile/src/terminal/mock-server-terminal-stream-cancellation.test.ts
+++ b/mobile/src/terminal/host-operations/mock-server-terminal-stream-cancellation.test.ts
@@ -4,7 +4,7 @@ import {
   handleRequest,
   type RpcRequest,
   type RpcResponse
-} from '../../scripts/mock-server-rpc-handlers'
+} from '../../../scripts/mock-server-rpc-handlers'
 
 function request(id: string, method: string): RpcRequest {
   return { id, method, params: { terminal: 'term-1', viewport: { cols: 80, rows: 24 } } }
diff --git a/mobile/src/terminal/terminal-reply-schema.ts b/mobile/src/terminal/host-operations/terminal-reply-schema.ts
similarity index 95%
rename from mobile/src/terminal/terminal-reply-schema.ts
rename to mobile/src/terminal/host-operations/terminal-reply-schema.ts
index fc8027050cc..36e9c5414ce 100644
--- a/mobile/src/terminal/terminal-reply-schema.ts
+++ b/mobile/src/terminal/host-operations/terminal-reply-schema.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { salvagedOptional } from '../../../src/shared/zod-salvage'
+import { salvagedOptional } from '../../../../src/shared/zod-salvage'
 
 export const terminalComposerDraftSchema = z.looseObject({
   terminal: salvagedOptional(
diff --git a/mobile/src/terminal/mobile-terminal-input-owner.ts b/mobile/src/terminal/input-delivery/mobile-terminal-input-owner.ts
similarity index 76%
rename from mobile/src/terminal/mobile-terminal-input-owner.ts
rename to mobile/src/terminal/input-delivery/mobile-terminal-input-owner.ts
index 9e3a582921f..e70438736e9 100644
--- a/mobile/src/terminal/mobile-terminal-input-owner.ts
+++ b/mobile/src/terminal/input-delivery/mobile-terminal-input-owner.ts
@@ -1,7 +1,7 @@
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { SendRequestOptions } from '../transport/rpc/unvalidated-rpc-request-port'
-import type { RpcSendParams } from '../../../src/shared/rpc-contract/rpc-send-params'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { SendRequestOptions } from '../../transport/rpc/unvalidated-rpc-request-port'
+import type { RpcSendParams } from '../../../../src/shared/rpc-contract/rpc-send-params'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 
 export type TerminalInputEnqueueOptions = {
   onAdmission?: (accepted: boolean) => void
diff --git a/mobile/src/terminal/mobile-terminal-input-sender.ts b/mobile/src/terminal/input-delivery/mobile-terminal-input-sender.ts
similarity index 93%
rename from mobile/src/terminal/mobile-terminal-input-sender.ts
rename to mobile/src/terminal/input-delivery/mobile-terminal-input-sender.ts
index 73ac5260d45..c1ab03cd31d 100644
--- a/mobile/src/terminal/mobile-terminal-input-sender.ts
+++ b/mobile/src/terminal/input-delivery/mobile-terminal-input-sender.ts
@@ -4,13 +4,16 @@ import {
   TERMINAL_ORDERED_INPUT_WINDOW,
   terminalOrderedInputControls,
   terminalOrderedInputByteLength
-} from '../../../src/shared/terminal/input/terminal-ordered-input'
-import { getTerminalInputByteLength } from '../../../src/shared/terminal/input/terminal-input'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { SendRequestOptions } from '../transport/rpc/unvalidated-rpc-request-port'
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
-import { terminalInputSend, terminalInputSessionOpen } from './mobile-terminal-operations'
-import { TERMINAL_LIVE_INPUT_MAX_BYTES } from './terminal-live-input'
+} from '../../../../src/shared/terminal/input/terminal-ordered-input'
+import { getTerminalInputByteLength } from '../../../../src/shared/terminal/input/terminal-input'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { SendRequestOptions } from '../../transport/rpc/unvalidated-rpc-request-port'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
+import {
+  terminalInputSend,
+  terminalInputSessionOpen
+} from '../host-operations/mobile-terminal-operations'
+import { TERMINAL_LIVE_INPUT_MAX_BYTES } from '../live-input/terminal-live-input'
 
 import {
   refused,
@@ -21,7 +24,6 @@ import {
   type Batch,
   type Owner
 } from './mobile-terminal-input-owner'
-export type { TerminalInputEnqueueOptions } from './mobile-terminal-input-owner'
 
 export class MobileTerminalInputSender {
   private readonly owners = new Map<string, Owner>()
diff --git a/mobile/src/terminal/terminal-input-connection-gate.ts b/mobile/src/terminal/input-delivery/terminal-input-connection-gate.ts
similarity index 90%
rename from mobile/src/terminal/terminal-input-connection-gate.ts
rename to mobile/src/terminal/input-delivery/terminal-input-connection-gate.ts
index 6747f5bd661..5ae45085574 100644
--- a/mobile/src/terminal/terminal-input-connection-gate.ts
+++ b/mobile/src/terminal/input-delivery/terminal-input-connection-gate.ts
@@ -1,4 +1,4 @@
-import type { ConnectionState } from '../transport/connection/connection-state'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 
 type MobileTerminalInputGateOptions = {
   readonly connState: ConnectionState
diff --git a/mobile/src/terminal/terminal-send-request.ts b/mobile/src/terminal/input-delivery/terminal-send-request.ts
similarity index 89%
rename from mobile/src/terminal/terminal-send-request.ts
rename to mobile/src/terminal/input-delivery/terminal-send-request.ts
index 6369309dff4..13065f0ad9c 100644
--- a/mobile/src/terminal/terminal-send-request.ts
+++ b/mobile/src/terminal/input-delivery/terminal-send-request.ts
@@ -1,4 +1,4 @@
-import type { SendRequestOptions } from '../transport/rpc/unvalidated-rpc-request-port'
+import type { SendRequestOptions } from '../../transport/rpc/unvalidated-rpc-request-port'
 
 type TerminalSendParams = {
   readonly terminal: string
diff --git a/mobile/src/terminal/terminal-accessory-keys.ts b/mobile/src/terminal/key-input/terminal-accessory-keys.ts
similarity index 94%
rename from mobile/src/terminal/terminal-accessory-keys.ts
rename to mobile/src/terminal/key-input/terminal-accessory-keys.ts
index 2d735c0526d..30dce61748a 100644
--- a/mobile/src/terminal/terminal-accessory-keys.ts
+++ b/mobile/src/terminal/key-input/terminal-accessory-keys.ts
@@ -1,12 +1,8 @@
 import {
   TERMINAL_CTRL_BACKSPACE_INPUT,
   TERMINAL_KITTY_SHIFT_ENTER_INPUT
-} from '../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
-import {
-  SPECIAL_KEY_LABELS,
-  TERMINAL_ACCESSORY_KEY_DEFINITIONS,
-  TERMINAL_SHORTCUT_SPECIAL_KEY_DEFINITIONS
-} from './terminal-key-definitions'
+} from '../../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
+import { SPECIAL_KEY_LABELS } from './terminal-key-definitions'
 
 export type TerminalAccessoryKey = {
   id: string
@@ -123,10 +119,6 @@ const CSI_TILDE_SPECIAL_KEYS: Record<string, number> = {
   f12: 24
 }
 
-export const TERMINAL_SHORTCUT_SPECIAL_KEYS = TERMINAL_SHORTCUT_SPECIAL_KEY_DEFINITIONS
-
-export const TERMINAL_ACCESSORY_KEYS = TERMINAL_ACCESSORY_KEY_DEFINITIONS
-
 export function buildTerminalShortcutKey(
   binding: TerminalShortcutBinding
 ): TerminalShortcutBuildResult | null {
diff --git a/mobile/src/terminal/terminal-accessory-layout.ts b/mobile/src/terminal/key-input/terminal-accessory-layout.ts
similarity index 97%
rename from mobile/src/terminal/terminal-accessory-layout.ts
rename to mobile/src/terminal/key-input/terminal-accessory-layout.ts
index 8eebafd8a9f..6a50d480c27 100644
--- a/mobile/src/terminal/terminal-accessory-layout.ts
+++ b/mobile/src/terminal/key-input/terminal-accessory-layout.ts
@@ -1,7 +1,9 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import { persistMirrored } from '../storage/mirrored-storage-keys'
+import { persistMirrored } from '../../storage/mirrored-storage-keys'
 
-import { TERMINAL_ACCESSORY_KEYS, type TerminalAccessoryKey } from './terminal-accessory-keys'
+import './terminal-accessory-keys'
+import type { TerminalAccessoryKey } from './terminal-accessory-keys'
+import { TERMINAL_ACCESSORY_KEY_DEFINITIONS as TERMINAL_ACCESSORY_KEYS } from './terminal-key-definitions'
 
 export const TERMINAL_ACCESSORY_LAYOUT_STORAGE_KEY = 'orca:terminal-accessory-layout'
 
diff --git a/mobile/src/terminal/terminal-accessory-repeat.ts b/mobile/src/terminal/key-input/terminal-accessory-repeat.ts
similarity index 100%
rename from mobile/src/terminal/terminal-accessory-repeat.ts
rename to mobile/src/terminal/key-input/terminal-accessory-repeat.ts
diff --git a/mobile/src/terminal/terminal-custom-keys.ts b/mobile/src/terminal/key-input/terminal-custom-keys.ts
similarity index 96%
rename from mobile/src/terminal/terminal-custom-keys.ts
rename to mobile/src/terminal/key-input/terminal-custom-keys.ts
index 62990ccc1bc..d40d61190e5 100644
--- a/mobile/src/terminal/terminal-custom-keys.ts
+++ b/mobile/src/terminal/key-input/terminal-custom-keys.ts
@@ -1,5 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import { persistMirrored, subscribeMirroredKey } from '../storage/mirrored-storage-keys'
+import { persistMirrored, subscribeMirroredKey } from '../../storage/mirrored-storage-keys'
 
 const CUSTOM_ACCESSORY_KEYS_STORAGE_KEY = 'orca:custom-accessory-keys'
 
diff --git a/mobile/src/terminal/terminal-key-chord-input.test.ts b/mobile/src/terminal/key-input/terminal-key-chord-input.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-key-chord-input.test.ts
rename to mobile/src/terminal/key-input/terminal-key-chord-input.test.ts
diff --git a/mobile/src/terminal/terminal-key-chord-input.ts b/mobile/src/terminal/key-input/terminal-key-chord-input.ts
similarity index 95%
rename from mobile/src/terminal/terminal-key-chord-input.ts
rename to mobile/src/terminal/key-input/terminal-key-chord-input.ts
index 1c560201514..cb313f51e31 100644
--- a/mobile/src/terminal/terminal-key-chord-input.ts
+++ b/mobile/src/terminal/key-input/terminal-key-chord-input.ts
@@ -2,7 +2,7 @@ import { buildTerminalShortcutKey, type TerminalShortcutModifier } from './termi
 import {
   createTerminalLiveAccessoryInput,
   type TerminalLiveAccessoryInput
-} from './terminal-live-accessory-input'
+} from '../live-input/terminal-live-accessory-input'
 
 export type TerminalKeyChord = {
   readonly key: string
diff --git a/mobile/src/terminal/terminal-key-definitions.ts b/mobile/src/terminal/key-input/terminal-key-definitions.ts
similarity index 99%
rename from mobile/src/terminal/terminal-key-definitions.ts
rename to mobile/src/terminal/key-input/terminal-key-definitions.ts
index dae77fd6641..48092d8c50a 100644
--- a/mobile/src/terminal/terminal-key-definitions.ts
+++ b/mobile/src/terminal/key-input/terminal-key-definitions.ts
@@ -1,4 +1,4 @@
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 import type { TerminalAccessoryKey, TerminalShortcutSpecialKey } from './terminal-accessory-keys'
 
 export const SPECIAL_KEY_LABELS: Record<string, string> = {
diff --git a/mobile/src/terminal/terminal-key-mode-encoding.test.ts b/mobile/src/terminal/key-input/terminal-key-mode-encoding.test.ts
similarity index 92%
rename from mobile/src/terminal/terminal-key-mode-encoding.test.ts
rename to mobile/src/terminal/key-input/terminal-key-mode-encoding.test.ts
index e709d0914ef..5c752899074 100644
--- a/mobile/src/terminal/terminal-key-mode-encoding.test.ts
+++ b/mobile/src/terminal/key-input/terminal-key-mode-encoding.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { encodeTerminalKeyForModes } from './terminal-key-mode-encoding'
-import type { TerminalModes } from './terminal-webview-contract'
+import type { TerminalModes } from '../webview/terminal-webview-contract'
 
 const MODES: TerminalModes = {
   bracketedPasteMode: false,
diff --git a/mobile/src/terminal/terminal-key-mode-encoding.ts b/mobile/src/terminal/key-input/terminal-key-mode-encoding.ts
similarity index 84%
rename from mobile/src/terminal/terminal-key-mode-encoding.ts
rename to mobile/src/terminal/key-input/terminal-key-mode-encoding.ts
index ceac3084c46..ed5d3542aa6 100644
--- a/mobile/src/terminal/terminal-key-mode-encoding.ts
+++ b/mobile/src/terminal/key-input/terminal-key-mode-encoding.ts
@@ -1,8 +1,8 @@
 import {
   encodeTerminalShiftEnter,
   TERMINAL_KITTY_SHIFT_ENTER_INPUT
-} from '../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
-import type { TerminalModes } from './terminal-webview-contract'
+} from '../../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
+import type { TerminalModes } from '../webview/terminal-webview-contract'
 
 // eslint-disable-next-line no-control-regex -- unmodified CSI cursor keys
 const UNMODIFIED_CURSOR_KEY = /^\x1b\[([ABCDHF])$/
diff --git a/mobile/src/terminal/terminal-sticky-modifiers.ts b/mobile/src/terminal/key-input/terminal-sticky-modifiers.ts
similarity index 100%
rename from mobile/src/terminal/terminal-sticky-modifiers.ts
rename to mobile/src/terminal/key-input/terminal-sticky-modifiers.ts
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts
similarity index 94%
rename from mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts
rename to mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts
index 5441080461c..71f73e63a0a 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-lift.test.ts
+++ b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
 import { computeActiveTerminalKeyboardLift } from './terminal-keyboard-avoidance-lift'
-import { parseTerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
-import type { TerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
+import { parseTerminalKeyboardAvoidanceMetrics } from '../webview/terminal-webview-contract'
+import type { TerminalKeyboardAvoidanceMetrics } from '../webview/terminal-webview-contract'
 
 const FRAME_HEIGHT = 800
 const ROWS = 40
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.ts
similarity index 94%
rename from mobile/src/terminal/terminal-keyboard-avoidance-lift.ts
rename to mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.ts
index fb93175cf26..7ea9e144610 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-lift.ts
+++ b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-lift.ts
@@ -1,4 +1,4 @@
-import type { TerminalKeyboardAvoidanceMetrics } from './terminal-webview-contract'
+import type { TerminalKeyboardAvoidanceMetrics } from '../webview/terminal-webview-contract'
 
 type ActiveTerminalKeyboardLiftParams = {
   keyboardLift: number
diff --git a/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-webview.test.ts
similarity index 96%
rename from mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts
rename to mobile/src/terminal/keyboard/terminal-keyboard-avoidance-webview.test.ts
index 3a07b277e6e..8d48d7bff9c 100644
--- a/mobile/src/terminal/terminal-keyboard-avoidance-webview.test.ts
+++ b/mobile/src/terminal/keyboard/terminal-keyboard-avoidance-webview.test.ts
@@ -1,9 +1,9 @@
 // @vitest-environment happy-dom
 import { Terminal } from '@xterm/xterm'
 import { describe, expect, it } from 'vitest'
-import { createTerminalDocumentScope } from './document/document-scope'
-import { emitKeyboardAvoidanceMetrics } from './document/viewport/keyboard-avoidance-metrics'
-import { commitFitScale } from './document/viewport/fit-scale'
+import { createTerminalDocumentScope } from '../document/document-scope'
+import { emitKeyboardAvoidanceMetrics } from '../document/viewport/keyboard-avoidance-metrics'
+import { commitFitScale } from '../document/viewport/fit-scale'
 
 function runMetricsOver(term: unknown, fitScale = 1): Record<string, unknown>[] {
   const notifications: Record<string, unknown>[] = []
diff --git a/mobile/src/terminal/terminal-keyboard-dismiss.ts b/mobile/src/terminal/keyboard/terminal-keyboard-dismiss.ts
similarity index 100%
rename from mobile/src/terminal/terminal-keyboard-dismiss.ts
rename to mobile/src/terminal/keyboard/terminal-keyboard-dismiss.ts
diff --git a/mobile/src/terminal/terminal-live-input-keyboard-reopen.ts b/mobile/src/terminal/keyboard/terminal-live-input-keyboard-reopen.ts
similarity index 80%
rename from mobile/src/terminal/terminal-live-input-keyboard-reopen.ts
rename to mobile/src/terminal/keyboard/terminal-live-input-keyboard-reopen.ts
index 4fc6cf57e1a..c8d0f39ce23 100644
--- a/mobile/src/terminal/terminal-live-input-keyboard-reopen.ts
+++ b/mobile/src/terminal/keyboard/terminal-live-input-keyboard-reopen.ts
@@ -1,4 +1,4 @@
-import { hostOs } from '../platform/host-os'
+import { hostOs } from '../../platform/host-os'
 
 /** Android keeps a hidden TextInput focused after Back closes the IME, so focus must blur first. */
 export function reopensFocusedInputWhenKeyboardHidden(): boolean {
diff --git a/mobile/src/terminal/terminal-live-accessory-input.ts b/mobile/src/terminal/live-input/terminal-live-accessory-input.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-accessory-input.ts
rename to mobile/src/terminal/live-input/terminal-live-accessory-input.ts
diff --git a/mobile/src/terminal/terminal-live-accessory-raw-send-target.ts b/mobile/src/terminal/live-input/terminal-live-accessory-raw-send-target.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-accessory-raw-send-target.ts
rename to mobile/src/terminal/live-input/terminal-live-accessory-raw-send-target.ts
diff --git a/mobile/src/terminal/terminal-live-accessory-raw-send.ts b/mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts
similarity index 78%
rename from mobile/src/terminal/terminal-live-accessory-raw-send.ts
rename to mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts
index 6ee6773c962..717df0d9019 100644
--- a/mobile/src/terminal/terminal-live-accessory-raw-send.ts
+++ b/mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts
@@ -1,8 +1,11 @@
 import { getTerminalLiveAccessoryRawSendTarget } from './terminal-live-accessory-raw-send-target'
-import { buildTerminalSendParams, TERMINAL_INPUT_SEND_OPTIONS } from './terminal-send-request'
-import { terminalInputSend } from './mobile-terminal-operations'
-import type { UnvalidatedRpcRequestPort } from '../transport/rpc/unvalidated-rpc-request-port'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import {
+  buildTerminalSendParams,
+  TERMINAL_INPUT_SEND_OPTIONS
+} from '../input-delivery/terminal-send-request'
+import { terminalInputSend } from '../host-operations/mobile-terminal-operations'
+import type { UnvalidatedRpcRequestPort } from '../../transport/rpc/unvalidated-rpc-request-port'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 
 type TerminalLiveAccessoryRawSendArgs = {
   readonly sendTerminalUserInput: typeof terminalInputSend.request
diff --git a/mobile/src/terminal/terminal-live-input-sender.ts b/mobile/src/terminal/live-input/terminal-live-input-sender.ts
similarity index 62%
rename from mobile/src/terminal/terminal-live-input-sender.ts
rename to mobile/src/terminal/live-input/terminal-live-input-sender.ts
index f316aa7d454..8a28c967211 100644
--- a/mobile/src/terminal/terminal-live-input-sender.ts
+++ b/mobile/src/terminal/live-input/terminal-live-input-sender.ts
@@ -1,4 +1,4 @@
-import type { TerminalInputEnqueueOptions } from './mobile-terminal-input-sender'
+import type { TerminalInputEnqueueOptions } from '../input-delivery/mobile-terminal-input-owner'
 
 export type TerminalLiveInputSender = (
   handle: string,
diff --git a/mobile/src/terminal/terminal-live-input-text-write.ts b/mobile/src/terminal/live-input/terminal-live-input-text-write.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-input-text-write.ts
rename to mobile/src/terminal/live-input/terminal-live-input-text-write.ts
diff --git a/mobile/src/terminal/terminal-live-input-text-write.web.test.ts b/mobile/src/terminal/live-input/terminal-live-input-text-write.web.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-input-text-write.web.test.ts
rename to mobile/src/terminal/live-input/terminal-live-input-text-write.web.test.ts
diff --git a/mobile/src/terminal/terminal-live-input-text-write.web.ts b/mobile/src/terminal/live-input/terminal-live-input-text-write.web.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-input-text-write.web.ts
rename to mobile/src/terminal/live-input/terminal-live-input-text-write.web.ts
diff --git a/mobile/src/terminal/terminal-live-input.test.ts b/mobile/src/terminal/live-input/terminal-live-input.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-input.test.ts
rename to mobile/src/terminal/live-input/terminal-live-input.test.ts
diff --git a/mobile/src/terminal/terminal-live-input.ts b/mobile/src/terminal/live-input/terminal-live-input.ts
similarity index 97%
rename from mobile/src/terminal/terminal-live-input.ts
rename to mobile/src/terminal/live-input/terminal-live-input.ts
index ea83a55c959..ae596017f91 100644
--- a/mobile/src/terminal/terminal-live-input.ts
+++ b/mobile/src/terminal/live-input/terminal-live-input.ts
@@ -1,4 +1,4 @@
-import { buildTerminalShortcutKey } from './terminal-accessory-keys'
+import { buildTerminalShortcutKey } from '../key-input/terminal-accessory-keys'
 
 const TERMINAL_LIVE_INPUT_MAX_BYTES = 256 * 1024
 
diff --git a/mobile/src/terminal/terminal-live-pending-flush-state.ts b/mobile/src/terminal/live-input/terminal-live-pending-flush-state.ts
similarity index 96%
rename from mobile/src/terminal/terminal-live-pending-flush-state.ts
rename to mobile/src/terminal/live-input/terminal-live-pending-flush-state.ts
index 7f42c63af27..ebdd005f303 100644
--- a/mobile/src/terminal/terminal-live-pending-flush-state.ts
+++ b/mobile/src/terminal/live-input/terminal-live-pending-flush-state.ts
@@ -1,4 +1,4 @@
-import type { TerminalInputEnqueueOptions } from './mobile-terminal-input-sender'
+import type { TerminalInputEnqueueOptions } from '../input-delivery/mobile-terminal-input-owner'
 export type TerminalLiveMirrorSender = (
   handle: string,
   payload: string,
@@ -200,5 +200,5 @@ function queueTerminalLiveSend(
   drainTerminalLiveMirrorSends(state)
   return request
 }
-import { getTerminalInputByteLength } from '../../../src/shared/terminal/input/terminal-input'
+import { getTerminalInputByteLength } from '../../../../src/shared/terminal/input/terminal-input'
 import { TERMINAL_LIVE_INPUT_MAX_BYTES } from './terminal-live-input'
diff --git a/mobile/src/terminal/terminal-live-preedit-mirror.test.ts b/mobile/src/terminal/live-input/terminal-live-preedit-mirror.test.ts
similarity index 74%
rename from mobile/src/terminal/terminal-live-preedit-mirror.test.ts
rename to mobile/src/terminal/live-input/terminal-live-preedit-mirror.test.ts
index d6a966b2348..04cba45fb51 100644
--- a/mobile/src/terminal/terminal-live-preedit-mirror.test.ts
+++ b/mobile/src/terminal/live-input/terminal-live-preedit-mirror.test.ts
@@ -12,10 +12,7 @@ type MirrorRun = {
 
 type MirrorFrame = { readonly text: string; readonly composing?: boolean }
 
-function runMirrorSequence(
-  fieldStates: readonly (string | MirrorFrame)[],
-  options: { readonly commitAtEnd: boolean } = { commitAtEnd: false }
-): MirrorRun {
+function runMirrorSequence(fieldStates: readonly (string | MirrorFrame)[]): MirrorRun {
   const payloads: string[] = []
   let sentText = ''
   let heldText = ''
@@ -29,16 +26,6 @@ function runMirrorSequence(
     sentText = step.nextSentText
     heldText = step.heldText
   }
-  if (options.commitAtEnd) {
-    const lastField = sentText + heldText
-    const step = computeTerminalLiveMirrorStep(sentText, lastField, { commitHeld: true })
-    const payload = buildTerminalLiveMirrorPayload(step)
-    if (payload.length > 0) {
-      payloads.push(payload)
-    }
-    sentText = step.nextSentText
-    heldText = step.heldText
-  }
   return { payloads, sentText, heldText }
 }
 
@@ -117,19 +104,7 @@ const twoSetFields = [
 describe('terminal live mirror with iOS keyboard edits', () => {
   it.each([
     { keyboard: 'Cheonjiin', fields: cheonjiinFields },
-    { keyboard: 'two-set', fields: twoSetFields },
-    {
-      keyboard: 'autocorrect around a held Korean tail',
-      fields: ['teh 하', 'teh 하ᄉᆞ', 'the 하ᄉᆞ', 'the 하세 ']
-    },
-    {
-      keyboard: 'replacement of an already-sent Korean prefix',
-      fields: ['안녕하', '안녕하ᄉᆞ', '반가ᄉᆞ', '반가워 ']
-    },
-    {
-      keyboard: 'delete-all with a held Korean tail',
-      fields: ['안녕하', '안녕하ᄉᆞ', '', '새 입력 ']
-    }
+    { keyboard: 'two-set', fields: twoSetFields }
   ])('replays $keyboard edits for both receiver deletion units', ({ fields }) => {
     const run = runMirrorSequence(fields.map((text) => ({ text, composing: false })))
     const segmenter = new Intl.Segmenter('ko', { granularity: 'grapheme' })
diff --git a/mobile/src/terminal/terminal-live-preedit-mirror.ts b/mobile/src/terminal/live-input/terminal-live-preedit-mirror.ts
similarity index 100%
rename from mobile/src/terminal/terminal-live-preedit-mirror.ts
rename to mobile/src/terminal/live-input/terminal-live-preedit-mirror.ts
diff --git a/mobile/src/terminal/terminal-live-text-commit.test.ts b/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts
similarity index 57%
rename from mobile/src/terminal/terminal-live-text-commit.test.ts
rename to mobile/src/terminal/live-input/terminal-live-text-commit.test.ts
index c363419cfa5..610b2679b6f 100644
--- a/mobile/src/terminal/terminal-live-text-commit.test.ts
+++ b/mobile/src/terminal/live-input/terminal-live-text-commit.test.ts
@@ -17,26 +17,4 @@ describe('terminal live accessory local edit text', () => {
       )
     }
   )
-
-  it.each([
-    ['', ''],
-    ['a', ''],
-    ['a🙂', 'a'],
-    ['🙂a', '🙂'],
-    ['🙂🙂', '🙂'],
-    ['a\ud800', 'a'],
-    ['a\udc00', 'a'],
-    ['\ud800\ud800', '\ud800'],
-    ['\udc00\ud800', '\udc00'],
-    ['e\u0301', 'e'],
-    ['👩‍💻', '👩‍'],
-    ['\r\n', '\r']
-  ])('preserves code-point deletion for %j', (fieldText, expected) => {
-    expect(getTerminalLiveAccessoryLocalEditText({ localEdit: 'backspace', fieldText })).toBe(
-      expected
-    )
-    expect(getTerminalLiveAccessoryLocalEditText({ localEdit: 'delete', fieldText })).toBe(
-      fieldText
-    )
-  })
 })
diff --git a/mobile/src/terminal/terminal-live-text-commit.ts b/mobile/src/terminal/live-input/terminal-live-text-commit.ts
similarity index 95%
rename from mobile/src/terminal/terminal-live-text-commit.ts
rename to mobile/src/terminal/live-input/terminal-live-text-commit.ts
index 2b18944cf16..4af6223e521 100644
--- a/mobile/src/terminal/terminal-live-text-commit.ts
+++ b/mobile/src/terminal/live-input/terminal-live-text-commit.ts
@@ -1,9 +1,9 @@
 import { getTerminalLiveSpecialKeyBytes } from './terminal-live-input'
-import { readUtf8CodePointAt } from '../../../src/shared/utf8-byte-limits'
+import { readUtf8CodePointAt } from '../../../../src/shared/utf8-byte-limits'
 import {
   encodeModifyOtherKeysEnter,
   TERMINAL_KITTY_SHIFT_ENTER_INPUT
-} from '../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
+} from '../../../../src/shared/terminal/protocol/input-modes/terminal-modified-enter-encoding'
 
 export type TerminalLiveSpecialKeyDecision =
   | { readonly kind: 'ignore' }
diff --git a/mobile/src/terminal/terminal-text-field-submit-binding.ts b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.ts
similarity index 100%
rename from mobile/src/terminal/terminal-text-field-submit-binding.ts
rename to mobile/src/terminal/live-input/terminal-text-field-submit-binding.ts
diff --git a/mobile/src/terminal/terminal-text-field-submit-binding.web.test.ts b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts
similarity index 84%
rename from mobile/src/terminal/terminal-text-field-submit-binding.web.test.ts
rename to mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts
index a3a52b32a35..45111eb0fa1 100644
--- a/mobile/src/terminal/terminal-text-field-submit-binding.web.test.ts
+++ b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.test.ts
@@ -1,10 +1,10 @@
 // @vitest-environment happy-dom
 import { describe, expect, it, vi } from 'vitest'
 import type { TextInputInstance } from 'react-native'
-import { hostOs } from '../platform/host-os'
+import { hostOs } from '../../platform/host-os'
 import { bindTerminalTextFieldSubmit as bindOnWeb } from './terminal-text-field-submit-binding.web'
 
-vi.mock('../platform/host-os', () => ({ hostOs: vi.fn(() => 'android') }))
+vi.mock('../../platform/host-os', () => ({ hostOs: vi.fn(() => 'android') }))
 
 const asField = (node: unknown): TextInputInstance | null =>
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the point of these cases is that a DOM node is what the native signature receives on RN Web, which is the mismatch this sibling exists for.
@@ -80,13 +80,8 @@ describe.each(['android', 'ios'] as const)('live terminal keyboard chords on %s'
 
   it.each([
     ['c', { ctrlKey: true }, '\x03'],
-    ['Escape', {}, '\x1b'],
-    ['Tab', {}, '\t'],
-    ['Tab', { shiftKey: true }, '\x1b[Z'],
-    ['ArrowUp', {}, '\x1b[A'],
     ['ArrowLeft', { ctrlKey: true }, '\x1b[1;5D'],
-    ['Enter', { shiftKey: true }, '\x1b[13;2u'],
-    ['ArrowLeft', { altKey: true }, '\x1b[1;3D']
+    ['Enter', { shiftKey: true }, '\x1b[13;2u']
   ])('claims %s once before RNWeb can resend it', (name, options, bytes) => {
     const { field, onChord, key } = setup()
     const parentKey = vi.fn()
@@ -96,28 +91,18 @@ describe.each(['android', 'ios'] as const)('live terminal keyboard chords on %s'
     expect(parentKey).not.toHaveBeenCalled()
   })
 
-  it.each(['b', '@', '[', ']', '{', ' '])(
-    'keeps Option-generated %j native on iOS and Alt chords on Android',
-    (name) => {
-      const { onChord, key } = setup()
-      expect(key(name, { altKey: true }).defaultPrevented).toBe(os === 'android')
-      expect(onChord.mock.calls).toEqual(os === 'android' ? [[{ bytes: `\x1b${name}` }]] : [])
-    }
-  )
+  it.each(['b'])('keeps Option-generated %j native on iOS and Alt chords on Android', (name) => {
+    const { onChord, key } = setup()
+    expect(key(name, { altKey: true }).defaultPrevented).toBe(os === 'android')
+    expect(onChord.mock.calls).toEqual(os === 'android' ? [[{ bytes: `\x1b${name}` }]] : [])
+  })
 
   it.each([
     ['a', {}],
     ['Enter', {}],
     ['Enter', { ctrlKey: true, shiftKey: true }],
-    ['Enter', { altKey: true, shiftKey: true }],
-    ['Enter', { shiftKey: true, isComposing: true }],
-    ['Enter', { shiftKey: true, keyCode: 229 }],
     ['Backspace', {}],
-    ['Delete', {}],
     ['ArrowLeft', {}],
-    ['ArrowRight', {}],
-    ['Home', {}],
-    ['End', {}],
     ['c', { ctrlKey: true, isComposing: true }],
     ['c', { ctrlKey: true, keyCode: 229 }],
     ['c', { ctrlKey: true, altKey: true }],
diff --git a/mobile/src/terminal/terminal-text-field-submit-binding.web.ts b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.ts
similarity index 96%
rename from mobile/src/terminal/terminal-text-field-submit-binding.web.ts
rename to mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.ts
index d81bb9f39eb..634679f0c8b 100644
--- a/mobile/src/terminal/terminal-text-field-submit-binding.web.ts
+++ b/mobile/src/terminal/live-input/terminal-text-field-submit-binding.web.ts
@@ -1,6 +1,6 @@
 import type { TextInputInstance } from 'react-native'
-import { hostOs } from '../platform/host-os'
-import { createTerminalKeyChordInput } from './terminal-key-chord-input'
+import { hostOs } from '../../platform/host-os'
+import { createTerminalKeyChordInput } from '../key-input/terminal-key-chord-input'
 import { getTerminalLiveSpecialKeyId } from './terminal-live-input'
 import type { TerminalLiveAccessoryInput } from './terminal-live-accessory-input'
 
diff --git a/mobile/src/terminal/terminal-text-input-normalization.test.ts b/mobile/src/terminal/live-input/terminal-text-input-normalization.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-text-input-normalization.test.ts
rename to mobile/src/terminal/live-input/terminal-text-input-normalization.test.ts
diff --git a/mobile/src/terminal/terminal-text-input-normalization.ts b/mobile/src/terminal/live-input/terminal-text-input-normalization.ts
similarity index 100%
rename from mobile/src/terminal/terminal-text-input-normalization.ts
rename to mobile/src/terminal/live-input/terminal-text-input-normalization.ts
diff --git a/mobile/src/terminal/use-terminal-live-accessory-input-commit.ts b/mobile/src/terminal/live-input/use-terminal-live-accessory-input-commit.ts
similarity index 100%
rename from mobile/src/terminal/use-terminal-live-accessory-input-commit.ts
rename to mobile/src/terminal/live-input/use-terminal-live-accessory-input-commit.ts
diff --git a/mobile/src/terminal/use-terminal-live-input-click.test.ts b/mobile/src/terminal/live-input/use-terminal-live-input-click.test.ts
similarity index 84%
rename from mobile/src/terminal/use-terminal-live-input-click.test.ts
rename to mobile/src/terminal/live-input/use-terminal-live-input-click.test.ts
index c855decfb7d..e1602214fc9 100644
--- a/mobile/src/terminal/use-terminal-live-input-click.test.ts
+++ b/mobile/src/terminal/live-input/use-terminal-live-input-click.test.ts
@@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { TerminalLiveInputSender } from './terminal-live-input-sender'
 import { useTerminalLiveInputCommit } from './use-terminal-live-input-commit'
 
-vi.mock('../platform/live-input-composing-range', () => ({
+vi.mock('../../platform/text-input/live-input-composing-range', () => ({
   reportedLiveInputComposing: (isComposing: boolean | undefined) => isComposing
 }))
 
@@ -17,12 +17,11 @@ type ClickHarness = {
   readonly captures: readonly string[]
   readonly handlers: Handlers
   readonly sent: readonly string[]
-  readonly changeHandle: (handle: string) => void
   readonly unmount: () => void
 }
 
 function createClickHarness(sender?: TerminalLiveInputSender): ClickHarness {
-  let activeHandle = 'terminal-a'
+  const activeHandle = 'terminal-a'
   const activeHandleRef: RefObject<string | null> = { current: activeHandle }
   const activeSessionTabTypeRef: RefObject<string | null> = { current: 'terminal' }
   const captures: string[] = []
@@ -69,11 +68,6 @@ function createClickHarness(sender?: TerminalLiveInputSender): ClickHarness {
       return handlers
     },
     sent,
-    changeHandle: (handle) => {
-      activeHandle = handle
-      activeHandleRef.current = handle
-      act(() => renderer?.update(createElement(Harness)))
-    },
     unmount: () => {
       act(() => renderer?.unmount())
     }
@@ -171,21 +165,18 @@ describe('terminal live input around a click', () => {
     }
   })
 
-  it.each(['insertText', 'insertFromPaste', 'insertCompositionText'])(
-    'preserves immediate matching DOM input %s without a key event',
-    async (inputType) => {
-      const { handlers, sent, captures, unmount } = createClickHarness()
-      try {
-        change(handlers, 'x')
-        await handlers.sendLiveInputClick('terminal-a', CLICK)
-        handlers.handleLiveInputChange({
-          nativeEvent: { text: 'x', isComposing: false, inputType }
-        })
-        await vi.waitFor(() => expect(sent.join('')).toBe('x' + CLICK + 'x'))
-        expect(captures.at(-1)).toBe('x')
-      } finally {
-        unmount()
-      }
+  it('preserves immediate matching DOM input without a key event', async () => {
+    const { handlers, sent, captures, unmount } = createClickHarness()
+    try {
+      change(handlers, 'x')
+      await handlers.sendLiveInputClick('terminal-a', CLICK)
+      handlers.handleLiveInputChange({
+        nativeEvent: { text: 'x', isComposing: false, inputType: 'insertText' }
+      })
+      await vi.waitFor(() => expect(sent.join('')).toBe(`x${CLICK}x`))
+      expect(captures.at(-1)).toBe('x')
+    } finally {
+      unmount()
     }
-  )
+  })
 })
diff --git a/mobile/src/terminal/use-terminal-live-input-commit.test.ts b/mobile/src/terminal/live-input/use-terminal-live-input-commit.test.ts
similarity index 70%
rename from mobile/src/terminal/use-terminal-live-input-commit.test.ts
rename to mobile/src/terminal/live-input/use-terminal-live-input-commit.test.ts
index 69927053d8e..8c53b95ee58 100644
--- a/mobile/src/terminal/use-terminal-live-input-commit.test.ts
+++ b/mobile/src/terminal/live-input/use-terminal-live-input-commit.test.ts
@@ -3,10 +3,9 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import type { TextInputInstance } from 'react-native'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { TerminalLiveInputSender } from './terminal-live-input-sender'
-import { TERMINAL_LIVE_HELD_PREEDIT_COMMIT_DELAY_MS } from './terminal-live-preedit-mirror'
 import { useTerminalLiveInputCommit } from './use-terminal-live-input-commit'
 
-vi.mock('../platform/live-input-composing-range', () => ({
+vi.mock('../../platform/text-input/live-input-composing-range', () => ({
   reportedLiveInputComposing: (isComposing: boolean | undefined) => isComposing
 }))
 
@@ -21,25 +20,18 @@ function changeLiveInput(
 }
 
 type TerminalLiveInputCommitHarness = {
-  readonly failures: ReturnType<typeof vi.fn>
   readonly captures: readonly string[]
-  readonly getHandlers: () => TerminalLiveInputCommitHandlers
   readonly handlers: TerminalLiveInputCommitHandlers
   readonly sent: readonly string[]
-  readonly setActiveSessionTabType: (next: string | undefined) => void
-  readonly setConnected: (next: boolean) => void
-  readonly setSendResult: (next: boolean) => void
   readonly unmount: () => void
 }
 
 type TerminalLiveInputCommitHarnessOptions = {
-  readonly sendResult?: boolean
   readonly sender?: TerminalLiveInputSender
   readonly bracketedPaste?: boolean
 }
 
 function createTerminalLiveInputCommitHarness({
-  sendResult = true,
   sender,
   bracketedPaste = false
 }: TerminalLiveInputCommitHarnessOptions = {}): TerminalLiveInputCommitHarness {
@@ -52,16 +44,12 @@ function createTerminalLiveInputCommitHarness({
   }
   const liveInputRef: RefObject<TextInputInstance | null> = { current: null }
   const sent: string[] = []
-  const failures = vi.fn()
-  let currentSendResult = sendResult
   const sendLiveTerminalInputRef: RefObject<TerminalLiveInputSender> = {
     current: async (handle, bytes) => {
       sent.push(bytes)
-      return sender ? sender(handle, bytes) : currentSendResult
+      return sender ? sender(handle, bytes) : true
     }
   }
-  let currentActiveSessionTabType: string | undefined = 'terminal'
-  let currentConnected = true
   let handlers: TerminalLiveInputCommitHandlers | null = null
   let renderer: ReactTestRenderer | null = null
 
@@ -69,10 +57,9 @@ function createTerminalLiveInputCommitHarness({
     handlers = useTerminalLiveInputCommit({
       activeHandle,
       activeHandleRef,
-      activeSessionTabType: currentActiveSessionTabType,
+      activeSessionTabType: 'terminal',
       activeSessionTabTypeRef,
-      connected: currentConnected,
-      onSendFailure: failures,
+      connected: true,
       framesLivePaste: () => bracketedPaste,
       liveInputRef,
       sendLiveTerminalInputRef,
@@ -89,33 +76,9 @@ function createTerminalLiveInputCommitHarness({
   }
 
   return {
-    failures,
     captures,
-    getHandlers: () => {
-      if (!handlers) {
-        throw new Error('terminal live input hook is not mounted')
-      }
-      return handlers
-    },
     handlers,
     sent,
-    setActiveSessionTabType: (next: string | undefined): void => {
-      currentActiveSessionTabType = next
-      // Couple tab ref and prop as production does; both become null during inventory lag.
-      activeSessionTabTypeRef.current = next ?? null
-      act(() => {
-        renderer?.update(createElement(Harness))
-      })
-    },
-    setConnected: (next: boolean): void => {
-      currentConnected = next
-      act(() => {
-        renderer?.update(createElement(Harness))
-      })
-    },
-    setSendResult: (next: boolean): void => {
-      currentSendResult = next
-    },
     unmount: () => {
       act(() => renderer?.unmount())
     }
@@ -134,7 +97,7 @@ describe('terminal live input commit hook', () => {
         .fn<TerminalLiveInputSender>()
         .mockReturnValueOnce(pending)
         .mockResolvedValue(true)
-      const { handlers, sent, captures, failures, unmount } = createTerminalLiveInputCommitHarness({
+      const { handlers, sent, captures, unmount } = createTerminalLiveInputCommitHarness({
         sender
       })
       changeLiveInput(handlers, 'abc', false)
@@ -145,14 +108,12 @@ describe('terminal live input commit hook', () => {
       await expect(submit).resolves.toBe(false)
       expect(sent).toEqual(['abc'])
       expect(captures.at(-1)).toBe('')
-      expect(failures).toHaveBeenCalledTimes(1)
 
       changeLiveInput(handlers, 'ab', false)
       changeLiveInput(handlers, 'x', false)
       await vi.waitFor(() => expect(sent).toEqual(['abc', 'x']))
       changeLiveInput(handlers, '', false)
       await vi.waitFor(() => expect(sent).toEqual(['abc', 'x', '\x7f']))
-      expect(failures).toHaveBeenCalledTimes(1)
       unmount()
     }
   )
@@ -170,7 +131,7 @@ describe('terminal live input commit hook', () => {
       expect(sent).toEqual([`\x1b[200~${text}\x1b[201~`, 'CLICK'])
       expect(captures.at(-1)).toBe('')
       changeLiveInput(handlers, 'x', false)
-      await vi.advanceTimersByTimeAsync(TERMINAL_LIVE_HELD_PREEDIT_COMMIT_DELAY_MS * 2)
+      await vi.advanceTimersByTimeAsync(600)
       expect(sent).toEqual([`\x1b[200~${text}\x1b[201~`, 'CLICK', 'x'])
     } finally {
       unmount()
diff --git a/mobile/src/terminal/use-terminal-live-input-commit.ts b/mobile/src/terminal/live-input/use-terminal-live-input-commit.ts
similarity index 99%
rename from mobile/src/terminal/use-terminal-live-input-commit.ts
rename to mobile/src/terminal/live-input/use-terminal-live-input-commit.ts
index a51d9bfab1e..c3e6a9061df 100644
--- a/mobile/src/terminal/use-terminal-live-input-commit.ts
+++ b/mobile/src/terminal/live-input/use-terminal-live-input-commit.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, type RefObject } from 'react'
 import type { TextInputInstance } from 'react-native'
-import { reportedLiveInputComposing } from '../platform/live-input-composing-range'
+import { reportedLiveInputComposing } from '../../platform/text-input/live-input-composing-range'
 import { getTerminalLiveSpecialKeyDecision } from './terminal-live-text-commit'
 import type { TerminalLiveAccessoryInput } from './terminal-live-accessory-input'
 import type { TerminalLiveInputSender } from './terminal-live-input-sender'
diff --git a/mobile/src/terminal/use-terminal-live-input-focus.ts b/mobile/src/terminal/live-input/use-terminal-live-input-focus.ts
similarity index 97%
rename from mobile/src/terminal/use-terminal-live-input-focus.ts
rename to mobile/src/terminal/live-input/use-terminal-live-input-focus.ts
index cd9608745a5..b916237b984 100644
--- a/mobile/src/terminal/use-terminal-live-input-focus.ts
+++ b/mobile/src/terminal/live-input/use-terminal-live-input-focus.ts
@@ -1,5 +1,5 @@
 import { useCallback, useLayoutEffect, useRef, type RefObject } from 'react'
-import { currentSoftKeyboardHeight } from '../platform/keyboard-occlusion'
+import { currentSoftKeyboardHeight } from '../../platform/keyboard/keyboard-occlusion'
 import {
   clearTerminalLiveInputFocusTimer,
   focusTerminalLiveInputTarget,
diff --git a/mobile/src/terminal/use-terminal-live-pending-input-flush.ts b/mobile/src/terminal/live-input/use-terminal-live-pending-input-flush.ts
similarity index 98%
rename from mobile/src/terminal/use-terminal-live-pending-input-flush.ts
rename to mobile/src/terminal/live-input/use-terminal-live-pending-input-flush.ts
index 296f92af6e9..5812dd32c87 100644
--- a/mobile/src/terminal/use-terminal-live-pending-input-flush.ts
+++ b/mobile/src/terminal/live-input/use-terminal-live-pending-input-flush.ts
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useRef, type RefObject } from 'react'
 import type { TextInputInstance } from 'react-native'
-import { getTerminalInputByteLength } from '../../../src/shared/terminal/input/terminal-input'
+import { getTerminalInputByteLength } from '../../../../src/shared/terminal/input/terminal-input'
 import {
   UNFRAMED_AGENT_INPUT_MAX_BYTES,
   wrapTerminalBracketedPasteText
-} from '../../../src/shared/terminal/input/terminal-bracketed-paste-text'
+} from '../../../../src/shared/terminal/input/terminal-bracketed-paste-text'
 import type { TerminalLiveInputSender } from './terminal-live-input-sender'
 import { writeTerminalLiveInputText } from './terminal-live-input-text-write'
 import {
diff --git a/mobile/src/terminal/use-terminal-text-field-submit-binding.test.tsx b/mobile/src/terminal/live-input/use-terminal-text-field-submit-binding.test.tsx
similarity index 61%
rename from mobile/src/terminal/use-terminal-text-field-submit-binding.test.tsx
rename to mobile/src/terminal/live-input/use-terminal-text-field-submit-binding.test.tsx
index 37688c3ff3a..e26bca9fc6b 100644
--- a/mobile/src/terminal/use-terminal-text-field-submit-binding.test.tsx
+++ b/mobile/src/terminal/live-input/use-terminal-text-field-submit-binding.test.tsx
@@ -7,27 +7,19 @@ import { useTerminalTextFieldSubmitBinding } from './use-terminal-text-field-sub
 
 // Mock only the platform listener seam so tests can invoke the closure it actually captured.
 const mocks = vi.hoisted(() => {
-  const boundHandlers: Array<() => void> = []
   return {
-    boundHandlers,
-    chordHandlers: new Array<(input: TerminalLiveAccessoryInput) => boolean>(),
-    unbindCount: 0,
-    releasedCount: 0
+    chordHandlers: new Array<(input: TerminalLiveAccessoryInput) => boolean>()
   }
 })
 
 vi.mock('./terminal-text-field-submit-binding', () => ({
   bindTerminalTextFieldSubmit: (
     _node: unknown,
-    onSubmit: () => void,
+    _onSubmit: () => void,
     onChord: (input: TerminalLiveAccessoryInput) => boolean
   ) => {
     mocks.chordHandlers.push(onChord)
-    mocks.boundHandlers.push(onSubmit)
-    mocks.unbindCount += 1
-    return () => {
-      mocks.releasedCount += 1
-    }
+    return () => {}
   }
 }))
 
@@ -59,31 +51,10 @@ const node = {} as TextInputInstance
 function reset(): void {
   submitted = []
   mocks.chordHandlers.length = 0
-  mocks.boundHandlers.length = 0
-  mocks.unbindCount = 0
-  mocks.releasedCount = 0
 }
 
 describe('the terminal text field submit binding', () => {
-  it('calls the handler the newest commit supplied, not the first', () => {
-    reset()
-    let renderer: ReactTestRenderer | null = null
-
-    act(() => {
-      renderer = create(createElement(Harness, { value: 'first' }))
-    })
-    act(() => {
-      renderer?.update(createElement(Harness, { value: 'second' }))
-    })
-    act(() => {
-      mocks.boundHandlers.at(-1)?.()
-    })
-
-    expect(submitted).toEqual(['second'])
-    act(() => renderer?.unmount())
-  })
-
-  it('refreshes a keyboard chord handler after a terminal or connection change', () => {
+  it('refreshes a captured keyboard chord handler after a commit', () => {
     reset()
     let renderer: ReactTestRenderer | null = null
     act(() => {
@@ -98,22 +69,4 @@ describe('the terminal text field submit binding', () => {
     expect(submitted).toEqual(['first', 'second'])
     act(() => renderer?.unmount())
   })
-
-  it('drops the binding when the field unmounts', () => {
-    reset()
-    let renderer: ReactTestRenderer | null = null
-
-    act(() => {
-      renderer = create(createElement(Harness, { value: 'first' }))
-    })
-    act(() => {
-      mocks.boundHandlers.at(-1)?.()
-    })
-
-    expect(submitted).toEqual(['first'])
-    expect(field.current).toBe(node)
-    act(() => renderer?.unmount())
-    expect(field.current).toBeNull()
-    expect(mocks.releasedCount).toBe(mocks.unbindCount)
-  })
 })
diff --git a/mobile/src/terminal/use-terminal-text-field-submit-binding.ts b/mobile/src/terminal/live-input/use-terminal-text-field-submit-binding.ts
similarity index 100%
rename from mobile/src/terminal/use-terminal-text-field-submit-binding.ts
rename to mobile/src/terminal/live-input/use-terminal-text-field-submit-binding.ts
diff --git a/mobile/src/terminal/terminal-output-ack.ts b/mobile/src/terminal/output-flow/terminal-output-ack.ts
similarity index 94%
rename from mobile/src/terminal/terminal-output-ack.ts
rename to mobile/src/terminal/output-flow/terminal-output-ack.ts
index 2a97a778690..e0204b082f3 100644
--- a/mobile/src/terminal/terminal-output-ack.ts
+++ b/mobile/src/terminal/output-flow/terminal-output-ack.ts
@@ -1,7 +1,7 @@
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { isRpcDeliveryUnknown } from '../transport/rpc/rpc-delivery-ambiguity'
-import type { TerminalWebViewHandle } from './terminal-webview-contract'
-import type { TerminalWebViewCommand } from './terminal-webview-messages'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { isRpcDeliveryUnknown } from '../../transport/rpc/rpc-delivery-ambiguity'
+import type { TerminalWebViewHandle } from '../webview/terminal-webview-contract'
+import type { TerminalWebViewCommand } from '../webview/terminal-webview-messages'
 import { createTerminalWriteCoalescer } from './terminal-write-coalescer'
 
 // Ack in batches: per-chunk acks would double the phone's request rate during a flood.
diff --git a/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts b/mobile/src/terminal/output-flow/terminal-write-coalescer-boundaries.test.ts
similarity index 96%
rename from mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts
rename to mobile/src/terminal/output-flow/terminal-write-coalescer-boundaries.test.ts
index 3e07870cd4e..0cdee8fd25e 100644
--- a/mobile/src/terminal/terminal-write-coalescer-boundaries.test.ts
+++ b/mobile/src/terminal/output-flow/terminal-write-coalescer-boundaries.test.ts
@@ -1,8 +1,8 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { TerminalWebViewCommand } from './terminal-webview-messages'
-import { useTerminalWebViewController } from './use-terminal-webview-controller'
+import type { TerminalWebViewCommand } from '../webview/terminal-webview-messages'
+import { useTerminalWebViewController } from '../webview/use-terminal-webview-controller'
 import { TERMINAL_WRITE_FLUSH_WINDOW_MS } from './terminal-write-coalescer'
 
 vi.mock('react-native', () => ({
diff --git a/mobile/src/terminal/terminal-write-coalescer.test.ts b/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts
similarity index 52%
rename from mobile/src/terminal/terminal-write-coalescer.test.ts
rename to mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts
index 5cc20d8fef1..41e833f8990 100644
--- a/mobile/src/terminal/terminal-write-coalescer.test.ts
+++ b/mobile/src/terminal/output-flow/terminal-write-coalescer.test.ts
@@ -1,11 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  createTerminalWriteCoalescer,
-  TERMINAL_WRITE_FLUSH_WINDOW_MS,
-  TERMINAL_WRITE_MAX_PENDING_UNITS,
-  TERMINAL_INTERACTIVE_WRITE_WINDOW_MS,
-  TERMINAL_INTERACTIVE_WRITE_DURATION_MS
-} from './terminal-write-coalescer'
+import { createTerminalWriteCoalescer } from './terminal-write-coalescer'
 
 function createDeliverySink() {
   const delivered: string[] = []
@@ -32,7 +26,7 @@ describe('terminal write coalescer', () => {
     coalescer.write('c')
     expect(sink.delivered).toEqual(['a'])
 
-    vi.advanceTimersByTime(TERMINAL_WRITE_FLUSH_WINDOW_MS)
+    vi.advanceTimersByTime(48)
     expect(sink.delivered).toEqual(['a', 'bc'])
   })
 
@@ -47,25 +41,10 @@ describe('terminal write coalescer', () => {
     vi.setSystemTime(100_000 - 60 * 60 * 1000)
     coalescer.write('b')
 
-    vi.advanceTimersByTime(TERMINAL_WRITE_FLUSH_WINDOW_MS)
+    vi.advanceTimersByTime(48)
     expect(sink.delivered).toEqual(['a', 'b'])
   })
 
-  it('flushes immediately when the pending buffer exceeds the size cap', () => {
-    vi.useFakeTimers()
-    const sink = createDeliverySink()
-    const coalescer = createTerminalWriteCoalescer(sink.deliver)
-
-    coalescer.write('a')
-    coalescer.write('x'.repeat(TERMINAL_WRITE_MAX_PENDING_UNITS + 1))
-
-    expect(sink.delivered).toHaveLength(2)
-    expect(sink.delivered[1]).toHaveLength(TERMINAL_WRITE_MAX_PENDING_UNITS + 1)
-    expect(vi.getTimerCount()).toBe(0)
-    vi.runOnlyPendingTimers()
-    expect(sink.delivered).toHaveLength(2)
-  })
-
   it('flushNow() delivers the joined pending buffer synchronously and cancels the timer', () => {
     vi.useFakeTimers()
     const sink = createDeliverySink()
@@ -77,25 +56,10 @@ describe('terminal write coalescer', () => {
     coalescer.flushNow()
 
     expect(sink.delivered).toEqual(['a', 'bc'])
-    expect(vi.getTimerCount()).toBe(0)
     vi.runOnlyPendingTimers()
     expect(sink.delivered).toEqual(['a', 'bc'])
   })
 
-  it('shortens an existing output wait when a scroll gesture arrives', () => {
-    vi.useFakeTimers()
-    const sink = createDeliverySink()
-    const coalescer = createTerminalWriteCoalescer(sink.deliver)
-    coalescer.write('first')
-    vi.advanceTimersByTime(5)
-    coalescer.write('response')
-    vi.advanceTimersByTime(3)
-    coalescer.markInteractive()
-    vi.advanceTimersByTime(TERMINAL_INTERACTIVE_WRITE_WINDOW_MS - 8)
-    expect(sink.delivered).toEqual(['first', 'response'])
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
   it('does not postpone output when gestures repeat faster than one frame', () => {
     vi.useFakeTimers()
     const sink = createDeliverySink()
@@ -105,11 +69,9 @@ describe('terminal write coalescer', () => {
     for (let i = 0; i < 8; i += 1) {
       coalescer.write(`${i}`)
       coalescer.markInteractive()
-      expect(vi.getTimerCount()).toBe(1)
       vi.advanceTimersByTime(2)
     }
     expect(sink.delivered).toEqual(['first', '01234567'])
-    expect(vi.getTimerCount()).toBe(0)
   })
 
   it('clears interactive state and pending output when a document is replaced', () => {
@@ -122,25 +84,9 @@ describe('terminal write coalescer', () => {
     coalescer.clear()
     coalescer.write('new')
     coalescer.write('new-trailing')
-    vi.advanceTimersByTime(TERMINAL_INTERACTIVE_WRITE_WINDOW_MS)
+    vi.advanceTimersByTime(16)
     expect(sink.delivered).toEqual(['old', 'new'])
-    vi.advanceTimersByTime(TERMINAL_WRITE_FLUSH_WINDOW_MS - TERMINAL_INTERACTIVE_WRITE_WINDOW_MS)
+    vi.advanceTimersByTime(32)
     expect(sink.delivered).toEqual(['old', 'new', 'new-trailing'])
   })
-
-  it('expires interactive batching on a monotonic clock after a wall-clock rollback', () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(100_000)
-    const sink = createDeliverySink()
-    const coalescer = createTerminalWriteCoalescer(sink.deliver)
-    coalescer.markInteractive()
-    vi.setSystemTime(0)
-    vi.advanceTimersByTime(TERMINAL_INTERACTIVE_WRITE_DURATION_MS)
-    coalescer.write('first')
-    coalescer.write('second')
-    vi.advanceTimersByTime(TERMINAL_INTERACTIVE_WRITE_WINDOW_MS)
-    expect(sink.delivered).toEqual(['first'])
-    vi.advanceTimersByTime(TERMINAL_WRITE_FLUSH_WINDOW_MS - TERMINAL_INTERACTIVE_WRITE_WINDOW_MS)
-    expect(sink.delivered).toEqual(['first', 'second'])
-  })
 })
diff --git a/mobile/src/terminal/terminal-write-coalescer.ts b/mobile/src/terminal/output-flow/terminal-write-coalescer.ts
similarity index 100%
rename from mobile/src/terminal/terminal-write-coalescer.ts
rename to mobile/src/terminal/output-flow/terminal-write-coalescer.ts
diff --git a/mobile/src/terminal/terminal-gesture-input.test.ts b/mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-gesture-input.test.ts
rename to mobile/src/terminal/pointer-input/terminal-gesture-input.test.ts
diff --git a/mobile/src/terminal/terminal-gesture-input.ts b/mobile/src/terminal/pointer-input/terminal-gesture-input.ts
similarity index 100%
rename from mobile/src/terminal/terminal-gesture-input.ts
rename to mobile/src/terminal/pointer-input/terminal-gesture-input.ts
diff --git a/mobile/src/terminal/terminal-mouse-authority.test.ts b/mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-mouse-authority.test.ts
rename to mobile/src/terminal/pointer-input/terminal-mouse-authority.test.ts
diff --git a/mobile/src/terminal/terminal-webview-mouse-click.test.ts b/mobile/src/terminal/pointer-input/terminal-webview-mouse-click.test.ts
similarity index 78%
rename from mobile/src/terminal/terminal-webview-mouse-click.test.ts
rename to mobile/src/terminal/pointer-input/terminal-webview-mouse-click.test.ts
index 0191c49119a..fefb5b1e847 100644
--- a/mobile/src/terminal/terminal-webview-mouse-click.test.ts
+++ b/mobile/src/terminal/pointer-input/terminal-webview-mouse-click.test.ts
@@ -32,21 +32,6 @@ describe('terminal WebView external mouse click', () => {
     ).toHaveLength(1)
   })
 
-  it('dismisses an existing selection with a click without focusing the keyboard', () => {
-    mouse.boot()
-    mouse.mouseDrag(40, 60, 160, 90)
-    mouse.clearPostedMessages()
-
-    mouse.mouseClick(240, 200)
-
-    const messages = mouse.postedMessages()
-    expect(messages.filter((message) => message.type === 'set-select-mode')).toEqual([
-      { type: 'set-select-mode', enabled: false }
-    ])
-    expect(messages.filter((message) => message.type === 'terminal-tap')).toEqual([])
-    expect(document.getElementById('selection-overlay')?.classList.contains('active')).toBe(false)
-  })
-
   it('lets the touch dispatcher own a gesture when touch events follow pointerdown', () => {
     mouse.boot()
     mouse.writeLegacyMouseEncoding()
diff --git a/mobile/src/terminal/terminal-webview-mouse-drag.test.ts b/mobile/src/terminal/pointer-input/terminal-webview-mouse-drag.test.ts
similarity index 85%
rename from mobile/src/terminal/terminal-webview-mouse-drag.test.ts
rename to mobile/src/terminal/pointer-input/terminal-webview-mouse-drag.test.ts
index 1747d3a5176..1f8767ae417 100644
--- a/mobile/src/terminal/terminal-webview-mouse-drag.test.ts
+++ b/mobile/src/terminal/pointer-input/terminal-webview-mouse-drag.test.ts
@@ -39,17 +39,6 @@ describe('terminal WebView external mouse drag', () => {
     expect(bytes).toHaveLength(6)
   })
 
-  it('selects text instead of reporting a drag while the encoding is unproven', () => {
-    mouse.boot(`${ESC}[?1002h`)
-    mouse.activeTerminal().modes.mouseTrackingMode = 'drag'
-    mouse.clearPostedMessages()
-
-    mouse.mouseDrag(40, 60, 160, 90)
-
-    expect(mouse.terminalInputBytes()).toBe('')
-    expect(mouse.selectionSpy()).toHaveBeenCalled()
-  })
-
   it('releases a tracked drag when the button state shows the pointerup was lost', () => {
     mouse.boot()
     mouse.writeLegacyMouseEncoding()
diff --git a/mobile/src/terminal/terminal-webview-mouse-test-harness.ts b/mobile/src/terminal/pointer-input/terminal-webview-mouse-test-harness.ts
similarity index 97%
rename from mobile/src/terminal/terminal-webview-mouse-test-harness.ts
rename to mobile/src/terminal/pointer-input/terminal-webview-mouse-test-harness.ts
index 1bdaafe1d81..9c8ddccd1f0 100644
--- a/mobile/src/terminal/terminal-webview-mouse-test-harness.ts
+++ b/mobile/src/terminal/pointer-input/terminal-webview-mouse-test-harness.ts
@@ -1,7 +1,7 @@
 import { runInThisContext } from 'node:vm'
 import { afterEach, beforeEach, vi, type Mock } from 'vitest'
-import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
-import { XTERM_HTML } from './terminal-webview-html'
+import { TERMINAL_DOCUMENT_SCRIPT } from '../document/terminal-webview-document-script.generated'
+import { XTERM_HTML } from '../document/native-terminal-html'
 
 function bodyMarkup(): string {
   const start = XTERM_HTML.indexOf('<body>') + '<body>'.length
@@ -247,7 +247,6 @@ export function useTerminalMouseWebViewHarness() {
     mouseClick,
     mouseDrag,
     postedMessages: () => postedMessages(postMessage),
-    selectionSpy: () => select,
     terminalInputBytes: () => terminalInputBytes(postMessage),
     terminalSurface,
     writeLegacyMouseEncoding
diff --git a/mobile/src/terminal/terminal-copy-gutter-preference.ts b/mobile/src/terminal/preferences/terminal-copy-gutter-preference.ts
similarity index 86%
rename from mobile/src/terminal/terminal-copy-gutter-preference.ts
rename to mobile/src/terminal/preferences/terminal-copy-gutter-preference.ts
index d537c90a6cf..978444f6145 100644
--- a/mobile/src/terminal/terminal-copy-gutter-preference.ts
+++ b/mobile/src/terminal/preferences/terminal-copy-gutter-preference.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef, type RefObject } from 'react'
 import { terminalCopyTrimsGutterRead } from './terminal-copy-settings-operations'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
 
 // Mirror desktop copy-gutter policy once per connection; mobile has no settings stream and defaults trimming on.
 export function useTerminalCopyTrimsGutter(
diff --git a/mobile/src/terminal/terminal-copy-settings-operations.ts b/mobile/src/terminal/preferences/terminal-copy-settings-operations.ts
similarity index 76%
rename from mobile/src/terminal/terminal-copy-settings-operations.ts
rename to mobile/src/terminal/preferences/terminal-copy-settings-operations.ts
index e7b9d1e5526..b118bbf1d41 100644
--- a/mobile/src/terminal/terminal-copy-settings-operations.ts
+++ b/mobile/src/terminal/preferences/terminal-copy-settings-operations.ts
@@ -1,7 +1,7 @@
-import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
-import type { RpcCompatibleReader } from '../transport/rpc/rpc-operation-contract'
-import '../../../src/shared/source-control/listing/source-control-group-order'
-import { settingsMember, settingsField } from '../settings/mobile-settings-projection'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
+import type { RpcCompatibleReader } from '../../transport/rpc/rpc-operation-contract'
+import '../../../../src/shared/source-control/listing/source-control-group-order'
+import { settingsMember, settingsField } from '../../settings/mobile-settings-projection'
 
 function onByDefaultSettingReader<Variant extends string>(
   key: string,
diff --git a/mobile/src/terminal/terminal-settings-scroll-lock.ts b/mobile/src/terminal/preferences/terminal-settings-scroll-lock.ts
similarity index 100%
rename from mobile/src/terminal/terminal-settings-scroll-lock.ts
rename to mobile/src/terminal/preferences/terminal-settings-scroll-lock.ts
diff --git a/mobile/src/terminal/terminal-settings-scroll-lock.web.ts b/mobile/src/terminal/preferences/terminal-settings-scroll-lock.web.ts
similarity index 100%
rename from mobile/src/terminal/terminal-settings-scroll-lock.web.ts
rename to mobile/src/terminal/preferences/terminal-settings-scroll-lock.web.ts
diff --git a/mobile/src/terminal/terminal-text-scales.ts b/mobile/src/terminal/preferences/terminal-text-scales.ts
similarity index 100%
rename from mobile/src/terminal/terminal-text-scales.ts
rename to mobile/src/terminal/preferences/terminal-text-scales.ts
diff --git a/mobile/src/terminal/use-terminal-text-scale-setting.ts b/mobile/src/terminal/preferences/use-terminal-text-scale-setting.ts
similarity index 97%
rename from mobile/src/terminal/use-terminal-text-scale-setting.ts
rename to mobile/src/terminal/preferences/use-terminal-text-scale-setting.ts
index 14598729ced..ad3501dc5b5 100644
--- a/mobile/src/terminal/use-terminal-text-scale-setting.ts
+++ b/mobile/src/terminal/preferences/use-terminal-text-scale-setting.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { loadTerminalTextScale, saveTerminalTextScale } from '../storage/preferences'
+import { loadTerminalTextScale, saveTerminalTextScale } from '../../storage/preferences'
 
 // A selection made before the initial storage read resolves must win over that older read.
 export function useTerminalTextScaleSetting(): [number, (scale: number) => void] {
diff --git a/mobile/src/terminal/quick-commands/QuickCommandEditorForm.tsx b/mobile/src/terminal/quick-commands/QuickCommandEditorForm.tsx
index 959588c9449..6e36d8ad874 100644
--- a/mobile/src/terminal/quick-commands/QuickCommandEditorForm.tsx
+++ b/mobile/src/terminal/quick-commands/QuickCommandEditorForm.tsx
@@ -13,7 +13,7 @@ import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { MobileAgentIcon } from '../../components/MobileAgentIcon'
 import { MessageBox } from '../../components/composer-input/MessageBox'
 import { TextField } from '../../components/composer-input/TextField'
-import { getQuickCommandAgentLabel } from '../quick-commands'
+import { getQuickCommandAgentLabel } from './quick-commands'
 import { getTerminalQuickCommandBodySize } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
 import {
   MAX_QUICK_COMMAND_LABEL_LENGTH,
diff --git a/mobile/src/terminal/quick-commands/QuickCommandRow.tsx b/mobile/src/terminal/quick-commands/QuickCommandRow.tsx
index 5cfc56b24e4..f428a957598 100644
--- a/mobile/src/terminal/quick-commands/QuickCommandRow.tsx
+++ b/mobile/src/terminal/quick-commands/QuickCommandRow.tsx
@@ -1,13 +1,13 @@
 import { useEffect, useRef, useState } from 'react'
 import { View, Text, Pressable, StyleSheet } from 'react-native'
-import { useClipboardWriter } from '../../platform/clipboard'
-import { triggerError } from '../../platform/haptics'
+import { useClipboardWriter } from '../../platform/clipboard/clipboard'
+import { triggerError } from '../../platform/haptics/haptics'
 import { Check, Copy, Pencil, Play, Trash2 } from 'lucide-react-native'
 import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
 import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { MobileAgentIcon } from '../../components/MobileAgentIcon'
 import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
-import { getQuickCommandDisplayPreview } from '../quick-commands'
+import { getQuickCommandDisplayPreview } from './quick-commands'
 import {
   getTerminalQuickCommandBody,
   isTerminalAgentQuickCommand as isAgentQuickCommand
diff --git a/mobile/src/terminal/quick-commands/QuickCommandsList.tsx b/mobile/src/terminal/quick-commands/QuickCommandsList.tsx
index 3d47f88d072..35b70c29ab9 100644
--- a/mobile/src/terminal/quick-commands/QuickCommandsList.tsx
+++ b/mobile/src/terminal/quick-commands/QuickCommandsList.tsx
@@ -8,7 +8,7 @@ import { TextField } from '../../components/composer-input/TextField'
 import { MOBILE_AGENT_CATALOG } from '../../agents/mobile-agent-catalog'
 import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
 import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
-import '../quick-commands'
+import './quick-commands'
 import { supportsTerminalAgentQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-commands'
 import { QuickCommandRow } from './QuickCommandRow'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
diff --git a/mobile/src/terminal/quick-commands/QuickCommandsSheet.tsx b/mobile/src/terminal/quick-commands/QuickCommandsSheet.tsx
index b1f4d7c60dc..9ce3ebd75b4 100644
--- a/mobile/src/terminal/quick-commands/QuickCommandsSheet.tsx
+++ b/mobile/src/terminal/quick-commands/QuickCommandsSheet.tsx
@@ -7,7 +7,7 @@ import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
-import { getQuickCommandPreview } from '../quick-commands'
+import { getQuickCommandPreview } from './quick-commands'
 import { terminalQuickCommandMatchesRepo as quickCommandMatchesRepo } from '../../../../src/shared/terminal/quick-commands/terminal-quick-commands'
 import { useQuickCommands } from './use-quick-commands'
 import { QuickCommandEditorForm } from './QuickCommandEditorForm'
diff --git a/mobile/src/terminal/quick-commands/mobile-quick-command-operations.ts b/mobile/src/terminal/quick-commands/mobile-quick-command-operations.ts
index f3f9eee7fb8..b5a9474840a 100644
--- a/mobile/src/terminal/quick-commands/mobile-quick-command-operations.ts
+++ b/mobile/src/terminal/quick-commands/mobile-quick-command-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import '../terminal-reply-schema'
+import '../host-operations/terminal-reply-schema'
 import { terminalQuickCommandsSchema } from './mobile-quick-command-reply-schema'
 
 export const quickCommandsReader = rpcResultVariant(
diff --git a/mobile/src/terminal/quick-commands/mobile-session-quick-command-launch.ts b/mobile/src/terminal/quick-commands/mobile-session-quick-command-launch.ts
index 6a8f270e4ab..21491aafc75 100644
--- a/mobile/src/terminal/quick-commands/mobile-session-quick-command-launch.ts
+++ b/mobile/src/terminal/quick-commands/mobile-session-quick-command-launch.ts
@@ -1,6 +1,6 @@
-import { buildMobileQuickCommandLaunch, type MobileQuickCommandLaunch } from '../quick-commands'
+import { buildMobileQuickCommandLaunch, type MobileQuickCommandLaunch } from './quick-commands'
 
-import { triggerError } from '../../platform/haptics'
+import { triggerError } from '../../platform/haptics/haptics'
 import { translate } from '../../i18n/mobile-i18n'
 import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
 import type { MobileNewTabAgentOption } from '../../session/agent-launch/mobile-new-tab-agent-options'
diff --git a/mobile/src/terminal/quick-commands/quick-command-draft.ts b/mobile/src/terminal/quick-commands/quick-command-draft.ts
index d7c575d97a8..4b231188792 100644
--- a/mobile/src/terminal/quick-commands/quick-command-draft.ts
+++ b/mobile/src/terminal/quick-commands/quick-command-draft.ts
@@ -4,7 +4,7 @@ import type {
   TerminalQuickCommandScope
 } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
 import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
-import '../quick-commands'
+import './quick-commands'
 import { getTerminalQuickCommandBodySize } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
 import {
   isTerminalAgentQuickCommand as isAgentQuickCommand,
diff --git a/mobile/src/terminal/quick-commands.ts b/mobile/src/terminal/quick-commands/quick-commands.ts
similarity index 81%
rename from mobile/src/terminal/quick-commands.ts
rename to mobile/src/terminal/quick-commands/quick-commands.ts
index 58cbf115a8b..57903e9445f 100644
--- a/mobile/src/terminal/quick-commands.ts
+++ b/mobile/src/terminal/quick-commands/quick-commands.ts
@@ -1,14 +1,14 @@
-import type { TerminalQuickCommand } from '../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
-import type { TuiAgent } from '../../../src/shared/agent-launch/catalog/tui-agent'
+import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
+import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
 import {
   flattenTerminalQuickCommand,
   isTerminalAgentQuickCommand,
   supportsTerminalAgentQuickCommand
-} from '../../../src/shared/terminal/quick-commands/terminal-quick-commands'
-import '../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
-import '../../../src/shared/protocol-version'
-import { TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY } from '../../../src/shared/terminal/quick-commands/terminal-quick-command-capabilities'
-import { TUI_AGENT_DISPLAY_NAMES as MOBILE_TUI_AGENT_LABELS } from '../../../src/shared/agent-launch/catalog/tui-agent-display-names'
+} from '../../../../src/shared/terminal/quick-commands/terminal-quick-commands'
+import '../../../../src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
+import '../../../../src/shared/protocol-version'
+import { TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-capabilities'
+import { TUI_AGENT_DISPLAY_NAMES as MOBILE_TUI_AGENT_LABELS } from '../../../../src/shared/agent-launch/catalog/tui-agent-display-names'
 
 // Reuse the pure desktop command logic; renderer-only labels and native truncation stay here.
 
diff --git a/mobile/src/terminal/quick-commands/use-quick-commands.ts b/mobile/src/terminal/quick-commands/use-quick-commands.ts
index 6a4aef5dbc9..b1c4ace9575 100644
--- a/mobile/src/terminal/quick-commands/use-quick-commands.ts
+++ b/mobile/src/terminal/quick-commands/use-quick-commands.ts
@@ -8,7 +8,7 @@ import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
 import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
 import { quickCommandsRead, quickCommandsWrite } from './mobile-quick-command-operations'
 
-import '../quick-commands'
+import './quick-commands'
 import {
   applyTerminalQuickCommandMutation,
   parseNormalizedTerminalQuickCommands,
diff --git a/mobile/src/terminal/session/MobileSessionAccessoryKeys.tsx b/mobile/src/terminal/session/accessory-keys/MobileSessionAccessoryKeys.tsx
similarity index 89%
rename from mobile/src/terminal/session/MobileSessionAccessoryKeys.tsx
rename to mobile/src/terminal/session/accessory-keys/MobileSessionAccessoryKeys.tsx
index 49d2a259dce..be256ed94d1 100644
--- a/mobile/src/terminal/session/MobileSessionAccessoryKeys.tsx
+++ b/mobile/src/terminal/session/accessory-keys/MobileSessionAccessoryKeys.tsx
@@ -7,26 +7,26 @@ import {
   Plus,
   Smartphone
 } from 'lucide-react-native'
-import { triggerMediumImpact } from '../../platform/haptics'
-import { createTerminalLiveAccessoryInput } from '../terminal-live-accessory-input'
-import { TERMINAL_ACCESSORY_REPEAT_DELAY_MS } from '../terminal-accessory-repeat'
-import { getVisibleTerminalAccessoryKeys } from '../terminal-accessory-layout'
-import { useDirectionPadAvailable } from '../../layout/use-shell-side-rail'
-import { isTerminalPhoneDisplayMode } from './terminal-phone-display-mode'
+import { triggerMediumImpact } from '../../../platform/haptics/haptics'
+import { createTerminalLiveAccessoryInput } from '../../live-input/terminal-live-accessory-input'
+import { TERMINAL_ACCESSORY_REPEAT_DELAY_MS } from '../../key-input/terminal-accessory-repeat'
+import { getVisibleTerminalAccessoryKeys } from '../../key-input/terminal-accessory-layout'
+import { useDirectionPadAvailable } from '../../../layout/use-shell-side-rail'
+import { isTerminalPhoneDisplayMode } from '../pane-layout/terminal-phone-display-mode'
 import { TERMINAL_KEY_HIT_SLOP, terminalDockStyles as styles } from './terminal-dock-styles'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { colors } from '../../theme/mobile-theme'
-import { styles as sessionStyles } from '../../session/mobile-session-styles'
-import { useKeyboardPersistingTaps } from '../../platform/keyboard-persisting-taps'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
-import { useMobileSessionKeyboardLift } from './use-mobile-session-keyboard-lift'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { colors } from '../../../theme/mobile-theme'
+import { styles as sessionStyles } from '../../../session/mobile-session-styles'
+import { useKeyboardPersistingTaps } from '../../../platform/keyboard/keyboard-persisting-taps'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
+import { useMobileSessionKeyboardLift } from '../input-controls/use-mobile-session-keyboard-lift'
 import {
   AGENT_SMART_KEY_STEP_MS,
   type AgentSmartKey
-} from '../../../../src/shared/terminal/input/agent-smart-keys'
-import type { TerminalAccessoryKey } from '../terminal-accessory-keys'
-import { resolveMobileTerminalTabSmartKeys } from './mobile-terminal-tab-agent'
+} from '../../../../../src/shared/terminal/input/agent-smart-keys'
+import type { TerminalAccessoryKey } from '../../key-input/terminal-accessory-keys'
+import { resolveMobileTerminalTabSmartKeys } from '../../../session/tabs/mobile-terminal-tab-agent'
 import { MobileSessionSmartKeys } from './MobileSessionSmartKeys'
 import { MobileSessionLatchKeys } from './MobileSessionLatchKeys'
 import { isAccessibilityClick, useTerminalKeyRowTouch } from './use-terminal-key-row-touch'
diff --git a/mobile/src/terminal/session/MobileSessionLatchKeys.tsx b/mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx
similarity index 84%
rename from mobile/src/terminal/session/MobileSessionLatchKeys.tsx
rename to mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx
index 234f96e4f72..dc2f483f8a6 100644
--- a/mobile/src/terminal/session/MobileSessionLatchKeys.tsx
+++ b/mobile/src/terminal/session/accessory-keys/MobileSessionLatchKeys.tsx
@@ -1,8 +1,8 @@
 import { Pressable, Text, type GestureResponderEvent } from 'react-native'
-import type { TerminalShortcutModifier } from '../terminal-accessory-keys'
-import type { StickyModifiers } from '../terminal-sticky-modifiers'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import type { TerminalShortcutModifier } from '../../key-input/terminal-accessory-keys'
+import type { StickyModifiers } from '../../key-input/terminal-sticky-modifiers'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
 import { TERMINAL_KEY_HIT_SLOP, terminalDockStyles as styles } from './terminal-dock-styles'
 
 const LATCHES: readonly { id: TerminalShortcutModifier; label: string }[] = [
diff --git a/mobile/src/terminal/session/MobileSessionSmartKeys.tsx b/mobile/src/terminal/session/accessory-keys/MobileSessionSmartKeys.tsx
similarity index 91%
rename from mobile/src/terminal/session/MobileSessionSmartKeys.tsx
rename to mobile/src/terminal/session/accessory-keys/MobileSessionSmartKeys.tsx
index fdc0f612d85..6635f563b2a 100644
--- a/mobile/src/terminal/session/MobileSessionSmartKeys.tsx
+++ b/mobile/src/terminal/session/accessory-keys/MobileSessionSmartKeys.tsx
@@ -3,11 +3,11 @@ import type {
   AgentSmartKey,
   AgentSmartKeyName,
   AgentSmartKeySet
-} from '../../../../src/shared/terminal/input/agent-smart-keys'
-import { MobileAgentIcon } from '../../components/MobileAgentIcon'
-import type { Translate } from '../../i18n/mobile-i18n'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+} from '../../../../../src/shared/terminal/input/agent-smart-keys'
+import { MobileAgentIcon } from '../../../components/MobileAgentIcon'
+import type { Translate } from '../../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
 import { TERMINAL_KEY_HIT_SLOP, terminalDockStyles as styles } from './terminal-dock-styles'
 
 function smartKeyWord(t: Translate, name: AgentSmartKeyName): string {
diff --git a/mobile/src/terminal/session/MobileTerminalMoreKeysSheet.tsx b/mobile/src/terminal/session/accessory-keys/MobileTerminalMoreKeysSheet.tsx
similarity index 82%
rename from mobile/src/terminal/session/MobileTerminalMoreKeysSheet.tsx
rename to mobile/src/terminal/session/accessory-keys/MobileTerminalMoreKeysSheet.tsx
index 530f33aa86e..163665f8a13 100644
--- a/mobile/src/terminal/session/MobileTerminalMoreKeysSheet.tsx
+++ b/mobile/src/terminal/session/accessory-keys/MobileTerminalMoreKeysSheet.tsx
@@ -1,9 +1,9 @@
-import { SPECIAL_KEY_LABELS } from '../terminal-key-definitions'
-import { createTerminalLiveAccessoryInput } from '../terminal-live-accessory-input'
-import { isTerminalPhoneDisplayMode } from './terminal-phone-display-mode'
-import { isMobileTerminalTabRunningAgent } from './mobile-terminal-tab-agent'
+import { SPECIAL_KEY_LABELS } from '../../key-input/terminal-key-definitions'
+import { createTerminalLiveAccessoryInput } from '../../live-input/terminal-live-accessory-input'
+import { isTerminalPhoneDisplayMode } from '../pane-layout/terminal-phone-display-mode'
+import { isMobileTerminalTabRunningAgent } from '../../../session/tabs/mobile-terminal-tab-agent'
 import { TerminalMoreKeysSheet } from './TerminalMoreKeysSheet'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
 
 const ARROW_IDS = ['arrowUp', 'arrowDown', 'arrowLeft', 'arrowRight']
 // Built-in keys each row already shows; the ⋯ sheet offers the rest.
diff --git a/mobile/src/terminal/session/TerminalMoreKeysSheet.tsx b/mobile/src/terminal/session/accessory-keys/TerminalMoreKeysSheet.tsx
similarity index 90%
rename from mobile/src/terminal/session/TerminalMoreKeysSheet.tsx
rename to mobile/src/terminal/session/accessory-keys/TerminalMoreKeysSheet.tsx
index df03af5a62e..6dd5d27abe5 100644
--- a/mobile/src/terminal/session/TerminalMoreKeysSheet.tsx
+++ b/mobile/src/terminal/session/accessory-keys/TerminalMoreKeysSheet.tsx
@@ -2,15 +2,16 @@ import { useRef } from 'react'
 import { Pressable, Text, View } from 'react-native'
 import { ClipboardPaste, FileUp, ImagePlus, Monitor, Plus, Smartphone } from 'lucide-react-native'
 import type { LucideIcon } from 'lucide-react-native'
-import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
-import { SectionHeader } from '../../components/list/ListGroup'
-import { triggerMediumImpact } from '../../platform/haptics'
-import type { TerminalAccessoryKey } from '../terminal-accessory-keys'
-import { TERMINAL_SHORTCUT_SPECIAL_KEYS } from '../terminal-accessory-keys'
-import type { CustomKey } from '../terminal-custom-keys'
-import { colors } from '../../theme/mobile-theme'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { BottomDrawer } from '../../../components/bottom-drawer/BottomDrawer'
+import { SectionHeader } from '../../../components/list/ListGroup'
+import { triggerMediumImpact } from '../../../platform/haptics/haptics'
+import type { TerminalAccessoryKey } from '../../key-input/terminal-accessory-keys'
+import '../../key-input/terminal-accessory-keys'
+import { TERMINAL_SHORTCUT_SPECIAL_KEY_DEFINITIONS as TERMINAL_SHORTCUT_SPECIAL_KEYS } from '../../key-input/terminal-key-definitions'
+import type { CustomKey } from '../../key-input/terminal-custom-keys'
+import { colors } from '../../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 import { terminalDockStyles as styles } from './terminal-dock-styles'
 
 const EXTRA_KEY_IDS = new Set([
diff --git a/mobile/src/terminal/session/shell-terminal-key-rail.ts b/mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.ts
similarity index 87%
rename from mobile/src/terminal/session/shell-terminal-key-rail.ts
rename to mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.ts
index 25f66325430..c157ea6c5c7 100644
--- a/mobile/src/terminal/session/shell-terminal-key-rail.ts
+++ b/mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.ts
@@ -2,11 +2,11 @@ import type {
   BridgeTerminalToolbar,
   BridgeTerminalKeyId,
   BridgeTerminalKeyRail
-} from '../../mobile-web-shell/bridge/bridge-terminal-key'
+} from '../../../mobile-web-shell/bridge/bridge-terminal-key'
 import { createElement, useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useFocusEffect } from 'expo-router'
-import { useSideRailContent, useSideRailStrip } from '../../layout/side-rail'
-import { TerminalKeyRail, terminalKeyRailKeys } from '../../mobile-web-shell/terminal-key-rail'
+import { useSideRailContent, useSideRailStrip } from '../../../layout/side-rail'
+import { TerminalKeyRail, terminalKeyRailKeys } from '../../../mobile-web-shell/terminal-key-rail'
 
 const NO_RAIL_KEYS: BridgeTerminalKeyRail = []
 
diff --git a/mobile/src/terminal/session/shell-terminal-key-rail.web.ts b/mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.web.ts
similarity index 93%
rename from mobile/src/terminal/session/shell-terminal-key-rail.web.ts
rename to mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.web.ts
index b4d334d6891..5cfd2b7b067 100644
--- a/mobile/src/terminal/session/shell-terminal-key-rail.web.ts
+++ b/mobile/src/terminal/session/accessory-keys/shell-terminal-key-rail.web.ts
@@ -11,8 +11,8 @@ import type {
   BridgeTerminalToolbar,
   BridgeTerminalKeyId,
   BridgeTerminalKeyRail
-} from '../../mobile-web-shell/bridge/bridge-terminal-key'
-import { usePageBridgeClient } from '../../transport/connection/client-context.web'
+} from '../../../mobile-web-shell/bridge/bridge-terminal-key'
+import { usePageBridgeClient } from '../../../transport/connection/client-context.web'
 
 let nextInputOwner = 0
 
diff --git a/mobile/src/terminal/session/terminal-dock-styles.ts b/mobile/src/terminal/session/accessory-keys/terminal-dock-styles.ts
similarity index 97%
rename from mobile/src/terminal/session/terminal-dock-styles.ts
rename to mobile/src/terminal/session/accessory-keys/terminal-dock-styles.ts
index 02f83eab246..bdd25cd764b 100644
--- a/mobile/src/terminal/session/terminal-dock-styles.ts
+++ b/mobile/src/terminal/session/accessory-keys/terminal-dock-styles.ts
@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native'
-import { colors, feedback, radii, spacing, typography } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
+import { colors, feedback, radii, spacing, typography } from '../../../theme/mobile-theme'
+import { themedStyleSheet } from '../../../theme/themed-styles'
 
 const KEY_HEIGHT = 32
 const KEY_ROW_HEIGHT = 46
diff --git a/mobile/src/terminal/session/use-mobile-session-accessory-selection.ts b/mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts
similarity index 90%
rename from mobile/src/terminal/session/use-mobile-session-accessory-selection.ts
rename to mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts
index 8d82b194027..bd535048d44 100644
--- a/mobile/src/terminal/session/use-mobile-session-accessory-selection.ts
+++ b/mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts
@@ -1,33 +1,33 @@
 import { useRef, useCallback, useEffect, useState } from 'react'
 import { useFocusEffect } from 'expo-router'
-import { getRepoIdFromWorktreeId } from '../../../../src/shared/worktree/id'
+import { getRepoIdFromWorktreeId } from '../../../../../src/shared/worktree/id'
 import { AppState, Keyboard, Platform, type HostInstance } from 'react-native'
 import {
   createTerminalAccessoryRepeatController,
   createTerminalAccessoryRepeatSender
-} from '../terminal-accessory-repeat'
-import { useClipboardReader, useClipboardWriter } from '../../platform/clipboard'
-import { translate } from '../../i18n/mobile-i18n'
+} from '../../key-input/terminal-accessory-repeat'
+import { useClipboardReader, useClipboardWriter } from '../../../platform/clipboard/clipboard'
+import { translate } from '../../../i18n/mobile-i18n'
 import {
   newTabRepoListRead,
   type MobileRuntimeRepoSummary
-} from '../../session/agent-launch/mobile-runtime-repo-operations'
+} from '../../../session/agent-launch/mobile-runtime-repo-operations'
 import {
   triggerSelection,
   triggerSuccess,
   triggerError,
   triggerEdgeBump
-} from '../../platform/haptics'
+} from '../../../platform/haptics/haptics'
 import {
   sameTerminalKeyboardAvoidanceMetrics,
   type TerminalKeyboardAvoidanceMetrics,
   type TerminalModes
-} from '../terminal-webview-contract'
-import type { createTerminalLiveAccessoryInput } from '../terminal-live-accessory-input'
-import { clearTerminalLiveInputFocusTimer } from '../terminal-live-input'
-import { stripTerminalSelectionGutter } from '../../../../src/shared/terminal/output/terminal-selection-gutter'
-import { useTerminalCopyTrimsGutter } from '../terminal-copy-gutter-preference'
-import type { MobileSessionTerminalInputModel } from './use-mobile-session-terminal-input'
+} from '../../webview/terminal-webview-contract'
+import type { createTerminalLiveAccessoryInput } from '../../live-input/terminal-live-accessory-input'
+import { clearTerminalLiveInputFocusTimer } from '../../live-input/terminal-live-input'
+import { stripTerminalSelectionGutter } from '../../../../../src/shared/terminal/output/terminal-selection-gutter'
+import { useTerminalCopyTrimsGutter } from '../../preferences/terminal-copy-gutter-preference'
+import type { MobileSessionTerminalInputModel } from '../input-controls/use-mobile-session-terminal-input'
 
 export function useMobileSessionAccessorySelection(scope: MobileSessionTerminalInputModel) {
   const {
diff --git a/mobile/src/terminal/session/use-session-terminal-key-rail.ts b/mobile/src/terminal/session/accessory-keys/use-session-terminal-key-rail.ts
similarity index 85%
rename from mobile/src/terminal/session/use-session-terminal-key-rail.ts
rename to mobile/src/terminal/session/accessory-keys/use-session-terminal-key-rail.ts
index c7806a45aac..99b1f2efdfb 100644
--- a/mobile/src/terminal/session/use-session-terminal-key-rail.ts
+++ b/mobile/src/terminal/session/accessory-keys/use-session-terminal-key-rail.ts
@@ -2,13 +2,13 @@ import { useMemo, useState } from 'react'
 import type {
   BridgeTerminalKeyId,
   BridgeTerminalToolbar
-} from '../../mobile-web-shell/bridge/bridge-terminal-key'
-import { sessionCommandDockShown } from '../../session/mobile-session-command-dock-shown'
-import { isTerminalPhoneDisplayMode } from './terminal-phone-display-mode'
-import { isMobileTerminalTabRunningAgent } from './mobile-terminal-tab-agent'
+} from '../../../mobile-web-shell/bridge/bridge-terminal-key'
+import { sessionCommandDockShown } from '../../../session/mobile-session-command-dock-shown'
+import { isTerminalPhoneDisplayMode } from '../pane-layout/terminal-phone-display-mode'
+import { isMobileTerminalTabRunningAgent } from '../../../session/tabs/mobile-terminal-tab-agent'
 import { useShellTerminalKeyRail } from './shell-terminal-key-rail'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
-import { useKeyboardOcclusion } from '../../platform/keyboard-occlusion'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
+import { useKeyboardOcclusion } from '../../../platform/keyboard/keyboard-occlusion'
 
 const ESC = '\x1b'
 const CTRL_C = '\x03'
diff --git a/mobile/src/terminal/session/use-terminal-dock-keys.ts b/mobile/src/terminal/session/accessory-keys/use-terminal-dock-keys.ts
similarity index 88%
rename from mobile/src/terminal/session/use-terminal-dock-keys.ts
rename to mobile/src/terminal/session/accessory-keys/use-terminal-dock-keys.ts
index e2ad94e5922..65b8d138e9e 100644
--- a/mobile/src/terminal/session/use-terminal-dock-keys.ts
+++ b/mobile/src/terminal/session/accessory-keys/use-terminal-dock-keys.ts
@@ -1,9 +1,9 @@
 import { useRef, useState, type RefObject } from 'react'
 import type { TextInputInstance } from 'react-native'
-import type { TerminalShortcutModifier } from '../terminal-accessory-keys'
-import { createTerminalKeyChordInput } from '../terminal-key-chord-input'
-import type { TerminalLiveAccessoryInput } from '../terminal-live-accessory-input'
-import { writeTerminalLiveInputText } from '../terminal-live-input-text-write'
+import type { TerminalShortcutModifier } from '../../key-input/terminal-accessory-keys'
+import { createTerminalKeyChordInput } from '../../key-input/terminal-key-chord-input'
+import type { TerminalLiveAccessoryInput } from '../../live-input/terminal-live-accessory-input'
+import { writeTerminalLiveInputText } from '../../live-input/terminal-live-input-text-write'
 import {
   appendedCharacter,
   consumeStickyModifiers,
@@ -12,7 +12,7 @@ import {
   STICKY_MODIFIER_DOUBLE_TAP_MS,
   tapStickyModifier,
   type StickyModifiers
-} from '../terminal-sticky-modifiers'
+} from '../../key-input/terminal-sticky-modifiers'
 
 type UseTerminalDockKeysOptions = {
   readonly activeHandle: string | null
diff --git a/mobile/src/terminal/session/use-terminal-key-row-touch.ts b/mobile/src/terminal/session/accessory-keys/use-terminal-key-row-touch.ts
similarity index 98%
rename from mobile/src/terminal/session/use-terminal-key-row-touch.ts
rename to mobile/src/terminal/session/accessory-keys/use-terminal-key-row-touch.ts
index 765f548f921..5269d9d7298 100644
--- a/mobile/src/terminal/session/use-terminal-key-row-touch.ts
+++ b/mobile/src/terminal/session/accessory-keys/use-terminal-key-row-touch.ts
@@ -8,7 +8,7 @@ import type {
 import {
   sameSmartKeySet,
   type AgentSmartKeySet
-} from '../../../../src/shared/terminal/input/agent-smart-keys'
+} from '../../../../../src/shared/terminal/input/agent-smart-keys'
 
 // The same movement the Duo rail allows before a touch stops counting as a press.
 const PRESS_MOVE_SLOP = 8
diff --git a/mobile/src/terminal/session/initial-session-terminal.ts b/mobile/src/terminal/session/creation/initial-session-terminal.ts
similarity index 100%
rename from mobile/src/terminal/session/initial-session-terminal.ts
rename to mobile/src/terminal/session/creation/initial-session-terminal.ts
diff --git a/mobile/src/terminal/session/mobile-chat-fork-create-feedback.ts b/mobile/src/terminal/session/creation/mobile-chat-fork-create-feedback.ts
similarity index 76%
rename from mobile/src/terminal/session/mobile-chat-fork-create-feedback.ts
rename to mobile/src/terminal/session/creation/mobile-chat-fork-create-feedback.ts
index ece73f51109..c78fb59a9ae 100644
--- a/mobile/src/terminal/session/mobile-chat-fork-create-feedback.ts
+++ b/mobile/src/terminal/session/creation/mobile-chat-fork-create-feedback.ts
@@ -1,11 +1,11 @@
-import { isRpcDeliveryUnknown } from '../../transport/rpc/rpc-delivery-ambiguity'
-import '../../transport/connection/stable-logical-rpc-client'
-import { isLogicalClientCutoverError } from '../../transport/connection/logical-client-cutover-error'
-import { RpcIncompatibleReplyError } from '../../transport/rpc/rpc-incompatible-reply-error'
-import { PROJECT_RUNTIME_REPAIR_REQUIRED_CODE } from '../../../../src/shared/project-runtime-repair-message'
-import { SESSION_TABS_CHAT_FORK_CLI_RUNTIME_CAPABILITY } from '../../../../src/shared/session-tabs-runtime-capabilities'
-import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
-import { createdTerminalDesktopWarning } from './mobile-session-terminal-reply-schema'
+import { isRpcDeliveryUnknown } from '../../../transport/rpc/rpc-delivery-ambiguity'
+import '../../../transport/connection/stable-logical-rpc-client'
+import { isLogicalClientCutoverError } from '../../../transport/connection/logical-client-cutover-error'
+import { RpcIncompatibleReplyError } from '../../../transport/rpc/rpc-incompatible-reply-error'
+import { PROJECT_RUNTIME_REPAIR_REQUIRED_CODE } from '../../../../../src/shared/project-runtime-repair-message'
+import { SESSION_TABS_CHAT_FORK_CLI_RUNTIME_CAPABILITY } from '../../../../../src/shared/session-tabs-runtime-capabilities'
+import type { RpcResponse } from '../../../transport/rpc/rpc-wire-types'
+import { createdTerminalDesktopWarning } from '../mobile-session-terminal-reply-schema'
 
 export function hostSupportsMobileChatFork(
   hostCapabilities: readonly string[] | undefined
diff --git a/mobile/src/terminal/session/mobile-session-terminal-create-copy.ts b/mobile/src/terminal/session/creation/mobile-session-terminal-create-copy.ts
similarity index 95%
rename from mobile/src/terminal/session/mobile-session-terminal-create-copy.ts
rename to mobile/src/terminal/session/creation/mobile-session-terminal-create-copy.ts
index 472cc67c9dc..99842685e82 100644
--- a/mobile/src/terminal/session/mobile-session-terminal-create-copy.ts
+++ b/mobile/src/terminal/session/creation/mobile-session-terminal-create-copy.ts
@@ -1,4 +1,4 @@
-import { translate } from '../../i18n/mobile-i18n'
+import { translate } from '../../../i18n/mobile-i18n'
 
 export const terminalCreateCopy = {
   forkUnavailable: (agentName: string) =>
diff --git a/mobile/src/terminal/session/mobile-session-terminal-create-feedback.ts b/mobile/src/terminal/session/creation/mobile-session-terminal-create-feedback.ts
similarity index 88%
rename from mobile/src/terminal/session/mobile-session-terminal-create-feedback.ts
rename to mobile/src/terminal/session/creation/mobile-session-terminal-create-feedback.ts
index d4a85ec9f55..e3aab82ab02 100644
--- a/mobile/src/terminal/session/mobile-session-terminal-create-feedback.ts
+++ b/mobile/src/terminal/session/creation/mobile-session-terminal-create-feedback.ts
@@ -1,6 +1,6 @@
-import { triggerError } from '../../platform/haptics'
+import { triggerError } from '../../../platform/haptics/haptics'
 import { terminalCreateCopy } from './mobile-session-terminal-create-copy'
-import type { MobileSessionAttachmentsModel } from '../../files/attachments/use-mobile-session-attachments'
+import type { MobileSessionAttachmentsModel } from '../../../files/attachments/use-mobile-session-attachments'
 import type { MobileSessionTerminalCreateOptions } from './mobile-session-terminal-create-request'
 
 export function createMobileSessionTerminalCreateFeedback(args: {
diff --git a/mobile/src/terminal/session/mobile-session-terminal-create-request.ts b/mobile/src/terminal/session/creation/mobile-session-terminal-create-request.ts
similarity index 78%
rename from mobile/src/terminal/session/mobile-session-terminal-create-request.ts
rename to mobile/src/terminal/session/creation/mobile-session-terminal-create-request.ts
index 1167b50323c..effb12f5713 100644
--- a/mobile/src/terminal/session/mobile-session-terminal-create-request.ts
+++ b/mobile/src/terminal/session/creation/mobile-session-terminal-create-request.ts
@@ -1,7 +1,7 @@
-import type { MobileQuickCommandLaunch } from '../quick-commands'
-import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import type { MobileNewTabAgentOption } from '../../session/agent-launch/mobile-new-tab-agent-options'
-import { sessionTabCreateTerminal } from '../../session/tabs/mobile-session-tab-write-operations'
+import type { MobileQuickCommandLaunch } from '../../quick-commands/quick-commands'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { MobileNewTabAgentOption } from '../../../session/agent-launch/mobile-new-tab-agent-options'
+import { sessionTabCreateTerminal } from '../../../session/tabs/mobile-session-tab-write-operations'
 
 export type MobileSessionTerminalCreateOptions = MobileQuickCommandLaunch['options'] & {
   onPromptSent?: () => void
diff --git a/mobile/src/terminal/session/terminal-create-lock.ts b/mobile/src/terminal/session/creation/terminal-create-lock.ts
similarity index 100%
rename from mobile/src/terminal/session/terminal-create-lock.ts
rename to mobile/src/terminal/session/creation/terminal-create-lock.ts
diff --git a/mobile/src/terminal/session/use-initial-session-terminal-autocreate.test.ts b/mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.test.ts
similarity index 100%
rename from mobile/src/terminal/session/use-initial-session-terminal-autocreate.test.ts
rename to mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.test.ts
diff --git a/mobile/src/terminal/session/use-initial-session-terminal-autocreate.ts b/mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.ts
similarity index 100%
rename from mobile/src/terminal/session/use-initial-session-terminal-autocreate.ts
rename to mobile/src/terminal/session/creation/use-initial-session-terminal-autocreate.ts
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts b/mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts
similarity index 86%
rename from mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts
rename to mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts
index cb0f22fc01a..6bbda02fecf 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts
+++ b/mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts
@@ -1,43 +1,43 @@
-import type { RpcSuccess } from '../../transport/rpc/rpc-wire-types'
-import { sessionTabCreateTerminal } from '../../session/tabs/mobile-session-tab-write-operations'
-import { triggerSuccess, triggerError } from '../../platform/haptics'
+import type { RpcSuccess } from '../../../transport/rpc/rpc-wire-types'
+import { sessionTabCreateTerminal } from '../../../session/tabs/mobile-session-tab-write-operations'
+import { triggerSuccess, triggerError } from '../../../platform/haptics/haptics'
 import { terminalCreateCopy } from './mobile-session-terminal-create-copy'
 import { createMobileSessionTerminalCreateFeedback } from './mobile-session-terminal-create-feedback'
-import { buildTerminalSendParams } from '../terminal-send-request'
-import { terminalRecordsEqual } from './mobile-terminal-records'
-import type { MobileNewTabAgentOption } from '../../session/agent-launch/mobile-new-tab-agent-options'
-import { formatAgentTypeLabel } from '../../../../src/shared/agent-status/presentation/agent-type-label'
+import { buildTerminalSendParams } from '../../input-delivery/terminal-send-request'
+import { terminalRecordsEqual } from '../inventory/mobile-terminal-records'
+import type { MobileNewTabAgentOption } from '../../../session/agent-launch/mobile-new-tab-agent-options'
+import { formatAgentTypeLabel } from '../../../../../src/shared/agent-status/presentation/agent-type-label'
 import {
   hostSupportsMobileChatFork,
   mobileChatForkCreateReplyMessage,
   mobileChatForkRequestFailureMessage
 } from './mobile-chat-fork-create-feedback'
-import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
-import type { Terminal } from './mobile-terminal-model'
-import type { MobileSessionAttachmentsModel } from '../../files/attachments/use-mobile-session-attachments'
+import type { MobileSessionTab } from '../../../session/tabs/mobile-session-tabs'
+import type { TerminalRecord as Terminal } from '../inventory/mobile-terminal-records'
+import type { MobileSessionAttachmentsModel } from '../../../files/attachments/use-mobile-session-attachments'
 import { useMobileTerminalCreateRouteOwner } from './use-mobile-terminal-create-route-owner'
-import { launchMobileSessionQuickCommand } from '../quick-commands/mobile-session-quick-command-launch'
-import type { TerminalQuickCommand } from '../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
+import { launchMobileSessionQuickCommand } from '../../quick-commands/mobile-session-quick-command-launch'
+import type { TerminalQuickCommand } from '../../../../../src/shared/terminal/quick-commands/terminal-quick-command-types'
 import {
   requestMobileSessionTerminalCreate,
   type MobileSessionTerminalCreateOptions
 } from './mobile-session-terminal-create-request'
-import { isAgentSessionHandleProvider } from '../../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
-import { createMobileStructuredAgentSession } from '../../session/native-chat/agent-session/mobile-structured-agent-session-launch'
+import { isAgentSessionHandleProvider } from '../../../../../src/shared/agent-session/lifecycle/agent-session-provider-handle'
+import { createMobileStructuredAgentSession } from '../../../session/native-chat/agent-session/mobile-structured-agent-session-launch'
 import {
   launchesThroughHost,
   launchNewTabAgentThroughHost
-} from '../../session/agent-launch/new-tab-agent-host-launch'
+} from '../../../session/agent-launch/new-tab-agent-host-launch'
 import {
   launchedSelection,
   withLaunchReply,
   withoutUnansweredLaunch,
   withoutPendingHandle
-} from '../../session/tabs/pending-session-selection'
+} from '../../../session/tabs/pending-session-selection'
 import { releaseTerminalCreateLock } from './terminal-create-lock'
-import { placeCreatedSessionTab } from '../../../../src/shared/session-tab-placement'
-import '../../../../src/shared/protocol-version'
-import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../src/shared/session-tabs-runtime-capabilities'
+import { placeCreatedSessionTab } from '../../../../../src/shared/session-tab-placement'
+import '../../../../../src/shared/protocol-version'
+import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../../src/shared/session-tabs-runtime-capabilities'
 
 export function useMobileSessionTerminalCreateActions(scope: MobileSessionAttachmentsModel) {
   const {
diff --git a/mobile/src/terminal/session/use-mobile-terminal-create-route-owner.ts b/mobile/src/terminal/session/creation/use-mobile-terminal-create-route-owner.ts
similarity index 91%
rename from mobile/src/terminal/session/use-mobile-terminal-create-route-owner.ts
rename to mobile/src/terminal/session/creation/use-mobile-terminal-create-route-owner.ts
index 320e8107076..54384a11f0b 100644
--- a/mobile/src/terminal/session/use-mobile-terminal-create-route-owner.ts
+++ b/mobile/src/terminal/session/creation/use-mobile-terminal-create-route-owner.ts
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react'
-import type { MobileSessionAttachmentsModel } from '../../files/attachments/use-mobile-session-attachments'
+import type { MobileSessionAttachmentsModel } from '../../../files/attachments/use-mobile-session-attachments'
 
 export function useMobileTerminalCreateRouteOwner(
   scope: Pick<
diff --git a/mobile/src/terminal/session/MobileTerminalInputActions.tsx b/mobile/src/terminal/session/input-controls/MobileTerminalInputActions.tsx
similarity index 88%
rename from mobile/src/terminal/session/MobileTerminalInputActions.tsx
rename to mobile/src/terminal/session/input-controls/MobileTerminalInputActions.tsx
index 3e83485ff24..62efc7a90ad 100644
--- a/mobile/src/terminal/session/MobileTerminalInputActions.tsx
+++ b/mobile/src/terminal/session/input-controls/MobileTerminalInputActions.tsx
@@ -7,21 +7,21 @@ import {
   type ViewStyle
 } from 'react-native'
 import { ImagePlus } from 'lucide-react-native'
-import { colors } from '../../theme/mobile-theme'
+import { colors } from '../../../theme/mobile-theme'
 import {
   COMPOSER_CONTROL_HIT_SLOP,
   composerInputStyles
-} from '../../components/composer-input/composer-input-styles'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { keepHeldPressThroughLongPress } from '../../platform/held-press-long-press'
-import { dictationControlsCopy } from '../../dictation/mobile-dictation-controls-copy'
-import { useMobileDictationCancelDrop } from '../../dictation/use-mobile-dictation-cancel-drop'
+} from '../../../components/composer-input/composer-input-styles'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
+import { keepHeldPressThroughLongPress } from '../../../platform/held-press-long-press'
+import { dictationControlsCopy } from '../../../dictation/mobile-dictation-controls-copy'
+import { useMobileDictationCancelDrop } from '../../../dictation/use-mobile-dictation-cancel-drop'
 import {
   MobileDictationMicIcon,
   MobileDictationRetryButton
-} from '../../dictation/MobileDictationLiveControls'
-import { MobileDictationLiveContext } from '../../dictation/mobile-dictation-live-context'
+} from '../../../dictation/MobileDictationLiveControls'
+import { MobileDictationLiveContext } from '../../../dictation/mobile-dictation-live-context'
 
 type DictationState = {
   readonly isStarting: boolean
diff --git a/mobile/src/terminal/session/MobileTerminalLiveInputStatus.tsx b/mobile/src/terminal/session/input-controls/MobileTerminalLiveInputStatus.tsx
similarity index 88%
rename from mobile/src/terminal/session/MobileTerminalLiveInputStatus.tsx
rename to mobile/src/terminal/session/input-controls/MobileTerminalLiveInputStatus.tsx
index da468519170..b498c6bd28c 100644
--- a/mobile/src/terminal/session/MobileTerminalLiveInputStatus.tsx
+++ b/mobile/src/terminal/session/input-controls/MobileTerminalLiveInputStatus.tsx
@@ -1,21 +1,21 @@
 import { useContext, type RefObject } from 'react'
 import { Text, View, type HostInstance } from 'react-native'
-import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { themedStyleSheet } from '../../theme/themed-styles'
-import { TailClippedText } from '../../components/TailClippedText'
+import { colors, radii, spacing, typography } from '../../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { themedStyleSheet } from '../../../theme/themed-styles'
+import { TailClippedText } from '../../../components/TailClippedText'
 import {
   mobileDictationStatusTitle,
   type MobileDictationStatusFlags
-} from '../../dictation/MobileDictationStatusAnnouncement'
-import { MobileDictationLiveContext } from '../../dictation/mobile-dictation-live-context'
+} from '../../../dictation/MobileDictationStatusAnnouncement'
+import { MobileDictationLiveContext } from '../../../dictation/mobile-dictation-live-context'
 import {
   MobileDictationCancelButton,
   MobileDictationFailureNote,
   MobileDictationFinishingNote,
   MobileDictationRecordingMeter
-} from '../../dictation/MobileDictationLiveControls'
+} from '../../../dictation/MobileDictationLiveControls'
 
 type MobileTerminalLiveInputStatusProps = {
   readonly dictation: MobileDictationStatusFlags
diff --git a/mobile/src/terminal/session/agent-send-keyboard-dismissal.ts b/mobile/src/terminal/session/input-controls/agent-send-keyboard-dismissal.ts
similarity index 69%
rename from mobile/src/terminal/session/agent-send-keyboard-dismissal.ts
rename to mobile/src/terminal/session/input-controls/agent-send-keyboard-dismissal.ts
index 0ed8c90118d..65556d9ae78 100644
--- a/mobile/src/terminal/session/agent-send-keyboard-dismissal.ts
+++ b/mobile/src/terminal/session/input-controls/agent-send-keyboard-dismissal.ts
@@ -1,6 +1,6 @@
-import type { AgentStatusEntry } from '../../../../src/shared/agent-status/contracts/agent-status-types'
-import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
-import { isMobileTerminalTabRunningAgent } from './mobile-terminal-tab-agent'
+import type { AgentStatusEntry } from '../../../../../src/shared/agent-status/contracts/agent-status-types'
+import type { TuiAgent } from '../../../../../src/shared/agent-launch/catalog/tui-agent'
+import { isMobileTerminalTabRunningAgent } from '../../../session/tabs/mobile-terminal-tab-agent'
 
 export type AgentSendKeyboardDismissalTab = {
   readonly type: string
diff --git a/mobile/src/terminal/session/live-input-capture.ts b/mobile/src/terminal/session/input-controls/live-input-capture.ts
similarity index 100%
rename from mobile/src/terminal/session/live-input-capture.ts
rename to mobile/src/terminal/session/input-controls/live-input-capture.ts
diff --git a/mobile/src/terminal/session/mobile-session-command-input-styles.ts b/mobile/src/terminal/session/input-controls/mobile-session-command-input-styles.ts
similarity index 92%
rename from mobile/src/terminal/session/mobile-session-command-input-styles.ts
rename to mobile/src/terminal/session/input-controls/mobile-session-command-input-styles.ts
index ff76a674449..c00f9f8382e 100644
--- a/mobile/src/terminal/session/mobile-session-command-input-styles.ts
+++ b/mobile/src/terminal/session/input-controls/mobile-session-command-input-styles.ts
@@ -1,7 +1,7 @@
 import { StyleSheet } from 'react-native'
 
-import { colors, spacing, radii, typography } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
+import { colors, spacing, radii, typography } from '../../../theme/mobile-theme'
+import { themedStyleSheet } from '../../../theme/themed-styles'
 
 export const mobileSessionCommandInputStyles = themedStyleSheet(() => ({
   createWarningBanner: {
diff --git a/mobile/src/terminal/session/terminal-gesture-input-policy.ts b/mobile/src/terminal/session/input-controls/terminal-gesture-input-policy.ts
similarity index 79%
rename from mobile/src/terminal/session/terminal-gesture-input-policy.ts
rename to mobile/src/terminal/session/input-controls/terminal-gesture-input-policy.ts
index 41eb4b24ebd..6353c15b5ca 100644
--- a/mobile/src/terminal/session/terminal-gesture-input-policy.ts
+++ b/mobile/src/terminal/session/input-controls/terminal-gesture-input-policy.ts
@@ -1,5 +1,5 @@
-import type { TerminalModes } from '../terminal-webview-contract'
-import '../../i18n/mobile-i18n'
+import type { TerminalModes } from '../../webview/terminal-webview-contract'
+import '../../../i18n/mobile-i18n'
 
 export const TERMINAL_GESTURE_INPUT_BUCKET_CAPACITY = 64
 
diff --git a/mobile/src/terminal/session/use-agent-send-keyboard-dismissal.ts b/mobile/src/terminal/session/input-controls/use-agent-send-keyboard-dismissal.ts
similarity index 100%
rename from mobile/src/terminal/session/use-agent-send-keyboard-dismissal.ts
rename to mobile/src/terminal/session/input-controls/use-agent-send-keyboard-dismissal.ts
diff --git a/mobile/src/terminal/session/use-mobile-session-keyboard-lift.ts b/mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-lift.ts
similarity index 82%
rename from mobile/src/terminal/session/use-mobile-session-keyboard-lift.ts
rename to mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-lift.ts
index ee3b0121461..81fc59c571b 100644
--- a/mobile/src/terminal/session/use-mobile-session-keyboard-lift.ts
+++ b/mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-lift.ts
@@ -1,7 +1,7 @@
-import { useKeyboardOcclusion } from '../../platform/keyboard-occlusion'
-import { hostOs } from '../../platform/host-os'
-import { computeActiveTerminalKeyboardLift } from '../terminal-keyboard-avoidance-lift'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
+import { useKeyboardOcclusion } from '../../../platform/keyboard/keyboard-occlusion'
+import { hostOs } from '../../../platform/host-os'
+import { computeActiveTerminalKeyboardLift } from '../../keyboard/terminal-keyboard-avoidance-lift'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
 
 // Read where the layout moves, so a keyboard change re-renders those views and not the whole session.
 // Expo edge-to-edge keeps window size on IME open; lift input from keyboard height without resizing the desktop PTY.
diff --git a/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts b/mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-state.ts
similarity index 84%
rename from mobile/src/terminal/session/use-mobile-session-keyboard-state.ts
rename to mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-state.ts
index 785f282bb4f..203ab4d6bb3 100644
--- a/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts
+++ b/mobile/src/terminal/session/input-controls/use-mobile-session-keyboard-state.ts
@@ -1,10 +1,13 @@
 import { useEffect, useCallback } from 'react'
-import { currentSoftKeyboardHeight, subscribeSoftKeyboard } from '../../platform/keyboard-occlusion'
-import { useTerminalViewportRefit } from '../terminal-viewport-refit'
-import { removeCustomKey, type CustomKey } from '../terminal-custom-keys'
-import { useWorkspaceExecutionHost } from '../../navigation/workspace-execution-host'
-import { writeLastVisitedWorktree } from '../../worktree/last-visited-worktree-by-host'
-import type { MobileSessionLifecycleModel } from '../../session/use-mobile-session-lifecycle'
+import {
+  currentSoftKeyboardHeight,
+  subscribeSoftKeyboard
+} from '../../../platform/keyboard/keyboard-occlusion'
+import { useTerminalViewportRefit } from '../../viewport/terminal-viewport-refit'
+import { removeCustomKey, type CustomKey } from '../../key-input/terminal-custom-keys'
+import { useWorkspaceExecutionHost } from '../../../navigation/workspace-execution-host'
+import { writeLastVisitedWorktree } from '../../../worktree/last-visited-worktree-by-host'
+import type { MobileSessionLifecycleModel } from '../../../session/use-mobile-session-lifecycle'
 
 export type MobileSessionKeyboardScope = Pick<
   MobileSessionLifecycleModel,
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-input.ts b/mobile/src/terminal/session/input-controls/use-mobile-session-terminal-input.ts
similarity index 91%
rename from mobile/src/terminal/session/use-mobile-session-terminal-input.ts
rename to mobile/src/terminal/session/input-controls/use-mobile-session-terminal-input.ts
index 060032164e6..e11dbb4a128 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-input.ts
+++ b/mobile/src/terminal/session/input-controls/use-mobile-session-terminal-input.ts
@@ -1,9 +1,12 @@
 import { useCallback } from 'react'
-import { translate } from '../../i18n/mobile-i18n'
-import { terminalBufferClear } from '../mobile-terminal-operations'
-import { sendMobileTerminalQueryReply } from '../mobile-terminal-query-reply'
-import { buildTerminalSendParams, TERMINAL_INPUT_SEND_OPTIONS } from '../terminal-send-request'
-import { countTerminalGestureInputSequences } from '../terminal-gesture-input'
+import { translate } from '../../../i18n/mobile-i18n'
+import { terminalBufferClear } from '../../host-operations/mobile-terminal-operations'
+import { sendMobileTerminalQueryReply } from '../../host-operations/mobile-terminal-query-reply'
+import {
+  buildTerminalSendParams,
+  TERMINAL_INPUT_SEND_OPTIONS
+} from '../../input-delivery/terminal-send-request'
+import { countTerminalGestureInputSequences } from '../../pointer-input/terminal-gesture-input'
 import {
   isGestureMouseTrackingMode,
   TERMINAL_GESTURE_INPUT_BUCKET_CAPACITY,
@@ -11,9 +14,10 @@ import {
   TERMINAL_GESTURE_INPUT_MAX_QUEUE_AGE_MS,
   TERMINAL_GESTURE_INPUT_REFILL_PER_SECOND
 } from './terminal-gesture-input-policy'
-import type { Terminal, TerminalGestureInputQueue } from './mobile-terminal-model'
-import type { TerminalPointerInput } from '../terminal-webview-contract'
-import type { MobileSessionFileActionsModel } from '../../files/session-documents/use-mobile-session-file-actions'
+import type { TerminalGestureInputQueue } from '../mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../inventory/mobile-terminal-records'
+import type { TerminalPointerInput } from '../../webview/terminal-webview-contract'
+import type { MobileSessionFileActionsModel } from '../../../files/session-documents/use-mobile-session-file-actions'
 
 export function useMobileSessionTerminalInput(scope: MobileSessionFileActionsModel) {
   const {
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-send-actions.ts b/mobile/src/terminal/session/input-controls/use-mobile-session-terminal-send-actions.ts
similarity index 84%
rename from mobile/src/terminal/session/use-mobile-session-terminal-send-actions.ts
rename to mobile/src/terminal/session/input-controls/use-mobile-session-terminal-send-actions.ts
index edb2ba3e1ae..359b7335e01 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-send-actions.ts
+++ b/mobile/src/terminal/session/input-controls/use-mobile-session-terminal-send-actions.ts
@@ -1,25 +1,28 @@
 import { useCallback } from 'react'
 import { Keyboard } from 'react-native'
-import { translate } from '../../i18n/mobile-i18n'
-import { triggerError } from '../../platform/haptics'
-import { currentSoftKeyboardHeight } from '../../platform/keyboard-occlusion'
-import type { createTerminalLiveAccessoryInput } from '../terminal-live-accessory-input'
-import { sendTerminalLiveAccessoryRawBytes } from '../terminal-live-accessory-raw-send'
+import { translate } from '../../../i18n/mobile-i18n'
+import { triggerError } from '../../../platform/haptics/haptics'
+import { currentSoftKeyboardHeight } from '../../../platform/keyboard/keyboard-occlusion'
+import type { createTerminalLiveAccessoryInput } from '../../live-input/terminal-live-accessory-input'
+import { sendTerminalLiveAccessoryRawBytes } from '../../live-input/terminal-live-accessory-raw-send'
 import {
   clearTerminalLiveInputFocusTimer,
   isTerminalLiveInputWithinByteLimit
-} from '../terminal-live-input'
-import { dismissTerminalKeyboard } from '../terminal-keyboard-dismiss'
-import { terminalInputSend } from '../mobile-terminal-operations'
-import { buildTerminalSendParams, TERMINAL_INPUT_SEND_OPTIONS } from '../terminal-send-request'
-import { normalizeTerminalTextInput } from '../terminal-text-input-normalization'
-import { encodeTerminalKeyForModes } from '../terminal-key-mode-encoding'
-import { useTerminalTextFieldSubmitBinding } from '../use-terminal-text-field-submit-binding'
+} from '../../live-input/terminal-live-input'
+import { dismissTerminalKeyboard } from '../../keyboard/terminal-keyboard-dismiss'
+import { terminalInputSend } from '../../host-operations/mobile-terminal-operations'
+import {
+  buildTerminalSendParams,
+  TERMINAL_INPUT_SEND_OPTIONS
+} from '../../input-delivery/terminal-send-request'
+import { normalizeTerminalTextInput } from '../../live-input/terminal-text-input-normalization'
+import { encodeTerminalKeyForModes } from '../../key-input/terminal-key-mode-encoding'
+import { useTerminalTextFieldSubmitBinding } from '../../live-input/use-terminal-text-field-submit-binding'
 import { useAgentSendKeyboardDismissal } from './use-agent-send-keyboard-dismissal'
-import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
-import { useMobileSessionTabActionSheetOpener } from '../../session/tabs/use-mobile-session-tab-action-targets'
-import type { MobileSessionTerminalWebviewModel } from './use-mobile-session-terminal-webview'
-import type { TerminalLiveInputSender } from '../terminal-live-input-sender'
+import type { MobileSessionTab } from '../../../session/tabs/mobile-session-tabs'
+import { useMobileSessionTabActionSheetOpener } from '../../../session/tabs/use-mobile-session-tab-action-targets'
+import type { MobileSessionTerminalWebviewModel } from '../use-mobile-session-terminal-webview'
+import type { TerminalLiveInputSender } from '../../live-input/terminal-live-input-sender'
 
 export function useMobileSessionTerminalSendActions(scope: MobileSessionTerminalWebviewModel) {
   const {
diff --git a/mobile/src/terminal/session/use-mobile-terminal-paste.ts b/mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts
similarity index 89%
rename from mobile/src/terminal/session/use-mobile-terminal-paste.ts
rename to mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts
index 8d61401c0b3..197e741b553 100644
--- a/mobile/src/terminal/session/use-mobile-terminal-paste.ts
+++ b/mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts
@@ -1,20 +1,20 @@
-import { separateImagePasteFromFollowingText } from '../../../../src/shared/image-paste-following-text'
+import { separateImagePasteFromFollowingText } from '../../../../../src/shared/image-paste-following-text'
 import {
   normalizeTerminalPasteLineEndings,
   wrapTerminalBracketedPasteText
-} from '../../../../src/shared/terminal/input/terminal-bracketed-paste-text'
+} from '../../../../../src/shared/terminal/input/terminal-bracketed-paste-text'
 import { useCallback, type RefObject } from 'react'
-import { translate } from '../../i18n/mobile-i18n'
-import { terminalInputSend } from '../mobile-terminal-operations'
-import { useClipboardReader } from '../../platform/clipboard'
-import type { TerminalModes } from '../terminal-webview-contract'
-import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../../transport/connection/connection-state'
+import { translate } from '../../../i18n/mobile-i18n'
+import { terminalInputSend } from '../../host-operations/mobile-terminal-operations'
+import { useClipboardReader } from '../../../platform/clipboard/clipboard'
+import type { TerminalModes } from '../../webview/terminal-webview-contract'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../../transport/connection/connection-state'
 import {
   buildMobileTerminalImagePastePayload,
   saveMobileClipboardImageAsTempFile
-} from '../../files/attachments/mobile-clipboard-image'
-import { fitMobileAgentImageBase64 } from '../../files/attachments/mobile-agent-image-fit'
+} from '../../../files/attachments/mobile-clipboard-image'
+import { fitMobileAgentImageBase64 } from '../../../files/attachments/mobile-agent-image-fit'
 
 // Match xterm's paste(): newlines become CR, and DECSET 2004 frames the text with ESC made inert.
 function buildMobileTerminalClipboardTextPayload(
diff --git a/mobile/src/terminal/session/mobile-terminal-inventory-request.test.ts b/mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.test.ts
similarity index 100%
rename from mobile/src/terminal/session/mobile-terminal-inventory-request.test.ts
rename to mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.test.ts
diff --git a/mobile/src/terminal/session/mobile-terminal-inventory-request.ts b/mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.ts
similarity index 100%
rename from mobile/src/terminal/session/mobile-terminal-inventory-request.ts
rename to mobile/src/terminal/session/inventory/mobile-terminal-inventory-request.ts
diff --git a/mobile/src/terminal/session/mobile-terminal-prune-decision.ts b/mobile/src/terminal/session/inventory/mobile-terminal-prune-decision.ts
similarity index 100%
rename from mobile/src/terminal/session/mobile-terminal-prune-decision.ts
rename to mobile/src/terminal/session/inventory/mobile-terminal-prune-decision.ts
diff --git a/mobile/src/terminal/session/mobile-terminal-records.ts b/mobile/src/terminal/session/inventory/mobile-terminal-records.ts
similarity index 95%
rename from mobile/src/terminal/session/mobile-terminal-records.ts
rename to mobile/src/terminal/session/inventory/mobile-terminal-records.ts
index cdc1f4cf4b4..35609bb4522 100644
--- a/mobile/src/terminal/session/mobile-terminal-records.ts
+++ b/mobile/src/terminal/session/inventory/mobile-terminal-records.ts
@@ -1,11 +1,11 @@
 import type {
   RuntimeMobileSessionTerminalTab,
   RuntimeMobileTerminalTheme
-} from '../../../../src/shared/runtime-mobile-session-tab-contracts'
-import type { AgentStatusEntry } from '../../../../src/shared/agent-status/contracts/agent-status-types'
-import type { BrowserLoadError } from '../../../../src/shared/browser-workspace-types'
-import { browserLoadErrorsEqual } from '../../../../src/shared/browser-load-failure'
-import { translate } from '../../i18n/mobile-i18n'
+} from '../../../../../src/shared/runtime-mobile-session-tab-contracts'
+import type { AgentStatusEntry } from '../../../../../src/shared/agent-status/contracts/agent-status-types'
+import type { BrowserLoadError } from '../../../../../src/shared/browser-workspace-types'
+import { browserLoadErrorsEqual } from '../../../../../src/shared/browser-load-failure'
+import { translate } from '../../../i18n/mobile-i18n'
 
 export type TerminalRecord = {
   handle: string
diff --git a/mobile/src/terminal/session/pending-terminal-handle-recovery.ts b/mobile/src/terminal/session/inventory/pending-terminal-handle-recovery.ts
similarity index 96%
rename from mobile/src/terminal/session/pending-terminal-handle-recovery.ts
rename to mobile/src/terminal/session/inventory/pending-terminal-handle-recovery.ts
index 1006bc460d2..dd49b86ce9f 100644
--- a/mobile/src/terminal/session/pending-terminal-handle-recovery.ts
+++ b/mobile/src/terminal/session/inventory/pending-terminal-handle-recovery.ts
@@ -1,4 +1,4 @@
-import type { MobileSessionTab } from '../../session/tabs/mobile-session-tabs'
+import type { MobileSessionTab } from '../../../session/tabs/mobile-session-tabs'
 
 export const PENDING_TERMINAL_HANDLE_RECOVERY_ATTEMPTS = 5
 
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-list.ts b/mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts
similarity index 95%
rename from mobile/src/terminal/session/use-mobile-session-terminal-list.ts
rename to mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts
index 49001fd3e1e..cff149e5dba 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-list.ts
+++ b/mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts
@@ -1,12 +1,12 @@
 import { useRef, useCallback, useEffect, useMemo } from 'react'
-import { sessionTerminalListRead } from './mobile-session-terminal-operations'
-import type { Terminal } from './mobile-terminal-model'
+import { sessionTerminalListRead } from '../mobile-session-terminal-operations'
+import type { TerminalRecord as Terminal } from './mobile-terminal-records'
 import { mergeTerminalListWithKnownRecords, terminalRecordsEqual } from './mobile-terminal-records'
 import {
   createTerminalPrunePredicate,
   pruneTerminalHandleMap
 } from './mobile-terminal-prune-decision'
-import type { MobileSessionTerminalStreamDisplayModel } from './use-mobile-session-terminal-stream-display'
+import type { MobileSessionTerminalStreamDisplayModel } from '../streaming/use-mobile-session-terminal-stream-display'
 import { MobileTerminalInventoryRequest } from './mobile-terminal-inventory-request'
 import type { MobileTerminalInventoryRefreshOptions } from './use-mobile-terminal-inventory-recovery'
 
diff --git a/mobile/src/terminal/session/use-mobile-terminal-inventory-recovery.ts b/mobile/src/terminal/session/inventory/use-mobile-terminal-inventory-recovery.ts
similarity index 97%
rename from mobile/src/terminal/session/use-mobile-terminal-inventory-recovery.ts
rename to mobile/src/terminal/session/inventory/use-mobile-terminal-inventory-recovery.ts
index 30398eb194d..89bdfd091bf 100644
--- a/mobile/src/terminal/session/use-mobile-terminal-inventory-recovery.ts
+++ b/mobile/src/terminal/session/inventory/use-mobile-terminal-inventory-recovery.ts
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { AppState } from 'react-native'
-import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../../transport/connection/connection-state'
 
 export type MobileTerminalInventoryRefreshOptions = {
   allowEmptyLoaded?: boolean
diff --git a/mobile/src/terminal/session/mobile-session-terminal-operations.ts b/mobile/src/terminal/session/mobile-session-terminal-operations.ts
index 505d6058da8..9a7bcf817b9 100644
--- a/mobile/src/terminal/session/mobile-session-terminal-operations.ts
+++ b/mobile/src/terminal/session/mobile-session-terminal-operations.ts
@@ -1,6 +1,9 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../../transport/rpc/rpc-operation-result-reader'
-import { terminalComposerDraftSchema, terminalSendAcceptedSchema } from '../terminal-reply-schema'
+import {
+  terminalComposerDraftSchema,
+  terminalSendAcceptedSchema
+} from '../host-operations/terminal-reply-schema'
 import { sessionTerminalInventorySchema } from './mobile-session-terminal-reply-schema'
 import { sessionWriteUnreadReplySchema } from '../../transport/rpc/rpc-uninterpreted-reply-schemas'
 
diff --git a/mobile/src/terminal/session/mobile-terminal-model.ts b/mobile/src/terminal/session/mobile-terminal-model.ts
index a2ace3d2de5..4c14560ed50 100644
--- a/mobile/src/terminal/session/mobile-terminal-model.ts
+++ b/mobile/src/terminal/session/mobile-terminal-model.ts
@@ -1,7 +1,3 @@
-import type { TerminalRecord } from './mobile-terminal-records'
-
-export type Terminal = TerminalRecord
-
 export type MobileDisplayMode = 'auto' | 'phone' | 'desktop'
 
 export type TerminalGestureInputBucket = {
diff --git a/mobile/src/terminal/session/MobileSessionTerminalLayoutSheet.tsx b/mobile/src/terminal/session/pane-layout/MobileSessionTerminalLayoutSheet.tsx
similarity index 89%
rename from mobile/src/terminal/session/MobileSessionTerminalLayoutSheet.tsx
rename to mobile/src/terminal/session/pane-layout/MobileSessionTerminalLayoutSheet.tsx
index 14d7c23c827..71fafc26474 100644
--- a/mobile/src/terminal/session/MobileSessionTerminalLayoutSheet.tsx
+++ b/mobile/src/terminal/session/pane-layout/MobileSessionTerminalLayoutSheet.tsx
@@ -1,8 +1,8 @@
 import { Check, Columns2, LayoutGrid, Rows2, SquareTerminal } from 'lucide-react-native'
-import { ActionSheetModal } from '../../components/ActionSheetModal'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import type { TerminalSplitLayout } from '../../storage/preferences'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
+import { ActionSheetModal } from '../../../components/ActionSheetModal'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import type { TerminalSplitLayout } from '../../../storage/preferences'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
 
 export function MobileSessionTerminalLayoutSheet({
   controller,
diff --git a/mobile/src/terminal/session/TerminalPaneView.tsx b/mobile/src/terminal/session/pane-layout/TerminalPaneView.tsx
similarity index 91%
rename from mobile/src/terminal/session/TerminalPaneView.tsx
rename to mobile/src/terminal/session/pane-layout/TerminalPaneView.tsx
index 44d96c545e8..f8da3a45b80 100644
--- a/mobile/src/terminal/session/TerminalPaneView.tsx
+++ b/mobile/src/terminal/session/pane-layout/TerminalPaneView.tsx
@@ -1,21 +1,21 @@
 import { useCallback, useEffect, useState } from 'react'
 import { AppState, StyleSheet, View, Text, Pressable } from 'react-native'
 import { useFocusEffect } from 'expo-router'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import type { ParsedFileLinkLocation } from '../../../../src/shared/file-links/file-link-location'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import type { ParsedFileLinkLocation } from '../../../../../src/shared/file-links/file-link-location'
 import { terminalPaneKeyboardLayout } from './mobile-terminal-pane-layout'
-import { colors, spacing, pressedStyle } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import type { TerminalFrame } from '../terminal-webview-messages'
-import { TerminalWebView } from '../TerminalWebView'
+import { colors, spacing, pressedStyle } from '../../../theme/mobile-theme'
+import { themedStyleSheet } from '../../../theme/themed-styles'
+import { useMobileColorScheme } from '../../../theme/use-mobile-color-scheme'
+import type { TerminalFrame } from '../../webview/terminal-webview-messages'
+import { TerminalWebView } from '../../webview/TerminalWebView'
 import type {
   TerminalKeyboardAvoidanceMetrics,
   TerminalModes,
   TerminalPointerInput,
   TerminalWebViewHandle
-} from '../terminal-webview-contract'
-import type { RuntimeMobileTerminalTheme } from '../../../../src/shared/runtime-mobile-session-tab-contracts'
+} from '../../webview/terminal-webview-contract'
+import type { RuntimeMobileTerminalTheme } from '../../../../../src/shared/runtime-mobile-session-tab-contracts'
 
 type TerminalPaneViewProps = {
   handle: string
diff --git a/mobile/src/terminal/session/mobile-terminal-pane-layout.ts b/mobile/src/terminal/session/pane-layout/mobile-terminal-pane-layout.ts
similarity index 93%
rename from mobile/src/terminal/session/mobile-terminal-pane-layout.ts
rename to mobile/src/terminal/session/pane-layout/mobile-terminal-pane-layout.ts
index 6bc36c723ea..957bdf80dda 100644
--- a/mobile/src/terminal/session/mobile-terminal-pane-layout.ts
+++ b/mobile/src/terminal/session/pane-layout/mobile-terminal-pane-layout.ts
@@ -1,5 +1,5 @@
-import type { TerminalSplitLayout } from '../../storage/preferences'
-import type { TerminalFrame } from '../terminal-webview-messages'
+import type { TerminalSplitLayout } from '../../../storage/preferences'
+import type { TerminalFrame } from '../../webview/terminal-webview-messages'
 
 export type TerminalPaneViewport = {
   terminalFrameRef: { current: TerminalFrame | null }
diff --git a/mobile/src/terminal/session/mounted-terminal-lru.ts b/mobile/src/terminal/session/pane-layout/mounted-terminal-lru.ts
similarity index 100%
rename from mobile/src/terminal/session/mounted-terminal-lru.ts
rename to mobile/src/terminal/session/pane-layout/mounted-terminal-lru.ts
diff --git a/mobile/src/terminal/session/terminal-phone-display-mode.ts b/mobile/src/terminal/session/pane-layout/terminal-phone-display-mode.ts
similarity index 89%
rename from mobile/src/terminal/session/terminal-phone-display-mode.ts
rename to mobile/src/terminal/session/pane-layout/terminal-phone-display-mode.ts
index 10f0fee2518..0ddb34bcb63 100644
--- a/mobile/src/terminal/session/terminal-phone-display-mode.ts
+++ b/mobile/src/terminal/session/pane-layout/terminal-phone-display-mode.ts
@@ -1,4 +1,4 @@
-import '../../i18n/mobile-i18n'
+import '../../../i18n/mobile-i18n'
 
 export function isTerminalPhoneDisplayMode(
   handle: string | null,
diff --git a/mobile/src/terminal/session/use-terminal-split-layout.ts b/mobile/src/terminal/session/pane-layout/use-terminal-split-layout.ts
similarity index 93%
rename from mobile/src/terminal/session/use-terminal-split-layout.ts
rename to mobile/src/terminal/session/pane-layout/use-terminal-split-layout.ts
index c616f8b2baf..9cec1b7bbea 100644
--- a/mobile/src/terminal/session/use-terminal-split-layout.ts
+++ b/mobile/src/terminal/session/pane-layout/use-terminal-split-layout.ts
@@ -4,8 +4,8 @@ import {
   loadTerminalSplitLayout,
   saveTerminalSplitLayout,
   type TerminalSplitLayout
-} from '../../storage/preferences'
-import { translate } from '../../i18n/mobile-i18n'
+} from '../../../storage/preferences'
+import { translate } from '../../../i18n/mobile-i18n'
 
 export function useTerminalSplitLayout() {
   const [terminalSplitLayout, setLayout] = useState<TerminalSplitLayout>('auto')
diff --git a/mobile/src/terminal/session/mobile-terminal-stream-subscribe.ts b/mobile/src/terminal/session/streaming/mobile-terminal-stream-subscribe.ts
similarity index 90%
rename from mobile/src/terminal/session/mobile-terminal-stream-subscribe.ts
rename to mobile/src/terminal/session/streaming/mobile-terminal-stream-subscribe.ts
index 78ece49beb6..611d33ee303 100644
--- a/mobile/src/terminal/session/mobile-terminal-stream-subscribe.ts
+++ b/mobile/src/terminal/session/streaming/mobile-terminal-stream-subscribe.ts
@@ -1,5 +1,5 @@
-import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
-import type { TerminalWebViewHandle } from '../terminal-webview-contract'
+import type { RpcClient } from '../../../transport/rpc/rpc-client-contract'
+import type { TerminalWebViewHandle } from '../../webview/terminal-webview-contract'
 
 /** A retired stream stays retired even when a cache clear reuses its numeric sequence. */
 export function createMobileTerminalStreamLifetime(args: {
diff --git a/mobile/src/terminal/session/mobile-terminal-viewport-resubscribe.ts b/mobile/src/terminal/session/streaming/mobile-terminal-viewport-resubscribe.ts
similarity index 97%
rename from mobile/src/terminal/session/mobile-terminal-viewport-resubscribe.ts
rename to mobile/src/terminal/session/streaming/mobile-terminal-viewport-resubscribe.ts
index ca3b496fd06..0ed0ac25e4e 100644
--- a/mobile/src/terminal/session/mobile-terminal-viewport-resubscribe.ts
+++ b/mobile/src/terminal/session/streaming/mobile-terminal-viewport-resubscribe.ts
@@ -1,8 +1,8 @@
 // Bound nonconverging viewport refits to avoid stream churn, broken gestures and battery drain.
 
-import type { TerminalFrame } from '../terminal-webview-messages'
-import { translate } from '../../i18n/mobile-i18n'
-import type { MobileTerminalDiagnostics } from './mobile-terminal-diagnostics'
+import type { TerminalFrame } from '../../webview/terminal-webview-messages'
+import { translate } from '../../../i18n/mobile-i18n'
+import type { MobileTerminalDiagnostics } from '../mobile-terminal-diagnostics'
 
 export const MAX_TERMINAL_VIEWPORT_RESUBSCRIBE_ATTEMPTS = 3
 
diff --git a/mobile/src/terminal/session/terminal-snapshot-byte-budget.ts b/mobile/src/terminal/session/streaming/terminal-snapshot-byte-budget.ts
similarity index 100%
rename from mobile/src/terminal/session/terminal-snapshot-byte-budget.ts
rename to mobile/src/terminal/session/streaming/terminal-snapshot-byte-budget.ts
diff --git a/mobile/src/terminal/session/terminal-snapshot-byte-budget.web.ts b/mobile/src/terminal/session/streaming/terminal-snapshot-byte-budget.web.ts
similarity index 56%
rename from mobile/src/terminal/session/terminal-snapshot-byte-budget.web.ts
rename to mobile/src/terminal/session/streaming/terminal-snapshot-byte-budget.web.ts
index 4e23309bab1..bf2b41adfd9 100644
--- a/mobile/src/terminal/session/terminal-snapshot-byte-budget.web.ts
+++ b/mobile/src/terminal/session/streaming/terminal-snapshot-byte-budget.web.ts
@@ -1,5 +1,5 @@
-import { BRIDGE_MAX_MESSAGE_BYTES } from '../../mobile-web-shell/bridge/bridge-caps'
-import { bridgeEventEnvelopeBytes } from '../../mobile-web-shell/bridge/bridge-event-envelope-bytes'
+import { MOBILE_BRIDGE_MAX_FRAME_BYTES as BRIDGE_MAX_MESSAGE_BYTES } from '../../../../../src/shared/mobile-bridge-frame-bytes'
+import { bridgeEventEnvelopeBytes } from '../../../mobile-web-shell/bridge/bridge-event-envelope-bytes'
 
 // Budget serialized payload bytes after bridge-envelope overhead; ANSI escapes expand in JSON and raw snapshot sizes can overflow the shell’s hard frame cap.
 export function mobileTerminalSnapshotByteBudget(): number | undefined {
diff --git a/mobile/src/terminal/session/terminal-stream-cwd.ts b/mobile/src/terminal/session/streaming/terminal-stream-cwd.ts
similarity index 90%
rename from mobile/src/terminal/session/terminal-stream-cwd.ts
rename to mobile/src/terminal/session/streaming/terminal-stream-cwd.ts
index 24ebd5de174..c479e5bb0cb 100644
--- a/mobile/src/terminal/session/terminal-stream-cwd.ts
+++ b/mobile/src/terminal/session/streaming/terminal-stream-cwd.ts
@@ -1,4 +1,4 @@
-import '../../i18n/mobile-i18n'
+import '../../../i18n/mobile-i18n'
 
 export function updateTerminalCwdFromStreamEvent(
   handle: string,
diff --git a/mobile/src/terminal/session/terminal-stream-layout.test.ts b/mobile/src/terminal/session/streaming/terminal-stream-layout.test.ts
similarity index 100%
rename from mobile/src/terminal/session/terminal-stream-layout.test.ts
rename to mobile/src/terminal/session/streaming/terminal-stream-layout.test.ts
diff --git a/mobile/src/terminal/session/terminal-stream-layout.ts b/mobile/src/terminal/session/streaming/terminal-stream-layout.ts
similarity index 96%
rename from mobile/src/terminal/session/terminal-stream-layout.ts
rename to mobile/src/terminal/session/streaming/terminal-stream-layout.ts
index 6a8c2be4c69..ed25d6c2d74 100644
--- a/mobile/src/terminal/session/terminal-stream-layout.ts
+++ b/mobile/src/terminal/session/streaming/terminal-stream-layout.ts
@@ -1,5 +1,5 @@
 import type { Dispatch, SetStateAction } from 'react'
-import type { MobileDisplayMode } from './mobile-terminal-model'
+import type { MobileDisplayMode } from '../mobile-terminal-model'
 
 /** Records a stream event's layout seq; false for a superseded `resized`. Each `subscribed` resets the mark;
  * scrollback leaves it, because binary scrollback `seq` counts output bytes, not layout changes. */
diff --git a/mobile/src/terminal/session/terminal-stream-resume.ts b/mobile/src/terminal/session/streaming/terminal-stream-resume.ts
similarity index 100%
rename from mobile/src/terminal/session/terminal-stream-resume.ts
rename to mobile/src/terminal/session/streaming/terminal-stream-resume.ts
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts
similarity index 93%
rename from mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts
rename to mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts
index af6817f1c60..e02724fe859 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts
+++ b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts
@@ -1,6 +1,6 @@
 import { useRef, useCallback } from 'react'
-import { terminalDisplayModeSet } from './mobile-session-terminal-operations'
-import { useMobileNativeChatTerminalStream } from '../../session/native-chat/use-mobile-native-chat-terminal-stream'
+import { terminalDisplayModeSet } from '../mobile-session-terminal-operations'
+import { useMobileNativeChatTerminalStream } from '../../../session/native-chat/use-mobile-native-chat-terminal-stream'
 import type { MobileSessionTerminalSubscriptionModel } from './use-mobile-session-terminal-subscription'
 
 export function useMobileSessionTerminalStreamDisplay(
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-subscription-foundation.ts b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription-foundation.ts
similarity index 98%
rename from mobile/src/terminal/session/use-mobile-session-terminal-subscription-foundation.ts
rename to mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription-foundation.ts
index 4ba5cd3f9e0..b0496749dc1 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-subscription-foundation.ts
+++ b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription-foundation.ts
@@ -1,5 +1,5 @@
 import { useRef, useCallback, useState } from 'react'
-import type { MobileSessionNativeChatDictationModel } from '../../session/use-mobile-session-native-chat-dictation'
+import type { MobileSessionNativeChatDictationModel } from '../../../session/use-mobile-session-native-chat-dictation'
 import { TerminalResumeState } from './terminal-stream-resume'
 
 export function useMobileSessionTerminalSubscriptionFoundation(
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-subscription.ts b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription.ts
similarity index 96%
rename from mobile/src/terminal/session/use-mobile-session-terminal-subscription.ts
rename to mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription.ts
index e164f9adb0b..adf5720a1a4 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-subscription.ts
+++ b/mobile/src/terminal/session/streaming/use-mobile-session-terminal-subscription.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import { isTerminalOscLinkRanges } from '../../../../src/shared/terminal/links/terminal-osc-link-ranges'
-import * as nativeChatTerminalStream from '../../session/native-chat/mobile-native-chat-terminal-stream'
+import { isTerminalOscLinkRanges } from '../../../../../src/shared/terminal/links/terminal-osc-link-ranges'
+import * as nativeChatTerminalStream from '../../../session/native-chat/mobile-native-chat-terminal-stream'
 import {
   createMobileTerminalStreamLifetime,
   subscribeMobileTerminalSafely
@@ -11,7 +11,7 @@ import {
   runTerminalViewportFitPass
 } from './mobile-terminal-viewport-resubscribe'
 import { updateTerminalCwdFromStreamEvent } from './terminal-stream-cwd'
-import { createTerminalOutputAck, writeTerminalStreamOutput } from '../terminal-output-ack'
+import * as terminalOutput from '../../output-flow/terminal-output-ack'
 import { acceptTerminalLayoutSeq, terminalDisplayModeAdopter } from './terminal-stream-layout'
 import { createTerminalStreamResumeCursor } from './terminal-stream-resume'
 import type { MobileSessionTerminalSubscriptionFoundationModel } from './use-mobile-session-terminal-subscription-foundation'
@@ -128,7 +128,7 @@ export function useMobileSessionTerminalSubscription(
       })
 
       // Lease-only streams carry no output, so only a rendered terminal asks for credit.
-      const outputAck = createTerminalOutputAck({
+      const outputAck = terminalOutput.createTerminalOutputAck({
         client,
         capabilities: nativeChatTerminalStream.mobileNativeChatTerminalCapabilities(covered),
         terminal: covered ? undefined : getTerminalRef(handle),
@@ -250,7 +250,7 @@ export function useMobileSessionTerminalSubscription(
           } else if (data.type === 'data') {
             updateTerminalCwdFromStreamEvent(handle, data, terminalCwdRef.current)
             resume.output(data, getTerminalRef(handle) !== undefined)
-            writeTerminalStreamOutput({
+            terminalOutput.writeTerminalStreamOutput({
               handle,
               chunk: data.chunk as string,
               terminal: getTerminalRef(handle),
diff --git a/mobile/src/terminal/session/MobileTerminalRenameModal.tsx b/mobile/src/terminal/session/tab-actions/MobileTerminalRenameModal.tsx
similarity index 70%
rename from mobile/src/terminal/session/MobileTerminalRenameModal.tsx
rename to mobile/src/terminal/session/tab-actions/MobileTerminalRenameModal.tsx
index 50408efcc77..5205d8873e3 100644
--- a/mobile/src/terminal/session/MobileTerminalRenameModal.tsx
+++ b/mobile/src/terminal/session/tab-actions/MobileTerminalRenameModal.tsx
@@ -1,10 +1,10 @@
-import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
-import { TextInputSheetContent } from '../../components/TextInputModal'
-import { useDraftRenameSheet } from '../../components/use-draft-rename-sheet'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useHostDisplay } from '../../host-descriptors/use-host-display'
-import { useHostProfile } from '../../host-catalog/use-host-profile'
-import type { MobileSessionController } from '../../session/use-mobile-session-controller'
+import { BottomDrawer } from '../../../components/bottom-drawer/BottomDrawer'
+import { TextInputSheetContent } from '../../../components/TextInputModal'
+import { useDraftRenameSheet } from '../../../components/use-draft-rename-sheet'
+import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
+import { useHostDisplay } from '../../../host-descriptors/use-host-display'
+import { useHostProfile } from '../../../host-catalog/use-host-profile'
+import type { MobileSessionController } from '../../../session/use-mobile-session-controller'
 
 export function MobileTerminalRenameModal({
   controller
diff --git a/mobile/src/terminal/session/mobile-terminal-action-sheet-actions.ts b/mobile/src/terminal/session/tab-actions/mobile-terminal-action-sheet-actions.ts
similarity index 88%
rename from mobile/src/terminal/session/mobile-terminal-action-sheet-actions.ts
rename to mobile/src/terminal/session/tab-actions/mobile-terminal-action-sheet-actions.ts
index 085a2d96d65..6ecc6738b1c 100644
--- a/mobile/src/terminal/session/mobile-terminal-action-sheet-actions.ts
+++ b/mobile/src/terminal/session/tab-actions/mobile-terminal-action-sheet-actions.ts
@@ -1,8 +1,8 @@
 import { Eraser, Monitor, Smartphone } from 'lucide-react-native'
-import type { ActionSheetAction } from '../../components/ActionSheetModal'
-import { translate } from '../../i18n/mobile-i18n'
-import type { MobileNativeChatTab } from '../../session/native-chat/mobile-native-chat-eligibility'
-import { getMobileNativeChatToggleActions } from '../../session/native-chat/mobile-native-chat-toggle-action'
+import type { ActionSheetAction } from '../../../components/ActionSheetModal'
+import { translate } from '../../../i18n/mobile-i18n'
+import type { MobileNativeChatTab } from '../../../session/native-chat/mobile-native-chat-eligibility'
+import { getMobileNativeChatToggleActions } from '../../../session/native-chat/mobile-native-chat-toggle-action'
 
 type TerminalTab = MobileNativeChatTab & { id: string; terminal: string | null }
 
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-runtime.ts b/mobile/src/terminal/session/use-mobile-session-terminal-runtime.ts
index 35405bc89a3..994fea2efa3 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-runtime.ts
+++ b/mobile/src/terminal/session/use-mobile-session-terminal-runtime.ts
@@ -2,26 +2,26 @@ import {
   terminalPaneViewport,
   resolveTerminalPaneHandles,
   type TerminalPaneViewport
-} from './mobile-terminal-pane-layout'
+} from './pane-layout/mobile-terminal-pane-layout'
 import type { PendingSessionSelection } from '../../session/tabs/pending-session-selection'
 import { useState, useRef, useCallback } from 'react'
-import type { TerminalFrame } from '../terminal-webview-messages'
+import type { TerminalFrame } from '../webview/terminal-webview-messages'
 import type { Keyboard } from 'react-native'
-import type { MobileTextInputHandle } from '../../platform/text-input-handle'
+import type { MobileTextInputHandle } from '../../platform/text-input/text-input-handle'
 import { useFocusEffect } from 'expo-router'
 import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
 import type { ConnectionState } from '../../transport/connection/connection-state'
-import type { TerminalModes, TerminalWebViewHandle } from '../terminal-webview-contract'
-import { useTerminalLiveInputFocus } from '../use-terminal-live-input-focus'
-import { reopensFocusedInputWhenKeyboardHidden } from '../terminal-live-input-keyboard-reopen'
-import type { TerminalLiveInputSender } from '../terminal-live-input-sender'
-import type { TerminalLiveInputFailure } from '../terminal-live-pending-flush-state'
-import { useTerminalLiveInputCommit } from '../use-terminal-live-input-commit'
-import { resolveMobileTerminalInputGate } from '../terminal-input-connection-gate'
-import { createInitialSessionAutoCreateState } from './use-initial-session-terminal-autocreate'
-import { TerminalViewportResubscribeBudget } from './mobile-terminal-viewport-resubscribe'
+import type { TerminalModes, TerminalWebViewHandle } from '../webview/terminal-webview-contract'
+import { useTerminalLiveInputFocus } from '../live-input/use-terminal-live-input-focus'
+import { reopensFocusedInputWhenKeyboardHidden } from '../keyboard/terminal-live-input-keyboard-reopen'
+import type { TerminalLiveInputSender } from '../live-input/terminal-live-input-sender'
+import type { TerminalLiveInputFailure } from '../live-input/terminal-live-pending-flush-state'
+import { useTerminalLiveInputCommit } from '../live-input/use-terminal-live-input-commit'
+import { resolveMobileTerminalInputGate } from '../input-delivery/terminal-input-connection-gate'
+import { createInitialSessionAutoCreateState } from './creation/use-initial-session-terminal-autocreate'
+import { TerminalViewportResubscribeBudget } from './streaming/mobile-terminal-viewport-resubscribe'
 import { MobileTerminalDiagnostics } from './mobile-terminal-diagnostics'
-import { useMobileTerminalInventoryRecoveryBridge } from './use-mobile-terminal-inventory-recovery'
+import { useMobileTerminalInventoryRecoveryBridge } from './inventory/use-mobile-terminal-inventory-recovery'
 import type { MobileSessionTab, MobileSessionTabType } from '../../session/tabs/mobile-session-tabs'
 import type { TerminalGestureInputBucket, TerminalGestureInputQueue } from './mobile-terminal-model'
 import type { MobileSessionScreenStateModel } from '../../session/use-mobile-session-screen-state'
diff --git a/mobile/src/terminal/session/use-mobile-session-terminal-webview.ts b/mobile/src/terminal/session/use-mobile-session-terminal-webview.ts
index 6e708c90789..a4994ad12d9 100644
--- a/mobile/src/terminal/session/use-mobile-session-terminal-webview.ts
+++ b/mobile/src/terminal/session/use-mobile-session-terminal-webview.ts
@@ -1,13 +1,13 @@
-import type { terminalInputSend } from '../mobile-terminal-operations'
-import { MobileTerminalInputSender } from '../mobile-terminal-input-sender'
-import '../mobile-terminal-input-owner'
-import type { TerminalInputEnqueueOptions } from '../mobile-terminal-input-owner'
+import type { terminalInputSend } from '../host-operations/mobile-terminal-operations'
+import { MobileTerminalInputSender } from '../input-delivery/mobile-terminal-input-sender'
+import '../input-delivery/mobile-terminal-input-owner'
+import type { TerminalInputEnqueueOptions } from '../input-delivery/mobile-terminal-input-owner'
 import { TERMINAL_ORDERED_INPUT_CAPABILITY } from '../../../../src/shared/terminal/input/terminal-ordered-input'
 import { useRouteCapability } from '../../worktree/use-workspace-client'
 import { pendingSelectionWantsHandle } from '../../session/tabs/pending-session-selection'
 import { useEffect, useCallback, useRef } from 'react'
-import type { TerminalWebViewHandle } from '../terminal-webview-contract'
-import type { TerminalFrame } from '../terminal-webview-messages'
+import type { TerminalWebViewHandle } from '../webview/terminal-webview-contract'
+import type { TerminalFrame } from '../webview/terminal-webview-messages'
 import type { MobileSessionTabSwitchingModel } from '../../session/tabs/use-mobile-session-tab-switching'
 
 export function useMobileSessionTerminalWebview(scope: MobileSessionTabSwitchingModel) {
diff --git a/mobile/src/terminal/terminal-auto-restore-fit-state.test.ts b/mobile/src/terminal/terminal-auto-restore-fit-state.test.ts
deleted file mode 100644
index ebd5588d29a..00000000000
--- a/mobile/src/terminal/terminal-auto-restore-fit-state.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  readTerminalAutoRestoreFitMs,
-  saveTerminalAutoRestoreFitMs
-} from './terminal-auto-restore-fit-state'
-
-describe('terminal auto restore fit state', () => {
-  it('reads host values after a read, a clamped save, and a refused save', async () => {
-    const sendRequest = vi
-      .fn()
-      .mockResolvedValueOnce({ id: '1', ok: true, result: { ms: 300_000 } })
-      .mockResolvedValueOnce({ id: '2', ok: true, result: { ms: 5_000 } })
-      .mockResolvedValueOnce({ id: '3', ok: false, error: { code: 'denied', message: 'Refused' } })
-      .mockResolvedValueOnce({ id: '4', ok: true, result: { ms: 120_000 } })
-
-    await expect(readTerminalAutoRestoreFitMs({ sendRequest })).resolves.toBe(300_000)
-    await expect(saveTerminalAutoRestoreFitMs({ sendRequest }, 1_000)).resolves.toBe(5_000)
-    await expect(saveTerminalAutoRestoreFitMs({ sendRequest }, 300_000)).resolves.toBe(120_000)
-    expect(sendRequest.mock.calls).toEqual([
-      ['terminal.getAutoRestoreFit'],
-      ['terminal.setAutoRestoreFit', { ms: 1_000 }],
-      ['terminal.setAutoRestoreFit', { ms: 300_000 }],
-      ['terminal.getAutoRestoreFit']
-    ])
-  })
-
-  it('reads a host without the setting as the default', async () => {
-    const sendRequest = vi.fn().mockResolvedValue({
-      id: '1',
-      ok: false,
-      error: { code: 'method_not_found', message: 'Unknown method' }
-    })
-
-    await expect(readTerminalAutoRestoreFitMs({ sendRequest })).resolves.toBeNull()
-    await expect(saveTerminalAutoRestoreFitMs({ sendRequest }, 60_000)).resolves.toBeNull()
-  })
-})
diff --git a/mobile/src/terminal/terminal-live-pending-flush-state.test.ts b/mobile/src/terminal/terminal-live-pending-flush-state.test.ts
deleted file mode 100644
index f4ce91838f3..00000000000
--- a/mobile/src/terminal/terminal-live-pending-flush-state.test.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { TERMINAL_LIVE_INPUT_MAX_BYTES } from './terminal-live-input'
-import {
-  cancelTerminalLivePendingFlush,
-  createTerminalLivePendingFlushState,
-  queueTerminalLiveMirrorSend,
-  waitForTerminalLivePendingFlush
-} from './terminal-live-pending-flush-state'
-
-describe('terminal live mirror send queue', () => {
-  it.each(['throw', 'reject', 'refuse', 'too-large'] as const)(
-    'retires dependent input after a send fails by %s',
-    async (failure) => {
-      const state = createTerminalLivePendingFlushState()
-      const writes: string[] = []
-      const onFailure = vi.fn()
-      state.onFailure = onFailure
-      const sender = (_handle: string, payload: string): Promise<boolean> => {
-        writes.push(payload)
-        if (writes.length === 1 && failure !== 'too-large') {
-          if (failure === 'throw') {
-            throw new Error('transport unavailable')
-          }
-          return failure === 'reject'
-            ? Promise.reject(new Error('timeout'))
-            : Promise.resolve(false)
-        }
-        return Promise.resolve(true)
-      }
-      const first = queueTerminalLiveMirrorSend(
-        state,
-        'terminal-1',
-        failure === 'too-large' ? 'a'.repeat(TERMINAL_LIVE_INPUT_MAX_BYTES + 1) : 'first',
-        sender
-      )
-      const second = queueTerminalLiveMirrorSend(state, 'terminal-1', 'second', sender)
-
-      await waitForTerminalLivePendingFlush(state)
-
-      await expect(Promise.all([first, second])).resolves.toEqual([false, false])
-      expect(writes).toEqual(failure === 'too-large' ? [] : ['first'])
-      expect(onFailure).toHaveBeenCalledExactlyOnceWith(
-        'terminal-1',
-        failure === 'too-large' ? 'input-too-large' : 'delivery-unconfirmed'
-      )
-      expect(state.activeRequests).toEqual([])
-      expect(state.pendingBatches).toEqual([])
-      await expect(queueTerminalLiveMirrorSend(state, 'terminal-1', 'fresh', sender)).resolves.toBe(
-        true
-      )
-    }
-  )
-
-  it('cancels flush waiters before the retired transport acknowledges', async () => {
-    const state = createTerminalLivePendingFlushState()
-    let releaseRetired = (_sent: boolean): void => {}
-    let releaseFresh = (_sent: boolean): void => {}
-    const retired = queueTerminalLiveMirrorSend(
-      state,
-      'retired',
-      'old',
-      () =>
-        new Promise<boolean>((resolve) => {
-          releaseRetired = resolve
-        })
-    )
-    let controlResult: boolean | null = null
-    const control = waitForTerminalLivePendingFlush(state).then((sent) => {
-      controlResult = sent
-    })
-
-    cancelTerminalLivePendingFlush(state)
-    const fresh = queueTerminalLiveMirrorSend(
-      state,
-      'fresh',
-      'new',
-      () =>
-        new Promise<boolean>((resolve) => {
-          releaseFresh = resolve
-        })
-    )
-    const freshBarrier = waitForTerminalLivePendingFlush(state)
-    try {
-      await vi.waitFor(() => expect(controlResult).toBe(false))
-      await expect(retired).resolves.toBe(false)
-      releaseRetired(true)
-      await Promise.resolve()
-      expect(state.current).toBe(freshBarrier)
-      cancelTerminalLivePendingFlush(state)
-      await expect(freshBarrier).resolves.toBe(false)
-      await expect(fresh).resolves.toBe(false)
-    } finally {
-      releaseRetired(true)
-      releaseFresh(true)
-      await control
-    }
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-html.web.ts b/mobile/src/terminal/terminal-webview-html.web.ts
deleted file mode 100644
index 54b94959be3..00000000000
--- a/mobile/src/terminal/terminal-webview-html.web.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Export only markup and element styles: CSP disallows nested/inline documents, and web imports the engine/modules directly.
-// Keep native script strings outside the web closure and scope element styles to the terminal host.
-export { MOBILE_TERMINAL_CARET_OPTIONS } from './terminal-webview-html/theme'
-export { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html/document-markup'
-export { TERMINAL_DOCUMENT_ELEMENT_STYLE } from './terminal-webview-html/document-style'
diff --git a/mobile/src/terminal/terminal-webview-html/document-shell.ts b/mobile/src/terminal/terminal-webview-html/document-shell.ts
index 46be3cc9dfe..172fa3d5850 100644
--- a/mobile/src/terminal/terminal-webview-html/document-shell.ts
+++ b/mobile/src/terminal/terminal-webview-html/document-shell.ts
@@ -4,8 +4,8 @@ import {
   TERMINAL_NERD_FONT_CSS,
   TERMINAL_SYMBOLS_FONT_CSS,
   XTERM_ENGINE_CSS
-} from '../terminal-webview-engine-css.generated'
-import { XTERM_ENGINE_JS } from '../terminal-webview-engine.generated'
+} from '../document/terminal-webview-engine-css.generated'
+import { XTERM_ENGINE_JS } from '../document/terminal-webview-engine.generated'
 
 export const TERMINAL_HTML_DOCUMENT_SHELL = `<!DOCTYPE html>
 <html>
diff --git a/mobile/src/terminal/terminal-webview-html/document-style.test.ts b/mobile/src/terminal/terminal-webview-html/document-style.test.ts
index 00363128aa3..7537423d714 100644
--- a/mobile/src/terminal/terminal-webview-html/document-style.test.ts
+++ b/mobile/src/terminal/terminal-webview-html/document-style.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { scopeStyleToHost } from '../../style-scoping/document-style-scoping'
-import { XTERM_ENGINE_CSS } from '../terminal-webview-engine-css.generated'
+import { XTERM_ENGINE_CSS } from '../document/terminal-webview-engine-css.generated'
 import { TERMINAL_DOCUMENT_ELEMENT_STYLE } from './document-style'
 
 // Verify native root rules remain separate while page-injected rules can reach only terminal-owned elements.
diff --git a/mobile/src/terminal/terminal-webview-init-surface.test.ts b/mobile/src/terminal/terminal-webview-init-surface.test.ts
deleted file mode 100644
index 355361108f3..00000000000
--- a/mobile/src/terminal/terminal-webview-init-surface.test.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
-import { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
-
-function bodyMarkup(): string {
-  return TERMINAL_DOCUMENT_MARKUP
-}
-
-type TerminalStub = ReturnType<typeof makeTerminal>
-type TerminalOptions = {
-  cursorInactiveStyle?: string
-  cursorStyle?: string
-  showCursorImmediately?: boolean
-}
-type RegisteredWindowListener = {
-  listener: EventListenerOrEventListenerObject
-  options?: boolean | AddEventListenerOptions
-  type: string
-}
-
-function makeTerminal(writeCallbacks: Array<() => void>, writes: string[]) {
-  const dimensions = { css: { cell: { width: 8, height: 15 } } }
-  const terminal = {
-    cols: 80,
-    rows: 24,
-    options: { fontSize: 13 },
-    modes: {},
-    element: null as HTMLElement | null,
-    disposed: false,
-    _core: {
-      _renderService: {
-        get dimensions(): typeof dimensions {
-          if (terminal.disposed) {
-            throw new Error('Renderer dimensions are unavailable after terminal disposal')
-          }
-          return dimensions
-        }
-      }
-    },
-    buffer: {
-      active: {
-        viewportY: 0,
-        baseY: 0,
-        length: 1,
-        cursorY: 0,
-        type: 'normal' as const,
-        getLine: () => null
-      }
-    },
-    write(data: string, callback?: () => void) {
-      writes.push(data)
-      if (callback) {
-        writeCallbacks.push(callback)
-      }
-    },
-    open(surface: HTMLElement) {
-      terminal.element = surface
-    },
-    loadAddon() {},
-    resize(cols: number, rows: number) {
-      terminal.cols = cols
-      terminal.rows = rows
-    },
-    clear() {},
-    reset() {},
-    refresh() {},
-    selectAll() {},
-    clearSelection() {},
-    select() {},
-    scrollLines() {},
-    scrollToBottom() {},
-    scrollToLine() {},
-    getSelection: () => '',
-    onData: () => ({ dispose() {} }),
-    onLineFeed: () => ({ dispose() {} }),
-    onScroll: () => ({ dispose() {} }),
-    onWriteParsed: () => ({ dispose() {} }),
-    dispose() {
-      terminal.disposed = true
-    }
-  }
-  return terminal
-}
-
-function dispatchInit(cols: number, initialData: string): void {
-  window.dispatchEvent(
-    new MessageEvent('message', {
-      data: JSON.stringify({ type: 'init', cols, rows: 40, initialData })
-    })
-  )
-}
-
-describe('terminal WebView init surface replacement', () => {
-  let animationFrames: Array<() => void>
-  let registeredWindowListeners: RegisteredWindowListener[]
-  let terminalOptions: TerminalOptions[]
-  let terminals: TerminalStub[]
-  let writeCallbacks: Array<() => void>
-  let writes: string[]
-
-  beforeEach(() => {
-    animationFrames = []
-    registeredWindowListeners = []
-    terminalOptions = []
-    terminals = []
-    writeCallbacks = []
-    writes = []
-    const addWindowEventListener = window.addEventListener.bind(window)
-    vi.spyOn(window, 'addEventListener').mockImplementation(((
-      type: string,
-      listener: EventListenerOrEventListenerObject,
-      options?: boolean | AddEventListenerOptions
-    ) => {
-      registeredWindowListeners.push({ type, listener, options })
-      addWindowEventListener(type, listener, options)
-    }) as typeof window.addEventListener)
-    vi.stubGlobal('requestAnimationFrame', (callback: () => void) => {
-      animationFrames.push(callback)
-      return animationFrames.length
-    })
-    Object.defineProperty(window, 'innerWidth', { value: 381, configurable: true })
-    Object.defineProperty(window, 'innerHeight', { value: 612, configurable: true })
-    const webWindow = window as unknown as {
-      Terminal: new (options: TerminalOptions) => TerminalStub
-      ReactNativeWebView: { postMessage: (data: string) => void }
-    }
-    webWindow.Terminal = function (options: TerminalOptions) {
-      terminalOptions.push(options)
-      const terminal = makeTerminal(writeCallbacks, writes)
-      terminals.push(terminal)
-      return terminal
-    } as unknown as new (options: TerminalOptions) => TerminalStub
-    webWindow.ReactNativeWebView = { postMessage: vi.fn() }
-    document.body.innerHTML = bodyMarkup()
-    new Function(TERMINAL_DOCUMENT_SCRIPT)()
-  })
-
-  afterEach(() => {
-    for (const { type, listener, options } of registeredWindowListeners) {
-      window.removeEventListener(type, listener as EventListener, options)
-    }
-    vi.restoreAllMocks()
-  })
-
-  it('commits only the newest surface when phone-fit init calls overlap', () => {
-    // Restored terminals may receive desktop replay, resize and phone replay before any xterm write completes.
-    dispatchInit(120, 'desktop')
-    animationFrames.shift()?.()
-    dispatchInit(51, 'phone-resize')
-    animationFrames.shift()?.()
-    dispatchInit(51, 'phone-scrollback')
-    animationFrames.shift()?.()
-
-    expect(terminals).toHaveLength(3)
-    expect(writeCallbacks).toHaveLength(3)
-    writeCallbacks[2]?.()
-    writeCallbacks[0]?.()
-    writeCallbacks[1]?.()
-
-    const surfaces = document.querySelectorAll('#terminal-container > div')
-    expect(surfaces).toHaveLength(1)
-    expect(surfaces[0]?.id).toBe('terminal-surface')
-    expect((surfaces[0] as HTMLElement).style.visibility).toBe('visible')
-    expect(terminals.map((terminal) => terminal.disposed)).toEqual([true, true, false])
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-interactive-output.test.tsx b/mobile/src/terminal/terminal-webview-interactive-output.test.tsx
deleted file mode 100644
index a84f902af16..00000000000
--- a/mobile/src/terminal/terminal-webview-interactive-output.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import {
-  useTerminalWebViewController,
-  type TerminalWebViewTransport
-} from './use-terminal-webview-controller'
-
-vi.mock('react-native', () => ({ AppState: { currentState: 'active' } }))
-
-vi.mock('./terminal-webview-engine-error-state', () => ({
-  useTerminalWebViewEngineErrorState: () => ({
-    clearEngineError: vi.fn(),
-    engineError: null,
-    reportEngineError: vi.fn(),
-    reportNativeEngineError: vi.fn()
-  })
-}))
-
-let root: ReactTestRenderer | undefined
-
-function mountController(interactionActive = true) {
-  const post = vi.fn<TerminalWebViewTransport['post']>()
-  const onTerminalInput = vi.fn()
-  const exposed: { current: ReturnType<typeof useTerminalWebViewController> | null } = {
-    current: null
-  }
-  const transport = { post, pingsOnForegroundRecovery: () => false }
-  function Probe() {
-    exposed.current = useTerminalWebViewController(
-      { onTerminalInput, interactionActive },
-      transport
-    )
-    return null
-  }
-  act(() => {
-    root = create(<Probe />)
-  })
-  const controller = exposed.current
-  if (!controller) {
-    throw new Error('Controller did not mount')
-  }
-  act(() => controller.receive({ type: 'web-ready' }))
-  const writes = () =>
-    post.mock.calls
-      .map(([command]) => command)
-      .filter((command) => command.type === 'write')
-      .map((command) => command.data)
-  return { controller, onTerminalInput, writes }
-}
-
-describe('terminal scroll response batching', () => {
-  afterEach(() => {
-    act(() => root?.unmount())
-    root = undefined
-    vi.useRealTimers()
-  })
-
-  it.each(['\x1b[<64;2;2M', '\x1b[A'])('shortens pending output for gesture %j', (bytes) => {
-    vi.useFakeTimers()
-    const { controller, onTerminalInput, writes } = mountController()
-    controller.handle.write('first')
-    vi.advanceTimersByTime(5)
-    controller.handle.write('response')
-    vi.advanceTimersByTime(3)
-    controller.receive({ type: 'terminal-input', bytes })
-    vi.advanceTimersByTime(8)
-    expect(writes()).toEqual(['first', 'response'])
-    expect(onTerminalInput).toHaveBeenCalledWith(bytes)
-  })
-
-  it.each(['', 'ordinary text', 123])('keeps ordinary batching for non-gesture %j', (bytes) => {
-    vi.useFakeTimers()
-    const { controller, writes } = mountController()
-    controller.handle.write('first')
-    controller.handle.write('pending')
-    controller.receive({ type: 'terminal-input', bytes })
-    vi.advanceTimersByTime(16)
-    expect(writes()).toEqual(['first'])
-    vi.advanceTimersByTime(32)
-    expect(writes()).toEqual(['first', 'pending'])
-  })
-
-  it('rejects inactive gesture notifications without changing output batching', () => {
-    vi.useFakeTimers()
-    const { controller, onTerminalInput, writes } = mountController(false)
-    controller.handle.write('first')
-    controller.handle.write('pending')
-    controller.receive({ type: 'terminal-input', bytes: '\x1b[A' })
-    vi.advanceTimersByTime(16)
-    expect(onTerminalInput).not.toHaveBeenCalled()
-    expect(writes()).toEqual(['first'])
-    vi.advanceTimersByTime(32)
-    expect(writes()).toEqual(['first', 'pending'])
-  })
-
-  it('drops pending gesture output before a new document snapshot', () => {
-    vi.useFakeTimers()
-    const { controller, writes } = mountController()
-    controller.handle.write('first')
-    controller.handle.write('stale')
-    controller.receive({ type: 'terminal-input', bytes: '\x1b[A' })
-    controller.handle.init({ cols: 80, rows: 24, initialData: 'snapshot', frame: null })
-    vi.advanceTimersByTime(48)
-    expect(writes()).toEqual(['first'])
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-query-reply-routing.test.ts b/mobile/src/terminal/terminal-webview-query-reply-routing.test.ts
deleted file mode 100644
index b5296d75b21..00000000000
--- a/mobile/src/terminal/terminal-webview-query-reply-routing.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { createElement } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { TerminalWebView } from './TerminalWebView'
-import { findByHostType } from '../test-support/react-test-renderer-host-nodes'
-
-vi.mock('react-native', () => ({
-  Platform: { OS: 'ios' },
-  StyleSheet: {
-    absoluteFill: {
-      bottom: 0,
-      left: 0,
-      position: 'absolute',
-      right: 0,
-      top: 0
-    },
-    create: (styles: unknown) => styles
-  },
-  Text: 'Text',
-  View: 'View'
-}))
-
-vi.mock('react-native-webview', async () => {
-  const React = await import('react')
-  const WebView = React.forwardRef((props: Record<string, unknown>, _ref) =>
-    React.createElement('WebView', props)
-  )
-  return { WebView, default: WebView }
-})
-
-vi.mock('lucide-react-native', () => ({
-  RefreshCw: 'RefreshCw'
-}))
-
-let renderer: ReactTestRenderer | null = null
-
-function postWebViewMessage(payload: Record<string, unknown>): void {
-  if (!renderer) {
-    throw new Error('TerminalWebView did not render')
-  }
-  const webView = findByHostType(renderer.root, 'WebView')
-  act(() => {
-    webView.props.onMessage({ nativeEvent: { data: JSON.stringify(payload) } })
-  })
-}
-
-describe('TerminalWebView query reply routing', () => {
-  afterEach(() => {
-    if (renderer) {
-      act(() => renderer?.unmount())
-      renderer = null
-    }
-    vi.restoreAllMocks()
-  })
-
-  it('routes only complete terminal query replies to native', () => {
-    const onTerminalQueryReply = vi.fn()
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-    act(() => {
-      renderer = create(createElement(TerminalWebView, { onTerminalQueryReply }))
-    })
-
-    postWebViewMessage({ type: 'terminal-data', bytes: '\x1b[3;4R' })
-    postWebViewMessage({ type: 'terminal-data', bytes: 'a' })
-    postWebViewMessage({ type: 'terminal-data', bytes: '\x1b[A' })
-
-    expect(onTerminalQueryReply).toHaveBeenCalledTimes(1)
-    expect(onTerminalQueryReply).toHaveBeenCalledWith('\x1b[3;4R')
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-tap-routing.test.ts b/mobile/src/terminal/terminal-webview-tap-routing.test.ts
deleted file mode 100644
index d8b30559234..00000000000
--- a/mobile/src/terminal/terminal-webview-tap-routing.test.ts
+++ /dev/null
@@ -1,375 +0,0 @@
-// @vitest-environment happy-dom
-// URL taps with slight jitter once hit the long-press slop gate and never reached the native browser bridge.
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
-import { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
-
-function bodyMarkup(): string {
-  return TERMINAL_DOCUMENT_MARKUP
-}
-
-function makeTerminal(
-  lineRef: { current: string },
-  mouseTrackingMode = 'none',
-  scrollbackRows = 0
-) {
-  return {
-    cols: 80,
-    rows: 24,
-    options: { fontSize: 13 },
-    modes: { mouseTrackingMode },
-    element: { scrollWidth: 800, scrollHeight: 360 },
-    _core: { _renderService: { dimensions: { css: { cell: { width: 8, height: 15 } } } } },
-    buffer: {
-      active: {
-        viewportY: 0,
-        baseY: scrollbackRows,
-        length: 1,
-        cursorY: 0,
-        type: 'normal' as const,
-        getLine(row: number) {
-          // Rows after the first are xterm soft-wrap continuations.
-          const text = lineRef.current.split('\n')[row]
-          if (text === undefined) {
-            return null
-          }
-          return {
-            length: 80,
-            isWrapped: row > 0,
-            // Honor xterm’s translateToString slice arguments so wide-cell offset conversion is realistic.
-            translateToString: (_trim?: boolean, start?: number, end?: number) =>
-              text.slice(start ?? 0, end ?? text.length),
-            getCell: () => ({ extended: undefined })
-          }
-        }
-      }
-    },
-    write(_d: string, cb?: () => void) {
-      cb?.()
-    },
-    open() {},
-    resize() {},
-    clear() {},
-    reset() {},
-    refresh() {},
-    selectAll() {},
-    clearSelection() {},
-    select() {},
-    scrollLines() {},
-    scrollToBottom() {},
-    getSelection: () => '',
-    onLineFeed: () => ({ dispose() {} }),
-    onScroll: () => ({ dispose() {} }),
-    onWriteParsed: () => ({ dispose() {} }),
-    dispose() {}
-  }
-}
-
-type Posted = Array<Record<string, unknown>>
-
-type OscLinkRange = { row: number; startCol: number; endCol: number; uri: string }
-
-function boot(
-  line: string,
-  oscLinks?: OscLinkRange[],
-  mouseTrackingMode = 'none',
-  scrollbackRows = 0
-): { posted: Posted; setLine: (line: string) => void } {
-  const posted: Posted = []
-  const lineRef = { current: line }
-  const w = window as unknown as { Terminal: unknown; ReactNativeWebView: unknown }
-  w.Terminal = function () {
-    return makeTerminal(lineRef, mouseTrackingMode, scrollbackRows)
-  }
-  w.ReactNativeWebView = {
-    postMessage(s: string) {
-      posted.push(JSON.parse(s))
-    }
-  }
-  document.body.innerHTML = bodyMarkup()
-  // The bundle the WebView loads, run as the WebView runs it.
-  new Function(TERMINAL_DOCUMENT_SCRIPT)()
-  window.dispatchEvent(
-    new MessageEvent('message', {
-      data: JSON.stringify({ type: 'init', cols: 80, rows: 24, initialData: '', oscLinks })
-    })
-  )
-  return {
-    posted,
-    setLine: (nextLine: string) => {
-      lineRef.current = nextLine
-    }
-  }
-}
-
-function fireTouch(type: string, touches: Array<{ x: number; y: number }>): void {
-  const surface = document.getElementById('terminal-surface') as HTMLElement
-  const ev = new Event(type, { bubbles: true, cancelable: true })
-  Object.defineProperty(ev, 'touches', {
-    value: touches.map((p, i) => ({ identifier: i, clientX: p.x, clientY: p.y, target: surface }))
-  })
-  surface.dispatchEvent(ev)
-}
-
-const settle = (): Promise<void> => new Promise((r) => setTimeout(r, 50))
-
-describe('terminal WebView tap routing', () => {
-  const URL_LINE = 'visit https://example.com/foo now'
-  const tapX = 12 * 8 * 0.3125
-  const tapY = 2
-  const screenXForCol = (col: number): number => col * 8 * 0.3125
-
-  beforeEach(() => {
-    vi.spyOn(window, 'addEventListener')
-    vi.spyOn(document, 'addEventListener')
-    Object.defineProperty(window, 'innerWidth', { value: 200, configurable: true })
-    Object.defineProperty(window, 'innerHeight', { value: 400, configurable: true })
-  })
-
-  afterEach(() => {
-    for (const [type, listener, options] of vi.mocked(window.addEventListener).mock.calls) {
-      window.removeEventListener(type, listener, options)
-    }
-    for (const [type, listener, options] of vi.mocked(document.addEventListener).mock.calls) {
-      document.removeEventListener(type, listener, options)
-    }
-    vi.restoreAllMocks()
-  })
-
-  it('still posts open-url when the tap jitters a few pixels', async () => {
-    // Small finger jitter must stay a tap and open the touched URL.
-    const { posted } = boot(URL_LINE)
-    await settle()
-    fireTouch('touchstart', [{ x: tapX, y: tapY }])
-    fireTouch('touchmove', [{ x: tapX + 11, y: tapY + 4 }])
-    fireTouch('touchend', [])
-    expect(posted.find((m) => m.type === 'open-url')?.url).toBe('https://example.com/foo')
-  })
-
-  it('focuses native input after reporting a touch tap to a mouse-tracking TUI', async () => {
-    const { posted } = boot('interactive prompt', undefined, 'drag')
-    await settle()
-    window.dispatchEvent(
-      new MessageEvent('message', {
-        data: JSON.stringify({ type: 'write', data: '\u001b[?1006l' })
-      })
-    )
-
-    fireTouch('touchstart', [{ x: 20, y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(
-      posted
-        .filter((message) => message.type === 'terminal-input' || message.type === 'terminal-tap')
-        .map((message) => message.type)
-    ).toEqual(['terminal-input', 'terminal-tap'])
-  })
-
-  it('focuses native input without mouse bytes while the tracking encoding is unproven', async () => {
-    const { posted } = boot('interactive prompt', undefined, 'drag')
-    await settle()
-
-    fireTouch('touchstart', [{ x: 20, y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((message) => message.type === 'terminal-input')).toBeUndefined()
-    expect(posted.filter((message) => message.type === 'terminal-tap')).toHaveLength(1)
-  })
-
-  it('opens first-load OSC links from snapshot metadata on the exact cell range', async () => {
-    const oscLinks = [{ row: 0, startCol: 6, endCol: 11, uri: 'https://example.com/issue/1234' }]
-    const { posted } = boot('issue #1234 done', oscLinks)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(7), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'open-url')?.url).toBe('https://example.com/issue/1234')
-  })
-
-  it('opens first-load file OSC links through terminal file taps', async () => {
-    const oscLinks = [{ row: 0, startCol: 5, endCol: 15, uri: 'file:///tmp/result.json#L12C3' }]
-    const { posted } = boot('open artifact here', oscLinks)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(7), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'open-url')).toBeUndefined()
-    expect(posted.find((m) => m.type === 'terminal-file-tap')).toEqual({
-      type: 'terminal-file-tap',
-      candidates: [{ pathText: '/tmp/result.json', line: 12, column: 3 }]
-    })
-  })
-
-  it('keeps the UNC host of an OSC file link for a Windows share workspace', async () => {
-    const oscLinks = [
-      { row: 0, startCol: 5, endCol: 15, uri: 'file://server/share/repo/app.ts#L12' }
-    ]
-    const { posted } = boot('open artifact here', oscLinks)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(7), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'terminal-file-tap')).toEqual({
-      type: 'terminal-file-tap',
-      candidates: [{ pathText: '//server/share/repo/app.ts', line: 12, column: null }]
-    })
-  })
-
-  it('keeps a tap on prose beside a path an ordinary tap', async () => {
-    const line = 'me@host:~/proj$ git status'
-    const { posted } = boot(line)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(line.indexOf('git') + 1), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'terminal-file-tap')).toBeUndefined()
-    expect(posted.find((m) => m.type === 'terminal-tap')).toBeDefined()
-  })
-
-  it('opens a markdown link whose destination has spaces', async () => {
-    const line = 'see [PDF](</tmp/folder with spaces/report.pdf>)'
-    const { posted } = boot(line)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(line.indexOf('with') + 1), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'terminal-file-tap')).toEqual({
-      type: 'terminal-file-tap',
-      candidates: [{ pathText: '/tmp/folder with spaces/report.pdf', line: null, column: null }]
-    })
-  })
-
-  it('opens plain file URLs through terminal file taps', async () => {
-    const line = 'open file:///tmp/result.json#L12C3 now'
-    const { posted } = boot(line)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(line.indexOf('result')), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'terminal-file-tap')).toEqual({
-      type: 'terminal-file-tap',
-      candidates: [{ pathText: '/tmp/result.json', line: 12, column: 3 }]
-    })
-  })
-
-  it('opens the whole URL when the tap lands on its soft-wrapped second row', async () => {
-    const url = `https://example.com/${'a'.repeat(70)}/end`
-    const text = `see ${url} now`
-    const { posted } = boot(`${text.slice(0, 80)}\n${text.slice(80)}`)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(2), y: tapY + 15 * 0.3125 }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'open-url')?.url).toBe(url)
-  })
-
-  it('does not open snapshot OSC links from adjacent terminal cells', async () => {
-    const oscLinks = [{ row: 0, startCol: 6, endCol: 11, uri: 'https://example.com/issue/1234' }]
-    const { posted } = boot('issue #1234 done', oscLinks)
-    await settle()
-
-    fireTouch('touchstart', [{ x: screenXForCol(12), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'open-url')).toBeUndefined()
-  })
-
-  it('does not open stale snapshot OSC links after the row text changes', async () => {
-    const oscLinks = [{ row: 0, startCol: 6, endCol: 11, uri: 'https://example.com/issue/1234' }]
-    const { posted, setLine } = boot('issue #1234 done', oscLinks)
-    await settle()
-    setLine('issue plain done')
-
-    fireTouch('touchstart', [{ x: screenXForCol(7), y: tapY }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'open-url')).toBeUndefined()
-  })
-
-  it('does not post open-url for a scroll gesture past the tap slop', async () => {
-    const { posted } = boot(URL_LINE)
-    await settle()
-    fireTouch('touchstart', [{ x: tapX, y: tapY }])
-    fireTouch('touchmove', [{ x: tapX, y: tapY + 120 }])
-    fireTouch('touchend', [])
-    expect(posted.find((m) => m.type === 'open-url')).toBeUndefined()
-  })
-
-  // Scaled rows are smaller than tap slop; a short drag can still count as a real row scroll.
-  it('does not tap after a short drag that scrolled scrollback', async () => {
-    const { posted } = boot('plain output', undefined, 'none', 50)
-    await settle()
-    fireTouch('touchstart', [{ x: 20, y: 100 }])
-    fireTouch('touchmove', [{ x: 20, y: 88 }])
-    fireTouch('touchend', [])
-    expect(posted.find((m) => m.type === 'terminal-tap')).toBeUndefined()
-  })
-
-  it('does not tap or click after a short drag that scrolled a mouse-tracking TUI', async () => {
-    const { posted } = boot('interactive prompt', undefined, 'drag')
-    await settle()
-    window.dispatchEvent(
-      new MessageEvent('message', {
-        data: JSON.stringify({ type: 'write', data: '\u001b[?1006l' })
-      })
-    )
-
-    fireTouch('touchstart', [{ x: 20, y: 100 }])
-    fireTouch('touchmove', [{ x: 20, y: 88 }])
-    fireTouch('touchend', [])
-
-    expect(posted.find((m) => m.type === 'terminal-tap')).toBeUndefined()
-    const input = posted
-      .filter((m) => m.type === 'terminal-input')
-      .map((m) => String(m.bytes))
-      .join('')
-    const reports = input.split('\u001b[M').slice(1)
-    expect(reports.length).toBeGreaterThan(0)
-    expect(reports.every((report) => report[0] === '`' || report[0] === 'a')).toBe(true)
-  })
-
-  it('still taps when the touch moves less than a row', async () => {
-    const { posted } = boot('plain output', undefined, 'none', 50)
-    await settle()
-    fireTouch('touchstart', [{ x: 20, y: 100 }])
-    fireTouch('touchmove', [{ x: 20, y: 97 }])
-    fireTouch('touchend', [])
-    expect(posted.filter((m) => m.type === 'terminal-tap')).toHaveLength(1)
-  })
-
-  it('still taps when the touch moves a row and back before anything scrolls', async () => {
-    const { posted } = boot('plain output', undefined, 'none', 50)
-    await settle()
-    fireTouch('touchstart', [{ x: 20, y: 100 }])
-    fireTouch('touchmove', [{ x: 20, y: 94 }])
-    fireTouch('touchmove', [{ x: 20, y: 100 }])
-    fireTouch('touchend', [])
-    expect(posted.filter((m) => m.type === 'terminal-tap')).toHaveLength(1)
-  })
-
-  it('does not tap when the touch stops a coast', async () => {
-    let now = 1_000
-    vi.spyOn(Date, 'now').mockImplementation(() => now)
-    const { posted } = boot('plain output', undefined, 'none', 50)
-    await settle()
-    fireTouch('touchstart', [{ x: 20, y: 300 }])
-    now += 16
-    fireTouch('touchmove', [{ x: 20, y: 240 }])
-    now += 16
-    fireTouch('touchmove', [{ x: 20, y: 180 }])
-    fireTouch('touchend', [])
-    const beforeStoppingTouch = posted.length
-
-    fireTouch('touchstart', [{ x: 20, y: 180 }])
-    fireTouch('touchend', [])
-
-    expect(posted.slice(beforeStoppingTouch).find((m) => m.type === 'terminal-tap')).toBeUndefined()
-  })
-})
diff --git a/mobile/src/terminal/terminal-webview-wheel-scroll.test.ts b/mobile/src/terminal/terminal-webview-wheel-scroll.test.ts
deleted file mode 100644
index 33f0c635258..00000000000
--- a/mobile/src/terminal/terminal-webview-wheel-scroll.test.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
-import { TERMINAL_DOCUMENT_SCRIPT } from './terminal-webview-document-script.generated'
-import { TERMINAL_DOCUMENT_MARKUP } from './terminal-webview-html'
-
-function bodyMarkup(): string {
-  return TERMINAL_DOCUMENT_MARKUP
-}
-
-type BufferState = {
-  baseY: number
-  type: 'alternate' | 'normal'
-  viewportY: number
-}
-
-type TerminalStub = ReturnType<typeof makeTerminal>
-type RegisteredWindowListener = {
-  listener: EventListenerOrEventListenerObject
-  options?: boolean | AddEventListenerOptions
-  type: string
-}
-
-const CELL_HEIGHT = 15
-const ESC = '\u001b'
-const ESC_ARROW_DOWN = `${ESC}[B`
-const ESC_APP_ARROW_UP = `${ESC}OA`
-
-function makeTerminal(buffer: BufferState, scrollLines: (lines: number) => void) {
-  const terminal = {
-    cols: 40,
-    rows: 24,
-    options: { fontSize: 13 },
-    modes: { mouseTrackingMode: 'none' as string },
-    element: null as HTMLElement | null,
-    _core: {
-      _renderService: { dimensions: { css: { cell: { width: 8, height: CELL_HEIGHT } } } }
-    },
-    buffer: {
-      active: {
-        get baseY() {
-          return buffer.baseY
-        },
-        get type() {
-          return buffer.type
-        },
-        get viewportY() {
-          return buffer.viewportY
-        },
-        cursorY: 0,
-        length: 1,
-        getLine: () => null
-      }
-    },
-    write(_data: string, callback?: () => void) {
-      callback?.()
-    },
-    open(surface: HTMLElement) {
-      terminal.element = surface
-    },
-    loadAddon() {},
-    resize(cols: number, rows: number) {
-      terminal.cols = cols
-      terminal.rows = rows
-    },
-    clear() {},
-    reset() {},
-    refresh() {},
-    selectAll() {},
-    clearSelection() {},
-    select() {},
-    scrollLines,
-    scrollToBottom() {},
-    scrollToLine() {},
-    attachCustomKeyEventHandler() {},
-    getSelection: () => '',
-    onData: () => ({ dispose() {} }),
-    onLineFeed: () => ({ dispose() {} }),
-    onScroll: () => ({ dispose() {} }),
-    onWriteParsed: () => ({ dispose() {} }),
-    dispose() {}
-  }
-  return terminal
-}
-
-function dispatchWheel(deltaY: number, init: WheelEventInit = {}): WheelEvent {
-  const surface = document.getElementById('terminal-surface')
-  if (!surface) {
-    throw new Error('terminal surface missing')
-  }
-  const event = new WheelEvent('wheel', {
-    bubbles: true,
-    cancelable: true,
-    clientX: 40,
-    clientY: 60,
-    deltaMode: 0,
-    deltaY,
-    ...init
-  })
-  if (init.ctrlKey) {
-    // Happy DOM drops wheel modifier initialization; set flags explicitly.
-    Object.defineProperty(event, 'ctrlKey', { value: true })
-  }
-  surface.dispatchEvent(event)
-  return event
-}
-
-function terminalInputBytes(postMessage: ReturnType<typeof vi.fn>): string {
-  return postMessage.mock.calls
-    .map(([raw]) => JSON.parse(String(raw)) as { bytes?: string; type: string })
-    .filter((msg) => msg.type === 'terminal-input')
-    .map((msg) => msg.bytes ?? '')
-    .join('')
-}
-
-describe('terminal WebView external pointer wheel scrolling', () => {
-  let animationFrames: Array<() => void>
-  let buffer: BufferState
-  let postMessage: Mock<(data: string) => void>
-  let registeredWindowListeners: RegisteredWindowListener[]
-  let scrollLines: Mock<(lines: number) => void>
-  let terminals: TerminalStub[]
-
-  function boot(): void {
-    document.body.innerHTML = bodyMarkup()
-    new Function(TERMINAL_DOCUMENT_SCRIPT)()
-    window.dispatchEvent(
-      new MessageEvent('message', {
-        data: JSON.stringify({ type: 'init', cols: 40, rows: 24, initialData: '' })
-      })
-    )
-    // Wait for init’s next-frame surface commit.
-    while (animationFrames.length > 0) {
-      animationFrames.shift()?.()
-    }
-  }
-
-  function flushFrames(): void {
-    for (let i = 0; i < 4 && animationFrames.length > 0; i++) {
-      animationFrames.shift()?.()
-    }
-  }
-
-  beforeEach(() => {
-    animationFrames = []
-    buffer = { baseY: 0, type: 'normal', viewportY: 0 }
-    registeredWindowListeners = []
-    scrollLines = vi.fn<(lines: number) => void>()
-    terminals = []
-    const addWindowEventListener = window.addEventListener.bind(window)
-    vi.spyOn(window, 'addEventListener').mockImplementation(((
-      type: string,
-      listener: EventListenerOrEventListenerObject,
-      options?: boolean | AddEventListenerOptions
-    ) => {
-      registeredWindowListeners.push({ type, listener, options })
-      addWindowEventListener(type, listener, options)
-    }) as typeof window.addEventListener)
-    vi.stubGlobal('requestAnimationFrame', (callback: () => void) => {
-      animationFrames.push(callback)
-      return animationFrames.length
-    })
-    vi.stubGlobal('cancelAnimationFrame', () => {})
-    Object.defineProperty(window, 'innerWidth', { value: 381, configurable: true })
-    Object.defineProperty(window, 'innerHeight', { value: 612, configurable: true })
-    postMessage = vi.fn<(data: string) => void>()
-    const webWindow = window as unknown as {
-      Terminal: new () => TerminalStub
-      ReactNativeWebView: { postMessage: (data: string) => void }
-    }
-    webWindow.Terminal = function () {
-      const terminal = makeTerminal(buffer, scrollLines)
-      terminals.push(terminal)
-      return terminal
-    } as unknown as new () => TerminalStub
-    webWindow.ReactNativeWebView = { postMessage }
-  })
-
-  afterEach(() => {
-    for (const { type, listener, options } of registeredWindowListeners) {
-      window.removeEventListener(type, listener as EventListener, options)
-    }
-    vi.restoreAllMocks()
-    vi.unstubAllGlobals()
-  })
-
-  it('turns an alternate-screen wheel scroll into cursor keys (#6863, #8818)', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-    expect(terminals).toHaveLength(1)
-
-    dispatchWheel(3 * CELL_HEIGHT)
-
-    // Alternate-screen TUIs have no scrollback; wheels must reach the PTY as input, matching touch.
-    expect(terminalInputBytes(postMessage)).toBe(ESC_ARROW_DOWN.repeat(3))
-  })
-
-  it('sends application cursor keys when the TUI enabled DECCKM', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-    const terminal = terminals[0]
-    if (!terminal) {
-      throw new Error('terminal missing')
-    }
-    ;(terminal.modes as Record<string, unknown>).applicationCursorKeysMode = true
-
-    dispatchWheel(-2 * CELL_HEIGHT)
-
-    expect(terminalInputBytes(postMessage)).toBe(ESC_APP_ARROW_UP.repeat(2))
-  })
-
-  it('reports the wheel as mouse tracking bytes when the TUI asked for them', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-    const terminal = terminals[0]
-    if (!terminal) {
-      throw new Error('terminal missing')
-    }
-    terminal.modes.mouseTrackingMode = 'any'
-    window.dispatchEvent(
-      new MessageEvent('message', {
-        data: JSON.stringify({ type: 'write', data: `${ESC}[?1006l` })
-      })
-    )
-
-    dispatchWheel(CELL_HEIGHT)
-
-    const bytes = terminalInputBytes(postMessage)
-    expect(bytes.slice(0, 4)).toBe(`${ESC}[Ma`)
-    expect(bytes).toHaveLength(6)
-    expect(bytes.charCodeAt(4)).toBeGreaterThanOrEqual(33)
-    expect(bytes.charCodeAt(5)).toBeGreaterThanOrEqual(33)
-  })
-
-  it('scrolls normal-buffer scrollback from a wheel instead of leaving it frozen', () => {
-    buffer = { baseY: 20, type: 'normal', viewportY: 20 }
-    boot()
-
-    dispatchWheel(-3 * CELL_HEIGHT)
-    flushFrames()
-
-    expect(scrollLines).toHaveBeenCalledWith(-3)
-  })
-
-  it('converts line-mode deltas that Android reports for external mouse wheels', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-
-    dispatchWheel(2, { deltaMode: 1 })
-
-    expect(terminalInputBytes(postMessage)).toBe(ESC_ARROW_DOWN.repeat(2))
-  })
-
-  it('swallows a trackpad pinch instead of firing cursor keys at the TUI', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-
-    const event = dispatchWheel(3 * CELL_HEIGHT, { ctrlKey: true })
-
-    expect(terminalInputBytes(postMessage)).toBe('')
-    expect(event.defaultPrevented).toBe(true)
-  })
-
-  it('clears fractional wheel state when the terminal is recreated', () => {
-    buffer = { baseY: 0, type: 'alternate', viewportY: 0 }
-    boot()
-    dispatchWheel(CELL_HEIGHT - 1)
-
-    window.dispatchEvent(
-      new MessageEvent('message', {
-        data: JSON.stringify({ type: 'init', cols: 40, rows: 24, initialData: '' })
-      })
-    )
-    flushFrames()
-    dispatchWheel(1)
-
-    expect(terminalInputBytes(postMessage)).toBe('')
-  })
-})
diff --git a/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts b/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts
new file mode 100644
index 00000000000..08e4fdf466c
--- /dev/null
+++ b/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  readTerminalAutoRestoreFitMs,
+  saveTerminalAutoRestoreFitMs
+} from './terminal-auto-restore-fit-state'
+
+describe('terminal auto restore fit state', () => {
+  it('reads a host without the setting as the default', async () => {
+    const sendRequest = vi.fn().mockResolvedValue({
+      id: '1',
+      ok: false,
+      error: { code: 'method_not_found', message: 'Unknown method' }
+    })
+
+    await expect(readTerminalAutoRestoreFitMs({ sendRequest })).resolves.toBeNull()
+    await expect(saveTerminalAutoRestoreFitMs({ sendRequest }, 60_000)).resolves.toBeNull()
+  })
+})
diff --git a/mobile/src/terminal/terminal-auto-restore-fit-state.ts b/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.ts
similarity index 95%
rename from mobile/src/terminal/terminal-auto-restore-fit-state.ts
rename to mobile/src/terminal/viewport/terminal-auto-restore-fit-state.ts
index 75a45147b30..95bdfe5d5dc 100644
--- a/mobile/src/terminal/terminal-auto-restore-fit-state.ts
+++ b/mobile/src/terminal/viewport/terminal-auto-restore-fit-state.ts
@@ -1,7 +1,7 @@
 import {
   terminalAutoRestoreFitRead,
   terminalAutoRestoreFitSave
-} from './mobile-terminal-operations'
+} from '../host-operations/mobile-terminal-operations'
 
 export type TerminalAutoRestoreFitByHost = Record<string, number | null | undefined>
 
diff --git a/mobile/src/terminal/terminal-cell-box.test.ts b/mobile/src/terminal/viewport/terminal-cell-box.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-cell-box.test.ts
rename to mobile/src/terminal/viewport/terminal-cell-box.test.ts
diff --git a/mobile/src/terminal/terminal-cell-box.ts b/mobile/src/terminal/viewport/terminal-cell-box.ts
similarity index 100%
rename from mobile/src/terminal/terminal-cell-box.ts
rename to mobile/src/terminal/viewport/terminal-cell-box.ts
diff --git a/mobile/src/terminal/terminal-grid-fit.test.ts b/mobile/src/terminal/viewport/terminal-grid-fit.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-grid-fit.test.ts
rename to mobile/src/terminal/viewport/terminal-grid-fit.test.ts
diff --git a/mobile/src/terminal/terminal-grid-fit.ts b/mobile/src/terminal/viewport/terminal-grid-fit.ts
similarity index 92%
rename from mobile/src/terminal/terminal-grid-fit.ts
rename to mobile/src/terminal/viewport/terminal-grid-fit.ts
index fe0c6b7f0a0..8fe3fa355a1 100644
--- a/mobile/src/terminal/terminal-grid-fit.ts
+++ b/mobile/src/terminal/viewport/terminal-grid-fit.ts
@@ -2,7 +2,7 @@
 import {
   TERMINAL_VIEWPORT_MIN_COLS,
   TERMINAL_VIEWPORT_MIN_ROWS
-} from '../../../src/shared/terminal/viewport/terminal-viewport'
+} from '../../../../src/shared/terminal/viewport/terminal-viewport'
 
 export type TerminalFitDimensions = { cols: number; rows: number }
 
diff --git a/mobile/src/terminal/terminal-viewport-refit-options.ts b/mobile/src/terminal/viewport/terminal-viewport-refit-options.ts
similarity index 74%
rename from mobile/src/terminal/terminal-viewport-refit-options.ts
rename to mobile/src/terminal/viewport/terminal-viewport-refit-options.ts
index 545c761c114..7ca409050a2 100644
--- a/mobile/src/terminal/terminal-viewport-refit-options.ts
+++ b/mobile/src/terminal/viewport/terminal-viewport-refit-options.ts
@@ -1,10 +1,10 @@
 import type { RefObject } from 'react'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { TerminalWebViewHandle } from './TerminalWebView'
-import type { TerminalFrame } from './terminal-webview-messages'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { TerminalWebViewHandle } from '../webview/terminal-webview-contract'
+import type { TerminalFrame } from '../webview/terminal-webview-messages'
 import type { TerminalViewportDims } from './terminal-viewport-refit'
-import type { TerminalPaneViewport } from './session/mobile-terminal-pane-layout'
+import type { TerminalPaneViewport } from '../session/pane-layout/mobile-terminal-pane-layout'
 
 export type TerminalViewportRefitOptions = {
   activeHandleRef: RefObject<string | null>
diff --git a/mobile/src/terminal/terminal-viewport-refit-state.ts b/mobile/src/terminal/viewport/terminal-viewport-refit-state.ts
similarity index 94%
rename from mobile/src/terminal/terminal-viewport-refit-state.ts
rename to mobile/src/terminal/viewport/terminal-viewport-refit-state.ts
index d32fb8d3ea4..b1461222ccc 100644
--- a/mobile/src/terminal/terminal-viewport-refit-state.ts
+++ b/mobile/src/terminal/viewport/terminal-viewport-refit-state.ts
@@ -1,5 +1,5 @@
-import type { RpcResponse } from '../transport/rpc/rpc-wire-types'
-import { isMethodNotFoundRefusal } from '../transport/rpc/rpc-acceptance-policies'
+import type { RpcResponse } from '../../transport/rpc/rpc-wire-types'
+import { isMethodNotFoundRefusal } from '../../transport/rpc/rpc-acceptance-policies'
 
 export type TerminalUpdateViewportCapability = 'unknown' | 'supported' | 'unsupported'
 
diff --git a/mobile/src/terminal/terminal-viewport-refit.ts b/mobile/src/terminal/viewport/terminal-viewport-refit.ts
similarity index 97%
rename from mobile/src/terminal/terminal-viewport-refit.ts
rename to mobile/src/terminal/viewport/terminal-viewport-refit.ts
index 3e3a80dd49b..f0660add1e4 100644
--- a/mobile/src/terminal/terminal-viewport-refit.ts
+++ b/mobile/src/terminal/viewport/terminal-viewport-refit.ts
@@ -1,9 +1,9 @@
 import type { TerminalViewportRefitOptions } from './terminal-viewport-refit-options'
-import { terminalPaneViewport } from './session/mobile-terminal-pane-layout'
+import { terminalPaneViewport } from '../session/pane-layout/mobile-terminal-pane-layout'
 import { useCallback, useEffect, useRef } from 'react'
 import { AppState, Platform, useWindowDimensions, type AppStateStatus } from 'react-native'
-import { shouldRecoverTerminalOnAppStateChange } from './terminal-foreground-recovery'
-import { terminalViewportUpdate } from './mobile-terminal-operations'
+import { shouldRecoverTerminalOnAppStateChange } from '../webview/terminal-foreground-recovery'
+import { terminalViewportUpdate } from '../host-operations/mobile-terminal-operations'
 import {
   isTerminalViewportRefitTargetCurrent,
   reduceTerminalFrameHeightRefit,
@@ -12,7 +12,7 @@ import {
   type TerminalFrameHeightRefitState,
   type TerminalUpdateViewportCapability
 } from './terminal-viewport-refit-state'
-import { currentAppStateStatus } from '../platform/app-state-status'
+import { currentAppStateStatus } from '../../platform/app-state-status'
 
 export type TerminalViewportDims = { cols: number; rows: number }
 
diff --git a/mobile/src/terminal/TerminalWebView.tsx b/mobile/src/terminal/webview/TerminalWebView.tsx
similarity index 95%
rename from mobile/src/terminal/TerminalWebView.tsx
rename to mobile/src/terminal/webview/TerminalWebView.tsx
index b2cb21eaec8..76f300c0e21 100644
--- a/mobile/src/terminal/TerminalWebView.tsx
+++ b/mobile/src/terminal/webview/TerminalWebView.tsx
@@ -1,18 +1,16 @@
 import { useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react'
 import { Platform, View } from 'react-native'
 import { WebView, type WebViewMessageEvent } from 'react-native-webview'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import type { TerminalWebViewHandle, TerminalWebViewProps } from './terminal-webview-contract'
 import { TerminalWebViewEngineErrorOverlay } from './terminal-webview-engine-error-state'
 import { TERMINAL_WEBVIEW_FRAME_STYLES } from './terminal-webview-frame-styles'
-import { xtermWebViewSource } from './terminal-webview-html'
+import { xtermWebViewSource } from '../document/native-terminal-html'
 import type { TerminalWebViewCommand } from './terminal-webview-messages'
 import { useTerminalWebViewController } from './use-terminal-webview-controller'
 
 type Props = TerminalWebViewProps
 
-export type { TerminalWebViewHandle } from './terminal-webview-contract'
-
 export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
   function TerminalWebView(props, ref) {
     const t = useMobileTranslation()
diff --git a/mobile/src/terminal/TerminalWebView.web.tsx b/mobile/src/terminal/webview/TerminalWebView.web.tsx
similarity index 94%
rename from mobile/src/terminal/TerminalWebView.web.tsx
rename to mobile/src/terminal/webview/TerminalWebView.web.tsx
index 984f7d0d515..1dad307eb20 100644
--- a/mobile/src/terminal/TerminalWebView.web.tsx
+++ b/mobile/src/terminal/webview/TerminalWebView.web.tsx
@@ -1,12 +1,12 @@
 import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
 import { View, type HostInstance } from 'react-native'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
 import type { TerminalWebViewHandle, TerminalWebViewProps } from './terminal-webview-contract'
 import { TerminalWebViewEngineErrorOverlay } from './terminal-webview-engine-error-state'
 import { TERMINAL_WEBVIEW_FRAME_STYLES } from './terminal-webview-frame-styles'
 import type { TerminalWebViewCommand } from './terminal-webview-messages'
-import type { TerminalWebDocument } from './terminal-web-document-mount'
+import type { TerminalWebDocument } from '../document/terminal-web-document-mount'
 import { useTerminalWebViewController } from './use-terminal-webview-controller'
 
 type Props = TerminalWebViewProps
@@ -21,8 +21,6 @@ function describeTerminalDocumentStartupError(error: unknown): string {
   )
 }
 
-export type { TerminalWebViewHandle } from './terminal-webview-contract'
-
 // react-native-webview has no rendered web implementation; mount the same document factory with the native controller contract.
 export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
   function TerminalWebView(props, ref) {
@@ -79,7 +77,7 @@ export const TerminalWebView = forwardRef<TerminalWebViewHandle, Props>(
         })
       }
       // Load xterm with the first terminal so chat-only sessions never parse it; posts queue in beforeMountRef meanwhile.
-      void import('./terminal-web-document-mount').then(
+      void import('../document/terminal-web-document-mount').then(
         ({ mountTerminalWebDocument }) => {
           if (disposed) {
             return
diff --git a/mobile/src/terminal/terminal-foreground-recovery.ts b/mobile/src/terminal/webview/terminal-foreground-recovery.ts
similarity index 92%
rename from mobile/src/terminal/terminal-foreground-recovery.ts
rename to mobile/src/terminal/webview/terminal-foreground-recovery.ts
index a54aa1105ec..c7d2a84d40f 100644
--- a/mobile/src/terminal/terminal-foreground-recovery.ts
+++ b/mobile/src/terminal/webview/terminal-foreground-recovery.ts
@@ -1,7 +1,7 @@
 import type { RefObject } from 'react'
-import type { TerminalResumeState } from './session/terminal-stream-resume'
-import type { ConnectionState } from '../transport/connection/connection-state'
-import type { TerminalWebViewHandle } from './TerminalWebView'
+import type { TerminalResumeState } from '../session/streaming/terminal-stream-resume'
+import type { ConnectionState } from '../../transport/connection/connection-state'
+import type { TerminalWebViewHandle } from './terminal-webview-contract'
 
 export const TERMINAL_FOREGROUND_RECOVERY_DELAY_MS = 120
 
diff --git a/mobile/src/terminal/terminal-webview-activity.test.tsx b/mobile/src/terminal/webview/terminal-webview-activity.test.tsx
similarity index 100%
rename from mobile/src/terminal/terminal-webview-activity.test.tsx
rename to mobile/src/terminal/webview/terminal-webview-activity.test.tsx
diff --git a/mobile/src/terminal/terminal-webview-cell-box.test.ts b/mobile/src/terminal/webview/terminal-webview-cell-box.test.ts
similarity index 85%
rename from mobile/src/terminal/terminal-webview-cell-box.test.ts
rename to mobile/src/terminal/webview/terminal-webview-cell-box.test.ts
index 5dfcb5dc351..fdbe3b06d85 100644
--- a/mobile/src/terminal/terminal-webview-cell-box.test.ts
+++ b/mobile/src/terminal/webview/terminal-webview-cell-box.test.ts
@@ -109,22 +109,6 @@ describe('the cell box xterm laid out', () => {
     expect(handle().fitDimensions(FRAME)).toEqual({ cols: 55, rows: 47 })
   })
 
-  it('fits in the app from the reported box, and sends the frame with every grid', () => {
-    const { handle, notify } = mount()
-    notify({ type: 'web-ready', cellBox: cellAt(scale) })
-    expect(handle().fitDimensions({ width: 427.5, height: 0 })).toBeNull()
-    expect(handle().fitDimensions({ width: 427.5, height: 710 })).toEqual({ cols: 55, rows: 47 })
-    const frame = { width: 427.5, height: 710 }
-    handle().init({ cols: 55, rows: 47, initialData: '', frame })
-    handle().resize(55, 47, frame)
-    handle().reflow(55, 47, frame)
-    const grids = nativeWebViewMethods.postMessage.mock.calls
-      .map(([message]) => JSON.parse(message))
-      .filter((message) => ['init', 'resize', 'reflow'].includes(message.type))
-    expect(grids.map((message) => message.frame)).toEqual([frame, frame, frame])
-    expect(postedTypes()).not.toContain('measure')
-  })
-
   it('sends nothing before a ready: a load start drops what was queued', () => {
     const { handle, notify, webView } = mount()
     handle().init({ cols: 55, rows: 47, initialData: 'snapshot', frame: null })
diff --git a/mobile/src/terminal/terminal-webview-contract.test.ts b/mobile/src/terminal/webview/terminal-webview-contract.test.ts
similarity index 100%
rename from mobile/src/terminal/terminal-webview-contract.test.ts
rename to mobile/src/terminal/webview/terminal-webview-contract.test.ts
diff --git a/mobile/src/terminal/terminal-webview-contract.ts b/mobile/src/terminal/webview/terminal-webview-contract.ts
similarity index 92%
rename from mobile/src/terminal/terminal-webview-contract.ts
rename to mobile/src/terminal/webview/terminal-webview-contract.ts
index d58413fe890..1d94ac272fa 100644
--- a/mobile/src/terminal/terminal-webview-contract.ts
+++ b/mobile/src/terminal/webview/terminal-webview-contract.ts
@@ -1,8 +1,8 @@
-import type { ParsedFileLinkLocation } from '../../../src/shared/file-links/file-link-location'
-import type { RuntimeMobileTerminalTheme } from '../../../src/shared/runtime-mobile-session-tab-contracts'
-import type { TerminalOscLinkRange } from '../../../src/shared/terminal/links/terminal-osc-link-ranges'
+import type { ParsedFileLinkLocation } from '../../../../src/shared/file-links/file-link-location'
+import type { RuntimeMobileTerminalTheme } from '../../../../src/shared/runtime-mobile-session-tab-contracts'
+import type { TerminalOscLinkRange } from '../../../../src/shared/terminal/links/terminal-osc-link-ranges'
 import type { StyleProp, ViewStyle } from 'react-native'
-import type { TerminalFitDimensions } from './terminal-grid-fit'
+import type { TerminalFitDimensions } from '../viewport/terminal-grid-fit'
 import type { TerminalFrame } from './terminal-webview-messages'
 
 type TerminalMouseTrackingMode = 'none' | 'x10' | 'vt200' | 'drag' | 'any'
diff --git a/mobile/src/terminal/terminal-webview-engine-error-state.tsx b/mobile/src/terminal/webview/terminal-webview-engine-error-state.tsx
similarity index 92%
rename from mobile/src/terminal/terminal-webview-engine-error-state.tsx
rename to mobile/src/terminal/webview/terminal-webview-engine-error-state.tsx
index 59c47f9de9a..53b18922e2a 100644
--- a/mobile/src/terminal/terminal-webview-engine-error-state.tsx
+++ b/mobile/src/terminal/webview/terminal-webview-engine-error-state.tsx
@@ -1,11 +1,11 @@
 import { useCallback, useState } from 'react'
 import { RefreshCw } from 'lucide-react-native'
 import { Pressable, StyleSheet, Text, View } from 'react-native'
-import { translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { colors, radii, pressedStyle } from '../theme/mobile-theme'
-import { themedStyleSheet } from '../theme/themed-styles'
-import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { colors, radii, pressedStyle } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 
 export type NativeWebViewEngineEvent = {
   readonly nativeEvent?: object
diff --git a/mobile/src/terminal/terminal-webview-engine.test.ts b/mobile/src/terminal/webview/terminal-webview-engine.test.ts
similarity index 93%
rename from mobile/src/terminal/terminal-webview-engine.test.ts
rename to mobile/src/terminal/webview/terminal-webview-engine.test.ts
index c1f48ded583..eec87833bdb 100644
--- a/mobile/src/terminal/terminal-webview-engine.test.ts
+++ b/mobile/src/terminal/webview/terminal-webview-engine.test.ts
@@ -2,7 +2,7 @@
 import { Script } from 'node:vm'
 import { parse } from 'acorn'
 import { describe, expect, it, vi } from 'vitest'
-import { XTERM_ENGINE_JS } from './terminal-webview-engine.generated'
+import { XTERM_ENGINE_JS } from '../document/terminal-webview-engine.generated'
 describe('terminal WebView bundled engine', () => {
   it('parses the bundled engine at the Chrome 74 syntax floor', () => {
     expect(() => parse(XTERM_ENGINE_JS, { ecmaVersion: 2019 })).not.toThrow()
diff --git a/mobile/src/terminal/terminal-webview-frame-styles.ts b/mobile/src/terminal/webview/terminal-webview-frame-styles.ts
similarity index 83%
rename from mobile/src/terminal/terminal-webview-frame-styles.ts
rename to mobile/src/terminal/webview/terminal-webview-frame-styles.ts
index 907a1f3326d..0a712d0a684 100644
--- a/mobile/src/terminal/terminal-webview-frame-styles.ts
+++ b/mobile/src/terminal/webview/terminal-webview-frame-styles.ts
@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native'
-import { colors } from '../theme/mobile-theme'
+import { colors } from '../../theme/mobile-theme'
 
 export const TERMINAL_WEBVIEW_FRAME_STYLES = StyleSheet.create({
   container: {
diff --git a/mobile/src/terminal/terminal-webview-messages.ts b/mobile/src/terminal/webview/terminal-webview-messages.ts
similarity index 85%
rename from mobile/src/terminal/terminal-webview-messages.ts
rename to mobile/src/terminal/webview/terminal-webview-messages.ts
index bb71effd322..d4b98bbab47 100644
--- a/mobile/src/terminal/terminal-webview-messages.ts
+++ b/mobile/src/terminal/webview/terminal-webview-messages.ts
@@ -1,5 +1,5 @@
-import type { RuntimeMobileTerminalTheme } from '../../../src/shared/runtime-mobile-session-tab-contracts'
-import type { TerminalOscLinkRange } from '../../../src/shared/terminal/links/terminal-osc-link-ranges'
+import type { RuntimeMobileTerminalTheme } from '../../../../src/shared/runtime-mobile-session-tab-contracts'
+import type { TerminalOscLinkRange } from '../../../../src/shared/terminal/links/terminal-osc-link-ranges'
 
 export type TerminalFrame = { width: number; height: number }
 
diff --git a/mobile/src/terminal/terminal-webview-notification-dispatch.ts b/mobile/src/terminal/webview/terminal-webview-notification-dispatch.ts
similarity index 93%
rename from mobile/src/terminal/terminal-webview-notification-dispatch.ts
rename to mobile/src/terminal/webview/terminal-webview-notification-dispatch.ts
index 859c0392e08..4b39e719aa6 100644
--- a/mobile/src/terminal/terminal-webview-notification-dispatch.ts
+++ b/mobile/src/terminal/webview/terminal-webview-notification-dispatch.ts
@@ -1,6 +1,6 @@
-import { parseTerminalKittyKeyboardFlags } from '../../../src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-flags'
-import type { ParsedFileLinkLocation } from '../../../src/shared/file-links/file-link-location'
-import { translate } from '../i18n/mobile-i18n'
+import { parseTerminalKittyKeyboardFlags } from '../../../../src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-flags'
+import type { ParsedFileLinkLocation } from '../../../../src/shared/file-links/file-link-location'
+import { translate } from '../../i18n/mobile-i18n'
 import {
   parseTerminalKeyboardAvoidanceMetrics,
   type TerminalSelectionEvents
diff --git a/mobile/src/terminal/terminal-webview-pending-messages.ts b/mobile/src/terminal/webview/terminal-webview-pending-messages.ts
similarity index 100%
rename from mobile/src/terminal/terminal-webview-pending-messages.ts
rename to mobile/src/terminal/webview/terminal-webview-pending-messages.ts
diff --git a/mobile/src/terminal/terminal-webview-query-reply-routing.ts b/mobile/src/terminal/webview/terminal-webview-query-reply-routing.ts
similarity index 75%
rename from mobile/src/terminal/terminal-webview-query-reply-routing.ts
rename to mobile/src/terminal/webview/terminal-webview-query-reply-routing.ts
index f37a4a17714..4b04548b4e8 100644
--- a/mobile/src/terminal/terminal-webview-query-reply-routing.ts
+++ b/mobile/src/terminal/webview/terminal-webview-query-reply-routing.ts
@@ -1,4 +1,4 @@
-import { isTerminalQueryReply } from '../../../src/shared/terminal/protocol/queries/terminal-query-reply'
+import { isTerminalQueryReply } from '../../../../src/shared/terminal/protocol/queries/terminal-query-reply'
 
 export function routeTerminalQueryReply(
   message: Record<string, unknown>,
diff --git a/mobile/src/terminal/terminal-webview-ready-promises.ts b/mobile/src/terminal/webview/terminal-webview-ready-promises.ts
similarity index 100%
rename from mobile/src/terminal/terminal-webview-ready-promises.ts
rename to mobile/src/terminal/webview/terminal-webview-ready-promises.ts
diff --git a/mobile/src/terminal/terminal-webview-ready-watchdog.ts b/mobile/src/terminal/webview/terminal-webview-ready-watchdog.ts
similarity index 96%
rename from mobile/src/terminal/terminal-webview-ready-watchdog.ts
rename to mobile/src/terminal/webview/terminal-webview-ready-watchdog.ts
index 3439aee04d9..2fc22784bb4 100644
--- a/mobile/src/terminal/terminal-webview-ready-watchdog.ts
+++ b/mobile/src/terminal/webview/terminal-webview-ready-watchdog.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, type RefObject } from 'react'
 import { AppState } from 'react-native'
-import { translate } from '../i18n/mobile-i18n'
+import { translate } from '../../i18n/mobile-i18n'
 
 // Silent startup/bridge failures may emit no error; a native watchdog must turn the blank pane into a reported failure.
 const WEB_READY_WATCHDOG_MS = 15000
diff --git a/mobile/src/terminal/terminal-webview-text-zoom.test.ts b/mobile/src/terminal/webview/terminal-webview-text-zoom.test.ts
similarity index 91%
rename from mobile/src/terminal/terminal-webview-text-zoom.test.ts
rename to mobile/src/terminal/webview/terminal-webview-text-zoom.test.ts
index 1f8eb4f967a..434852cdecf 100644
--- a/mobile/src/terminal/terminal-webview-text-zoom.test.ts
+++ b/mobile/src/terminal/webview/terminal-webview-text-zoom.test.ts
@@ -1,7 +1,7 @@
 // @vitest-environment happy-dom
 import { describe, expect, it } from 'vitest'
-import { createTerminalDocumentScope } from './document/document-scope'
-import { normalizeStatusDotPresentation } from './document/engine/write-queue'
+import { createTerminalDocumentScope } from '../document/document-scope'
+import { normalizeStatusDotPresentation } from '../document/engine/write-queue'
 
 function normalizeStatusDotChunks(chunks: string[]) {
   const scope = createTerminalDocumentScope()
diff --git a/mobile/src/terminal/use-terminal-webview-controller.ts b/mobile/src/terminal/webview/use-terminal-webview-controller.ts
similarity index 95%
rename from mobile/src/terminal/use-terminal-webview-controller.ts
rename to mobile/src/terminal/webview/use-terminal-webview-controller.ts
index d6093bee1f5..d4c1b6811d2 100644
--- a/mobile/src/terminal/use-terminal-webview-controller.ts
+++ b/mobile/src/terminal/webview/use-terminal-webview-controller.ts
@@ -1,7 +1,7 @@
-import { parseTerminalKittyKeyboardFlags } from '../../../src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-flags'
+import { parseTerminalKittyKeyboardFlags } from '../../../../src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-flags'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
-import { readTerminalCellBox, type TerminalCellBox } from './terminal-cell-box'
-import { fitDimensionsFromCell } from './terminal-grid-fit'
+import { readTerminalCellBox, type TerminalCellBox } from '../viewport/terminal-cell-box'
+import { fitDimensionsFromCell } from '../viewport/terminal-grid-fit'
 import type {
   TerminalInit,
   TerminalWebViewHandle,
@@ -14,8 +14,8 @@ import { createTerminalWebViewPendingMessages } from './terminal-webview-pending
 import { dispatchTerminalWebViewNotification } from './terminal-webview-notification-dispatch'
 import { routeTerminalQueryReply } from './terminal-webview-query-reply-routing'
 import { useTerminalWebViewReadyPromises } from './terminal-webview-ready-promises'
-import { createTerminalDocumentWrites } from './terminal-output-ack'
-import { isTerminalGestureInput } from './terminal-gesture-input'
+import { createTerminalDocumentWrites } from '../output-flow/terminal-output-ack'
+import { isTerminalGestureInput } from '../pointer-input/terminal-gesture-input'
 
 // Share readiness, queues, coalescing and imperative handles across hosts; only document command/notify transport differs.
 
diff --git a/mobile/src/test-support/bridged-parity/c1-page-closure.ts b/mobile/src/test-support/bridged-parity/c1-page-closure.ts
deleted file mode 100644
index 68096408415..00000000000
--- a/mobile/src/test-support/bridged-parity/c1-page-closure.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-// Pin verdicts per golden in the resolved web route closure; global class totals can hide one regression offset by another fix.
-// Shell-only bundle operations do not belong to the page closure even when a shared runner reaches them.
-
-import type { PageClosurePins } from './page-closure'
-
-export const C1_PAGE_CLOSURE: PageClosurePins = {
-  'settings.repo-metadata': {
-    'matrix-settings.repo-metadata-host.platform-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-repo.list-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-ssh.listtargetsummaries-1': 'result-absent-settlement',
-    'schedules-settings-repo-metadata-fulfilled': 'identical',
-    'settings-repo-cache-expiry': 'identical',
-    'settings-repo-metadata-fulfilled': 'identical',
-    'settings-repo-metadata-icons': 'identical',
-    'settings-repo-metadata-refuse-after-data': 'identical',
-    'settings-repo-metadata-refused': 'identical',
-    'settings-repo-metadata-single-host': 'identical',
-    'settings-repo-metadata-transport-error': 'identical'
-  },
-  'settings.workspace-context': {
-    'lifecycle-settings-workspace-context-fulfilled': 'identical',
-    'matrix-settings.workspace-context-jira.status-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-linear.status-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-preflight.check-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-ui.get-1': 'result-absent-settlement',
-    'schedules-settings-workspace-context-fulfilled': 'identical',
-    'settings-workspace-context-fulfilled': 'identical',
-    'settings-workspace-context-refuse-after-data': 'identical',
-    'settings-workspace-context-refused': 'identical',
-    'settings-workspace-context-transport-error': 'identical'
-  },
-  'tasks.smart-source-search': {
-    'matrix-tasks.smart-source-search-github.listworkitems-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-gitlab.listworkitems-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-linear.listissues-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-linear.searchissues-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-repo.searchrefs-1': 'params-undefined',
-    'tw-smart-search-all-providers': 'params-undefined',
-    'tw-smart-search-gitlab-provider-error': 'identical',
-    'tw-smart-search-linear-listed': 'params-undefined'
-  },
-  'worktree.create-retry': {
-    'matrix-worktree.create-retry-worktree.create-1': 'result-absent-settlement',
-    'tw-create-retry-ambiguous-after-drop': 'identical',
-    'tw-create-retry-ambiguous-while-connected': 'identical',
-    'tw-create-retry-ambiguous-without-idempotency': 'identical',
-    'tw-create-retry-created': 'identical',
-    'tw-create-retry-name-collision': 'identical',
-    'tw-create-retry-unretryable-refusal': 'identical',
-    'tw-create-retry-warning-kept': 'identical'
-  },
-  'tasks.paste-lookup': {
-    'matrix-tasks.paste-lookup-github.reposlug-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-github.workitem-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-github.workitembyownerrepo-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-gitlab.workitembypath-1': 'result-absent-settlement',
-    'tw-paste-lookup-resolved': 'identical',
-    'tw-paste-lookup-slug-refused': 'identical',
-    'tw-paste-lookup-slug-unsupported': 'identical'
-  },
-  'host-worktree-refresh': {
-    'host-worktree-refresh-stream': 'write-ordinal',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1': 'write-ordinal',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2': 'result-absent-observation',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3': 'result-absent-observation',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1': 'write-ordinal'
-  },
-  'host.worktree-actions': {
-    'host-worktree-actions-pin-open-delete': 'identical',
-    'host-worktree-delete-archive-hook-failed': 'identical',
-    'host-worktree-delete-refused': 'identical',
-    'matrix-host.worktree-actions-repo.hooks-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.activate-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.rm-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.set-1': 'result-absent-settlement'
-  },
-  'components.execution-target': {
-    'components-target-ssh': 'identical',
-    'matrix-components.execution-target-preflight.detectremoteagents-1': 'result-absent-settlement',
-    'matrix-components.execution-target-ssh.connect-1': 'result-absent-settlement',
-    'matrix-components.execution-target-ssh.getstate-1': 'result-absent-settlement'
-  },
-  'settings.workspace-submit': {
-    'matrix-settings.workspace-submit-settings.get-1': 'result-absent-settlement',
-    'settings-workspace-submit-fulfilled': 'identical',
-    'settings-workspace-submit-refused': 'identical',
-    'settings-workspace-submit-transport-error': 'identical'
-  },
-  'transport.host-status-gates': {
-    'matrix-transport.host-status-gates-status.get-1': 'result-absent-settlement',
-    'transport-host-status-gates-drop-keeps-capabilities': 'identical',
-    'transport-host-status-gates-ready': 'identical',
-    'transport-host-status-gates-refused-degrades': 'identical'
-  },
-  'worktree.hosted-base': {
-    'matrix-worktree.hosted-base-worktree.resolvemrbase-1': 'result-absent-settlement',
-    'matrix-worktree.hosted-base-worktree.resolveprbase-1': 'result-absent-settlement',
-    'tw-hosted-base-resolved': 'identical',
-    'tw-hosted-base-soft-error': 'identical'
-  },
-  'worktree.runtime-capabilities': {
-    'matrix-worktree.runtime-capabilities-status.get-1': 'result-absent-settlement',
-    'tw-capabilities-advertised': 'identical',
-    'tw-capabilities-cutover-retried': 'identical',
-    'tw-capabilities-legacy-idempotency': 'identical'
-  },
-  'host.view-settings': {
-    'host-view-settings-sync': 'identical',
-    'matrix-host.view-settings-settings.get-1': 'result-absent-settlement',
-    'matrix-host.view-settings-ui.get-1': 'result-absent-settlement',
-    'matrix-host.view-settings-ui.set-1': 'result-absent-settlement'
-  },
-  'worktree.catalog-snapshot': {
-    'matrix-worktree.catalog-snapshot-worktree.ps-1': 'result-absent-settlement',
-    'worktree-catalog-snapshot': 'identical',
-    'worktree-catalog-snapshot-unreadable': 'result-absent-settlement'
-  },
-  'worktree.setup-hook-trust': {
-    'matrix-worktree.setup-hook-trust-ui.set-1': 'result-absent-settlement',
-    'tw-setup-hook-trust-always': 'identical',
-    'tw-setup-hook-trust-approved': 'identical'
-  },
-  'components.execution-target-local': {
-    'components-target-local': 'identical',
-    'matrix-components.execution-target-local-preflight.detectagents-1': 'result-absent-settlement'
-  },
-  'components.new-workspace-repositories': {
-    'matrix-components.new-workspace-repositories-repo.list-1': 'result-absent-settlement',
-    'new-workspace-repositories-fulfilled': 'identical'
-  },
-  'components.setup-script': {
-    'components-setup-ask': 'identical',
-    'matrix-components.setup-script-repo.hooks-1': 'result-absent-settlement'
-  },
-  'worktree.agent-launch-create': {
-    'matrix-worktree.agent-launch-create-agent.launch-1': 'result-absent-settlement',
-    'tw-create-retry-agent-launched': 'identical'
-  },
-  'worktree.retired-names': {
-    'matrix-worktree.retired-names-worktree.listretirednames-1': 'result-absent-settlement',
-    'worktree-retired-names': 'identical'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/c2-page-closure.ts b/mobile/src/test-support/bridged-parity/c2-page-closure.ts
deleted file mode 100644
index 29515d60252..00000000000
--- a/mobile/src/test-support/bridged-parity/c2-page-closure.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { C1_PAGE_CLOSURE } from './c1-page-closure'
-import { C2_TASK_SOURCE_CLOSURE_FAMILIES } from './c2-task-source-closure-families'
-import { C2_WORK_ITEM_CLOSURE_FAMILIES } from './c2-work-item-closure-families'
-import type { PageClosurePins } from './page-closure'
-
-// Measure the tasks .web route, excluding the native shell switch’s imports. Inherit C1 verdicts instead of applying C2’s new-family rule to them.
-// Families with no byte-identical golden certify only stable divergence classification, not byte parity.
-export const C2_PAGE_CLOSURE: PageClosurePins = {
-  ...C1_PAGE_CLOSURE,
-  ...C2_WORK_ITEM_CLOSURE_FAMILIES,
-  ...C2_TASK_SOURCE_CLOSURE_FAMILIES
-}
diff --git a/mobile/src/test-support/bridged-parity/c2-task-source-closure-families.ts b/mobile/src/test-support/bridged-parity/c2-task-source-closure-families.ts
deleted file mode 100644
index 255161424c3..00000000000
--- a/mobile/src/test-support/bridged-parity/c2-task-source-closure-families.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import type { PageClosurePins } from './page-closure'
-
-// Task-source closure data is checked against actual runs by c2-page-closure; the table itself is not parity evidence.
-export const C2_TASK_SOURCE_CLOSURE_FAMILIES: PageClosurePins = {
-  'linear.select-workspace-picker': {
-    'linear-select-workspace': 'identical',
-    'matrix-linear.select-workspace-picker-linear.selectworkspace-1': 'result-absent-settlement'
-  },
-  'project-explicit-false': {
-    b2: 'identical',
-    'matrix-project-explicit-false-github.project.updateissuebyslug-1': 'result-absent-settlement'
-  },
-  'settings-best-effort': {
-    'matrix-settings-best-effort-settings.update-1': 'result-absent-settlement',
-    'settings-task-write': 'identical',
-    'tw-task-preferences-resume-write': 'identical'
-  },
-  'settings.task-hydration': {
-    'lifecycle-settings-task-hydration-fulfilled': 'identical',
-    'matrix-settings.task-hydration-linear.status-1': 'result-absent-settlement',
-    'matrix-settings.task-hydration-jira.status-1': 'result-absent-settlement',
-    'matrix-settings.task-hydration-preflight.check-1': 'result-absent-settlement',
-    'matrix-settings.task-hydration-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.task-hydration-status.get-1': 'result-absent-settlement',
-    'matrix-settings.task-hydration-ui.get-1': 'result-absent-settlement',
-    'schedules-settings-task-hydration-fulfilled': 'identical',
-    'settings-task-hydration-fulfilled': 'identical',
-    'settings-task-hydration-refuse-after-data': 'identical',
-    'settings-task-hydration-refused': 'identical',
-    'settings-task-hydration-transport-error': 'identical'
-  },
-  'settings.task-workspace': {
-    'matrix-settings.task-workspace-settings.get-1': 'result-absent-settlement',
-    'settings-task-workspace-fulfilled': 'identical',
-    'settings-task-workspace-refused': 'identical',
-    'settings-task-workspace-transport-error': 'identical'
-  },
-  'settings.task-workspace-create': {
-    'matrix-settings.task-workspace-create-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.task-workspace-create-worktree.create-1': 'result-absent-settlement',
-    'settings-task-workspace-create-linear': 'identical',
-    'settings-task-workspace-create-pr-start-point': 'identical'
-  },
-  'tasks.linear-connect': {
-    'matrix-tasks.linear-connect-linear.connect-1': 'result-absent-settlement',
-    'tk-linear-connect': 'identical'
-  },
-  'tasks.linear-team-context': {
-    'matrix-tasks.linear-team-context-linear.listteams-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.linear-team-context-linear.teamstates-1': { verdict: 'bridge-contract' },
-    'tk-linear-team-context': { verdict: 'bridge-contract' }
-  },
-  'tasks.project-board-load': {
-    'matrix-tasks.project-board-load-github.project.listaccessible-1': 'result-absent-settlement',
-    'matrix-tasks.project-board-load-github.project.listviews-1': 'result-absent-settlement',
-    'matrix-tasks.project-board-load-github.project.listviews-2': 'result-absent-settlement',
-    'matrix-tasks.project-board-load-github.project.resolveref-1': 'result-absent-settlement',
-    'matrix-tasks.project-board-load-github.project.viewtable-1': 'result-absent-settlement',
-    'tk-project-board-load': 'identical'
-  },
-  'tasks.project-repo-slugs': {
-    'matrix-tasks.project-repo-slugs-github.reposlug-1': 'result-absent-settlement',
-    'tk-project-repo-slugs': 'identical'
-  },
-  'tasks.provider-load': {
-    'matrix-tasks.provider-load-github.countworkitems-1': 'result-absent-settlement',
-    'matrix-tasks.provider-load-github.listworkitems-1': 'result-absent-settlement',
-    'matrix-tasks.provider-load-linear.listteams-1': 'result-absent-settlement',
-    'matrix-tasks.provider-load-linear.status-1': 'result-absent-settlement',
-    'matrix-tasks.provider-load-settings.update-1': 'result-absent-settlement',
-    'tk-provider-load': 'identical'
-  },
-  'tasks.route-repo-list': {
-    'matrix-tasks.route-repo-list-repo.list-1': 'result-absent-settlement',
-    'tasks-route-repo-list': 'identical'
-  },
-  'tasks.task-create-github': {
-    'matrix-tasks.task-create-github-github.createissue-1': 'result-absent-settlement',
-    'matrix-tasks.task-create-github-repo.update-1': 'result-absent-settlement',
-    'tk-create-github': 'identical'
-  },
-  'tasks.task-create-gitlab': {
-    'matrix-tasks.task-create-gitlab-gitlab.createissue-1': 'result-absent-settlement',
-    'tk-create-gitlab': 'identical'
-  },
-  'tasks.task-create-linear': {
-    'matrix-tasks.task-create-linear-linear.createissue-1': 'result-absent-settlement',
-    'tk-create-linear': 'identical'
-  },
-  'tasks.task-list-gitlab-items': {
-    'matrix-tasks.task-list-gitlab-items-gitlab.listworkitems-1': 'params-undefined',
-    'tk-list-gitlab-items': 'params-undefined'
-  },
-  'tasks.task-list-gitlab-todos': {
-    'matrix-tasks.task-list-gitlab-todos-gitlab.todos-1': 'result-absent-settlement',
-    'tk-list-gitlab-todos': 'identical'
-  },
-  'tasks.task-list-linear': {
-    'matrix-tasks.task-list-linear-linear.listissues-1': 'result-absent-settlement',
-    'matrix-tasks.task-list-linear-linear.searchissues-1': 'result-absent-settlement',
-    'tk-list-linear': 'identical',
-    'tk-list-linear-switch-back': 'identical'
-  },
-  'tasks.workspace-source': {
-    'matrix-tasks.workspace-source-repo.searchrefs-1': 'result-absent-settlement',
-    'matrix-tasks.workspace-source-repo.sparsepresets-1': 'result-absent-settlement',
-    'tw-workspace-source-presets': 'identical',
-    'tw-workspace-source-presets-refused': 'identical'
-  },
-  'tasks.workspace-sparse': {
-    'matrix-tasks.workspace-sparse-repo.savesparsepreset-1': 'result-absent-settlement',
-    'matrix-tasks.workspace-sparse-ssh.getstate-1': 'result-absent-settlement',
-    'tw-workspace-sparse-missing-preset': 'identical',
-    'tw-workspace-sparse-saved': 'identical'
-  },
-  'tasks.workspace-ssh': {
-    'matrix-tasks.workspace-ssh-preflight.detectremoteagents-1': 'result-absent-settlement',
-    'matrix-tasks.workspace-ssh-repo.hooks-1': 'result-absent-settlement',
-    'matrix-tasks.workspace-ssh-ssh.connect-1': 'result-absent-settlement',
-    'tw-workspace-ssh-connect-refused': 'identical',
-    'tw-workspace-ssh-connected': 'identical',
-    'tw-workspace-ssh-not-ready': 'identical'
-  },
-  'tasks.workspace-ssh-local': {
-    'matrix-tasks.workspace-ssh-local-preflight.detectagents-1': 'result-absent-settlement',
-    'tw-workspace-ssh-local-agents': 'identical'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/c2-work-item-closure-families.ts b/mobile/src/test-support/bridged-parity/c2-work-item-closure-families.ts
deleted file mode 100644
index 0249da74754..00000000000
--- a/mobile/src/test-support/bridged-parity/c2-work-item-closure-families.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import type { PageClosurePins } from './page-closure'
-
-// Classify only C2’s added work-item families; inherited C1 verdicts are pinned separately, not re-derived.
-export const C2_WORK_ITEM_CLOSURE_FAMILIES: PageClosurePins = {
-  'linear-detail-barrier': {
-    b3: 'identical',
-    'lifecycle-b3': 'identical',
-    'matrix-linear-detail-barrier-linear.getissue-1': 'result-absent-settlement',
-    'matrix-linear-detail-barrier-linear.issuecomments-1': 'result-absent-settlement',
-    'schedules-b3': 'identical'
-  },
-  'tasks.item-checks-files': {
-    'matrix-tasks.item-checks-files-github.addprreviewcomment-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-checks-files-github.prfilecontents-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-checks-files-github.rerunprchecks-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-checks-files-github.resolvereviewthread-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-checks-files-github.setprfileviewed-1': { verdict: 'bridge-contract' },
-    'tk-item-checks-files': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-comment-github': {
-    'matrix-tasks.item-comment-github-github.addissuecomment-1': { verdict: 'bridge-contract' },
-    'tk-item-comment-github': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-comment-gitlab': {
-    'matrix-tasks.item-comment-gitlab-gitlab.addissuecomment-1': { verdict: 'bridge-contract' },
-    'tk-item-comment-gitlab': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-comment-gitlab-mr': {
-    'matrix-tasks.item-comment-gitlab-mr-gitlab.addmrcomment-1': { verdict: 'bridge-contract' },
-    'tk-item-comment-gitlab-mr': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-detail-github': {
-    'matrix-tasks.item-detail-github-status.get-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-detail-github-github.workitemdetails-1': { verdict: 'bridge-contract' },
-    'tk-item-detail-github': { verdict: 'bridge-contract' },
-    'tk-item-detail-github-reactions': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-detail-gitlab': {
-    'matrix-tasks.item-detail-gitlab-gitlab.workitemdetails-1': { verdict: 'bridge-contract' },
-    'tk-item-detail-gitlab': { verdict: 'bridge-contract' },
-    'tk-item-detail-gitlab-reactions': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-detail-linear': {
-    'matrix-tasks.item-detail-linear-linear.getissue-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-detail-linear-linear.issuecomments-1': { verdict: 'bridge-contract' },
-    'tk-item-detail-linear': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-detail-metadata': {
-    'tk-item-detail-metadata': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-merge-gitlab': {
-    'matrix-tasks.item-merge-gitlab-gitlab.mergemr-1': { verdict: 'bridge-contract' },
-    'tk-item-merge-gitlab': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-metadata-github': {
-    'matrix-tasks.item-metadata-github-github.updatepr-1': { verdict: 'bridge-contract' },
-    'tk-item-metadata-github': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-metadata-gitlab': {
-    'matrix-tasks.item-metadata-gitlab-gitlab.updateissue-1': { verdict: 'bridge-contract' },
-    'tk-item-metadata-gitlab': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-metadata-gitlab-mr': {
-    'matrix-tasks.item-metadata-gitlab-mr-gitlab.updatemr-1': { verdict: 'bridge-contract' },
-    'tk-item-metadata-gitlab-mr': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-reply-merge': {
-    'matrix-tasks.item-reply-merge-github.addissuecomment-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-reply-merge-github.addprreviewcommentreply-1': {
-      verdict: 'bridge-contract'
-    },
-    'matrix-tasks.item-reply-merge-github.mergepr-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-reply-merge-linear.updateissue-1': { verdict: 'bridge-contract' },
-    'tk-item-reply-merge': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-review-github': {
-    'matrix-tasks.item-review-github-pr-check-discovery': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-review-github-github.prchecks-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-review-github-github.requestprreviewers-1': { verdict: 'bridge-contract' },
-    'tk-item-review-github': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-status-gitlab': {
-    'matrix-tasks.item-status-gitlab-status.get-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-status-gitlab-github.updateissue-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.item-status-gitlab-gitlab.updateissue-1': { verdict: 'bridge-contract' },
-    'tk-item-status-gitlab': { verdict: 'bridge-contract' }
-  },
-  'tasks.item-status-gitlab-mr': {
-    'matrix-tasks.item-status-gitlab-mr-gitlab.updatemrstate-1': { verdict: 'bridge-contract' },
-    'tk-item-status-gitlab-mr': { verdict: 'bridge-contract' }
-  },
-  'tasks.linear-item': {
-    'matrix-tasks.linear-item-linear.addissuecomment-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.linear-item-linear.createissue-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.linear-item-linear.getissue-1': { verdict: 'bridge-contract' },
-    'tk-linear-item': { verdict: 'bridge-contract' }
-  },
-  'tasks.project-row-comments-issue': {
-    'matrix-tasks.project-row-comments-issue-github.project.addissuecommentbyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-comments-issue-github.project.updateissuebyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-comments-issue-github.project.updateissuecommentbyslug-1':
-      'result-absent-settlement',
-    'tk-project-row-comments-issue': 'identical'
-  },
-  'tasks.project-row-comments-pr': {
-    'matrix-tasks.project-row-comments-pr-github.project.updatepullrequestbyslug-1':
-      'result-absent-settlement',
-    'tk-project-row-comments-pr': 'identical'
-  },
-  'tasks.project-row-detail': {
-    'matrix-tasks.project-row-detail-github.project.workitemdetailsbyslug-1': {
-      verdict: 'bridge-contract'
-    },
-    'tk-project-row-detail': { verdict: 'bridge-contract' }
-  },
-  'tasks.project-row-fields': {
-    'matrix-tasks.project-row-fields-github.project.clearitemfield-1': 'result-absent-settlement',
-    'matrix-tasks.project-row-fields-github.project.updateissuetypebyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-fields-github.project.updateitemfield-1': 'result-absent-settlement',
-    'tk-project-row-fields': 'identical'
-  },
-  'tasks.project-row-files-merge': {
-    'matrix-tasks.project-row-files-merge-status.get-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.project-row-files-merge-github.addprreviewcomment-1': {
-      verdict: 'bridge-contract'
-    },
-    'matrix-tasks.project-row-files-merge-github.mergepr-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.project-row-files-merge-github.prfilecontents-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.project-row-files-merge-github.updateissue-1': { verdict: 'bridge-contract' },
-    'matrix-tasks.project-row-files-merge-github.updateprstate-1': { verdict: 'bridge-contract' },
-    'tk-project-row-files-merge': { verdict: 'bridge-contract' }
-  },
-  'tasks.project-row-metadata-load': {
-    'matrix-tasks.project-row-metadata-load-github.project.listassignableusersbyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-metadata-load-github.project.listissuetypesbyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-metadata-load-github.project.listlabelsbyslug-1':
-      'result-absent-settlement',
-    'tk-project-row-metadata-load': 'identical'
-  },
-  'tasks.project-row-review-checks': {
-    'matrix-tasks.project-row-review-checks-github.prchecks-1': 'result-absent-settlement',
-    'matrix-tasks.project-row-review-checks-github.requestprreviewers-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-review-checks-github.rerunprchecks-1': 'result-absent-settlement',
-    'matrix-tasks.project-row-review-checks-github.setprfileviewed-1': 'result-absent-settlement',
-    'tk-project-row-review-checks': 'identical'
-  },
-  'tasks.project-row-threads': {
-    'matrix-tasks.project-row-threads-github.addissuecomment-1': 'result-absent-settlement',
-    'matrix-tasks.project-row-threads-github.addprreviewcommentreply-1': 'result-absent-settlement',
-    'matrix-tasks.project-row-threads-github.project.deleteissuecommentbyslug-1':
-      'result-absent-settlement',
-    'matrix-tasks.project-row-threads-github.resolvereviewthread-1': 'result-absent-settlement',
-    'tk-project-row-threads': 'identical'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/c3-explorer-closure-families.ts b/mobile/src/test-support/bridged-parity/c3-explorer-closure-families.ts
deleted file mode 100644
index 925f1e92f52..00000000000
--- a/mobile/src/test-support/bridged-parity/c3-explorer-closure-families.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { PageClosurePins } from './page-closure'
-
-// Keep explorer evidence separate from preview route grants; injected absent-result partitions have no valid wire equivalent.
-export const C3_EXPLORER_CLOSURE_FAMILIES: PageClosurePins = {
-  'files.explorer-screen': {
-    'files-explorer-legacy-fallback': 'identical',
-    'files-explorer-readdir': 'identical',
-    'matrix-files.explorer-screen-files.list-1': 'result-absent-settlement',
-    'matrix-files.explorer-screen-files.readdir-1': 'result-absent-settlement'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/c3-page-closure.ts b/mobile/src/test-support/bridged-parity/c3-page-closure.ts
deleted file mode 100644
index 3b0b26f727f..00000000000
--- a/mobile/src/test-support/bridged-parity/c3-page-closure.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { C1_PAGE_CLOSURE } from './c1-page-closure'
-import { C3_EXPLORER_CLOSURE_FAMILIES } from './c3-explorer-closure-families'
-import { C3_PREVIEW_CLOSURE_FAMILIES } from './c3-preview-closure-families'
-import type { PageClosurePins } from './page-closure'
-
-// Measure the resolved explorer/preview web routes and inherit C1 pins verbatim; applying later classification rules to inherited families changes their verdicts.
-// These recordings cover single save round trips, not retry/idempotency; files methods have no mobile streams.
-export const C3_PAGE_CLOSURE: PageClosurePins = {
-  ...C1_PAGE_CLOSURE,
-  ...C3_EXPLORER_CLOSURE_FAMILIES,
-  ...C3_PREVIEW_CLOSURE_FAMILIES
-}
diff --git a/mobile/src/test-support/bridged-parity/c3-preview-closure-families.ts b/mobile/src/test-support/bridged-parity/c3-preview-closure-families.ts
deleted file mode 100644
index 4c15e1270b8..00000000000
--- a/mobile/src/test-support/bridged-parity/c3-preview-closure-families.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { PageClosurePins } from './page-closure'
-
-// Preview read/save recordings cover one round trip and one stale-grant path; they do not establish save retry safety.
-export const C3_PREVIEW_CLOSURE_FAMILIES: PageClosurePins = {
-  'files.preview-artifact-image': {
-    'files-preview-artifact-image-read': 'identical',
-    'matrix-files.preview-artifact-image-files.readterminalartifactpreview-1':
-      'result-absent-settlement'
-  },
-  'files.preview-load': {
-    'files-preview-artifact-direct': 'identical',
-    'files-preview-artifact-image': 'identical',
-    'files-preview-grant-refresh': 'identical',
-    'files-preview-worktree': 'identical',
-    'files-preview-worktree-image': 'identical',
-    'matrix-files.preview-load-files.readterminalartifact-1': 'result-absent-settlement',
-    'matrix-files.preview-load-files.readterminalartifact-2': 'result-absent-settlement',
-    'matrix-files.preview-load-files.resolveterminalpath-1': 'result-absent-settlement'
-  },
-  'files.preview-save': {
-    'files-save-blind': 'identical',
-    'files-save-verified': 'identical',
-    'matrix-files.preview-save-files.readterminalartifact-1': 'result-absent-settlement',
-    'matrix-files.preview-save-files.writeterminalartifact-1': 'result-absent-settlement'
-  },
-  'files.preview-worktree-image': {
-    'files-preview-worktree-image-read': 'identical',
-    'matrix-files.preview-worktree-image-files.readpreview-1': 'result-absent-settlement'
-  },
-  'files.preview-worktree-text': {
-    'files-preview-worktree-text-read': 'identical',
-    'matrix-files.preview-worktree-text-files.read-1': 'result-absent-settlement'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/c5-page-closure.ts b/mobile/src/test-support/bridged-parity/c5-page-closure.ts
deleted file mode 100644
index 6dfcd5ba880..00000000000
--- a/mobile/src/test-support/bridged-parity/c5-page-closure.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-// History goldens require complete residual certification; unchanged families retain their legacy labels.
-// Measure the .web entry; its native sibling imports shell-only bundle operations that the page never loads.
-
-import type { PageClosurePins } from './page-closure'
-
-export const C5_PAGE_CLOSURE: PageClosurePins = {
-  'aiVault.history': {
-    'aivault-history-scan-association': 'write-ordinal',
-    'aivault-history-scan-fulfilled': 'write-ordinal',
-    'aivault-history-scan-refresh': 'write-ordinal',
-    'aivault-history-scan-revisit': 'write-ordinal',
-    'aivault-history-scan-unsupported': 'write-ordinal',
-    'aivault-history-scan-worktrees-late': 'identical',
-    'matrix-aivault.history-aivault.listsessions-1': 'result-absent-settlement',
-    'matrix-aivault.history-status.get-1': 'result-absent-settlement'
-  },
-  'aiVault.history-screen': {
-    'aivault-history-screen-listed': 'write-ordinal',
-    'aivault-history-screen-worktrees': 'write-ordinal',
-    'matrix-aivault.history-screen-platform-status': 'result-absent-settlement',
-    'matrix-aivault.history-screen-worktree.ps-1': 'result-absent-settlement'
-  },
-  'aiVault.resume-launch': {
-    'aivault-resume-launch-create-refused': 'identical',
-    'aivault-resume-launch-invalid-tab': 'identical',
-    'aivault-resume-launch-locked': 'identical',
-    'aivault-resume-launch-sent': 'identical',
-    'matrix-aivault.resume-launch-session.tabs.createterminal-1': 'result-absent-settlement',
-    'matrix-aivault.resume-launch-terminal.send-1': 'result-absent-settlement'
-  },
-  'aiVault.resume-preparation': {
-    'aivault-resume-prepare-refused': 'identical',
-    'aivault-resume-prepare-repin': 'identical',
-    'aivault-resume-prepare-skipped': 'identical',
-    'aivault-resume-prepare-unavailable': 'identical',
-    'matrix-aivault.resume-preparation-aivault.preparesessionresume-1': 'result-absent-settlement'
-  },
-  'components.execution-target': {
-    'components-target-ssh': 'identical',
-    'matrix-components.execution-target-preflight.detectremoteagents-1': 'result-absent-settlement',
-    'matrix-components.execution-target-ssh.connect-1': 'result-absent-settlement',
-    'matrix-components.execution-target-ssh.getstate-1': 'result-absent-settlement'
-  },
-  'components.execution-target-local': {
-    'components-target-local': 'identical',
-    'matrix-components.execution-target-local-preflight.detectagents-1': 'result-absent-settlement'
-  },
-  'components.new-workspace-repositories': {
-    'matrix-components.new-workspace-repositories-repo.list-1': 'result-absent-settlement',
-    'new-workspace-repositories-fulfilled': 'identical'
-  },
-  'components.setup-script': {
-    'components-setup-ask': 'identical',
-    'matrix-components.setup-script-repo.hooks-1': 'result-absent-settlement'
-  },
-  'host-worktree-refresh': {
-    'host-worktree-refresh-stream': 'write-ordinal',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-1': 'write-ordinal',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-2': 'result-absent-observation',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-1-3': 'result-absent-observation',
-    'matrix-host-worktree-refresh-runtime.clientevents.subscribe-2-1': 'write-ordinal'
-  },
-  'host.view-settings': {
-    'host-view-settings-sync': 'identical',
-    'matrix-host.view-settings-settings.get-1': 'result-absent-settlement',
-    'matrix-host.view-settings-ui.get-1': 'result-absent-settlement',
-    'matrix-host.view-settings-ui.set-1': 'result-absent-settlement'
-  },
-  'host.worktree-actions': {
-    'host-worktree-actions-pin-open-delete': 'identical',
-    'host-worktree-delete-archive-hook-failed': 'identical',
-    'host-worktree-delete-refused': 'identical',
-    'matrix-host.worktree-actions-repo.hooks-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.activate-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.rm-1': 'result-absent-settlement',
-    'matrix-host.worktree-actions-worktree.set-1': 'result-absent-settlement'
-  },
-  'settings.repo-metadata': {
-    'matrix-settings.repo-metadata-host.platform-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-repo.list-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.repo-metadata-ssh.listtargetsummaries-1': 'result-absent-settlement',
-    'schedules-settings-repo-metadata-fulfilled': 'identical',
-    'settings-repo-cache-expiry': 'identical',
-    'settings-repo-metadata-fulfilled': 'identical',
-    'settings-repo-metadata-icons': 'identical',
-    'settings-repo-metadata-refuse-after-data': 'identical',
-    'settings-repo-metadata-refused': 'identical',
-    'settings-repo-metadata-single-host': 'identical',
-    'settings-repo-metadata-transport-error': 'identical'
-  },
-  'settings.resume-metadata': {
-    'matrix-settings.resume-metadata-folderworkspace.list-1': 'result-absent-settlement',
-    'matrix-settings.resume-metadata-projectgroup.list-1': 'result-absent-settlement',
-    'matrix-settings.resume-metadata-repo.list-1': 'result-absent-settlement',
-    'matrix-settings.resume-metadata-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.resume-metadata-worktree.ps-1': 'result-absent-settlement',
-    'schedules-settings-resume-metadata-fulfilled': 'identical',
-    'settings-resume-metadata-fulfilled': 'identical',
-    'settings-resume-metadata-refuse-after-data': 'identical',
-    'settings-resume-metadata-refused': 'identical',
-    'settings-resume-metadata-transport-error': 'identical'
-  },
-  'settings.workspace-context': {
-    'lifecycle-settings-workspace-context-fulfilled': 'identical',
-    'matrix-settings.workspace-context-jira.status-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-linear.status-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-preflight.check-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-settings.get-1': 'result-absent-settlement',
-    'matrix-settings.workspace-context-ui.get-1': 'result-absent-settlement',
-    'schedules-settings-workspace-context-fulfilled': 'identical',
-    'settings-workspace-context-fulfilled': 'identical',
-    'settings-workspace-context-refuse-after-data': 'identical',
-    'settings-workspace-context-refused': 'identical',
-    'settings-workspace-context-transport-error': 'identical'
-  },
-  'settings.workspace-submit': {
-    'matrix-settings.workspace-submit-settings.get-1': 'result-absent-settlement',
-    'settings-workspace-submit-fulfilled': 'identical',
-    'settings-workspace-submit-refused': 'identical',
-    'settings-workspace-submit-transport-error': 'identical'
-  },
-  'tasks.paste-lookup': {
-    'matrix-tasks.paste-lookup-github.reposlug-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-github.workitem-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-github.workitembyownerrepo-1': 'result-absent-settlement',
-    'matrix-tasks.paste-lookup-gitlab.workitembypath-1': 'result-absent-settlement',
-    'tw-paste-lookup-resolved': 'identical',
-    'tw-paste-lookup-slug-refused': 'identical',
-    'tw-paste-lookup-slug-unsupported': 'identical'
-  },
-  'tasks.smart-source-search': {
-    'matrix-tasks.smart-source-search-github.listworkitems-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-gitlab.listworkitems-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-linear.listissues-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-linear.searchissues-1': 'params-undefined',
-    'matrix-tasks.smart-source-search-repo.searchrefs-1': 'params-undefined',
-    'tw-smart-search-all-providers': 'params-undefined',
-    'tw-smart-search-gitlab-provider-error': 'identical',
-    'tw-smart-search-linear-listed': 'params-undefined'
-  },
-  'transport.host-status-gates': {
-    'matrix-transport.host-status-gates-status.get-1': 'result-absent-settlement',
-    'transport-host-status-gates-drop-keeps-capabilities': 'identical',
-    'transport-host-status-gates-ready': 'identical',
-    'transport-host-status-gates-refused-degrades': 'identical'
-  },
-  'worktree.agent-launch-create': {
-    'matrix-worktree.agent-launch-create-agent.launch-1': 'result-absent-settlement',
-    'tw-create-retry-agent-launched': 'identical'
-  },
-  'worktree.catalog-snapshot': {
-    'matrix-worktree.catalog-snapshot-worktree.ps-1': 'result-absent-settlement',
-    'worktree-catalog-snapshot': 'identical',
-    'worktree-catalog-snapshot-unreadable': 'result-absent-settlement'
-  },
-  'worktree.create-retry': {
-    'matrix-worktree.create-retry-worktree.create-1': 'result-absent-settlement',
-    'tw-create-retry-ambiguous-after-drop': 'identical',
-    'tw-create-retry-ambiguous-while-connected': 'identical',
-    'tw-create-retry-ambiguous-without-idempotency': 'identical',
-    'tw-create-retry-created': 'identical',
-    'tw-create-retry-name-collision': 'identical',
-    'tw-create-retry-unretryable-refusal': 'identical',
-    'tw-create-retry-warning-kept': 'identical'
-  },
-  'worktree.hosted-base': {
-    'matrix-worktree.hosted-base-worktree.resolvemrbase-1': 'result-absent-settlement',
-    'matrix-worktree.hosted-base-worktree.resolveprbase-1': 'result-absent-settlement',
-    'tw-hosted-base-resolved': 'identical',
-    'tw-hosted-base-soft-error': 'identical'
-  },
-  'worktree.retired-names': {
-    'matrix-worktree.retired-names-worktree.listretirednames-1': 'result-absent-settlement',
-    'worktree-retired-names': 'identical'
-  },
-  'worktree.runtime-capabilities': {
-    'matrix-worktree.runtime-capabilities-status.get-1': 'result-absent-settlement',
-    'tw-capabilities-advertised': 'identical',
-    'tw-capabilities-cutover-retried': 'identical',
-    'tw-capabilities-legacy-idempotency': 'identical'
-  },
-  'worktree.setup-hook-trust': {
-    'matrix-worktree.setup-hook-trust-ui.set-1': 'result-absent-settlement',
-    'tw-setup-hook-trust-always': 'identical',
-    'tw-setup-hook-trust-approved': 'identical'
-  }
-}
diff --git a/mobile/src/test-support/bridged-parity/page-closure.ts b/mobile/src/test-support/bridged-parity/page-closure.ts
deleted file mode 100644
index 8bc32328cbb..00000000000
--- a/mobile/src/test-support/bridged-parity/page-closure.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { BridgedParityClass } from './divergence-classes'
-
-// Share drift semantics across closure tables so inherited goldens cannot receive inconsistent verdicts by domain.
-
-export type StrictBridgedVerdict = BridgedParityClass | 'identical'
-export type BridgedParityVerdict = StrictBridgedVerdict | { verdict: 'bridge-contract' }
-
-export function verdictName(value: BridgedParityVerdict): string {
-  return typeof value === 'string' ? value : value.verdict
-}
-export function sameVerdict(left: BridgedParityVerdict, right: BridgedParityVerdict): boolean {
-  return typeof left === 'string' || typeof right === 'string'
-    ? left === right
-    : left.verdict === right.verdict
-}
-
-export type PageClosureObservation = {
-  family: string
-  verdict: BridgedParityVerdict
-  domain?: 'paired' | 'bridge-only'
-}
-
-export type PageClosurePins = Readonly<
-  Record<string, Readonly<Record<string, BridgedParityVerdict>>>
->
-
-// Compare family membership as well as verdicts so newly reached goldens cannot evade a table that never named them.
-export function pageClosureDrift(
-  pinned: PageClosurePins,
-  observed: ReadonlyMap<string, PageClosureObservation>
-): readonly string[] {
-  const byFamily = new Map<string, string[]>()
-  for (const [id, { family }] of observed) {
-    byFamily.set(family, [...(byFamily.get(family) ?? []), id])
-  }
-  const drift: string[] = []
-  for (const [family, pins] of Object.entries(pinned)) {
-    const seen = byFamily.get(family) ?? []
-    const arrived = seen.filter((id) => !Object.hasOwn(pins, id))
-    const left = Object.keys(pins).filter((id) => !seen.includes(id))
-    if (arrived.length > 0 || left.length > 0) {
-      drift.push(
-        `${family}: arrived ${arrived.join(', ') || '(none)'}; left ${left.join(', ') || '(none)'}`
-      )
-    }
-    for (const [id, verdict] of Object.entries(pins)) {
-      const ran = observed.get(id)?.verdict
-      if (ran !== undefined && !sameVerdict(ran, verdict)) {
-        drift.push(`${id}: pinned ${JSON.stringify(verdict)}, ran ${JSON.stringify(ran)}`)
-      }
-    }
-  }
-  return drift
-}
-
-export function readPageClosure(
-  name: string,
-  pinned: PageClosurePins,
-  observed: ReadonlyMap<string, PageClosureObservation>
-): string {
-  const closure = [...observed].filter(([, seen]) => seen.family in pinned)
-  const diverged = closure.filter(([, seen]) => seen.verdict !== 'identical')
-  return [
-    `\n${name} page closure: ${closure.length} goldens in ${Object.keys(pinned).length} families, ${
-      closure.length - diverged.length
-    } byte-identical\n`,
-    ...diverged.map(([id, seen]) => `  ${id}: ${JSON.stringify(seen.verdict)}\n`)
-  ].join('')
-}
diff --git a/mobile/src/test-support/census-source-files.ts b/mobile/src/test-support/census-source-files.ts
deleted file mode 100644
index a72066c7d4b..00000000000
--- a/mobile/src/test-support/census-source-files.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { readdirSync } from 'node:fs'
-import { join } from 'node:path'
-
-// Exclude generated/vendor bundles; source censuses must inspect editable call sites, including generators and original document modules.
-export function isGeneratedSource(name: string): boolean {
-  return /\.generated\.tsx?$/.test(name)
-}
-
-// Share source-boundary rules; each census still decides which extensions and tests matter to its own contract.
-export function censusSourceFiles(directory: string): string[] {
-  return readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {
-    const path = join(directory, entry.name)
-    if (entry.isDirectory()) {
-      return entry.name === 'node_modules' ? [] : censusSourceFiles(path)
-    }
-    return isGeneratedSource(entry.name) ? [] : [path]
-  })
-}
diff --git a/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts
index 3fa2de1e3e5..86f6e5925e0 100644
--- a/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/client-event-stream-mount-adapters.ts
@@ -1,6 +1,6 @@
 import type * as UseLiveWorktreeNameModule from '../../../worktree/use-live-worktree-name'
 import type * as HostWorktreeRefreshModule from '../../../worktree/host-worktree-refresh'
-import type * as HostListQueries from '../../../host-screen/host-list-queries'
+import type * as HostListQueries from '../../../host-screen/catalog/host-list-queries'
 import type * as HostQueryModule from '../../../query/host-query'
 import { hookMount } from '../hook-mount'
 import { hookScreenMount } from '../mounted-screen-tree'
@@ -53,7 +53,7 @@ export function clientEventStreamMountAdapters(
         'mobile/src/query/host-query.ts'
       )
       const queries = modules.load<typeof HostListQueries>(
-        'mobile/src/host-screen/host-list-queries.ts'
+        'mobile/src/host-screen/catalog/host-list-queries.ts'
       )
       let status: string | null = null
       const hook = hookMount(() => {
diff --git a/mobile/src/test-support/rpc-recording/adapters/diff-review-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/diff-review-mount-adapters.ts
index 49e55d5b8bb..61c9cc79c02 100644
--- a/mobile/src/test-support/rpc-recording/adapters/diff-review-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/diff-review-mount-adapters.ts
@@ -2,7 +2,7 @@ import type * as MobileDiffReviewLoadersModule from '../../../source-control/rev
 import type { MountAdapter } from '../recording-scenario'
 import type * as CommitLoader from '../../../source-control/review/mobile-diff-review-commit-loader'
 import type * as SnapshotLoader from '../../../source-control/review/mobile-diff-review-snapshot-loader'
-import type * as GitStatusQuery from '../../../source-control/mobile-git-status-query'
+import type * as GitStatusQuery from '../../../source-control/changes/mobile-git-status-query'
 import type { operationModuleLoader } from '../operation-module-loader'
 
 const WORKTREE = 'repo-9::/w'
@@ -64,7 +64,7 @@ export function diffReviewMountAdapters(
         action(name, args) {
           if (name === 'snapshot') {
             const statusQuery = modules.load<typeof GitStatusQuery>(
-              'mobile/src/source-control/mobile-git-status-query.ts'
+              'mobile/src/source-control/changes/mobile-git-status-query.ts'
             ).gitStatusQuery
             return modules
               .load<typeof SnapshotLoader>(
diff --git a/mobile/src/test-support/rpc-recording/adapters/file-explorer-screen-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/file-explorer-screen-mount-adapters.ts
index 41b41d8facd..0f1b86b63a7 100644
--- a/mobile/src/test-support/rpc-recording/adapters/file-explorer-screen-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/file-explorer-screen-mount-adapters.ts
@@ -1,3 +1,4 @@
+import type * as FileExplorerScreenModule from '../../../files/explorer/MobileFileExplorerPanel'
 import { createElement } from 'react'
 import { projectMountedScreen, renderedElementProps, screenMount } from '../mounted-screen-tree'
 import { mountFixture } from '../recorder-fixture-shape'
@@ -19,8 +20,8 @@ export function fileExplorerScreenMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'files.explorer-screen': ({ client, effect }) => {
-      const Panel = modules.load<typeof import('../../../files/MobileFileExplorerPanel')>(
-        'mobile/src/files/MobileFileExplorerPanel.tsx'
+      const Panel = modules.load<typeof FileExplorerScreenModule>(
+        'mobile/src/files/explorer/MobileFileExplorerPanel.tsx'
       ).MobileFileExplorerPanel
       const hostClientContext = loadHostClientContext(modules)
       const context = mountFixture<RpcClientContextValue>({
diff --git a/mobile/src/test-support/rpc-recording/adapters/file-request-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/file-request-mount-adapters.ts
index 69aee295011..a838c88cd6a 100644
--- a/mobile/src/test-support/rpc-recording/adapters/file-request-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/file-request-mount-adapters.ts
@@ -1,3 +1,6 @@
+import type * as FileMutationOwnershipModule from '../../../files/mutation-ownership/mobile-file-mutation-ownership'
+import type * as FilePreviewRequestModule from '../../../files/preview/mobile-file-preview-request'
+import type * as FileTabDocModule from '../../../files/session-documents/mobile-file-tab-doc'
 import type { MountAdapter } from '../recording-scenario'
 import type { operationModuleLoader } from '../operation-module-loader'
 
@@ -21,8 +24,8 @@ export function fileRequestMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'files.mutation-ownership': ({ client }) => {
-      const capture = modules.load<typeof import('../../../files/mobile-file-mutation-ownership')>(
-        'mobile/src/files/mobile-file-mutation-ownership.ts'
+      const capture = modules.load<typeof FileMutationOwnershipModule>(
+        'mobile/src/files/mutation-ownership/mobile-file-mutation-ownership.ts'
       ).captureMobileFileMutationOwnership
       let ownership: unknown = 'uncaptured'
       return {
@@ -36,8 +39,8 @@ export function fileRequestMountAdapters(
       }
     },
     'files.preview-load': ({ client, effect }) => {
-      const load = modules.load<typeof import('../../../files/mobile-file-preview-request')>(
-        'mobile/src/files/mobile-file-preview-request.ts'
+      const load = modules.load<typeof FilePreviewRequestModule>(
+        'mobile/src/files/preview/mobile-file-preview-request.ts'
       ).loadMobileFilePreview
       let preview: unknown = 'unloaded'
       return {
@@ -59,8 +62,8 @@ export function fileRequestMountAdapters(
       }
     },
     'files.preview-save': ({ client, effect }) => {
-      const save = modules.load<typeof import('../../../files/mobile-file-preview-request')>(
-        'mobile/src/files/mobile-file-preview-request.ts'
+      const save = modules.load<typeof FilePreviewRequestModule>(
+        'mobile/src/files/preview/mobile-file-preview-request.ts'
       ).saveMobileTerminalArtifactPreview
       let saved: unknown = 'unsaved'
       return {
@@ -78,8 +81,8 @@ export function fileRequestMountAdapters(
       }
     },
     'files.tab-doc': ({ client }) => {
-      const resolve = modules.load<typeof import('../../../files/mobile-file-tab-doc')>(
-        'mobile/src/files/mobile-file-tab-doc.ts'
+      const resolve = modules.load<typeof FileTabDocModule>(
+        'mobile/src/files/session-documents/mobile-file-tab-doc.ts'
       ).resolveMobileFileTabDoc
       const docs: Record<string, unknown> = {}
       return {
diff --git a/mobile/src/test-support/rpc-recording/adapters/host-screen-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/host-screen-mount-adapters.ts
index 269cec1e798..c502d7a387d 100644
--- a/mobile/src/test-support/rpc-recording/adapters/host-screen-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/host-screen-mount-adapters.ts
@@ -1,3 +1,4 @@
+import type * as HostViewSettingsModule from '../../../host-screen/view-settings/use-host-view-settings'
 import type { MountAdapter } from '../recording-scenario'
 import { INITIAL_MOBILE_VIEW } from '../../../worktree/workspace-view-settings'
 import { hookMount, performHookAction } from '../hook-mount'
@@ -9,9 +10,9 @@ export function hostScreenMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'host.view-settings': (context) => {
-      const useViewSettings = modules.load<
-        typeof import('../../../host-screen/use-host-view-settings')
-      >('mobile/src/host-screen/use-host-view-settings.ts').useHostViewSettings
+      const useViewSettings = modules.load<typeof HostViewSettingsModule>(
+        'mobile/src/host-screen/view-settings/use-host-view-settings.ts'
+      ).useHostViewSettings
       const state = observableModel(context, {
         clientRef: { current: context.client },
         view: INITIAL_MOBILE_VIEW,
diff --git a/mobile/src/test-support/rpc-recording/adapters/host-worktree-action-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/host-worktree-action-mount-adapters.ts
index d927a211549..54cc47e1bdc 100644
--- a/mobile/src/test-support/rpc-recording/adapters/host-worktree-action-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/host-worktree-action-mount-adapters.ts
@@ -1,3 +1,4 @@
+import type * as HostWorktreeActionsModule from '../../../host-screen/workspace-actions/use-host-worktree-actions'
 import type { MountAdapter } from '../recording-scenario'
 import { hookMount, performHookAction } from '../hook-mount'
 import { observableModel, projectObservable } from '../observable-model'
@@ -24,9 +25,9 @@ export function hostWorktreeActionMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'host.worktree-actions': (context) => {
-      const useActions = modules.load<
-        typeof import('../../../host-screen/use-host-worktree-actions')
-      >('mobile/src/host-screen/use-host-worktree-actions.ts').useHostWorktreeActions
+      const useActions = modules.load<typeof HostWorktreeActionsModule>(
+        'mobile/src/host-screen/workspace-actions/use-host-worktree-actions.ts'
+      ).useHostWorktreeActions
       const state = observableModel(context, {
         pinnedIds: new Set<string>(),
         worktrees: [ROW],
diff --git a/mobile/src/test-support/rpc-recording/adapters/hosted-review-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/hosted-review-mount-adapters.ts
index 29fe064ca00..26efffb95ad 100644
--- a/mobile/src/test-support/rpc-recording/adapters/hosted-review-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/hosted-review-mount-adapters.ts
@@ -1,3 +1,7 @@
+import type * as MobileHostedReviewGitPreparationModule from '../../../source-control/review/creation/mobile-hosted-review-git-preparation'
+import type * as MobileHostedReviewRemotePrerequisiteModule from '../../../source-control/review/creation/mobile-hosted-review-remote-prerequisite'
+import type * as MobileHostedReviewServiceModule from '../../../source-control/review/creation/mobile-hosted-review-service'
+import type * as MobileHostedReviewCreateIntentRunnerModule from '../../../source-control/review/creation/mobile-hosted-review-create-intent-runner'
 import type { MountAdapter } from '../recording-scenario'
 import { operationModuleLoader } from '../operation-module-loader'
 
@@ -15,9 +19,9 @@ export function hostedReviewMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'source-control.review-git-preparation': ({ client }) => {
-      const preparation = modules.load<
-        typeof import('../../../source-control/mobile-hosted-review-git-preparation')
-      >('mobile/src/source-control/mobile-hosted-review-git-preparation.ts')
+      const preparation = modules.load<typeof MobileHostedReviewGitPreparationModule>(
+        'mobile/src/source-control/review/creation/mobile-hosted-review-git-preparation.ts'
+      )
       let status: unknown = 'unread'
       let committed: unknown = 'uncommitted'
       return {
@@ -40,10 +44,8 @@ export function hostedReviewMountAdapters(
       }
     },
     'source-control.remote-prerequisite': (context) => {
-      const apply = modules.load<
-        typeof import('../../../source-control/mobile-hosted-review-remote-prerequisite')
-      >(
-        'mobile/src/source-control/mobile-hosted-review-remote-prerequisite.ts'
+      const apply = modules.load<typeof MobileHostedReviewRemotePrerequisiteModule>(
+        'mobile/src/source-control/review/creation/mobile-hosted-review-remote-prerequisite.ts'
       ).applyMobileHostedReviewRemotePrerequisite
       let outcome: unknown = 'unapplied'
       return {
@@ -72,9 +74,9 @@ export function hostedReviewMountAdapters(
       }
     },
     'source-control.hosted-review-eligibility': ({ client }) => {
-      const service = modules.load<
-        typeof import('../../../source-control/mobile-hosted-review-service')
-      >('mobile/src/source-control/mobile-hosted-review-service.ts')
+      const service = modules.load<typeof MobileHostedReviewServiceModule>(
+        'mobile/src/source-control/review/creation/mobile-hosted-review-service.ts'
+      )
       let eligibility: unknown = 'unfetched'
       let prefill: unknown = 'unresolved'
       return {
@@ -102,9 +104,9 @@ export function hostedReviewMountAdapters(
       }
     },
     'source-control.hosted-review-create': ({ client }) => {
-      const create = modules.load<
-        typeof import('../../../source-control/mobile-hosted-review-service')
-      >('mobile/src/source-control/mobile-hosted-review-service.ts').createMobileHostedReview
+      const create = modules.load<typeof MobileHostedReviewServiceModule>(
+        'mobile/src/source-control/review/creation/mobile-hosted-review-service.ts'
+      ).createMobileHostedReview
       let outcome: unknown = 'uncreated'
       return {
         action: (_name, args) =>
@@ -125,10 +127,8 @@ export function hostedReviewMountAdapters(
       }
     },
     'source-control.create-intent': (context) => {
-      const run = modules.load<
-        typeof import('../../../source-control/mobile-hosted-review-create-intent-runner')
-      >(
-        'mobile/src/source-control/mobile-hosted-review-create-intent-runner.ts'
+      const run = modules.load<typeof MobileHostedReviewCreateIntentRunnerModule>(
+        'mobile/src/source-control/review/creation/mobile-hosted-review-create-intent-runner.ts'
       ).runMobileHostedReviewCreateIntent
       let outcome: unknown = 'unrun'
       return {
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-screen-read-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-screen-read-mount-adapters.ts
index 0af37c6409d..c25af10bc33 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-screen-read-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-screen-read-mount-adapters.ts
@@ -1,12 +1,12 @@
 import type * as UseMobileSessionDocumentReadersModule from '../../../files/session-documents/use-mobile-session-document-readers'
-import type * as UseMobileSessionTerminalListModule from '../../../terminal/session/use-mobile-session-terminal-list'
+import type * as UseMobileSessionTerminalListModule from '../../../terminal/session/inventory/use-mobile-session-terminal-list'
 import { hookMount, performHookAction } from '../hook-mount'
 import type {
   FileDocState,
   MarkdownDocState
 } from '../../../files/session-documents/session-document-state'
 import type { MobileSessionTab } from '../../../session/tabs/mobile-session-tabs'
-import type { TerminalRecord } from '../../../terminal/session/mobile-terminal-records'
+import type { TerminalRecord } from '../../../terminal/session/inventory/mobile-terminal-records'
 import { mountFixture } from '../recorder-fixture-shape'
 import type { MountAdapter } from '../recording-scenario'
 import type { operationModuleLoader } from '../operation-module-loader'
@@ -73,7 +73,7 @@ export function sessionScreenReadMountAdapters(
     },
     'session.terminal-inventory': ({ client, effect }) => {
       const useList = modules.load<typeof UseMobileSessionTerminalListModule>(
-        'mobile/src/terminal/session/use-mobile-session-terminal-list.ts'
+        'mobile/src/terminal/session/inventory/use-mobile-session-terminal-list.ts'
       ).useMobileSessionTerminalList
       let terminals: TerminalRecord[] = []
       const terminalsRef: { current: TerminalRecord[] } = { current: [] }
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-screen-tab-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-screen-tab-mount-adapters.ts
index 64e3c776843..00a755080f4 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-screen-tab-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-screen-tab-mount-adapters.ts
@@ -2,7 +2,7 @@ import type * as UseMobileSessionContentCreateActionsModule from '../../../sessi
 import type * as UseMobileSessionCloseActionsModule from '../../../session/tabs/use-mobile-session-close-actions'
 import { hookMount, performHookAction } from '../hook-mount'
 import type { MobileSessionTab } from '../../../session/tabs/mobile-session-tabs'
-import type { TerminalRecord } from '../../../terminal/session/mobile-terminal-records'
+import type { TerminalRecord } from '../../../terminal/session/inventory/mobile-terminal-records'
 import { mountFixture } from '../recorder-fixture-shape'
 import type { MountAdapter } from '../recording-scenario'
 import type { operationModuleLoader } from '../operation-module-loader'
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-terminal-create-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-terminal-create-mount-adapters.ts
index d040a2bbc0d..5a317d76eb1 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-terminal-create-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-terminal-create-mount-adapters.ts
@@ -1,4 +1,4 @@
-import type * as UseMobileSessionTerminalCreateActionsModule from '../../../terminal/session/use-mobile-session-terminal-create-actions'
+import type * as UseMobileSessionTerminalCreateActionsModule from '../../../terminal/session/creation/use-mobile-session-terminal-create-actions'
 import type { PendingSessionSelection } from '../../../session/tabs/pending-session-selection'
 import { hookMount } from '../hook-mount'
 import { mountFixture } from '../recorder-fixture-shape'
@@ -8,7 +8,7 @@ import type {
   MobileSessionTab,
   MobileSessionTabType
 } from '../../../session/tabs/mobile-session-tabs'
-import type { Terminal } from '../../../terminal/session/mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../../../terminal/session/inventory/mobile-terminal-records'
 import { SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../../src/shared/protocol-version'
 
 const PREVIOUS_HANDLE = 'terminal-0'
@@ -22,9 +22,9 @@ export function sessionTerminalCreateMountAdapters(
   return {
     'session.create-terminal': ({ client, effect }) => {
       const useCreateActions = modules.load<typeof UseMobileSessionTerminalCreateActionsModule>(
-        'mobile/src/terminal/session/use-mobile-session-terminal-create-actions.ts'
+        'mobile/src/terminal/session/creation/use-mobile-session-terminal-create-actions.ts'
       ).useMobileSessionTerminalCreateActions
-      modules.load('mobile/src/terminal/session/mobile-session-terminal-create-request.ts')
+      modules.load('mobile/src/terminal/session/creation/mobile-session-terminal-create-request.ts')
 
       let terminals: Terminal[] = []
       let sessionTabs: MobileSessionTab[] = []
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-terminal-display-mode-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-terminal-display-mode-mount-adapters.ts
index cfb13a845f0..4a085641413 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-terminal-display-mode-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-terminal-display-mode-mount-adapters.ts
@@ -1,4 +1,4 @@
-import type * as UseMobileSessionTerminalStreamDisplayModule from '../../../terminal/session/use-mobile-session-terminal-stream-display'
+import type * as UseMobileSessionTerminalStreamDisplayModule from '../../../terminal/session/streaming/use-mobile-session-terminal-stream-display'
 import { hookScreenMount } from '../mounted-screen-tree'
 import { mountFixture } from '../recorder-fixture-shape'
 import type { operationModuleLoader } from '../operation-module-loader'
@@ -15,7 +15,7 @@ export function sessionTerminalDisplayModeMountAdapters(
   return {
     'session.terminal-display-mode': ({ client, effect }) => {
       const useStreamDisplay = modules.load<typeof UseMobileSessionTerminalStreamDisplayModule>(
-        'mobile/src/terminal/session/use-mobile-session-terminal-stream-display.ts'
+        'mobile/src/terminal/session/streaming/use-mobile-session-terminal-stream-display.ts'
       ).useMobileSessionTerminalStreamDisplay
 
       const terminalModes = new Map<string, MobileDisplayMode>()
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-terminal-gesture-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-terminal-gesture-mount-adapters.ts
index e9418392c3d..93d0fb0e074 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-terminal-gesture-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-terminal-gesture-mount-adapters.ts
@@ -1,15 +1,15 @@
-import type * as UseMobileSessionTerminalInputModule from '../../../terminal/session/use-mobile-session-terminal-input'
-import type * as MobileTerminalOperations from '../../../terminal/mobile-terminal-operations'
+import type * as UseMobileSessionTerminalInputModule from '../../../terminal/session/input-controls/use-mobile-session-terminal-input'
+import type * as MobileTerminalOperations from '../../../terminal/host-operations/mobile-terminal-operations'
 import { hookScreenMount } from '../mounted-screen-tree'
 import { mountFixture } from '../recorder-fixture-shape'
 import type { operationModuleLoader } from '../operation-module-loader'
 import type { MountAdapter } from '../recording-scenario'
-import type { TerminalModes } from '../../../terminal/terminal-webview-contract'
+import type { TerminalModes } from '../../../terminal/webview/terminal-webview-contract'
 import type {
-  Terminal,
   TerminalGestureInputBucket,
   TerminalGestureInputQueue
 } from '../../../terminal/session/mobile-terminal-model'
+import type { TerminalRecord as Terminal } from '../../../terminal/session/inventory/mobile-terminal-records'
 
 const HANDLE = 'terminal-1'
 const DEVICE_TOKEN = 'device-token-1'
@@ -32,11 +32,11 @@ export function sessionTerminalGestureMountAdapters(
   return {
     'session.terminal-gesture-input': ({ client, effect }) => {
       const useTerminalInput = modules.load<typeof UseMobileSessionTerminalInputModule>(
-        'mobile/src/terminal/session/use-mobile-session-terminal-input.ts'
+        'mobile/src/terminal/session/input-controls/use-mobile-session-terminal-input.ts'
       ).useMobileSessionTerminalInput
 
       const { terminalInputSend } = modules.load<typeof MobileTerminalOperations>(
-        'mobile/src/terminal/mobile-terminal-operations.ts'
+        'mobile/src/terminal/host-operations/mobile-terminal-operations.ts'
       )
 
       const buckets = { current: new Map<string, TerminalGestureInputBucket>() }
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-terminal-input-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-terminal-input-mount-adapters.ts
index e199f1c7050..0717b1c5a4a 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-terminal-input-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-terminal-input-mount-adapters.ts
@@ -1,12 +1,12 @@
-import type * as UseMobileSessionAccessorySelectionModule from '../../../terminal/session/use-mobile-session-accessory-selection'
-import type * as UseMobileTerminalPasteModule from '../../../terminal/session/use-mobile-terminal-paste'
-import type * as UseMobileSessionTerminalSendActionsModule from '../../../terminal/session/use-mobile-session-terminal-send-actions'
-import type * as MobileTerminalOperations from '../../../terminal/mobile-terminal-operations'
+import type * as UseMobileSessionAccessorySelectionModule from '../../../terminal/session/accessory-keys/use-mobile-session-accessory-selection'
+import type * as UseMobileTerminalPasteModule from '../../../terminal/session/input-controls/use-mobile-terminal-paste'
+import type * as UseMobileSessionTerminalSendActionsModule from '../../../terminal/session/input-controls/use-mobile-session-terminal-send-actions'
+import type * as MobileTerminalOperations from '../../../terminal/host-operations/mobile-terminal-operations'
 import { hookScreenMount } from '../mounted-screen-tree'
 import { mountFixture } from '../recorder-fixture-shape'
 import type { operationModuleLoader } from '../operation-module-loader'
 import type { MountAdapter, MountContext } from '../recording-scenario'
-import type { TerminalModes } from '../../../terminal/terminal-webview-contract'
+import type { TerminalModes } from '../../../terminal/webview/terminal-webview-contract'
 
 const HANDLE = 'terminal-1'
 const DEVICE_TOKEN = 'device-token-1'
@@ -39,13 +39,13 @@ function mountTerminalClipboard(
   { client, effect }: MountContext
 ) {
   const useAccessorySelection = modules.load<typeof UseMobileSessionAccessorySelectionModule>(
-    'mobile/src/terminal/session/use-mobile-session-accessory-selection.ts'
+    'mobile/src/terminal/session/accessory-keys/use-mobile-session-accessory-selection.ts'
   ).useMobileSessionAccessorySelection
   const useTerminalPaste = modules.load<typeof UseMobileTerminalPasteModule>(
-    'mobile/src/terminal/session/use-mobile-terminal-paste.ts'
+    'mobile/src/terminal/session/input-controls/use-mobile-terminal-paste.ts'
   ).useMobileTerminalPaste
   const { terminalInputSend } = modules.load<typeof MobileTerminalOperations>(
-    'mobile/src/terminal/mobile-terminal-operations.ts'
+    'mobile/src/terminal/host-operations/mobile-terminal-operations.ts'
   )
 
   const ptyModesRef = { current: new Map([[HANDLE, PTY_MODES]]) }
@@ -137,10 +137,10 @@ function mountTerminalInputSend(
   { client, effect }: MountContext
 ) {
   const useSendActions = modules.load<typeof UseMobileSessionTerminalSendActionsModule>(
-    'mobile/src/terminal/session/use-mobile-session-terminal-send-actions.ts'
+    'mobile/src/terminal/session/input-controls/use-mobile-session-terminal-send-actions.ts'
   ).useMobileSessionTerminalSendActions
   const { terminalInputSend } = modules.load<typeof MobileTerminalOperations>(
-    'mobile/src/terminal/mobile-terminal-operations.ts'
+    'mobile/src/terminal/host-operations/mobile-terminal-operations.ts'
   )
 
   const activeHandleRef = { current: HANDLE }
diff --git a/mobile/src/test-support/rpc-recording/adapters/settings-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/settings-mount-adapters.ts
index 734ad92cd5d..120f69c359c 100644
--- a/mobile/src/test-support/rpc-recording/adapters/settings-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/settings-mount-adapters.ts
@@ -1,9 +1,9 @@
 import type * as UsePrBotAuthorOverridesModule from '../../../source-control/review/use-pr-bot-author-overrides'
 import type * as UseNewWorkspaceRuntimeContextModule from '../../../components/use-new-workspace-runtime-context'
-import type * as UseHostRepoMetadataModule from '../../../host-screen/use-host-repo-metadata'
+import type * as UseHostRepoMetadataModule from '../../../host-screen/catalog/use-host-repo-metadata'
 import type * as UseMobileTasksRuntimeHydrationModule from '../../../tasks/screen-state/use-mobile-tasks-runtime-hydration'
 import { notifyManager, useQueryClient, type QueryClient } from '@tanstack/react-query'
-import type * as HostListQueries from '../../../host-screen/host-list-queries'
+import type * as HostListQueries from '../../../host-screen/catalog/host-list-queries'
 import type * as ResumeMetadata from '../../../agent-history/mobile-agent-history-resume-metadata'
 import { hostQueryKey, hostScopeKey } from '../../../query/host-query-key'
 import type { OperationExposure } from '../operation-module-loader'
@@ -94,10 +94,10 @@ export function settingsMountAdapters(
     },
     'settings.repo-metadata': (context) => {
       const useMetadata = modules.load<typeof UseHostRepoMetadataModule>(
-        'mobile/src/host-screen/use-host-repo-metadata.ts'
+        'mobile/src/host-screen/catalog/use-host-repo-metadata.ts'
       ).useHostRepoMetadata
       const queries = modules.load<typeof HostListQueries>(
-        'mobile/src/host-screen/host-list-queries.ts'
+        'mobile/src/host-screen/catalog/host-list-queries.ts'
       )
       const state = observableModel(context, { clientRef: { current: context.client } })
       // A fault schedule ends with the read settling on a timeout, after the recorder's last zero-time drain; deliver
diff --git a/mobile/src/test-support/rpc-recording/adapters/source-control-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/source-control-mount-adapters.ts
index 3bc399d0bf9..21d64d3d5ce 100644
--- a/mobile/src/test-support/rpc-recording/adapters/source-control-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/source-control-mount-adapters.ts
@@ -1,3 +1,7 @@
+import type * as MobileBranchBaseRefModule from '../../../source-control/branches/mobile-branch-base-ref'
+import type * as MobileGitHistoryModule from '../../../source-control/history/mobile-git-history'
+import type * as MobileCommitMessageAiModule from '../../../source-control/commits/mobile-commit-message-ai'
+import type * as MobilePrLinkModule from '../../../source-control/review/mobile-pr-link'
 import type { MountAdapter } from '../recording-scenario'
 import { operationModuleLoader } from '../operation-module-loader'
 
@@ -8,8 +12,8 @@ export function sourceControlMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'source-control.branch-base-ref': ({ client }) => {
-      const resolve = modules.load<typeof import('../../../source-control/mobile-branch-base-ref')>(
-        'mobile/src/source-control/mobile-branch-base-ref.ts'
+      const resolve = modules.load<typeof MobileBranchBaseRefModule>(
+        'mobile/src/source-control/branches/mobile-branch-base-ref.ts'
       ).resolveMobileBranchCompareBaseRef
       let baseRef: unknown = 'unresolved'
       return {
@@ -23,8 +27,8 @@ export function sourceControlMountAdapters(
       }
     },
     'source-control.git-history': ({ client }) => {
-      const history = modules.load<typeof import('../../../source-control/mobile-git-history')>(
-        'mobile/src/source-control/mobile-git-history.ts'
+      const history = modules.load<typeof MobileGitHistoryModule>(
+        'mobile/src/source-control/history/mobile-git-history.ts'
       )
       let rows: unknown = 'unloaded'
       return {
@@ -38,8 +42,8 @@ export function sourceControlMountAdapters(
       }
     },
     'source-control.commit-message': ({ client }) => {
-      const ai = modules.load<typeof import('../../../source-control/mobile-commit-message-ai')>(
-        'mobile/src/source-control/mobile-commit-message-ai.ts'
+      const ai = modules.load<typeof MobileCommitMessageAiModule>(
+        'mobile/src/source-control/commits/mobile-commit-message-ai.ts'
       )
       let generated: unknown = 'ungenerated'
       return {
@@ -57,8 +61,8 @@ export function sourceControlMountAdapters(
       }
     },
     'source-control.pr-link': ({ client }) => {
-      const link = modules.load<typeof import('../../../source-control/mobile-pr-link')>(
-        'mobile/src/source-control/mobile-pr-link.ts'
+      const link = modules.load<typeof MobilePrLinkModule>(
+        'mobile/src/source-control/review/mobile-pr-link.ts'
       )
       let outcome: unknown = 'unlinked'
       let linkedPR: unknown = 'unread'
diff --git a/mobile/src/test-support/rpc-recording/adapters/source-control-screen-read-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/source-control-screen-read-mount-adapters.ts
index 396df685987..f10f8b4651f 100644
--- a/mobile/src/test-support/rpc-recording/adapters/source-control-screen-read-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/source-control-screen-read-mount-adapters.ts
@@ -1,3 +1,5 @@
+import type * as UseMobileSourceControlLoadersModule from '../../../source-control/changes/use-mobile-source-control-loaders'
+import type * as MobileGitHistoryListModule from '../../../source-control/history/MobileGitHistoryList'
 import { createElement } from 'react'
 import { hookMount, performHookAction } from '../hook-mount'
 import { projectMountedScreen, renderedElementProps, screenMount } from '../mounted-screen-tree'
@@ -20,10 +22,8 @@ export function sourceControlScreenReadMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'source-control.changes-load': ({ client, effect }) => {
-      const useLoaders = modules.load<
-        typeof import('../../../source-control/use-mobile-source-control-loaders')
-      >(
-        'mobile/src/source-control/use-mobile-source-control-loaders.ts'
+      const useLoaders = modules.load<typeof UseMobileSourceControlLoadersModule>(
+        'mobile/src/source-control/changes/use-mobile-source-control-loaders.ts'
       ).useMobileSourceControlLoaders
       let loaders: ReturnType<typeof useLoaders>
       // Keep callbacks stable; new identities would retrigger status loading and hide settled state.
@@ -71,8 +71,8 @@ export function sourceControlScreenReadMountAdapters(
       }
     },
     'source-control.history-branch-commits': ({ client, effect }) => {
-      const List = modules.load<typeof import('../../../source-control/MobileGitHistoryList')>(
-        'mobile/src/source-control/MobileGitHistoryList.tsx'
+      const List = modules.load<typeof MobileGitHistoryListModule>(
+        'mobile/src/source-control/history/MobileGitHistoryList.tsx'
       ).MobileGitHistoryList
       const hostClientContext = loadHostClientContext(modules)
       const context = mountFixture<RpcClientContextValue>({
diff --git a/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
index a90a51d1e0f..ec6f124f136 100644
--- a/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/terminal-mount-adapters.ts
@@ -1,4 +1,7 @@
-import type * as MobileTerminalOperations from '../../../terminal/mobile-terminal-operations'
+import type * as MobileTerminalQueryReplyModule from '../../../terminal/host-operations/mobile-terminal-query-reply'
+import type * as TerminalLiveAccessoryRawSendModule from '../../../terminal/live-input/terminal-live-accessory-raw-send'
+import type * as TerminalViewportRefitModule from '../../../terminal/viewport/terminal-viewport-refit'
+import type * as MobileTerminalOperations from '../../../terminal/host-operations/mobile-terminal-operations'
 import type { MountAdapter, MountContext } from '../recording-scenario'
 import { hookMount } from '../hook-mount'
 import type { operationModuleLoader } from '../operation-module-loader'
@@ -28,8 +31,8 @@ export function terminalMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'terminal.query-reply': ({ client }) => {
-      const send = modules.load<typeof import('../../../terminal/mobile-terminal-query-reply')>(
-        'mobile/src/terminal/mobile-terminal-query-reply.ts'
+      const send = modules.load<typeof MobileTerminalQueryReplyModule>(
+        'mobile/src/terminal/host-operations/mobile-terminal-query-reply.ts'
       ).sendMobileTerminalQueryReply
       const subscribed = new Set([HANDLE])
       let accepted: unknown = 'unsent'
@@ -54,11 +57,11 @@ export function terminalMountAdapters(
     },
     'terminal.accessory-raw-send': ({ client }) => {
       const { terminalInputSend } = modules.load<typeof MobileTerminalOperations>(
-        'mobile/src/terminal/mobile-terminal-operations.ts'
+        'mobile/src/terminal/host-operations/mobile-terminal-operations.ts'
       )
-      const send = modules.load<
-        typeof import('../../../terminal/terminal-live-accessory-raw-send')
-      >('mobile/src/terminal/terminal-live-accessory-raw-send.ts').sendTerminalLiveAccessoryRawBytes
+      const send = modules.load<typeof TerminalLiveAccessoryRawSendModule>(
+        'mobile/src/terminal/live-input/terminal-live-accessory-raw-send.ts'
+      ).sendTerminalLiveAccessoryRawBytes
       let accepted: unknown = 'unsent'
       return {
         action: (_name, args) =>
@@ -80,8 +83,8 @@ export function terminalMountAdapters(
       }
     },
     'terminal.viewport-refit': ({ client, effect }) => {
-      const useRefit = modules.load<typeof import('../../../terminal/terminal-viewport-refit')>(
-        'mobile/src/terminal/terminal-viewport-refit.ts'
+      const useRefit = modules.load<typeof TerminalViewportRefitModule>(
+        'mobile/src/terminal/viewport/terminal-viewport-refit.ts'
       ).useTerminalViewportRefit
       const terminalRefs = { current: new Map([[HANDLE, terminalWebViewHandle(effect, VIEWPORT)]]) }
       const viewportRef: { current: { cols: number; rows: number } | null } = { current: null }
diff --git a/mobile/src/test-support/rpc-recording/task-owner-recording.test.ts b/mobile/src/test-support/rpc-recording/task-owner-recording.test.ts
index 77ffc9195ec..72ca2ff0ad5 100644
--- a/mobile/src/test-support/rpc-recording/task-owner-recording.test.ts
+++ b/mobile/src/test-support/rpc-recording/task-owner-recording.test.ts
@@ -139,10 +139,6 @@ describe('committed production task owners in recording adapters', () => {
 
   it.each([
     ['tk-item-metadata-gitlab', 'update-gitlab'],
-    ['tk-item-comment-github', 'comment'],
-    ['tk-item-checks-files', 'rerun'],
-    ['tk-item-status-gitlab', 'gitlab-status'],
-    ['tk-project-row-files-merge', 'pr-state'],
     ['tk-linear-item', 'comment']
   ])(
     '%s records deferred acquire, refused reentry, release and fresh remount',
@@ -260,7 +256,7 @@ describe('committed production task owners in recording adapters', () => {
     }
   )
 
-  it.each(['tk-item-checks-files', 'tk-project-row-files-merge'])(
+  it.each(['tk-item-checks-files'])(
     '%s records a same-path file successor and ignores retired publication/finish',
     async (id) => {
       const base = pilot(id)
@@ -328,8 +324,6 @@ describe('committed production task owners in recording adapters', () => {
   )
 
   it.each([
-    ['tk-item-detail-github', 'payload', 'detailLoading'],
-    ['tk-item-detail-gitlab', 'payload', 'detailLoading'],
     ['tk-item-detail-linear', 'payload', 'detailLoading'],
     ['tk-project-row-detail', 'detail', 'projectRowDetailLoading']
   ])(
diff --git a/mobile/src/worktree/home-host-worktree-fetch.ts b/mobile/src/worktree/home-host-worktree-fetch.ts
index 53e48cd9f70..1abb6cf37c9 100644
--- a/mobile/src/worktree/home-host-worktree-fetch.ts
+++ b/mobile/src/worktree/home-host-worktree-fetch.ts
@@ -2,7 +2,7 @@ import * as z from 'zod'
 import {
   HOME_WORKTREE_COUNTS_FAMILY,
   type NO_HOST_LIST_INPUT
-} from '../host-screen/host-list-queries'
+} from '../host-screen/catalog/host-list-queries'
 import { defineHostQuery } from '../query/host-query'
 import {
   homeAgentEntries,
diff --git a/mobile/src/worktree/host-worktree-refresh.ts b/mobile/src/worktree/host-worktree-refresh.ts
index 0231ff7e6fd..f933f3f496a 100644
--- a/mobile/src/worktree/host-worktree-refresh.ts
+++ b/mobile/src/worktree/host-worktree-refresh.ts
@@ -2,7 +2,7 @@ import {
   subscribeSharedClientEvents,
   type SharedClientEventsClient
 } from '../transport/connection/shared-client-events'
-import type { HostSidebarFeedTriggers } from '../host-screen/host-sidebar-feed-connection'
+import type { HostSidebarFeedTriggers } from '../host-screen/sidebar-feed/host-sidebar-feed-connection'
 
 // Keep lifecycle callers independent of RN types.
 type HostAppState = {
diff --git a/mobile/src/worktree/session-worktree-record-operations.ts b/mobile/src/worktree/session-worktree-record-operations.ts
index b2d75f24af1..189f6c95bef 100644
--- a/mobile/src/worktree/session-worktree-record-operations.ts
+++ b/mobile/src/worktree/session-worktree-record-operations.ts
@@ -1,6 +1,6 @@
 import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc/rpc-operation'
 import { rpcResultVariant } from '../transport/rpc/rpc-operation-result-reader'
-import '../terminal/terminal-reply-schema'
+import '../terminal/host-operations/terminal-reply-schema'
 import { sessionWorktreeRecordSchema } from './session-worktree-record-reply-schema'
 
 // Read the whole worktree for notes and live title; unlike mutation readers, absent records need no error or wrong-host fallback.
diff --git a/mobile/tsconfig.test.mobile-declarations.json b/mobile/tsconfig.test.mobile-declarations.json
index 623991763da..2db5ec60c48 100644
--- a/mobile/tsconfig.test.mobile-declarations.json
+++ b/mobile/tsconfig.test.mobile-declarations.json
@@ -31,7 +31,7 @@
     "src/test-support/rpc-recording/derived-goldens.ts",
     "src/test-support/rpc-recording/golden-recording.ts",
     "src/test-support/rpc-recording/scenario-input.ts",
-    "src/host-screen/host-sidebar-feed-sections.ts",
+    "src/host-screen/sidebar-feed/host-sidebar-feed-sections.ts",
     "src/worktree/workspace-list-sections.ts",
     "src/worktree/worktree-catalog-snapshot-client.ts",
     "src/worktree/worktree-host-context-labels.ts",
diff --git a/mobile/web-entry/index.tsx b/mobile/web-entry/index.tsx
index df11b8b7952..dc5f74447fb 100644
--- a/mobile/web-entry/index.tsx
+++ b/mobile/web-entry/index.tsx
@@ -38,10 +38,10 @@ import { startPageLocaleCatalogs } from '../src/i18n/page-locale-catalog-source'
 import { getUiIntlLocale } from '../src/i18n/ui-intl-locale'
 import { readDeviceUiLocaleTags, resolveUiLocaleFromTags } from '../src/i18n/system-ui-locale'
 import { publishPageHostProfile } from '../src/mobile-web-shell/bridge/page-host-profile'
-import { publishExternalLinkOpener } from '../src/platform/external-link.web'
-import { publishHapticsNotifier } from '../src/platform/haptics.web'
-import { startBlurringOnKeyboardClose } from '../src/platform/keyboard-close-blur.web'
-import { publishShellKeyboardSource } from '../src/platform/keyboard-occlusion.web'
+import { publishExternalLinkOpener } from '../src/platform/external-links/external-link.web'
+import { publishHapticsNotifier } from '../src/platform/haptics/haptics.web'
+import { startBlurringOnKeyboardClose } from '../src/platform/keyboard/keyboard-close-blur.web'
+import { publishShellKeyboardSource } from '../src/platform/keyboard/keyboard-occlusion.web'
 // Select the page-client provider explicitly; the builder aliases extensionless screen imports to this same web module.
 import { RpcClientProvider } from '../src/transport/connection/client-context.web'
 import { OrcaQueryProvider } from '../src/query/orca-query-provider.web'
diff --git a/mobile/web-entry/web-overrides.json b/mobile/web-entry/web-overrides.json
index a624a12ad27..c65965ae4fe 100644
--- a/mobile/web-entry/web-overrides.json
+++ b/mobile/web-entry/web-overrides.json
@@ -15,7 +15,7 @@
     },
     {
       "file": "packages/expo-two-way-audio/src/ExpoTwoWayAudioModule.web.ts",
-      "reason": "Vendored with the module, not added for Route A. Nothing on the page reaches it any more: dictation's capture went behind src/platform/dictation-capture.web.ts, which asks the shell for the microphone, so the only importer of @orca/expo-two-way-audio is the native half of that seam. The file stays because it ships with the vendored module, and it answers denied microphone permission, which is what a browser outside the shell can honestly say."
+      "reason": "Vendored with the module, not added for Route A. Nothing on the page reaches it any more: dictation's capture went behind src/platform/audio-capture/dictation-capture.web.ts, which asks the shell for the microphone, so the only importer of @orca/expo-two-way-audio is the native half of that seam. The file stays because it ships with the vendored module, and it answers denied microphone permission, which is what a browser outside the shell can honestly say."
     },
     {
       "file": "src/navigation/use-back-claim.web.ts",
@@ -58,15 +58,15 @@
       "reason": "The shell renders this page for this route, so the page has no shell to mount inside itself. Its native file reaches OrcaMobileWebShellView, whose requireNativeViewManager call runs at import and throws in a browser."
     },
     {
-      "file": "src/platform/text-input-font-size.web.ts",
+      "file": "src/platform/text-input/text-input-font-size.web.ts",
       "reason": "iOS zooms the page on focus of any text input under 16px and does not zoom back out, which leaves the document at a scale other than 1 for a whole typing session. keyboard-occlusion.web.ts reads a scale other than 1 as 'not a keyboard' on purpose, because geometry cannot separate a zoom from a keyboard, so the commit bar and the note composer would never lift on the platform they were written for. The web file raises the app's 14px body size to that floor; the native file is the body size, so a phone renders exactly what it rendered before. maximum-scale=1 on the viewport meta was the other fix and was rejected: Android WebView honours it and it would take deliberate pinch zoom away from low-vision users."
     },
     {
-      "file": "src/platform/text-input-content-height.web.ts",
+      "file": "src/platform/text-input/text-input-content-height.web.ts",
       "reason": "react-native-web renders a multiline TextInput as a <textarea> that keeps the browser's default two rows whatever it holds, where a native multiline input grows between its min and max heights by itself. The web file measures the text in a hidden copy of the textarea and returns that height, so the chat composer grows with its draft, placeholder, and dictation preview; the native file returns nothing to measure. Resizing the live field to measure it was rejected: WebKit clamps the scroll position of the list around it, so the queue jumped while typing."
     },
     {
-      "file": "src/platform/haptics.web.ts",
+      "file": "src/platform/haptics/haptics.web.ts",
       "reason": "expo-haptics has a web build that fakes an iOS haptic by appending a hidden <label><input type=\"checkbox\" switch> to document.head, clicking it and removing it, once per call. C1.9 traced a long press that never fired on the worktree list to that stray click, and the file explorer calls triggerSelection on every row tap. So the page asks the shell for the device's own haptic instead, over the native.haptics.trigger notify behind the haptics grant: 70 to 77 bytes per frame, no reply, and haptics.ts's own Platform.OS split on the other side. A notify rather than a verb because nothing is owed back and a reply would spend a slot in the same in-flight window a forwarded request does, at 90 call sites (rulings-ota-c7.md ruling 30). The five exports are the five kinds the frame admits; mobile-web-app-haptics-seam.test.mjs is the fence."
     },
     {
@@ -82,15 +82,15 @@
       "reason": "The shell renders this page for this route, so the page has no shell to mount inside itself. Its native file reaches OrcaMobileWebShellView, whose requireNativeViewManager call runs at import and throws in a browser."
     },
     {
-      "file": "src/platform/external-link.web.ts",
+      "file": "src/platform/external-links/external-link.web.ts",
       "reason": "The page runs inside the shell's WebView, where react-native-web's Linking.openURL calls window.open(url, '_blank', 'noopener') and resolves whether or not anything opened; only a tel: URL assigns window.location, and none of the three allowed schemes is one. Both shells refuse window.open outright: iOS sets javaScriptCanOpenWindowsAutomatically = false and returns nil from WKUIDelegate's createWebViewWith, and Android sets javaScriptCanOpenWindowsAutomatically = false, setSupportMultipleWindows(false) and returns false from onCreateWindow. So the native path reports success into a tap that did nothing. This one posts the externalLink notify instead, after the same scheme check the frame enforces, and names its refusal rather than throwing inside a tap handler."
     },
     {
-      "file": "src/platform/keyboard-occlusion.web.ts",
+      "file": "src/platform/keyboard/keyboard-occlusion.web.ts",
       "reason": "react-native-web's Keyboard is a stub: addListener returns a subscription that never fires and isVisible() is always false, so a screen waiting for keyboardDidShow inside the page waits forever and the software keyboard covers whatever sits at the bottom of the document — the source-control commit bar, and the review note composer whose KeyboardAvoidingView is driven by those same events. The browser publishes the geometry a different way: the layout viewport keeps its size and visualViewport shrinks, so the occluded strip is innerHeight minus the visual viewport's height and offsetTop, tracked on its resize and scroll. A document with no visualViewport answers 0 rather than guessing."
     },
     {
-      "file": "src/platform/clipboard.web.ts",
+      "file": "src/platform/clipboard/clipboard.web.ts",
       "reason": "expo-clipboard resolves to navigator.clipboard on the web, which needs a secure context; the iOS shell serves the page from the custom scheme orca-mobile-web://<session>/ while Android serves https, so that path would work on one platform and silently not on the other. This one asks the shell through the native.clipboard.write and native.clipboard.read verbs, where the pasteboard is the device's, and rejects when the route was not granted one so the caller's own catch puts that on screen. An image is the same pasteboard reached a different way: native.clipboard.read admits only text, and a 24 MiB base64 image cannot cross an 8 MiB reply cap, so readImage runs native.media.pick with source 'clipboard', reads the staged bytes back a chunk at a time and gives the handle back. contents answers per grant without probing, because the shell serves no 'is there text' verb and reading to find out would raise iOS's paste-consent prompt on every mount."
     },
     {
@@ -134,7 +134,7 @@
       "reason": "Not an RN Web API gap but a transport one that exists only in the page: a screencast frame crosses the bridge as one message under BRIDGE_MAX_MESSAGE_BYTES, and a phone's mobile view at the native device scale factor produces a worst-case JPEG larger than that. This file budgets the mobile view's area against the cap, the envelope it measures rather than names, and one worst-case bytes-per-pixel constant. Web view mode is untouched, because a letterboxed desktop viewport is not an area the page can predict."
     },
     {
-      "file": "src/terminal/session/terminal-snapshot-byte-budget.web.ts",
+      "file": "src/terminal/session/streaming/terminal-snapshot-byte-budget.web.ts",
       "reason": "Not an RN Web API gap but a transport one that exists only in the page. A terminal's first frame is its scrollback snapshot, which the desktop trims to 512 KiB of raw terminal text while the bridge measures the serialized event against BRIDGE_MAX_MESSAGE_BYTES. An ANSI snapshot is mostly ESC bytes and JSON spends six on each, so a colour-dense 80-column screen comes back at 669,268 bytes against a 655,360-byte cap and the stream ends with overflow before a live byte is painted. This file derives the budget the page sends in terminal.subscribe from the cap less the event envelope; the native sibling sends nothing, because a socket frame has no ceiling above it and a budget there would shrink a phone's scrollback for a limit that does not exist."
     },
     {
@@ -142,35 +142,31 @@
       "reason": "A picked skill leads the composer's draft and is drawn highlighted in place. Natively that is a styled span of the TextInput's own text, but react-native-web renders TextInput as a textarea, which cannot style part of its text and ignores Text children. This one draws a copy of the draft behind the field with the skill highlighted, clears the field's own text while keeping its caret, and moves the copy with the field's scroll. It also measures the shown text to grow the textarea, whose default two rows do not grow with content, and caps it to the space above the keyboard."
     },
     {
-      "file": "src/terminal/TerminalWebView.web.tsx",
+      "file": "src/terminal/webview/TerminalWebView.web.tsx",
       "reason": "react-native-webview has no web build that renders anything: on the page it paints the line \"React Native WebView does not support this platform\" where the terminal was, which is a red line and no terminal rather than a crash. This file mounts the same document the WebView loads — xterm imported from @xterm/xterm with the unicode11 and webgl addons, and the document's own modules imported in the order the generator emits them — behind the identical TerminalWebViewProps and TerminalWebViewHandle, so nothing above the contract can tell the two apart."
     },
     {
-      "file": "src/terminal/terminal-webview-html.web.ts",
-      "reason": "The native file composes the whole WebView document, which splices in the 612 KiB minified xterm engine string. On the page that string is unusable — the shell's CSP is script-src 'self' with frame-src 'none', so there is no nested document to load it into — and it would be the largest single module in the session route's closure. The web file answers the caret options, the markup and the stylesheet, which is everything the page mounts, and nothing else."
-    },
-    {
-      "file": "src/platform/dictation-capture.web.ts",
+      "file": "src/platform/audio-capture/dictation-capture.web.ts",
       "reason": "Dictation's capture seam. The native file holds the microphone through @orca/expo-two-way-audio, which a browser does not have; this one asks the shell for it over native.audio.start|read|stop, draining the shell's ring on a timer and raising each reply as the events the engine emits directly, and taking the utterance's tail off the stop's own reply. The screen an open microphone holds awake is not in this seam at all: the device module that opens the mic takes it and gives it back on both hosts. The flow above the seam is one file on both hosts."
     },
     {
-      "file": "src/platform/on-device-speech.web.ts",
+      "file": "src/platform/speech/on-device-speech.web.ts",
       "reason": "Dictation's on-device recognizer. Native screens never dictate on the phone, so the native file answers null; the session page asks the shell over native.speech.act, whose recognizer hears the microphone the shell already captures, and answers null on shells that do not grant the verb so dictation goes to the computer as before."
     },
     {
-      "file": "src/platform/on-device-speech-locale.web.ts",
+      "file": "src/platform/speech/on-device-speech-locale.web.ts",
       "reason": "The language the phone's recognizer is asked about. The native file reads the device's language list through expo-localization, which the page does not load; the WebView's navigator.languages is that same list, so the shell's Voice settings and the session page ask about one locale."
     },
     {
-      "file": "src/platform/pdf-opener.web.ts",
+      "file": "src/platform/pdf-viewing/pdf-opener.web.ts",
       "reason": "Native file routes never render a preview themselves: they mount this page, which cannot show a PDF because the shell's CSP refuses frames and objects. This one asks the shell through native.pdf.view, which downloads the file and shows it in Quick Look or the Android PDF viewer, cancels that download when the preview is left, and returns null on shells that do not grant the verb so the preview asks for an app update."
     },
     {
-      "file": "src/platform/image-actions.web.ts",
+      "file": "src/platform/image-actions/image-actions.web.ts",
       "reason": "The page cannot reach the clipboard, Photos or the share sheet: the shell origin is not a secure context on iOS and Android WebView has no Web Share. This one stages a base64 image to the shell a chunk at a time over native.image.act, because a chat image passes the 640 KiB frame cap, then asks the shell to copy, save or share it; web images go by URL because the page cannot read cross-origin pixels. Shells that do not grant the verb get null, so the viewer offers no actions."
     },
     {
-      "file": "src/platform/media-picker.web.ts",
+      "file": "src/platform/media-picking/media-picker.web.ts",
       "reason": "expo-image-picker and expo-document-picker are native modules whose import runs a codegen lookup that throws in a browser, and the route manifest imports every route, so one of them in a page closure takes the whole bundle down rather than one picker. This one asks the shell through native.media.pick, reads the bytes back a chunk at a time over native.media.read because a picked image reaches 18 MiB raw against an 8 MiB reply ceiling, and releases every handle it was handed, including the ones its caller never took. The pasteboard is not here: clipboard.web.ts owns it on both platforms and reaches the same verbs for an image."
     },
     {
@@ -190,15 +186,15 @@
       "reason": "Natively there is no `init` and the shell layout decides who draws the host sidebar. Inside the page the only answer is the `ownsHostArea` init fact, never the page's own width, because a detail-route page on a wide iPad sits beside the shell's sidebar."
     },
     {
-      "file": "src/terminal/terminal-settings-scroll-lock.web.ts",
+      "file": "src/terminal/preferences/terminal-settings-scroll-lock.web.ts",
       "reason": "setNativeProps does not exist on React Native Web, where an Animated.ScrollView ref is the DOM node, so the drag's scroll lock threw instead of landing; this one sets overflowY inline and clears it again, which RN Web's own class then takes back over."
     },
     {
-      "file": "src/terminal/terminal-live-input-text-write.web.ts",
+      "file": "src/terminal/live-input/terminal-live-input-text-write.web.ts",
       "reason": "setNativeProps does not exist on React Native Web, where a TextInput ref is the DOM node, so the native write threw out of the session route's mount effect and faulted the page instead of clearing the field; this one sets value on the <input> or <textarea> RN Web rendered."
     },
     {
-      "file": "src/terminal/terminal-text-field-submit-binding.web.ts",
+      "file": "src/terminal/live-input/terminal-text-field-submit-binding.web.ts",
       "reason": "react-native-web's keydown handler withholds onSubmitEditing whenever the Enter keydown reports a composition — nativeEvent.isComposing, or the Android keyCode 229 that stands for it — which is a soft keyboard's normal state mid-word, so Enter on the page neither sent the line nor cleared the field while native Android's editor action fired as it always does. Both terminal fields reach their send through onSubmitEditing alone and both are bound here: the live input's carriage return, and the buffered command field's draft. The native file binds nothing, because that editor action needs no help; this one listens for beforeinput and acts on insertLineBreak and insertParagraph, the browser's own end-of-line signals. react-native-web calls preventDefault on every keydown it does submit on, so those events exist only in the cases it dropped and never produce a second carriage return; an IME still choosing a candidate reports insertCompositionText and is left alone."
     },
     {
@@ -226,7 +222,7 @@
       "reason": "The fold is a native reserved region the WebView cannot see: WebKit exposes no viewport segments, and the native file reads an Expo module the page does not have. This one reads the fold the shell measured over the page from `init`, already in the page's px."
     },
     {
-      "file": "src/terminal/session/shell-terminal-key-rail.web.ts",
+      "file": "src/terminal/session/accessory-keys/shell-terminal-key-rail.web.ts",
       "reason": "The iPhone Duo key rail is drawn by the shell in a side inset strip the page cannot reach. The native file has no shell around it and answers no rail; this one reads whether the shell shows one from `init` and takes its presses from the bridge."
     },
     {
@@ -234,7 +230,7 @@
       "reason": "React Native Web has no native animation driver, so every working ring and live tool-run pulse ran as its own JS loop writing a style each frame on the page's main thread, which is busiest while a reply streams. The native file keeps the native-driver loops; this one runs the same spin and pulse as Web Animations on the element, which the compositor plays, with one shared phase like desktop's spinner."
     },
     {
-      "file": "src/platform/shell-storage.web.ts",
+      "file": "src/platform/shell-storage/shell-storage.web.ts",
       "reason": "Native settings screens can cover a still-mounted page. Observe same-session storage snapshots so preference readers refresh on return without remounting the terminal."
     },
     {
@@ -246,11 +242,11 @@
       "reason": "The shipping web session owns DOM scroll anchoring and reveals focused lower controls inside the keyboard-safe viewport. Native rendering keeps its existing scroll behavior."
     },
     {
-      "file": "src/platform/page-box.web.ts",
+      "file": "src/platform/view-measurement/page-box.web.ts",
       "reason": "RNW's measure() is asynchronous and drops its callback for a detached node, so a held mic released over the dictation cancel button would never stop. The page reads the DOM box synchronously; native keeps measure()."
     },
     {
-      "file": "src/platform/accessibility-announcer.web.ts",
+      "file": "src/platform/accessibility/accessibility-announcer.web.ts",
       "reason": "React Native Web's announceForAccessibility is a no-op and VoiceOver in the shell's WebView doesn't read the page's live regions, so the page asks the shell to announce through native.a11y.announce; without it, the caller keeps its live region."
     }
   ]
diff --git a/native/computer-use-linux/runtime_render_test.py b/native/computer-use-linux/runtime_render_test.py
index d43d1e8b859..48bc2c1f1e0 100644
--- a/native/computer-use-linux/runtime_render_test.py
+++ b/native/computer-use-linux/runtime_render_test.py
@@ -437,13 +437,10 @@ class RuntimeRenderTest(unittest.TestCase):
                             result = runtime.run_operation(request)
                             self.assertTrue(result["ok"])
                             self.assertEqual(pointer_calls, [(505, 206), (525, 226)] if operation["tool"] == "drag" else [(505, 206)])
-                            self.assertGreaterEqual(fixture.clock, 0.1)
                         else:
                             with self.assertRaisesRegex(RuntimeError, "window_not_focused"):
                                 runtime.run_operation(request)
                             self.assertEqual(pointer_calls, [])
-                            self.assertGreaterEqual(fixture.clock, 0.5)
-                    self.assertTrue(restored)
 
     def test_restoration_requires_selected_window_focus_before_keyboard_input(self):
         restore_window = runtime.restore_window
@@ -528,24 +525,25 @@ class RuntimeRenderTest(unittest.TestCase):
                     self.assertEqual(active[0], 99)
 
     def test_text_entry_inserts_into_the_focused_field_of_a_background_window(self):
-        for tool in ("type_text", "paste_text"):
-            for value in ("there", "🚀 café"):
-                for selection in ((6, 11), None):
-                    field = FakeAccessible("text", "Message", value="Hello world")
-                    field.caret, field.selection = 11, selection
-                    field.get_state_set = lambda: FakeStateSet(FakeStateType.FOCUSED, FakeStateType.EDITABLE)
-                    field.get_editable_text_iface = lambda: field
-                    with self.subTest(tool=tool, value=value, selection=selection), SnapshotFixture(FakeAccessible("frame", "Editor", children=[field])) as fixture:
-                        calls = []
-                        fixture.restore = lambda: calls.append("restore")
-                        with patch.object(runtime, "type_text", lambda _: calls.append("keys")), \
-                             patch.object(runtime, "paste_text", lambda _: calls.append("clipboard")):
-                            result = runtime.run_operation({"tool": tool, "app": "Fixture", "text": value, "noScreenshot": True})
-                        self.assertEqual(calls, [])
-                        prefix = "Hello " if selection else "Hello world"
-                        self.assertEqual((field.value, field.caret), (prefix + value, len(prefix) + len(value)))
-                        self.assertEqual(result["action"]["path"], "accessibility")
-                        self.assertEqual(result["action"]["verification"]["state"], "verified")
+        cases = (
+            ("type_text", "🚀 café", (6, 11), "Hello 🚀 café", 12),
+            ("paste_text", "there", None, "Hello worldthere", 16),
+        )
+        for tool, value, selection, expected, expected_caret in cases:
+            field = FakeAccessible("text", "Message", value="Hello world")
+            field.caret, field.selection = 11, selection
+            field.get_state_set = lambda: FakeStateSet(FakeStateType.FOCUSED, FakeStateType.EDITABLE)
+            field.get_editable_text_iface = lambda: field
+            with self.subTest(tool=tool, value=value, selection=selection), SnapshotFixture(FakeAccessible("frame", "Editor", children=[field])) as fixture:
+                calls = []
+                fixture.restore = lambda: calls.append("restore")
+                with patch.object(runtime, "type_text", lambda _: calls.append("keys")), \
+                     patch.object(runtime, "paste_text", lambda _: calls.append("clipboard")):
+                    result = runtime.run_operation({"tool": tool, "app": "Fixture", "text": value, "noScreenshot": True})
+                self.assertEqual(calls, [])
+                self.assertEqual((field.value, field.caret), (expected, expected_caret))
+                self.assertEqual(result["action"]["path"], "accessibility")
+                self.assertEqual(result["action"]["verification"]["state"], "verified")
 
     def test_element_text_entry_targets_the_named_field_and_never_types_at_focus(self):
         for editable in (True, False):
@@ -574,45 +572,46 @@ class RuntimeRenderTest(unittest.TestCase):
                 keys.assert_not_called()
 
     def test_text_entry_without_an_editable_focused_field_still_requires_window_focus(self):
-        cases = [
-            ("not-editable", 1, (6, 11)),
-            ("count-error", TimeoutError("selection timed out"), (6, 11)),
-            ("multiple", 2, (6, 11)),
-            ("range-error", 1, TimeoutError("range timed out")),
-            ("range-outside", 1, (6, 12)),
-        ]
-        for tool in ("type_text", "paste_text"):
-            for active in (False, True):
-                for name, count, selection in cases:
-                    field = FakeAccessible("text", "Message", value="Hello world")
-                    field.caret, field.selection = 11, (6, 11)
-                    states = [FakeStateType.FOCUSED] + ([] if name == "not-editable" else [FakeStateType.EDITABLE])
-                    field.get_state_set = lambda: FakeStateSet(*states)
-                    field.get_editable_text_iface = lambda: field
-                    selected = types.SimpleNamespace(start_offset=selection[0], end_offset=selection[1]) if isinstance(selection, tuple) else selection
-                    with self.subTest(tool=tool, active=active, case=name), SnapshotFixture(
-                        FakeAccessible("frame", "Editor", children=[field])
-                    ) as fixture, patch.object(runtime.Atspi.Text, "get_n_selections", return_value=count, side_effect=count if isinstance(count, Exception) else None), \
-                         patch.object(runtime.Atspi.Text, "get_selection", return_value=selected, side_effect=selected if isinstance(selected, Exception) else None), \
-                         patch.object(runtime.Atspi.EditableText, "insert_text", wraps=FakeEditableText.insert_text) as insert, \
-                         patch.object(runtime, "type_text") as keys, patch.object(runtime, "paste_text") as paste:
-                        if active:
-                            fixture.root.get_state_set = lambda: FakeStateSet(FakeStateType.ACTIVE)
-                            result = runtime.run_operation({"tool": tool, "app": "Fixture", "text": "x", "noScreenshot": True})
-                            if tool == "type_text":
-                                keys.assert_called_once_with("x", fixture.root)
-                            else:
-                                paste.assert_called_once_with("x")
-                            self.assertEqual(result["action"]["verification"]["state"], "unverified")
-                        else:
-                            with self.assertRaisesRegex(RuntimeError, "window_not_focused"):
-                                runtime.run_operation({"tool": tool, "app": "Fixture", "text": "x", "noScreenshot": True})
-                        if not active or tool != "type_text":
-                            keys.assert_not_called()
-                        if not active or tool != "paste_text":
-                            paste.assert_not_called()
-                        insert.assert_not_called()
-                        self.assertEqual((field.value, field.selection), ("Hello world", (6, 11)))
+        cases = (
+            ("type_text", False, "not-editable", 1, (6, 11)),
+            ("type_text", True, "not-editable", 1, (6, 11)),
+            ("paste_text", False, "not-editable", 1, (6, 11)),
+            ("paste_text", True, "not-editable", 1, (6, 11)),
+            ("type_text", False, "count-error", TimeoutError("selection timed out"), (6, 11)),
+            ("type_text", False, "multiple", 2, (6, 11)),
+            ("type_text", False, "range-error", 1, TimeoutError("range timed out")),
+            ("type_text", False, "range-outside", 1, (6, 12)),
+        )
+        for tool, active, name, count, selection in cases:
+            field = FakeAccessible("text", "Message", value="Hello world")
+            field.caret, field.selection = 11, (6, 11)
+            states = [FakeStateType.FOCUSED] + ([] if name == "not-editable" else [FakeStateType.EDITABLE])
+            field.get_state_set = lambda: FakeStateSet(*states)
+            field.get_editable_text_iface = lambda: field
+            selected = types.SimpleNamespace(start_offset=selection[0], end_offset=selection[1]) if isinstance(selection, tuple) else selection
+            with self.subTest(tool=tool, active=active, case=name), SnapshotFixture(
+                FakeAccessible("frame", "Editor", children=[field])
+            ) as fixture, patch.object(runtime.Atspi.Text, "get_n_selections", return_value=count, side_effect=count if isinstance(count, Exception) else None), \
+                 patch.object(runtime.Atspi.Text, "get_selection", return_value=selected, side_effect=selected if isinstance(selected, Exception) else None), \
+                 patch.object(runtime.Atspi.EditableText, "insert_text", wraps=FakeEditableText.insert_text) as insert, \
+                 patch.object(runtime, "type_text") as keys, patch.object(runtime, "paste_text") as paste:
+                if active:
+                    fixture.root.get_state_set = lambda: FakeStateSet(FakeStateType.ACTIVE)
+                    result = runtime.run_operation({"tool": tool, "app": "Fixture", "text": "x", "noScreenshot": True})
+                    if tool == "type_text":
+                        keys.assert_called_once_with("x", fixture.root)
+                    else:
+                        paste.assert_called_once_with("x")
+                    self.assertEqual(result["action"]["verification"]["state"], "unverified")
+                else:
+                    with self.assertRaisesRegex(RuntimeError, "window_not_focused"):
+                        runtime.run_operation({"tool": tool, "app": "Fixture", "text": "x", "noScreenshot": True})
+                if not active or tool != "type_text":
+                    keys.assert_not_called()
+                if not active or tool != "paste_text":
+                    paste.assert_not_called()
+                insert.assert_not_called()
+                self.assertEqual((field.value, field.selection), ("Hello world", (6, 11)))
 
     def test_partial_text_replacement_fails_without_typing_again(self):
         tool = "type_text"
@@ -643,12 +642,9 @@ class RuntimeRenderTest(unittest.TestCase):
     def test_unconfirmed_text_insertion_does_not_fall_back_to_another_write(self):
         write = FakeEditableText.insert_text
         failures = {
-            "false-after-write": "foobarbar",
             "timeout-after-write": "foobarbar",
             "no-op": "foobar",
-            "truncated": "foobbar",
             "wrong-text": "foobazbar",
-            "count-unavailable": "foobarbar",
         }
         tool = "type_text"
         for failure, expected in failures.items():
@@ -659,16 +655,13 @@ class RuntimeRenderTest(unittest.TestCase):
             def insert(node, position, text, length):
                 if failure == "no-op":
                     return True
-                write(node, position, "baz" if failure == "wrong-text" else text, 1 if failure == "truncated" else length)
+                write(node, position, "baz" if failure == "wrong-text" else text, length)
                 if failure == "timeout-after-write":
                     raise TimeoutError("reply lost after insertion")
-                return failure != "false-after-write"
-            def count(node):
-                return None if failure == "count-unavailable" and node.value != "foobar" else len(node.value)
+                return True
             with self.subTest(tool=tool, failure=failure), SnapshotFixture(
                 FakeAccessible("frame", "Editor", children=[field])
             ) as fixture, patch.object(runtime.Atspi.EditableText, "insert_text", side_effect=insert), \
-                 patch.object(runtime.Atspi.Text, "get_character_count", side_effect=count), \
                  patch.object(runtime, "type_text") as keys, patch.object(runtime, "paste_text") as paste:
                 fixture.root.get_state_set = lambda: FakeStateSet(FakeStateType.ACTIVE)
                 with self.assertRaisesRegex(RuntimeError, "text_insertion_unconfirmed"):
@@ -680,21 +673,20 @@ class RuntimeRenderTest(unittest.TestCase):
 
     def test_unconfirmed_caret_movement_does_not_report_text_entry_success(self):
         tool = "type_text"
-        for failure in (False, True, TimeoutError("provider timed out")):
-            field = FakeAccessible("text", "Message", value="Hello world")
-            field.caret, field.selection = 6, (6, 11)
-            field.get_state_set = lambda: FakeStateSet(FakeStateType.FOCUSED, FakeStateType.EDITABLE)
-            field.get_editable_text_iface = lambda: field
-            with self.subTest(tool=tool, failure=failure), SnapshotFixture(
-                FakeAccessible("frame", "Editor", children=[field])
-            ) as fixture, patch.object(runtime.Atspi.Text, "set_caret_offset", side_effect=failure if isinstance(failure, Exception) else None, return_value=failure), \
-                 patch.object(runtime, "type_text") as keys, patch.object(runtime, "paste_text") as paste:
-                fixture.root.get_state_set = lambda: FakeStateSet(FakeStateType.ACTIVE)
-                with self.assertRaisesRegex(RuntimeError, "text_caret_unconfirmed"):
-                    runtime.run_operation({"tool": tool, "app": "Fixture", "text": "there", "noScreenshot": True})
-                self.assertEqual((field.value, field.caret), ("Hello there", 6))
-                keys.assert_not_called()
-                paste.assert_not_called()
+        field = FakeAccessible("text", "Message", value="Hello world")
+        field.caret, field.selection = 6, (6, 11)
+        field.get_state_set = lambda: FakeStateSet(FakeStateType.FOCUSED, FakeStateType.EDITABLE)
+        field.get_editable_text_iface = lambda: field
+        with SnapshotFixture(
+            FakeAccessible("frame", "Editor", children=[field])
+        ) as fixture, patch.object(runtime.Atspi.Text, "set_caret_offset", return_value=True), \
+             patch.object(runtime, "type_text") as keys, patch.object(runtime, "paste_text") as paste:
+            fixture.root.get_state_set = lambda: FakeStateSet(FakeStateType.ACTIVE)
+            with self.assertRaisesRegex(RuntimeError, "text_caret_unconfirmed"):
+                runtime.run_operation({"tool": tool, "app": "Fixture", "text": "there", "noScreenshot": True})
+            self.assertEqual((field.value, field.caret), ("Hello there", 6))
+            keys.assert_not_called()
+            paste.assert_not_called()
 
     def test_tree_marks_controls_without_enabled_or_sensitive_state_disabled(self):
         disabled = FakeAccessible("push button", "Continue")
@@ -719,8 +711,8 @@ class RuntimeRenderTest(unittest.TestCase):
             fixture.delays = {tab: 20 for tab in tabs[:-1]}
             snapshot = runtime.make_snapshot("chrome", False)
             by_name = {item["name"]: item for item in snapshot["elements"]}
-            for node in (tabs[-1], buttons[8]):
-                self.assertEqual(by_name[node.name]["frame"]["x"], fixture.bounds[node].x - 100)
+            for node, expected_x in ((tabs[-1], 110), (buttons[8], 200)):
+                self.assertEqual(by_name[node.name]["frame"]["x"], expected_x)
             self.assertNotIn("Tab 0", by_name)
             indexes = [item["index"] for item in snapshot["elements"]]
             self.assertEqual(len(indexes), len(set(indexes)))
diff --git a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/AttributeValueCoercionTests.swift b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/AttributeValueCoercionTests.swift
index 947a4c1da61..2eb42dd2ee1 100644
--- a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/AttributeValueCoercionTests.swift
+++ b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/AttributeValueCoercionTests.swift
@@ -24,7 +24,6 @@ final class AttributeValueCoercionTests: XCTestCase {
             ("9.007199254740993e15", 9_007_199_254_740_993),
             ("10.0e-1", 1),
             ("+0.000E999999999999999999999", 0),
-            ("-.0e-999999999999999999999", 0),
         ]
 
         for (requested, expected) in cases {
diff --git a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/ElementActionabilityTests.swift b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/ElementActionabilityTests.swift
index 92a411fa7b2..fc8b629438d 100644
--- a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/ElementActionabilityTests.swift
+++ b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/ElementActionabilityTests.swift
@@ -19,7 +19,6 @@ final class ElementActionabilityTests: XCTestCase {
         var nodes: [Int: Node]
         var retriesLeft = 5
         var onRetry: (FakeTree) -> Void = { _ in }
-        private(set) var scrollRequests = 0
 
         init(_ nodes: [Int: Node]) {
             self.nodes = nodes
@@ -49,7 +48,6 @@ final class ElementActionabilityTests: XCTestCase {
 
         func scrollToVisible(_ element: Int) throws -> Bool {
             guard let target = nodes[element]?.scrollsTo else { return false }
-            scrollRequests += 1
             nodes[element]?.frame = target
             return true
         }
@@ -100,7 +98,6 @@ final class ElementActionabilityTests: XCTestCase {
         guard case let .ready(point) = try ElementActionability.pointerTarget(3, windowFrame: window, ax: tree) else {
             return XCTFail("the button should be clickable once scrolled into view")
         }
-        XCTAssertEqual(tree.scrollRequests, 1)
         XCTAssertEqual(point, CGPoint(x: 50, y: 160))
     }
 
@@ -123,7 +120,6 @@ final class ElementActionabilityTests: XCTestCase {
         guard case let .ready(point) = try ElementActionability.pointerTarget(3, windowFrame: window, ax: tree) else {
             return XCTFail("the visible part of the group should take the click")
         }
-        XCTAssertEqual(tree.scrollRequests, 0)
         XCTAssertEqual(point, CGPoint(x: 200, y: 150))
     }
 
@@ -149,7 +145,6 @@ final class ElementActionabilityTests: XCTestCase {
         guard case let .ready(point) = try ElementActionability.pointerTarget(3, windowFrame: window, ax: tree) else {
             return XCTFail("the row should be clicked once scrolled out from under the header")
         }
-        XCTAssertEqual(tree.scrollRequests, 1)
         XCTAssertEqual(point, CGPoint(x: 50, y: 50))
     }
 
@@ -202,7 +197,6 @@ final class ElementActionabilityTests: XCTestCase {
         guard case let .ready(point) = try ElementActionability.pointerTarget(3, windowFrame: window, ax: tree) else {
             return XCTFail("the link should be clicked once scrolled into its container's view")
         }
-        XCTAssertEqual(tree.scrollRequests, 1)
         XCTAssertEqual(point, CGPoint(x: 50, y: 60))
     }
 
diff --git a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/RowSelectionClickTests.swift b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/RowSelectionClickTests.swift
index e2f9669cfa7..1d4d6d06337 100644
--- a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/RowSelectionClickTests.swift
+++ b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/RowSelectionClickTests.swift
@@ -53,18 +53,6 @@ final class RowSelectionClickTests: XCTestCase {
         ])
     }
 
-    func testOnlyARowThatReadsUnselectedQualifies() {
-        let tree = outline()
-        tree.nodes[5] = .init(role: "AXButton", selected: false, parent: 1)
-        tree.nodes[6] = .init(role: "AXRow", parent: 1)
-
-        XCTAssertTrue(RowSelectionClick.isUnselectedRow(3, ax: tree))
-        XCTAssertTrue(RowSelectionClick.isUnselectedRow(4, ax: tree))
-        XCTAssertFalse(RowSelectionClick.isUnselectedRow(2, ax: tree))
-        XCTAssertFalse(RowSelectionClick.isUnselectedRow(5, ax: tree))
-        XCTAssertFalse(RowSelectionClick.isUnselectedRow(6, ax: tree))
-    }
-
     func testAClickThatSelectedTheRowNeedsNoWrite() throws {
         let tree = outline(rowSettable: ["AXSelected"])
         tree.nodes[3]?.selected = true
@@ -73,27 +61,6 @@ final class RowSelectionClickTests: XCTestCase {
         XCTAssertEqual(tree.writes, [])
     }
 
-    func testAClickThatSelectedNothingReplacesTheContainerSelection() throws {
-        let tree = outline(rowSettable: ["AXSelected"])
-
-        XCTAssertEqual(try RowSelectionClick.confirm(3, ax: tree), .selectedByWrite(attribute: "AXSelectedRows"))
-        XCTAssertEqual(tree.writes, ["AXSelectedRows:1:3"])
-    }
-
-    func testARowWhoseContainerTakesNoWriteSelectsItself() throws {
-        let tree = outline(containerSettable: [], rowSettable: ["AXSelected"])
-
-        XCTAssertEqual(try RowSelectionClick.confirm(3, ax: tree), .selectedByWrite(attribute: "AXSelected"))
-        XCTAssertEqual(tree.writes, ["AXSelected:3"])
-    }
-
-    func testACellIsSelectedThroughItsRowInTheOwningContainer() throws {
-        let tree = outline()
-
-        XCTAssertEqual(try RowSelectionClick.confirm(4, ax: tree), .selectedByWrite(attribute: "AXSelectedRows"))
-        XCTAssertEqual(tree.writes, ["AXSelectedRows:1:3"])
-    }
-
     func testACellWrappedInAGroupIsSelectedThroughItsRow() throws {
         let tree = outline()
         tree.nodes[5] = .init(role: "AXGroup", parent: 3)
diff --git a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/TextInsertionReadbackTests.swift b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/TextInsertionReadbackTests.swift
index 88ce1fd7932..5451d4da06f 100644
--- a/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/TextInsertionReadbackTests.swift
+++ b/native/computer-use-macos/Tests/OrcaComputerUseMacOSTests/TextInsertionReadbackTests.swift
@@ -8,7 +8,6 @@ final class TextInsertionReadbackTests: XCTestCase {
             TextInsertionReadback.expectedValue(current: "a😀bcd", selection: 3..<5, inserting: "XY"),
             "a😀XYd"
         )
-        XCTAssertEqual(TextInsertionReadback.expectedValue(current: "", selection: nil, inserting: "hi"), "hi")
     }
 
     func testUnpredictableInsertionsReturnNil() {
@@ -16,7 +15,6 @@ final class TextInsertionReadbackTests: XCTestCase {
         XCTAssertNil(TextInsertionReadback.expectedValue(current: "abc", selection: 2..<4, inserting: "d"))
         XCTAssertNil(TextInsertionReadback.expectedValue(current: "a😀", selection: 2..<2, inserting: "d"))
         XCTAssertNil(TextInsertionReadback.expectedValue(current: "", selection: 0..<0, inserting: "send\n"))
-        XCTAssertNil(TextInsertionReadback.expectedValue(current: "", selection: 0..<0, inserting: "a\tb"))
         XCTAssertNil(TextInsertionReadback.expectedValue(current: "hello", selection: 0..<5, inserting: "hello"))
     }
 
@@ -68,11 +66,6 @@ final class TextInsertionReadbackTests: XCTestCase {
         XCTAssertEqual(settle(expected: "hello", reads: ["", "h"], secondsPerRead: 0.025), .undetermined)
     }
 
-    func testFieldStillFillingAtTheCapIsUndetermined() {
-        let reads = (0..<100).map { String(repeating: "a", count: $0) }
-        XCTAssertEqual(settle(expected: String(repeating: "a", count: 200), reads: reads, secondsPerRead: 0.1), .undetermined)
-    }
-
     private func settle(expected: String, reads: [String], secondsPerRead: Double) -> TextInsertionReadback.Outcome {
         var clock = 0.0
         var remaining = reads[...]
diff --git a/native/wayland-clipboard/x11_test.py b/native/wayland-clipboard/x11_test.py
index c7425e0e6a3..f23843ee320 100644
--- a/native/wayland-clipboard/x11_test.py
+++ b/native/wayland-clipboard/x11_test.py
@@ -48,7 +48,6 @@ class X11PublisherTest(unittest.TestCase):
                                          "XDG_RUNTIME_DIR": server.directory.name,
                                          "WAYLAND_DISPLAY": "wayland-test"}, timeout=5)
             self.assertEqual(result.returncode, 0, result.stderr)
-            self.assertEqual(result.stdout, b"")
             self.assertTrue(server.disconnected.wait(1))
 
     def read(self):
@@ -62,7 +61,7 @@ class X11PublisherTest(unittest.TestCase):
             with self.subTest(length=len(text)):
                 self.copy(text)
                 self.assertEqual(self.read(), text)
-                self.assertEqual(self.read(), text)
+        self.assertEqual(self.read(), b"x" * (16 * 1024 * 1024))
 
 
 
diff --git a/package.json b/package.json
index a15fcdc3edb..c022ea14cf1 100644
--- a/package.json
+++ b/package.json
@@ -440,8 +440,8 @@
         },
         {
           "files": [
-            "src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts",
-            "src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts"
+            "src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts",
+            "src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts"
           ],
           "rules": [
             "react-doctor/no-adjust-state-on-prop-change"
diff --git a/src/cli/browser/browser-nav.ts b/src/cli/browser/browser-nav.ts
index 8fba9f4e6b8..07de32ccfdb 100644
--- a/src/cli/browser/browser-nav.ts
+++ b/src/cli/browser/browser-nav.ts
@@ -1,4 +1,4 @@
-import type { BrowserSnapshotOptions } from '../../shared/rpc-contract/browser-observation-params'
+import type { BrowserSnapshotOptions } from '../../shared/rpc-contract/browser/browser-observation-params'
 import type {
   BrowserBackResult,
   BrowserEvalResult,
diff --git a/src/cli/connectors/connector.ts b/src/cli/connectors/connector.ts
index 9458436358b..ff38435a9c9 100644
--- a/src/cli/connectors/connector.ts
+++ b/src/cli/connectors/connector.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto'
 import { ORCA_SCRUB_SAFE_PANE_ENV } from '../../shared/agent-hook-listener/transport/agent-hook-scrub-safe-env'
-import { CONNECTOR_REPLY_UNAVAILABLE } from '../../shared/rpc-contract/connector-params'
+import { CONNECTOR_REPLY_UNAVAILABLE } from '../../shared/rpc-contract/connectors/connector-params'
 import type { CommandHandler, HandlerContext } from '../dispatch/dispatch'
 import {
   getOptionalNonNegativeIntegerFlag,
diff --git a/src/cli/plugins/view/plugin-shot-editor.ts b/src/cli/plugins/view/plugin-shot-editor.ts
index 055aae27edf..e5f86f6501a 100644
--- a/src/cli/plugins/view/plugin-shot-editor.ts
+++ b/src/cli/plugins/view/plugin-shot-editor.ts
@@ -15,7 +15,7 @@ import {
   PLUGIN_SHOT_MAX_WIDTH,
   PLUGIN_SHOT_MIN_HEIGHT,
   PLUGIN_SHOT_MIN_WIDTH
-} from '../../../shared/rpc-contract/plugins-params'
+} from '../../../shared/rpc-contract/plugins/plugins-params'
 import { callPlugins, resolveHostPluginPath, stringFlag } from '../plugin-runtime'
 import { readPluginFolderKey } from './plugin-shot-scenario'
 
diff --git a/src/cli/plugins/view/plugin-view.ts b/src/cli/plugins/view/plugin-view.ts
index fc9ec87c2c5..3622fb3add5 100644
--- a/src/cli/plugins/view/plugin-view.ts
+++ b/src/cli/plugins/view/plugin-view.ts
@@ -7,7 +7,7 @@ import { RuntimeClientError } from '../../runtime/types'
 import {
   PLUGIN_SHOT_MAX_WIDTH,
   PLUGIN_SHOT_MIN_WIDTH
-} from '../../../shared/rpc-contract/plugins-params'
+} from '../../../shared/rpc-contract/plugins/plugins-params'
 import {
   parsePluginShotActs,
   type PluginShotAct,
diff --git a/src/cli/runtime/envelope-schema.test.ts b/src/cli/runtime/envelope-schema.test.ts
index 75a00185cde..365f4c5de09 100644
--- a/src/cli/runtime/envelope-schema.test.ts
+++ b/src/cli/runtime/envelope-schema.test.ts
@@ -1,17 +1,7 @@
 import { describe, expect, it } from 'vitest'
-import { RuntimeRpcEnvelopeSchema, isKeepaliveFrame } from './envelope-schema'
+import { RuntimeRpcEnvelopeSchema } from './envelope-schema'
 
 describe('RuntimeRpcEnvelopeSchema', () => {
-  it('accepts a well-formed success envelope', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      ok: true,
-      result: { anything: 1 },
-      _meta: { runtimeId: 'runtime-1' }
-    })
-    expect(parsed.success).toBe(true)
-  })
-
   it('accepts and strips additive future success fields', () => {
     const parsed = RuntimeRpcEnvelopeSchema.safeParse({
       id: 'req-1',
@@ -32,33 +22,6 @@ describe('RuntimeRpcEnvelopeSchema', () => {
     })
   })
 
-  it('accepts a well-formed failure envelope', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      ok: false,
-      error: { code: 'not_found', message: 'not_found' },
-      _meta: { runtimeId: 'runtime-1' }
-    })
-    expect(parsed.success).toBe(true)
-  })
-
-  it('accepts structured failure data for agent recovery hints', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      ok: false,
-      error: {
-        code: 'app_not_found',
-        message: 'app not found: Gmail',
-        data: {
-          nextSteps: ['Target the desktop browser app/window that contains Gmail.']
-        }
-      },
-      _meta: { runtimeId: 'runtime-1' }
-    })
-
-    expect(parsed.success).toBe(true)
-  })
-
   it('accepts and strips additive future failure fields', () => {
     const parsed = RuntimeRpcEnvelopeSchema.safeParse({
       id: 'req-1',
@@ -83,82 +46,4 @@ describe('RuntimeRpcEnvelopeSchema', () => {
       }
     })
   })
-
-  it('accepts a failure envelope without _meta', () => {
-    // Failures before runtimeId resolution legitimately omit _meta.
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      ok: false,
-      error: { code: 'runtime_unavailable', message: 'runtime_unavailable' }
-    })
-    expect(parsed.success).toBe(true)
-  })
-
-  it('rejects a frame missing the ok discriminator', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      result: {},
-      _meta: { runtimeId: 'runtime-1' }
-    })
-    expect(parsed.success).toBe(false)
-  })
-
-  it('rejects a frame with a non-string id', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 123,
-      ok: true,
-      result: {},
-      _meta: { runtimeId: 'runtime-1' }
-    })
-    expect(parsed.success).toBe(false)
-  })
-
-  it('still rejects malformed known fields when future fields are present', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({
-      id: 'req-1',
-      ok: false,
-      error: { code: 500, message: 'Nope', futureErrorField: true },
-      futureEnvelopeField: 'new'
-    })
-
-    expect(parsed.success).toBe(false)
-  })
-
-  it('rejects a frame with unrelated fields only', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({ hello: 'world' })
-    expect(parsed.success).toBe(false)
-  })
-
-  it('accepts a keepalive frame', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({ _keepalive: true })
-    expect(parsed.success).toBe(true)
-  })
-
-  it('rejects a keepalive frame with _keepalive !== true', () => {
-    const parsed = RuntimeRpcEnvelopeSchema.safeParse({ _keepalive: false })
-    expect(parsed.success).toBe(false)
-  })
-})
-
-describe('isKeepaliveFrame', () => {
-  it('returns true for a well-formed keepalive', () => {
-    expect(isKeepaliveFrame({ _keepalive: true })).toBe(true)
-  })
-
-  it('returns false for a success envelope', () => {
-    expect(isKeepaliveFrame({ id: 'x', ok: true, result: {}, _meta: { runtimeId: 'r' } })).toBe(
-      false
-    )
-  })
-
-  it('returns false for non-object inputs', () => {
-    expect(isKeepaliveFrame(null)).toBe(false)
-    expect(isKeepaliveFrame(undefined)).toBe(false)
-    expect(isKeepaliveFrame('keepalive')).toBe(false)
-  })
-
-  it('returns false when _keepalive is not strictly true', () => {
-    expect(isKeepaliveFrame({ _keepalive: 1 })).toBe(false)
-    expect(isKeepaliveFrame({ _keepalive: 'true' })).toBe(false)
-  })
 })
diff --git a/src/cli/runtime/profile-state-recovery-launch.test.ts b/src/cli/runtime/profile-state-recovery-launch.test.ts
index 67ea0019a0e..c27b5b7bdcf 100644
--- a/src/cli/runtime/profile-state-recovery-launch.test.ts
+++ b/src/cli/runtime/profile-state-recovery-launch.test.ts
@@ -4,10 +4,7 @@ import {
   PROFILE_STATE_RECOVERY_FLAG,
   PROFILE_STATE_RECOVERY_RESULT_PREFIX
 } from '../../shared/profile-state-recovery-command'
-import {
-  canLaunchProfileStateRecovery,
-  launchProfileStateRecovery
-} from './profile-state-recovery-launch'
+import { launchProfileStateRecovery } from './profile-state-recovery-launch'
 
 const mocks = vi.hoisted(() => ({ run: vi.fn() }))
 vi.mock('@orca/process-host', () => ({ runProcess: mocks.run }))
@@ -47,17 +44,6 @@ beforeEach(() => {
 afterEach(() => vi.unstubAllEnvs())
 
 describe('profile-state recovery launch', () => {
-  it('requires an app executable or Electron Node mode to launch recovery', () => {
-    vi.stubEnv('ELECTRON_RUN_AS_NODE', undefined)
-    vi.stubEnv('ORCA_APP_EXECUTABLE', undefined)
-    expect(canLaunchProfileStateRecovery()).toBe(false)
-    vi.stubEnv('ELECTRON_RUN_AS_NODE', '1')
-    expect(canLaunchProfileStateRecovery()).toBe(true)
-    vi.stubEnv('ELECTRON_RUN_AS_NODE', undefined)
-    vi.stubEnv('ORCA_APP_EXECUTABLE', '/explicit/Orca')
-    expect(canLaunchProfileStateRecovery()).toBe(true)
-  })
-
   it('uses a foreground-safe serve request and binds the canonical recovery root', async () => {
     vi.stubEnv('ELECTRON_RUN_AS_NODE', '1')
     vi.stubEnv('ORCA_USER_DATA_PATH', '/stale/root')
@@ -81,21 +67,6 @@ describe('profile-state recovery launch', () => {
     expect(mocks.run.mock.calls[0][0].env).not.toHaveProperty('ELECTRON_RUN_AS_NODE')
   })
 
-  it('round-trips current JSON selection without requiring an invented revision', async () => {
-    const current = { ...result, revision: null }
-    mocks.run.mockResolvedValue({
-      code: 0,
-      signal: null,
-      timedOut: false,
-      stdout: `${PROFILE_STATE_RECOVERY_RESULT_PREFIX}${JSON.stringify({ ok: true, result: current })}\n`,
-      stderr: ''
-    })
-    expect(
-      await launchProfileStateRecovery({ userDataPath: '.', selector: { kind: 'current-json' } })
-    ).toEqual(current)
-    expect(mocks.run.mock.calls[0][0].args.at(-1)).toContain('"kind":"current-json"')
-  })
-
   it('preserves a structured refusal from the lock owner', async () => {
     mocks.run.mockResolvedValue({
       code: 1,
@@ -107,13 +78,6 @@ describe('profile-state recovery launch', () => {
     })
   })
 
-  it('round-trips latest JSON selection and the exported SQLite revision', async () => {
-    expect(
-      await launchProfileStateRecovery({ userDataPath: '.', selector: { kind: 'latest-json' } })
-    ).toEqual(result)
-    expect(mocks.run.mock.calls[0][0].args.at(-1)).toContain('"kind":"latest-json"')
-  })
-
   it.each([
     { code: 1 },
     { signal: 'SIGKILL' },
@@ -121,41 +85,12 @@ describe('profile-state recovery launch', () => {
     { outputTruncated: true },
     { stdout: '' },
     { stdout: `${PROFILE_STATE_RECOVERY_RESULT_PREFIX}{` },
-    { stdout: `${PROFILE_STATE_RECOVERY_RESULT_PREFIX}{"ok":true,"result":{}}` },
-    {
-      stdout: `${PROFILE_STATE_RECOVERY_RESULT_PREFIX}{}\n${PROFILE_STATE_RECOVERY_RESULT_PREFIX}{}`
-    }
-  ])('rejects incomplete or ambiguous child results %j', async (override) => {
+    { stdout: `${PROFILE_STATE_RECOVERY_RESULT_PREFIX}{"ok":true,"result":{}}` }
+  ])('rejects incomplete child results %j', async (override) => {
     const original = await mocks.run()
     mocks.run.mockResolvedValue({ ...original, ...override })
     await expect(launchProfileStateRecovery(request)).rejects.toMatchObject({
       code: 'runtime_error'
     })
   })
-
-  it('propagates launch failure without retrying another recovery path', async () => {
-    mocks.run.mockRejectedValue(new Error('Executable unavailable'))
-    await expect(launchProfileStateRecovery(request)).rejects.toThrow('Executable unavailable')
-    expect(mocks.run).toHaveBeenCalledOnce()
-  })
-
-  it('retains bounded child diagnostics when recovery exits without a result', async () => {
-    mocks.run.mockResolvedValue({
-      code: null,
-      signal: 'SIGTRAP',
-      timedOut: false,
-      stdout: '',
-      stderr: `${'x'.repeat(5000)}\nsandbox unavailable\n`
-    })
-    await expect(launchProfileStateRecovery(request)).rejects.toMatchObject({
-      data: {
-        exitCode: null,
-        signal: 'SIGTRAP',
-        timedOut: false,
-        outputTruncated: false,
-        stderr: `${'x'.repeat(5000)}\nsandbox unavailable`.slice(-4096)
-      }
-    })
-    expect(mocks.run).toHaveBeenCalledOnce()
-  })
 })
diff --git a/src/cli/runtime/runtime-listener-probe.test.ts b/src/cli/runtime/runtime-listener-probe.test.ts
index e0018e059c8..05ddf3ff7d1 100644
--- a/src/cli/runtime/runtime-listener-probe.test.ts
+++ b/src/cli/runtime/runtime-listener-probe.test.ts
@@ -109,30 +109,4 @@ describe('probeRuntimeListener', () => {
       vi.useRealTimers()
     }
   })
-
-  it.each([
-    ['a missing endpoint', undefined],
-    ['a blank endpoint', '   '],
-    ['a numeric endpoint', 42]
-  ])('frees a profile whose metadata carries %s instead of dialling it', async (_label, value) => {
-    // Invalid endpoints can throw or dial an unrelated numeric TCP port.
-    const metadata = metadataFor(nextEndpoint())
-    const transport = { ...metadata.transports[0]! }
-    Object.assign(transport, { endpoint: value })
-
-    await expect(probeRuntimeListener({ ...metadata, transports: [transport] })).resolves.toBe(
-      'not-listening'
-    )
-  })
-
-  it('frees a profile whose metadata published no local transport to probe', async () => {
-    const metadata = metadataFor(nextEndpoint())
-
-    await expect(
-      probeRuntimeListener({
-        ...metadata,
-        transports: metadata.transports.filter((transport) => transport.kind === 'websocket')
-      })
-    ).resolves.toBe('not-listening')
-  })
 })
diff --git a/src/cli/runtime/runtime-source-fence.test.ts b/src/cli/runtime/runtime-source-fence.test.ts
index 95667fa8c8e..e73676313b3 100644
--- a/src/cli/runtime/runtime-source-fence.test.ts
+++ b/src/cli/runtime/runtime-source-fence.test.ts
@@ -11,7 +11,6 @@ import {
 } from '../../shared/runtime-source-env'
 import { RuntimeClient } from './client'
 import { RuntimeClientError } from './types'
-import { resolveFencedRuntimeSource } from './runtime-source-fence'
 
 const SOURCE_A = '11111111-1111-4111-8111-111111111111'
 const SOURCE_B = '22222222-2222-4222-8222-222222222222'
@@ -126,27 +125,16 @@ describe('RuntimeClient runtime-source fence', () => {
     expect(runtime.methods).toEqual(['status.get', 'status.get'])
   })
 
-  it('accepts a restarted runtime of the same source and probes it only once', async () => {
+  it('accepts a restarted runtime of the same source and carries its verified identity', async () => {
     const runtime = await startRuntime({ runtimeId: 'runtime-a2', installationId: SOURCE_A })
     launchedBy(SOURCE_A, 'runtime-a1')
     const client = new RuntimeClient(runtime.userDataPath, 2_000, null, null, 'orca')
 
     await client.call('terminal.send', { terminal: 't1', text: 'hi' })
-    await client.call('worktree.list')
-    expect(runtime.methods).toEqual(['status.get', 'terminal.send', 'worktree.list'])
+    expect(runtime.methods).toEqual(['status.get', 'terminal.send'])
     // The host must recheck identity if it changes after the probe.
     const expected = { sourceId: SOURCE_A, runtimeId: 'runtime-a2' }
-    expect(runtime.expectations).toEqual([undefined, expected, expected])
-  })
-
-  it('sends without a probe when the launching runtime is still the live one', async () => {
-    const runtime = await startRuntime({ runtimeId: 'runtime-a', installationId: SOURCE_A })
-    launchedBy(SOURCE_A, 'runtime-a')
-    const client = new RuntimeClient(runtime.userDataPath, 2_000, null, null, 'orca')
-
-    await client.call('worktree.list')
-    expect(runtime.methods).toEqual(['worktree.list'])
-    expect(runtime.expectations).toEqual([{ sourceId: SOURCE_A, runtimeId: 'runtime-a' }])
+    expect(runtime.expectations).toEqual([undefined, expected])
   })
 
   it('refuses when the live runtime cannot say which profile it serves', async () => {
@@ -177,11 +165,4 @@ describe('RuntimeClient runtime-source fence', () => {
     await client.call('worktree.list')
     expect(runtime.methods).toEqual(['worktree.list'])
   })
-
-  it('still fences a terminal whose CLI fell back to the platform default profile', () => {
-    const stamp = { sourceId: SOURCE_A, incarnation: 'runtime-a', profilePath: '/profiles/custom' }
-    expect(resolveFencedRuntimeSource(stamp, '/profiles/default', '/profiles/default')).toBe(stamp)
-    expect(resolveFencedRuntimeSource(stamp, '/profiles/custom', '/profiles/default')).toBe(stamp)
-    expect(resolveFencedRuntimeSource(stamp, '/profiles/dev', '/profiles/default')).toBeNull()
-  })
 })
diff --git a/src/cli/runtime/serve-appimage-update.test.ts b/src/cli/runtime/serve-appimage-update.test.ts
index c9535d0c42a..90b44aa2424 100644
--- a/src/cli/runtime/serve-appimage-update.test.ts
+++ b/src/cli/runtime/serve-appimage-update.test.ts
@@ -68,14 +68,6 @@ function restartDeps(overrides: Partial<AppImageRestartDeps> = {}): AppImageRest
 }
 
 describe('supervised serve and a replaced AppImage', () => {
-  it('finds the AppImage a stable-launcher service was unpacked from', async () => {
-    const { appImagePath, executable } = await makeRunningGeneration()
-    const watch = resolveAppImageBuildWatch(executable, {}, 'linux')
-    expect(watch?.appImagePath).toBe(appImagePath)
-    expect(inspectAppImageBuild(watch!)).toBe('current')
-    expect(resolveAppImageBuildWatch(executable, {}, 'darwin')).toBeNull()
-  })
-
   it('ignores a source record that names another AppImage', async () => {
     const { root, executable } = await makeRunningGeneration()
     const namespacePath = join(executable, '..', '..')
@@ -159,10 +151,9 @@ describe('supervised serve and a replaced AppImage', () => {
     const watch = resolveAppImageBuildWatch(executable, {}, 'linux')!
     await swapIn(appImagePath, 'build C')
     const attemptPath = join(root, 'attempt.json')
-    const logs: string[] = []
     const make = (overrides: { force?: boolean; runningKey?: string } = {}) =>
       createSupervisedAppImageUpdate({
-        ...restartDeps({ log: (line) => logs.push(line) }),
+        ...restartDeps(),
         watch: { ...watch, runningKey: overrides.runningKey ?? watch.runningKey },
         attemptPath,
         force: overrides.force ?? false
@@ -172,13 +163,10 @@ describe('supervised serve and a replaced AppImage', () => {
     expect(first.inspect()).toBe('superseded')
     await first.restart(() => false)
     const candidateKey = resolveAppImageCacheKey(appImagePath)
-    expect(JSON.parse(await readFile(attemptPath, 'utf8'))).toEqual({ candidateKey })
 
     // The new build died early; the service manager restarted the old one.
     const second = make()
     expect(second.inspect()).toBe('current')
-    expect(second.inspect()).toBe('current')
-    expect(logs.filter((line) => line.includes('did not come up'))).toHaveLength(1)
 
     expect(make({ force: true }).inspect()).toBe('superseded')
     await make().restart(() => false)
diff --git a/src/cli/runtime/serve-bundle-park.test.ts b/src/cli/runtime/serve-bundle-park.test.ts
index 29e8aa34dc1..ac17bf1b2c8 100644
--- a/src/cli/runtime/serve-bundle-park.test.ts
+++ b/src/cli/runtime/serve-bundle-park.test.ts
@@ -64,13 +64,6 @@ describe('openServeBundlePark', () => {
     await writeFile(parkRecordPath(dir), JSON.stringify(record))
   }
 
-  it('takes part only under an installed launchd label on macOS', () => {
-    expect(open({})).toBeNull()
-    expect(open({ XPC_SERVICE_NAME: 'application.com.other' })).toBeNull()
-    expect(open({ XPC_SERVICE_NAME: LABEL }, 'linux')).toBeNull()
-    expect(open()).not.toBeNull()
-  })
-
   it('registers with its child pid and removes the registration on close', async () => {
     const park = open()!
     park.heartbeat(77)
@@ -157,8 +150,6 @@ describe('openServeBundlePark', () => {
   it('holds while committed until the bundle changes, then releases', async () => {
     const park = open()!
     await writeRecord({ phase: 'commit', commitDeadlineAt: Date.now() + 60_000 })
-    const bundleBefore = JSON.parse(await readFile(parkRecordPath(dir), 'utf8')).bundleBefore
-    expect(bundleBefore).toBe('unused')
     // 'unused' differs from the real identity, which models a bundle ShipIt already replaced.
     expect(park.holds()).toBe(false)
     const identity = formatBundleIdentity(
diff --git a/src/cli/runtime/serve-electron-preflight.test.ts b/src/cli/runtime/serve-electron-preflight.test.ts
index 4dcd0e1cfb9..51b2d1b21b3 100644
--- a/src/cli/runtime/serve-electron-preflight.test.ts
+++ b/src/cli/runtime/serve-electron-preflight.test.ts
@@ -167,16 +167,11 @@ describe.skipIf(process.platform === 'win32')('serve private admission snapshots
     writeFileSync(join(root, 'orca-runtime.json'), JSON.stringify(metadata))
     return metadata
   }
-  it('keeps the missing-M0 default path synchronous without a second read', () => {
-    expect(preflightElectronServe({}, root, { platform: 'linux' })).toBeNull()
-    expect(metadataReader.tryReadMetadata).toHaveBeenCalledTimes(1)
-  })
   it.each([2147483647, process.pid])(
     'retains launch permission for absent listener even with PID %s',
     async (pid) => {
       publish(pid)
       await expect(preflightElectronServe({}, root, { platform: 'linux' })).resolves.toBeNull()
-      expect(metadataReader.tryReadMetadata).toHaveBeenCalledTimes(2)
     }
   )
   it.each(['disappeared', 'replacement', 'incomplete'])(
@@ -209,7 +204,6 @@ describe.skipIf(process.platform === 'win32')('serve private admission snapshots
       expect(String(vi.mocked(process.stderr.write).mock.calls.at(-1)?.[0])).toContain(
         change === 'replacement' ? `pid ${process.pid}` : 'pid 2147483647'
       )
-      expect(metadataReader.tryReadMetadata).toHaveBeenCalledTimes(2)
     }
   )
 })
diff --git a/src/cli/runtime/serve-install-hold.test.ts b/src/cli/runtime/serve-install-hold.test.ts
deleted file mode 100644
index ad7a85848dc..00000000000
--- a/src/cli/runtime/serve-install-hold.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { readServeInstallEvidence } from './serve-install-hold'
-
-describe('readServeInstallEvidence', () => {
-  let root: string
-  let bundle: string
-  let executable: string
-
-  beforeEach(async () => {
-    root = await mkdtemp(join(tmpdir(), 'orca-install-hold-'))
-    bundle = join(root, 'Orca.app')
-    executable = join(bundle, 'Contents', 'MacOS', 'Orca')
-    await mkdir(join(bundle, 'Contents', 'MacOS'), { recursive: true })
-    await writeFile(executable, '')
-  })
-
-  afterEach(async () => {
-    await rm(root, { recursive: true, force: true })
-  })
-
-  const shipIt = (b: string): string =>
-    `${b}/Contents/Frameworks/Squirrel.framework/Resources/ShipIt com.stablyai.orca.ShipIt /state.plist`
-
-  it('holds while ShipIt replaces this bundle, and when the check cannot run', async () => {
-    await expect(
-      readServeInstallEvidence(executable, {
-        platform: 'darwin',
-        listProcesses: async () => `/sbin/launchd\n${shipIt(bundle)}\n`
-      })
-    ).resolves.toEqual({ kind: 'hold', reason: 'installer-running' })
-    await expect(
-      readServeInstallEvidence(executable, { platform: 'darwin', listProcesses: async () => null })
-    ).resolves.toEqual({ kind: 'hold', reason: 'installer-unknown' })
-  })
-
-  it("ignores another bundle's ShipIt and an executable that merely contains the name", async () => {
-    await expect(
-      readServeInstallEvidence(executable, {
-        platform: 'darwin',
-        listProcesses: async () => `${shipIt('/Applications/Other.app')}\n${executable} --serve\n`
-      })
-    ).resolves.toEqual({ kind: 'clear' })
-  })
-
-  it('holds while the executable is missing, and skips the macOS check elsewhere', async () => {
-    await expect(readServeInstallEvidence(join(root, 'gone'))).resolves.toEqual({
-      kind: 'hold',
-      reason: 'bundle-missing'
-    })
-    await expect(
-      readServeInstallEvidence(executable, {
-        platform: 'linux',
-        listProcesses: async () => {
-          throw new Error('must not list processes off macOS')
-        }
-      })
-    ).resolves.toEqual({ kind: 'clear' })
-  })
-})
diff --git a/src/cli/runtime/serve-pid1-init-reaper.test.ts b/src/cli/runtime/serve-pid1-init-reaper.test.ts
index f7d85f427d9..e453de42c3b 100644
--- a/src/cli/runtime/serve-pid1-init-reaper.test.ts
+++ b/src/cli/runtime/serve-pid1-init-reaper.test.ts
@@ -24,26 +24,6 @@ function deps(overrides: Partial<ServeInitReaperDeps> = {}): ServeInitReaperDeps
 }
 
 describe('reexecServeUnderInitReaper', () => {
-  it('replaces a PID 1 Linux serve with bash running the same command and environment', () => {
-    const d = deps()
-    expect(reexecServeUnderInitReaper(d)).toBe('reexec')
-    expect(d.execve).toHaveBeenCalledWith(
-      '/bin/bash',
-      [
-        'bash',
-        '-c',
-        SERVE_INIT_REAPER_SCRIPT,
-        'orca-serve-init',
-        '/opt/orca/orca-ide',
-        '/opt/orca/resources/cli/index.js',
-        'serve',
-        '--port',
-        '6768'
-      ],
-      { ELECTRON_RUN_AS_NODE: '1' }
-    )
-  })
-
   it('keeps the eval script of a `-e <cli> -- serve` launch', () => {
     const d = deps({ execArgv: ['-e', 'require(cli)'], argv: ['/opt/orca/orca-ide', 'serve'] })
     expect(reexecServeUnderInitReaper(d)).toBe('reexec')
@@ -87,29 +67,6 @@ describe('reexecServeUnderInitReaper', () => {
     expect(reexecServeUnderInitReaper(d)).toBe('unavailable')
     expect(d.execve).not.toHaveBeenCalled()
   })
-
-  it('leaves a serve that is not PID 1, or not on Linux, alone', () => {
-    for (const d of [deps({ pid: 4242 }), deps({ platform: 'darwin' })]) {
-      expect(reexecServeUnderInitReaper(d)).toBe('not-pid1')
-      expect(d.execve).not.toHaveBeenCalled()
-      expect(d.warn).not.toHaveBeenCalled()
-    }
-  })
-
-  it('warns and keeps serving when no bash is installed or the process cannot be replaced', () => {
-    for (const d of [
-      deps({ exists: () => false }),
-      deps({ execve: null }),
-      deps({
-        execve: () => {
-          throw new Error('ENOENT')
-        }
-      })
-    ]) {
-      expect(reexecServeUnderInitReaper(d)).toBe('unavailable')
-      expect(d.warn).toHaveBeenCalledWith(expect.stringContaining('docker run --init'))
-    }
-  })
 })
 
 const bash = ['/bin/bash', '/usr/bin/bash'].find((path) => existsSync(path))
diff --git a/src/cli/runtime/serve-signal-exit-diagnostic.test.ts b/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
index cbb0bb24eb8..6868d97c0da 100644
--- a/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
+++ b/src/cli/runtime/serve-signal-exit-diagnostic.test.ts
@@ -1,15 +1,13 @@
+import { MacServeStartupAbortError, serveSignalExitError } from './serve-signal-exit-diagnostic'
 import { EventEmitter } from 'node:events'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { MacServeStartupAbortError, serveSignalExitError } from './serve-signal-exit-diagnostic'
 import {
-  SERVE_CHILD_FORCE_KILL_GRACE_MS,
   SERVE_CHILD_FORCE_KILL_SCHEDULING_MARGIN_MS,
   superviseForegroundServe
 } from './serve-update-supervisor'
-import { RuntimeClientError } from './types'
 import {
   QUIT_RENDERER_ACK_TIMEOUT_MS,
   WILL_QUIT_TEARDOWN_DEADLINE_MS
@@ -26,13 +24,6 @@ function setPlatform(platform: NodeJS.Platform): void {
   Object.defineProperty(process, 'platform', { configurable: true, value: platform })
 }
 
-function superviseUntilExit(code: number | null, signal: NodeJS.Signals | null): Promise<number> {
-  const child = new FakeChildProcess()
-  const supervised = superviseChild(child)
-  child.emit('exit', code, signal)
-  return supervised
-}
-
 function superviseChild(child: FakeChildProcess): Promise<number> {
   return superviseForegroundServe({
     spec: { program: '/Applications/Orca.app/Contents/MacOS/Orca', args: ['--serve'] },
@@ -50,43 +41,9 @@ afterEach(() => {
 })
 
 describe('serveSignalExitError', () => {
-  it('explains the Launch Services startup abort on darwin SIGABRT', () => {
+  it('classifies darwin SIGABRT as a startup abort', () => {
     const error = serveSignalExitError('SIGABRT', 'darwin')
-
     expect(error).toBeInstanceOf(MacServeStartupAbortError)
-    expect(error).toBeInstanceOf(RuntimeClientError)
-    expect(error.code).toBe('runtime_serve_failed')
-    expect(error.message).toContain('aborted with SIGABRT on macOS')
-    expect(error.message).toContain('_RegisterApplication')
-    expect(error.data).toMatchObject({
-      nextSteps: [
-        expect.stringContaining('desktop Orca is already running'),
-        expect.stringContaining('refuse for 30 minutes'),
-        expect.stringContaining('~/Library/Logs/DiagnosticReports/Orca-*.ips')
-      ]
-    })
-  })
-
-  it('does not claim the macOS cause off darwin', () => {
-    for (const platform of ['linux', 'win32'] as const) {
-      const error = serveSignalExitError('SIGABRT', platform)
-
-      expect(error.message).toBe('Orca serve exited via SIGABRT.')
-      expect(error.data).toBeUndefined()
-    }
-  })
-
-  it('does not claim the macOS cause for other darwin signals', () => {
-    const error = serveSignalExitError('SIGKILL', 'darwin')
-
-    expect(error.message).toBe('Orca serve exited via SIGKILL.')
-    expect(error.data).toBeUndefined()
-  })
-
-  it('stays clear when neither a code nor a signal is reported', () => {
-    expect(serveSignalExitError(null, 'darwin').message).toBe(
-      'Orca serve exited without reporting an exit code or signal.'
-    )
   })
 })
 
@@ -97,13 +54,6 @@ describe('superviseForegroundServe signal exits', () => {
     const child = new FakeChildProcess()
     const supervised = superviseChild(child)
 
-    expect(SERVE_CHILD_FORCE_KILL_GRACE_MS).toBe(
-      QUIT_RENDERER_ACK_TIMEOUT_MS +
-        WILL_QUIT_TEARDOWN_DEADLINE_MS +
-        SERVE_CHILD_FORCE_KILL_SCHEDULING_MARGIN_MS
-    )
-    expect(SERVE_CHILD_FORCE_KILL_GRACE_MS).toBeLessThanOrEqual(35_000)
-
     process.emit('SIGTERM', 'SIGTERM')
     expect(child.kill).toHaveBeenCalledOnce()
     expect(child.kill).toHaveBeenLastCalledWith('SIGTERM')
@@ -127,11 +77,9 @@ describe('superviseForegroundServe signal exits', () => {
 
     process.emit('SIGINT', 'SIGINT')
     expect(child.kill).not.toHaveBeenCalled()
-    expect(vi.getTimerCount()).toBe(1)
 
     child.emit('exit', 0, null)
     await expect(supervised).resolves.toBe(0)
-    expect(vi.getTimerCount()).toBe(0)
   })
 
   it('forwards Linux terminal hangup and removes the listener after exit', async () => {
@@ -193,29 +141,5 @@ describe('superviseForegroundServe signal exits', () => {
 
     await expect(supervised).resolves.toBe(1)
     expect(child.kill).not.toHaveBeenCalled()
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('throws the macOS diagnostic when the child aborts on darwin', async () => {
-    setPlatform('darwin')
-
-    await expect(superviseUntilExit(null, 'SIGABRT')).rejects.toThrow(
-      /aborted with SIGABRT on macOS/
-    )
-  })
-
-  it('reports the plain signal on linux', async () => {
-    setPlatform('linux')
-
-    await expect(superviseUntilExit(null, 'SIGABRT')).rejects.toThrow(
-      'Orca serve exited via SIGABRT.'
-    )
-  })
-
-  it('returns numeric exit codes unchanged', async () => {
-    setPlatform('darwin')
-
-    await expect(superviseUntilExit(0, null)).resolves.toBe(0)
-    await expect(superviseUntilExit(7, null)).resolves.toBe(7)
   })
 })
diff --git a/src/cli/runtime/serve-supervised-service.test.ts b/src/cli/runtime/serve-supervised-service.test.ts
index 195cb534bfe..f3b97dff825 100644
--- a/src/cli/runtime/serve-supervised-service.test.ts
+++ b/src/cli/runtime/serve-supervised-service.test.ts
@@ -3,14 +3,11 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { superviseServeService, type SupervisedServeOptions } from './serve-supervised-service'
-import { readServeSupervisorBrake, SERVE_SUPERVISOR_FAILURE_LIMIT } from './serve-supervisor-brake'
+import { readServeSupervisorBrake } from './serve-supervisor-brake'
 
 /** Virtual clock: timers fire in order as soon as the loop awaits them. */
 function harness(overrides: Partial<SupervisedServeOptions> & { userDataPath: string }) {
   let clock = 1_000_000
-  const sleeps: number[] = []
-  const logs: string[] = []
-  let stopListener: (() => void) | null = null
   const options: SupervisedServeOptions = {
     executable: '/opt/orca/orca',
     force: false,
@@ -20,28 +17,16 @@ function harness(overrides: Partial<SupervisedServeOptions> & { userDataPath: st
     now: () => clock,
     random: () => 0.5,
     setTimer: (callback, ms) => {
-      sleeps.push(ms)
       clock += ms
       queueMicrotask(callback)
       return () => undefined
     },
-    onStopSignal: (listener) => {
-      stopListener = listener
-      return () => {
-        stopListener = null
-      }
-    },
-    log: (line) => logs.push(line),
+    onStopSignal: () => () => undefined,
+    log: () => undefined,
     ...overrides
   }
   return {
-    options,
-    sleeps,
-    logs,
-    stop: () => stopListener?.(),
-    advance: (ms: number) => {
-      clock += ms
-    }
+    options
   }
 }
 
@@ -56,18 +41,9 @@ describe('superviseServeService', () => {
     await rm(userDataPath, { recursive: true, force: true })
   })
 
-  it('restarts a dying child with growing delays, then gives up and exits 0 durably', async () => {
-    let runs = 0
-    const h = harness({
-      userDataPath,
-      runOnce: async () => {
-        runs++
-        return 1
-      }
-    })
+  it('persists give-up after repeated child failure and refuses another launch', async () => {
+    const h = harness({ userDataPath })
     await expect(superviseServeService(h.options)).resolves.toBe(0)
-    expect(runs).toBe(SERVE_SUPERVISOR_FAILURE_LIMIT)
-    expect(h.sleeps).toEqual([1_000, 2_000, 4_000, 8_000, 16_000])
     const record = readServeSupervisorBrake(userDataPath)
     expect(record?.gaveUp?.reason).toContain('exited with code 1')
 
@@ -81,8 +57,5 @@ describe('superviseServeService', () => {
     })
     await expect(superviseServeService(again.options)).resolves.toBe(0)
     expect(rerun).toBe(0)
-    expect(again.logs.join('\n')).toContain('--force')
   })
-
-  // #32177: a lock this machine cannot judge (a shared home) is a peer, not a fault to give up on.
 })
diff --git a/src/cli/runtime/serve-supervisor-relocation.test.ts b/src/cli/runtime/serve-supervisor-relocation.test.ts
index c1d39a1ebfd..802db8ff75b 100644
--- a/src/cli/runtime/serve-supervisor-relocation.test.ts
+++ b/src/cli/runtime/serve-supervisor-relocation.test.ts
@@ -92,17 +92,6 @@ describe('relocateServeSupervisor', () => {
     expect(relocated.execve).not.toHaveBeenCalled()
   })
 
-  it('stays in place outside a packaged app', async () => {
-    for (const d of [
-      deps({ env: {} }),
-      deps({ env: { ELECTRON_RUN_AS_NODE: '1', ORCA_APP_EXECUTABLE: '/dev/Orca' } }),
-      deps({ appRoot: join(root, 'checkout') })
-    ]) {
-      await expect(relocateServeSupervisor(d)).resolves.toBe('in-place')
-      expect(d.execve).not.toHaveBeenCalled()
-    }
-  })
-
   // Re-exec closes the AppImage keepalive pipe and unmounts libraries needed by the new image.
   it('stays in place when running from an AppImage, whose files cannot change under it', async () => {
     const d = deps({
@@ -235,14 +224,6 @@ describe('relocateServeSupervisor', () => {
     }
     const appCli = () => join(appRoot, 'out', 'cli', 'index.js')
 
-    it('re-runs plain serve with the same arguments on the replaced executable', () => {
-      const argv = ['/ignored', appCli(), 'serve', '--json']
-      const { execve, execPath } = restart({ ELECTRON_RUN_AS_NODE: '1' }, argv)
-      expect(execve).toHaveBeenCalledWith(execPath, [execPath, ...argv.slice(1)], {
-        ELECTRON_RUN_AS_NODE: '1'
-      })
-    })
-
     it('does not restart when the executable is the one it started from, as after a restart', () => {
       const argv = ['/ignored', appCli(), 'serve']
       const installed = statSync(deps().execPath)
@@ -265,14 +246,6 @@ describe('relocateServeSupervisor', () => {
       expect(log).toHaveBeenCalledWith(expect.stringContaining('not ready to run'))
     })
 
-    it('logs instead of throwing on a runtime that cannot replace its own process', () => {
-      const execve = vi.fn(() => {
-        throw new Error('this runtime cannot replace its own process')
-      })
-      expect(() => restart({}, ['/ignored', appCli(), 'serve'], { execve })).not.toThrow()
-      expect(log).toHaveBeenCalledWith(expect.stringContaining('cannot replace'))
-    })
-
     it('re-runs a relocated supervisor from the app, which copies the new release aside', async () => {
       const first = deps()
       await relocateServeSupervisor(first)
diff --git a/src/cli/runtime/status.test.ts b/src/cli/runtime/status.test.ts
index 86b9943e981..425a26d441b 100644
--- a/src/cli/runtime/status.test.ts
+++ b/src/cli/runtime/status.test.ts
@@ -4,9 +4,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { getRuntimeMetadataPath } from '../../shared/runtime-bootstrap'
-import type { RuntimeStatus } from '../../shared/runtime-types'
 import { RuntimeClient } from './client'
-import { projectRemoteAppStatus } from './status'
 
 const servers = new Set<ReturnType<typeof createServer>>()
 const sockets = new Set<Socket>()
@@ -87,33 +85,30 @@ describe.skipIf(process.platform === 'win32')('CLI runtime status', () => {
 
 // A persisted host PID cannot establish liveness in the caller's namespace.
 describe.skipIf(process.platform === 'win32')('CLI status connection authority', () => {
-  it.each(['EPERM', 'ESRCH'])(
-    'reports an unavailable endpoint without using a PID probe (%s)',
-    async (code) => {
-      const userDataPath = mkdtempSync(join(tmpdir(), 'orca-runtime-status-probe-'))
-      writeFileSync(
-        getRuntimeMetadataPath(userDataPath),
-        JSON.stringify({
-          runtimeId: 'runtime-unreachable',
-          pid: 424242,
-          transport: { kind: 'unix', endpoint: join(userDataPath, 'absent.sock') },
-          authToken: 'token',
-          startedAt: 1
-        })
-      )
-      const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => {
-        throw Object.assign(new Error(`kill ${code}`), { code })
+  it('reports an unavailable endpoint without using a PID probe', async () => {
+    const userDataPath = mkdtempSync(join(tmpdir(), 'orca-runtime-status-probe-'))
+    writeFileSync(
+      getRuntimeMetadataPath(userDataPath),
+      JSON.stringify({
+        runtimeId: 'runtime-unreachable',
+        pid: 424242,
+        transport: { kind: 'unix', endpoint: join(userDataPath, 'absent.sock') },
+        authToken: 'token',
+        startedAt: 1
       })
-      try {
-        await expect(new RuntimeClient(userDataPath).getCliStatus()).rejects.toMatchObject({
-          code: 'runtime_unavailable'
-        })
-        expect(killSpy).not.toHaveBeenCalled()
-      } finally {
-        killSpy.mockRestore()
-      }
+    )
+    const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => {
+      throw new Error('unexpected PID probe')
+    })
+    try {
+      await expect(new RuntimeClient(userDataPath).getCliStatus()).rejects.toMatchObject({
+        code: 'runtime_unavailable'
+      })
+      expect(killSpy).not.toHaveBeenCalled()
+    } finally {
+      killSpy.mockRestore()
     }
-  )
+  })
 
   it('reports a status timeout from a live listener without declaring its hidden PID dead', async () => {
     const userDataPath = mkdtempSync(join(tmpdir(), 'orca-status-timeout-'))
@@ -148,41 +143,3 @@ describe.skipIf(process.platform === 'win32')('CLI status connection authority',
     }
   })
 })
-
-describe('projectRemoteAppStatus', () => {
-  function remoteStatus(overrides: Partial<RuntimeStatus> = {}): RuntimeStatus {
-    return {
-      runtimeId: 'remote-runtime',
-      graphStatus: 'ready',
-      authoritativeWindowId: null,
-      ...overrides
-    } as RuntimeStatus
-  }
-
-  it('reports the target app as running when a renderer owns the graph there', () => {
-    expect(projectRemoteAppStatus(remoteStatus({ desktopWindowStatus: 'available' }))).toEqual({
-      running: true,
-      pid: null,
-      desktopWindowStatus: 'available'
-    })
-  })
-
-  it.each(['openable', 'initializing', 'blocked'] as const)(
-    'does not claim a running desktop for window status %s',
-    (desktopWindowStatus) => {
-      expect(projectRemoteAppStatus(remoteStatus({ desktopWindowStatus })).running).toBe(false)
-    }
-  )
-
-  it('reports not running when the target has no desktop window status', () => {
-    expect(projectRemoteAppStatus(remoteStatus())).toEqual({ running: false, pid: null })
-  })
-
-  it('honors the authoritativeWindowId fallback for older runtimes', () => {
-    expect(projectRemoteAppStatus(remoteStatus({ authoritativeWindowId: 3 }))).toEqual({
-      running: true,
-      pid: null,
-      desktopWindowStatus: 'available'
-    })
-  })
-})
diff --git a/src/cli/runtime/transport-framing.test.ts b/src/cli/runtime/transport-framing.test.ts
index 2c7bfb5ecf0..66fbcbfa177 100644
--- a/src/cli/runtime/transport-framing.test.ts
+++ b/src/cli/runtime/transport-framing.test.ts
@@ -18,10 +18,10 @@ const reply = (result: unknown) =>
   `${JSON.stringify({ id: 'request-1', ok: true, result, _meta: { runtimeId: 'runtime-1' } })}\n`
 
 class TestSocket extends EventEmitter {
-  setEncoding = vi.fn()
-  write = vi.fn()
-  end = vi.fn()
-  destroy = vi.fn()
+  setEncoding = (): void => {}
+  write = (): void => {}
+  end = (): void => {}
+  destroy = (): void => {}
 }
 let socket: TestSocket
 
@@ -30,50 +30,16 @@ beforeEach(() => {
   createConnection.mockReturnValue(socket)
 })
 afterEach(() => {
-  vi.restoreAllMocks()
   vi.useRealTimers()
 })
 
 describe('CLI runtime response framing', () => {
-  it.each([1, 7, 256, 4096])(
-    'reads a fragmented response with %i-character chunks',
-    async (size) => {
-      const result = { data: '界😀'.repeat(10000) }
-      const encoded = reply(result)
-      const pending = sendRequest(metadata, 'terminal.read', {}, 30000)
-      for (let offset = 0; offset < encoded.length; offset += size) {
-        socket.emit('data', encoded.slice(offset, offset + size))
-      }
-      await expect(pending).resolves.toMatchObject({ result })
-      expect(socket.setEncoding).toHaveBeenCalledExactlyOnceWith('utf8')
-      expect(socket.end).toHaveBeenCalledOnce()
-    }
-  )
-
-  it('searches each fragment once without rescanning the accumulated reply', async () => {
-    const encoded = reply({ data: 'x'.repeat(1024 * 1024) })
+  it('reads a response split across chunks without losing its payload', async () => {
+    const encoded = reply({ data: '界😀done' })
     const pending = sendRequest(metadata, 'terminal.read', {}, 30000)
-    const originalIndexOf = String.prototype.indexOf
-    let searchedCharacters = 0
-    const search = vi.spyOn(String.prototype, 'indexOf').mockImplementation(function (
-      this: string,
-      value,
-      position
-    ) {
-      if (value === '\n') {
-        searchedCharacters += this.length - (position ?? 0)
-      }
-      return originalIndexOf.call(this, value, position)
-    })
-    try {
-      for (let offset = 0; offset < encoded.length; offset += 256) {
-        socket.emit('data', encoded.slice(offset, offset + 256))
-      }
-    } finally {
-      search.mockRestore()
-    }
-    await expect(pending).resolves.toMatchObject({ ok: true })
-    expect(searchedCharacters).toBe(encoded.length)
+    socket.emit('data', encoded.slice(0, 7))
+    socket.emit('data', encoded.slice(7))
+    await expect(pending).resolves.toMatchObject({ result: { data: '界😀done' } })
   })
 
   it('refreshes keepalives across chunks and ignores blanks and data after the final frame', async () => {
@@ -86,13 +52,10 @@ describe('CLI runtime response framing', () => {
     socket.emit('data', `${reply({ data: 'done' })}invalid JSON\n`)
     socket.emit('data', 'more ignored data')
     await expect(pending).resolves.toMatchObject({ result: { data: 'done' } })
-    expect(socket.end).toHaveBeenCalledOnce()
-    expect(vi.getTimerCount()).toBe(0)
   })
 
   it.each([
     ['broken JSON\n', 'invalid_runtime_response'],
-    ['{}\n', 'invalid_runtime_response'],
     ['{"id":"other","ok":true,"result":{}}\n', 'invalid_runtime_response'],
     [
       '{"id":"request-1","ok":true,"result":{},"_meta":{"runtimeId":"other"}}\n',
@@ -105,29 +68,18 @@ describe('CLI runtime response framing', () => {
       socket.emit('data', line.slice(0, 2))
       socket.emit('data', line.slice(2) + reply({ data: 'ignored' }))
       await expect(pending).rejects.toMatchObject({ code })
-      expect(socket.end).toHaveBeenCalledOnce()
     }
   )
 
-  it('preserves terminal failure envelopes', async () => {
-    const pending = sendRequest(metadata, 'terminal.read', {}, 30000)
-    socket.emit('data', '{"id":"request-1","ok":false,"error":{"code":"bad","message":"no"}}\n')
-    await expect(pending).resolves.toMatchObject({
-      ok: false,
-      error: { code: 'bad', message: 'no' }
-    })
-  })
-
   it('rejects close with an incomplete frame and does not parse later data', async () => {
     const pending = sendRequest(metadata, 'terminal.read', {}, 30000)
     socket.emit('data', '{"id":')
     socket.emit('close')
     socket.emit('data', reply({ data: 'ignored' }))
     await expect(pending).rejects.toMatchObject({ code: 'runtime_unavailable' })
-    expect(socket.end).toHaveBeenCalledOnce()
   })
 
-  it('destroys a timed out socket holding an incomplete frame', async () => {
+  it('rejects a timed out incomplete frame and ignores a late reply', async () => {
     vi.useFakeTimers()
     const pending = sendRequest(metadata, 'terminal.read', {}, 100)
     const rejected = expect(pending).rejects.toMatchObject({ code: 'runtime_timeout' })
@@ -135,7 +87,5 @@ describe('CLI runtime response framing', () => {
     await vi.advanceTimersByTimeAsync(100)
     socket.emit('data', reply({ data: 'ignored' }))
     await rejected
-    expect(socket.destroy).toHaveBeenCalledOnce()
-    expect(vi.getTimerCount()).toBe(0)
   })
 })
diff --git a/src/cli/runtime/websocket-transport.test.ts b/src/cli/runtime/websocket-transport.test.ts
deleted file mode 100644
index a0cfb912efa..00000000000
--- a/src/cli/runtime/websocket-transport.test.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import { createServer, type Server } from 'node:http'
-import 'node:fs'
-import 'node:os'
-import 'node:path'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { WebSocketServer } from 'ws'
-import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
-
-import type { RuntimeStatus } from '../../shared/runtime-types'
-import {
-  decrypt,
-  deriveSharedKey,
-  encrypt,
-  generateKeyPair,
-  publicKeyToBase64
-} from '../../shared/remote-runtime/e2ee/node/e2ee-crypto'
-import './websocket-transport'
-import '../../shared/remote-runtime/requests/remote-runtime-prepared-request-admission'
-import { RuntimeClient } from './client'
-import '../workspaces/worktree-removal-request'
-import { launchOrcaApp } from './launch'
-import './environments'
-import {
-  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-  RUNTIME_PROTOCOL_VERSION
-} from '../../shared/protocol-version'
-
-vi.mock('./launch', () => ({
-  launchOrcaApp: vi.fn()
-}))
-
-type TestRuntime = {
-  endpoint: string
-  publicKeyB64: string
-  deviceToken: string
-  authFrames: Record<string, unknown>[]
-  requestMethods: string[]
-  requestParams: unknown[]
-  connectionCount: () => number
-  close: () => Promise<void>
-}
-
-describe('CLI remote WebSocket transport', () => {
-  const servers: TestRuntime[] = []
-
-  afterEach(async () => {
-    vi.mocked(launchOrcaApp).mockClear()
-    await Promise.all(servers.splice(0).map((server) => server.close()))
-  })
-
-  it('blocks remote RPCs when the server protocol is too old', async () => {
-    const runtime = await startTestRuntime('runtime-old', { runtimeProtocolVersion: 1 })
-    servers.push(runtime)
-
-    const client = new RuntimeClient(
-      '/tmp/unused',
-      5_000,
-      encodePairingOffer({
-        v: 2,
-        endpoint: runtime.endpoint,
-        deviceToken: runtime.deviceToken,
-        publicKeyB64: runtime.publicKeyB64
-      })
-    )
-
-    await expect(client.call('repo.list')).rejects.toMatchObject({
-      code: 'incompatible_runtime',
-      message: expect.stringContaining('server is too old')
-    })
-    expect(runtime.connectionCount()).toBe(1)
-    expect(runtime.authFrames).toHaveLength(1)
-    expect(runtime.requestMethods).toEqual(['status.get'])
-  })
-})
-
-async function startTestRuntime(
-  runtimeId: string,
-  statusOverrides: {
-    runtimeProtocolVersion?: number
-    minCompatibleRuntimeClientVersion?: number
-    desktopWindowStatus?: 'available' | 'openable' | 'initializing' | 'blocked'
-    appVersion?: string
-    remoteUpdateSupport?: {
-      installMode: 'unsupported-headless-serve'
-      automatic: false
-      reason: 'manual-service-update-required'
-    }
-    capabilities?: string[]
-    malformed?: boolean
-    failure?: boolean
-    hold?: string
-    onRequest?: (method: string) => void
-    disconnect?: boolean
-    mutationDisconnect?: boolean
-    rejectAuth?: boolean
-    degradations?: RuntimeStatus['degradations']
-  } = {}
-): Promise<TestRuntime> {
-  const serverKeyPair = generateKeyPair()
-  const deviceToken = `token-${runtimeId}`
-  const httpServer = createServer()
-  const wss = new WebSocketServer({ server: httpServer })
-  const authFrames: Record<string, unknown>[] = []
-  const requestMethods: string[] = []
-  const requestParams: unknown[] = []
-  let connectionCount = 0
-
-  wss.on('connection', (ws) => {
-    let sharedKey: Uint8Array | null = null
-    let authenticated = false
-
-    ws.on('message', (data) => {
-      const frame = data.toString()
-      if (!sharedKey) {
-        const hello = JSON.parse(frame) as Record<string, unknown> & {
-          type?: string
-          publicKeyB64?: string
-        }
-        if (!hello.publicKeyB64) {
-          // Legacy-only host: refuses a v2 hello the way hosts before v2 do.
-          ws.close(4001, 'Invalid e2ee_hello')
-          return
-        }
-        connectionCount += 1
-        const clientPublicKey = Buffer.from(hello.publicKeyB64 ?? '', 'base64')
-        sharedKey = deriveSharedKey(serverKeyPair.secretKey, clientPublicKey)
-        ws.send(JSON.stringify({ type: 'e2ee_ready' }))
-        return
-      }
-
-      const plaintext = decrypt(frame, sharedKey)
-      if (!plaintext) {
-        ws.close(4003, 'decrypt failed')
-        return
-      }
-      if (!authenticated) {
-        const auth = JSON.parse(plaintext) as Record<string, unknown> & {
-          type?: string
-          deviceToken?: string
-        }
-        authFrames.push(auth)
-        if (
-          auth.type !== 'e2ee_auth' ||
-          auth.deviceToken !== deviceToken ||
-          statusOverrides.rejectAuth
-        ) {
-          ws.send(encrypt(JSON.stringify({ type: 'e2ee_error' }), sharedKey))
-          ws.close(4001, 'auth failed')
-          return
-        }
-        authenticated = true
-        ws.send(encrypt(JSON.stringify({ type: 'e2ee_authenticated' }), sharedKey))
-        return
-      }
-
-      const request: { id: string; method: string; params?: unknown } = JSON.parse(plaintext)
-      requestMethods.push(request.method)
-      requestParams.push(request.params)
-      statusOverrides.onRequest?.(request.method)
-      if (request.method === statusOverrides.hold) {
-        return
-      }
-      if (request.method === 'status.get' && statusOverrides.disconnect) {
-        ws.close()
-        return
-      }
-      if (request.method === 'worktree.rm' && statusOverrides.mutationDisconnect) {
-        ws.close()
-        return
-      }
-      const response =
-        request.method === 'status.get' && statusOverrides.failure
-          ? {
-              id: request.id,
-              ok: false,
-              error: { code: 'runtime_unavailable', message: 'status failed' },
-              _meta: { runtimeId }
-            }
-          : request.method === 'worktree.rm'
-            ? { id: request.id, ok: true, result: { removed: true }, _meta: { runtimeId } }
-            : request.method === 'status.get'
-              ? {
-                  id: request.id,
-                  ok: true,
-                  result: statusOverrides.malformed
-                    ? { capabilities: 42 }
-                    : {
-                        runtimeId,
-                        rendererGraphEpoch: 1,
-                        graphStatus: 'ready',
-                        authoritativeWindowId: null,
-                        desktopWindowStatus: statusOverrides.desktopWindowStatus,
-                        liveTabCount: 0,
-                        liveLeafCount: 0,
-                        runtimeProtocolVersion:
-                          statusOverrides.runtimeProtocolVersion ?? RUNTIME_PROTOCOL_VERSION,
-                        minCompatibleRuntimeClientVersion:
-                          statusOverrides.minCompatibleRuntimeClientVersion ??
-                          MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-                        appVersion: statusOverrides.appVersion,
-                        remoteUpdateSupport: statusOverrides.remoteUpdateSupport,
-                        capabilities: statusOverrides.capabilities,
-                        degradations: statusOverrides.degradations
-                      },
-                  _meta: { runtimeId }
-                }
-              : {
-                  id: request.id,
-                  ok: false,
-                  error: { code: 'method_not_found', message: 'Unknown method' },
-                  _meta: { runtimeId }
-                }
-      ws.send(encrypt(JSON.stringify(response), sharedKey))
-    })
-  })
-
-  await listen(httpServer)
-  const address = httpServer.address()
-  if (!address || typeof address === 'string') {
-    throw new Error('Expected TCP test server')
-  }
-
-  return {
-    endpoint: `ws://127.0.0.1:${address.port}`,
-    publicKeyB64: publicKeyToBase64(serverKeyPair.publicKey),
-    deviceToken,
-    authFrames,
-    requestMethods,
-    requestParams,
-    connectionCount: () => connectionCount,
-    close: async () => {
-      await new Promise<void>((resolve) => {
-        wss.close(() => resolve())
-        for (const client of wss.clients) {
-          client.close()
-        }
-      })
-      await closeHttpServer(httpServer)
-    }
-  }
-}
-
-async function listen(server: Server): Promise<void> {
-  await new Promise<void>((resolve, reject) => {
-    server.once('error', reject)
-    server.listen(0, '127.0.0.1', () => {
-      server.off('error', reject)
-      resolve()
-    })
-  })
-}
-
-async function closeHttpServer(server: Server): Promise<void> {
-  await new Promise<void>((resolve, reject) => {
-    server.close((error) => {
-      if (error) {
-        reject(error)
-        return
-      }
-      resolve()
-    })
-  })
-}
diff --git a/src/cli/speech/speech.ts b/src/cli/speech/speech.ts
index e1870ed9797..3867bb0a36b 100644
--- a/src/cli/speech/speech.ts
+++ b/src/cli/speech/speech.ts
@@ -2,7 +2,7 @@ import type { CommandHandler, HandlerContext } from '../dispatch/dispatch'
 import { printResult } from '../output/command-result-output'
 import { RuntimeClientError } from '../runtime/types'
 import type { RuntimeRpcSuccess } from '../../shared/runtime-rpc-envelope'
-import { OPENAI_SPEECH_KEY_MAX_LENGTH } from '../../shared/rpc-contract/speech-params'
+import { OPENAI_SPEECH_KEY_MAX_LENGTH } from '../../shared/rpc-contract/speech/speech-params'
 
 type OpenAiSpeechKeyStatus = { configured: boolean; protection: string | null }
 
diff --git a/src/main/agent-hooks/server/server-codex-question-skip.ts b/src/main/agent-hooks/server/server-codex-question-skip.ts
index e59e028baaf..0cb25cf6d89 100644
--- a/src/main/agent-hooks/server/server-codex-question-skip.ts
+++ b/src/main/agent-hooks/server/server-codex-question-skip.ts
@@ -1,4 +1,4 @@
-import { codexRowAfterQuestionSkip } from '../../../shared/agent-hook-listener/providers/codex-question-skip'
+import { codexRowAfterQuestionSkip } from '../../../shared/agent-hook-listener/providers/codex/codex-question-skip'
 import { AGENT_STATUS_STALE_AFTER_MS } from '../../../shared/agent-status/contracts/agent-status-freshness'
 import type { AgentQuestionAnsweredInferenceRequest } from '../../../shared/agent-status/lifecycle/agent-question-answered-intent'
 import { CODEX_ASYNC_QUESTION_TOOL } from '../../../shared/codex-async-question-input'
diff --git a/src/main/agent-hooks/server/server-foreign-turn-hook.ts b/src/main/agent-hooks/server/server-foreign-turn-hook.ts
index 78bca1b8942..c204ec960f4 100644
--- a/src/main/agent-hooks/server/server-foreign-turn-hook.ts
+++ b/src/main/agent-hooks/server/server-foreign-turn-hook.ts
@@ -1,5 +1,5 @@
 import type { AgentHookEventPayload } from '../../../shared/agent-hook-listener/listener-event'
-import { rowHoldsOtherCodexThread } from '../../../shared/agent-hook-listener/providers/codex-ephemeral-threads'
+import { rowHoldsOtherCodexThread } from '../../../shared/agent-hook-listener/providers/codex/codex-ephemeral-threads'
 import { isStaleGrokTurnEnd } from './server-grok-status-rules'
 import type { EnrichedAgentHookEventPayload } from './server-types'
 
diff --git a/src/main/agent-hooks/server/server-hydration.ts b/src/main/agent-hooks/server/server-hydration.ts
index ebabcfb7ad3..781d5edf6c6 100644
--- a/src/main/agent-hooks/server/server-hydration.ts
+++ b/src/main/agent-hooks/server/server-hydration.ts
@@ -5,8 +5,8 @@ import {
 import {
   seedClaudeLeadTurnFromPersistedStatus,
   seedClaudeSubagentRosterFromSnapshots
-} from '../../../shared/agent-hook-listener/providers/claude-roster-state'
-import { seedCodexStateFromSnapshot } from '../../../shared/agent-hook-listener/providers/codex-state'
+} from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state'
+import { seedCodexStateFromSnapshot } from '../../../shared/agent-hook-listener/providers/codex/codex-state'
 import { AGENT_STATUS_PERSISTED_HYDRATION_MODE } from '../../../shared/agent-status/transport/agent-status-legacy-adapter'
 import { AGENT_STATUS_HYDRATE_MAX_AGE_MS as HYDRATE_MAX_AGE_MS } from '../../../shared/agent-status/contracts/agent-status-freshness'
 import { LAST_STATUS_FILE_VERSION, STATUS_FLUSH_BUSY_TIMEOUT_MS } from './server-constants'
diff --git a/src/main/agent-hooks/server/server-ingest-remote.ts b/src/main/agent-hooks/server/server-ingest-remote.ts
index 675a68e5aa1..1c4feee87d3 100644
--- a/src/main/agent-hooks/server/server-ingest-remote.ts
+++ b/src/main/agent-hooks/server/server-ingest-remote.ts
@@ -16,7 +16,7 @@ import {
   isClaudeCompactCompletionConsumed,
   markClaudeCompactCompletionConsumed,
   resolveLegacyCompactTrigger
-} from '../../../shared/agent-hook-listener/providers/claude-compact-completion'
+} from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-compact-completion'
 import { launchTokenHash } from '../../../shared/agent-hook-listener/transport/agent-hook-spool'
 import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
 import type { IncomingAgentHookEvent } from './server-types'
diff --git a/src/main/agent-hooks/server/server-relay-sessions.ts b/src/main/agent-hooks/server/server-relay-sessions.ts
index 29daa5c2837..bb8374a8db7 100644
--- a/src/main/agent-hooks/server/server-relay-sessions.ts
+++ b/src/main/agent-hooks/server/server-relay-sessions.ts
@@ -1,6 +1,6 @@
 import { hasShedSubagentsField } from '../../../shared/agent-hook-listener/transport/agent-hook-relay'
 import { readAgentPaneRootBinding } from '../../../shared/agent-status/process/agent-process-presence'
-import type { CodexRemoteRosterAuthority } from '../../../shared/agent-hook-listener/providers/codex-state'
+import type { CodexRemoteRosterAuthority } from '../../../shared/agent-hook-listener/providers/codex/codex-state'
 import type { ParsedAgentStatusPayload } from '../../../shared/agent-status/contracts/agent-status-types'
 
 // One binding per pane a relay asked about; a link restart drops them all.
diff --git a/src/main/agent-hooks/server/server-status-application.ts b/src/main/agent-hooks/server/server-status-application.ts
index e7a625f10ed..6cf5f15661a 100644
--- a/src/main/agent-hooks/server/server-status-application.ts
+++ b/src/main/agent-hooks/server/server-status-application.ts
@@ -14,7 +14,7 @@ import type {
 } from '../../../shared/agent-status/contracts/agent-status-observation'
 import { AGENT_STATUS_2A_CURRENT_PRODUCER_MODE } from '../../../shared/agent-status/transport/agent-status-legacy-adapter'
 import { mainAgentState } from '../../../shared/agent-status/lifecycle/main-agent-status'
-import { previousCodexTurnContext } from '../../../shared/agent-hook-listener/providers/codex-session-start'
+import { previousCodexTurnContext } from '../../../shared/agent-hook-listener/providers/codex/codex-session-start'
 import { admitLegacyAgentStatus } from '../../../shared/agent-hook-listener/listener-state'
 import type { EnrichedAgentHookEventPayload } from './server-types'
 import { agentTypeToPromptSentAgentKind } from './server-status-identity'
diff --git a/src/main/agent-hooks/server/server-status-inference.ts b/src/main/agent-hooks/server/server-status-inference.ts
index c7352198056..ed31c3a116e 100644
--- a/src/main/agent-hooks/server/server-status-inference.ts
+++ b/src/main/agent-hooks/server/server-status-inference.ts
@@ -2,7 +2,7 @@ import type { RemoteAgentInterruptDispatch } from '../../../shared/agent-hook-li
 import {
   markClaudeLeadTurnDone,
   clearClaudeAnsweredQuestionWait
-} from '../../../shared/agent-hook-listener/providers/claude-roster-state'
+} from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state'
 import {
   isAgentInterruptInputIntent,
   isNavigationEscapeIntent,
diff --git a/src/main/agent-hooks/server/server-status-retries.ts b/src/main/agent-hooks/server/server-status-retries.ts
index c23da129c52..8486042e4e9 100644
--- a/src/main/agent-hooks/server/server-status-retries.ts
+++ b/src/main/agent-hooks/server/server-status-retries.ts
@@ -1,5 +1,5 @@
-import { ClaudeHelperKillPoller } from '../../../shared/agent-hook-listener/providers/claude-helper-kill-poller'
-import { pollCodexTranscriptStatus } from '../../../shared/agent-hook-listener/providers/codex-transcript-poll'
+import { ClaudeHelperKillPoller } from '../../../shared/agent-hook-listener/providers/claude/transcripts/claude-helper-kill-poller'
+import { pollCodexTranscriptStatus } from '../../../shared/agent-hook-listener/providers/codex/codex-transcript-poll'
 import { normalizeHookPayload } from '../../../shared/agent-hook-listener/normalization/normalize-hook-payload'
 import {
   hasPendingAgentResultText,
diff --git a/src/main/agent-hooks/server/server-status-update.ts b/src/main/agent-hooks/server/server-status-update.ts
index df37b55c600..8bd55299dfb 100644
--- a/src/main/agent-hooks/server/server-status-update.ts
+++ b/src/main/agent-hooks/server/server-status-update.ts
@@ -6,16 +6,16 @@ import {
   needsHookRootEvidence,
   readHookProcessVerdict
 } from '../../../shared/agent-hook-listener/presence/agent-hook-owner-presence'
-import { markCodexLeadTurnInterrupted } from '../../../shared/agent-hook-listener/providers/codex-state'
-import { reconcileCodexStatusEvent } from '../../../shared/agent-hook-listener/providers/codex-session-start'
+import { markCodexLeadTurnInterrupted } from '../../../shared/agent-hook-listener/providers/codex/codex-state'
+import { reconcileCodexStatusEvent } from '../../../shared/agent-hook-listener/providers/codex/codex-session-start'
 import {
   resolveAgentStatusIdentity,
   shouldSuppressInheritedTerminalStatus
 } from '../../../shared/agent-status/identity/agent-status-identity'
 import type { EnrichedAgentHookEventPayload, IncomingAgentHookEvent } from './server-types'
 import type { AgentStatusObservationOrigin } from '../../../shared/agent-status/contracts/agent-status-observation'
-import { ClaudeOwedNotificationExpiryTimers } from '../../../shared/agent-hook-listener/providers/claude-owed-notification-expiry-timers'
-import { setClaudeMainAgentTurnState } from '../../../shared/agent-hook-listener/providers/claude-roster-state'
+import { ClaudeOwedNotificationExpiryTimers } from '../../../shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-notification-expiry-timers'
+import { setClaudeMainAgentTurnState } from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state'
 import {
   attachClaudePermissionToolUseId,
   pairedClaudeNonAgentWork,
diff --git a/src/main/agent-hooks/server/server-types.ts b/src/main/agent-hooks/server/server-types.ts
index 4d69de23568..f538246b821 100644
--- a/src/main/agent-hooks/server/server-types.ts
+++ b/src/main/agent-hooks/server/server-types.ts
@@ -8,7 +8,7 @@ import type { AgentStatusState } from '../../../shared/agent-status/contracts/ag
 import type { AgentStatusObservation } from '../../../shared/agent-status/contracts/agent-status-observation'
 import type { AgentKind } from '../../../shared/telemetry-events'
 import type { LegacyPaneKeyAliasEntry } from '../../../shared/persisted-state-types'
-import type { CodexRemoteRosterAuthority } from '../../../shared/agent-hook-listener/providers/codex-state'
+import type { CodexRemoteRosterAuthority } from '../../../shared/agent-hook-listener/providers/codex/codex-state'
 import type { AgentHookSource } from '../../../shared/agent-hook-listener/transport/agent-hook-relay'
 
 export type HookServerStartOptions = {
diff --git a/src/main/agent-hooks/server/testing/interruptions/server-claude-helper-recovery.test.ts b/src/main/agent-hooks/server/testing/interruptions/server-claude-helper-recovery.test.ts
deleted file mode 100644
index 1311a436db7..00000000000
--- a/src/main/agent-hooks/server/testing/interruptions/server-claude-helper-recovery.test.ts
+++ /dev/null
@@ -1,463 +0,0 @@
-import { appendFileSync } from 'node:fs'
-import { appendFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { createServer } from 'node:http'
-import { join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { RelayAgentHookServer } from '../../../../../wsl-guest/agent-hooks/server/agent-hook-server'
-import { AgentHookServer } from '../../agent-hook-server'
-import { buildBody, PANE, postHookEvent } from '../server.test-fixtures'
-import { ClaudeHelperKillPoller } from '../../../../../shared/agent-hook-listener/providers/claude-helper-kill-poller'
-import '../../../../../shared/agent-hook-listener/providers/claude-transcript-decoder'
-import '../../../../../shared/agent-hook-listener/transcripts/agent-transcript-poll-scheduler'
-
-// Complete captured lifecycle records, with runtime replay seeded by real persisted HTTP state.
-vi.mock('../../../../telemetry/client', () => ({ track: vi.fn() }))
-vi.mock('../../../../telemetry/cohort-classifier', () => ({
-  getCohortAtEmit: () => ({ nth_repo_added: 2 })
-}))
-const servers: { stop: () => void }[] = []
-const folders: string[] = []
-const realSetTimeout = globalThis.setTimeout
-beforeEach(() => {
-  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'performance'] })
-})
-afterEach(async () => {
-  for (const server of servers.splice(0)) {
-    server.stop()
-  }
-  vi.useRealTimers()
-  // Only exact test-created mkdtemp paths; no external state is reachable.
-  for (const folder of folders.splice(0)) {
-    await rm(folder, { recursive: true, force: true })
-  }
-  vi.restoreAllMocks()
-})
-const lines = (records: Record<string, unknown>[]) =>
-  records.map((r) => `${JSON.stringify(r)}\n`).join('')
-// ast-grep-ignore: test-no-real-time-wait -- Real elapsed gaps separate hook R, provider K and restart S.
-const pause = (ms: number) => new Promise((resolve) => realSetTimeout(resolve, ms))
-// Transcript polls run on the fake clock while transcript I/O and wall time stay real.
-const settle = (assertion: () => void) =>
-  vi.waitFor(
-    () => {
-      vi.advanceTimersByTime(250)
-      assertion()
-    },
-    { timeout: 3000, interval: 10 }
-  )
-async function load(stream: string): Promise<Record<string, unknown>[]> {
-  return (
-    await readFile(
-      new URL(
-        `../../../../../shared/__fixtures__/claude-helper-kill-2.1.310-${stream}.jsonl`,
-        import.meta.url
-      ),
-      'utf8'
-    )
-  )
-    .trim()
-    .split('\n')
-    .map((line) => JSON.parse(line))
-}
-const hooks = [
-  { hook_event_name: 'UserPromptSubmit', prompt: 'work' },
-  { hook_event_name: 'SubagentStart', agent_id: 'a123' },
-  {
-    hook_event_name: 'Stop',
-    last_assistant_message: 'READY',
-    background_tasks: [
-      { id: 'a123', type: 'subagent', status: 'running' },
-      { id: 'shell', type: 'shell', status: 'running' }
-    ]
-  }
-]
-
-async function setup(
-  kind: string,
-  when: string,
-  options: {
-    cutoff?: number
-    killAt?: number
-    throwOnce?: boolean
-    disabled?: boolean
-    beforeStart?: (transcript: string) => void
-    retryBind?: boolean
-    busyPort?: number
-    stopBeforeBind?: boolean
-    advanceBeforeBind?: () => void
-    retired?: boolean
-  } = {}
-) {
-  const inputHooks = options.throwOnce ? [hooks[1]] : hooks
-  const parent = await load('parent'),
-    child = await load('child')
-  let oldKill = parent.find((r) => r.subtype === 'agents_killed')!
-  const folder = await mkdtemp(join(tmpdir(), 'pr35930-c5-bounded-'))
-  folders.push(folder)
-  const transcript = join(folder, 'session.jsonl')
-  await writeFile(transcript, lines(parent.filter((r) => r !== oldKill)))
-  await mkdir(join(folder, 'session', 'subagents'), { recursive: true })
-  await writeFile(join(folder, 'session', 'subagents', 'agent-a123.jsonl'), lines(child))
-  const body = (payload: Record<string, unknown>) =>
-    buildBody(
-      { session_id: 'session', transcript_path: transcript, ...payload },
-      { launchToken: 'same-owner' }
-    )
-  const endpointDir =
-    kind === 'desktop-spool' ? join(folder, 'agent-hooks', 'c5-bounded') : join(folder, 'endpoint')
-  const startOptions = { env: 'production', userDataPath: folder, endpointNamespace: 'c5-bounded' }
-  // Desktop restart is seeded by actual HTTP admission/persistence, not injected snapshot roster.
-  if (kind === 'desktop-spool') {
-    const previous = new AgentHookServer()
-    servers.push(previous)
-    await previous.start(startOptions)
-    for (const h of inputHooks) {
-      expect((await postHookEvent(previous, body(h))).status).toBe(204)
-    }
-    expect(previous.getStatusSnapshotForPane(PANE)[0]?.subagents?.[0]?.state).toBe('working')
-    previous.flushStatusPersistSync()
-    previous.stop()
-  }
-  if (kind.endsWith('spool')) {
-    await mkdir(join(endpointDir, 'spool'), { recursive: true })
-    // Actual failed-hook emission while stopped: use the shell writer's second floor.
-    const receivedAt = options.cutoff ?? Math.floor(Date.now() / 1000) * 1000
-    await writeFile(
-      join(endpointDir, 'spool', 'claude.jsonl'),
-      lines(
-        inputHooks.map((h) => ({
-          ...body(h),
-          source: 'claude',
-          launchToken: 'same-owner',
-          receivedAt
-        }))
-      )
-    )
-  }
-  if (when === 'before-start') {
-    // ast-grep-ignore: test-no-real-time-wait -- Provider K must follow failed-hook R with real I/O.
-    await pause(5)
-    oldKill = { ...oldKill, timestamp: new Date(options.killAt ?? Date.now()).toISOString() }
-    await appendFile(transcript, lines([oldKill]))
-    // ast-grep-ignore: test-no-real-time-wait -- Restart S must follow provider K without mocking host time.
-    await pause(20)
-  }
-  options.beforeStart?.(transcript)
-  const desktop = new AgentHookServer()
-  servers.push(desktop)
-  if (options.retired) {
-    desktop.dropStatusEntriesByTabPrefix('tab-1')
-  }
-  let prebind = false,
-    threw = false
-  const beforeBind = () => {
-    if (when === 'accepted-before-bind' && !prebind) {
-      prebind = true
-      appendFileSync(
-        transcript,
-        lines([{ ...oldKill, timestamp: new Date(Date.now()).toISOString() }])
-      )
-      options.advanceBeforeBind?.()
-      if (options.stopBeforeBind) {
-        if (kind.startsWith('desktop')) {
-          desktop.stop()
-        } else {
-          relay.stop()
-        }
-      }
-    }
-  }
-  desktop.setListener((event) => {
-    if (options.throwOnce && !threw && event.hookEventName === 'SubagentStart') {
-      threw = true
-      appendFileSync(
-        transcript,
-        lines([{ ...oldKill, timestamp: new Date(Date.now()).toISOString() }])
-      )
-      throw new Error('test outward listener')
-    }
-    if (event.hookEventName !== 'Stop') {
-      return
-    }
-    if (kind === 'desktop-spool') {
-      if (!options.disabled) {
-        expect(desktop['server']).toBe(null)
-      }
-      beforeBind()
-    }
-  })
-  const relay = new RelayAgentHookServer({
-    endpointDir,
-    token: 'c5-bounded',
-    preferredPort: options.retryBind ? -1 : options.busyPort,
-    isPaneSurfaceRetired: () => options.retired === true,
-    forward: (e) => {
-      desktop.ingestRemote(e, 'connection')
-      if (kind === 'relay-spool' && e.hookEventName === 'Stop') {
-        beforeBind()
-      }
-    }
-  })
-  servers.push(relay)
-  const start = () =>
-    kind.startsWith('desktop')
-      ? desktop.start({ ...startOptions, statusHooksEnabled: !options.disabled })
-      : relay.start({ publishEndpoint: false })
-  if (options.retryBind || (options.throwOnce && kind === 'desktop-spool')) {
-    await expect(start()).rejects.toThrow()
-    const observer = kind.startsWith('desktop')
-      ? desktop['claudeHelperKills']
-      : relay['retryScheduler']['claudeHelperKills']
-    const retained = observer['observations'].get(PANE)!
-    expect(retained.parent.offset).toBe(0)
-    expect(observer['scheduler']['entries'].size).toBe(0)
-    if (options.retryBind) {
-      Reflect.set(relay, 'preferredPort', 0)
-    }
-    await start()
-    expect(observer['observations'].get(PANE)).toBe(retained)
-  } else {
-    await start()
-  }
-  const post = async (payload: Record<string, unknown>, extra: Record<string, unknown> = {}) => {
-    if (kind.startsWith('desktop')) {
-      expect((await postHookEvent(desktop, { ...body(payload), ...extra })).status).toBe(204)
-    } else {
-      const { port, token } = relay.getCoordinates()
-      expect(
-        (
-          await fetch(`http://127.0.0.1:${port}/hook/claude`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'X-Orca-Agent-Hook-Token': token },
-            body: JSON.stringify({ ...body(payload), ...extra })
-          })
-        ).status
-      ).toBe(204)
-    }
-  }
-  if (!kind.endsWith('spool')) {
-    for (const h of inputHooks) {
-      await post(h)
-    }
-  }
-  const poller = kind.startsWith('desktop')
-    ? desktop['claudeHelperKills']
-    : relay['retryScheduler']['claudeHelperKills']
-  const entries = poller['observations']
-  return {
-    desktop,
-    relay,
-    poller,
-    post,
-    transcript,
-    oldKill,
-    entries,
-    prebind,
-    threw,
-    row: () => desktop.getStatusSnapshotForPane(PANE)[0]
-  }
-}
-
-it.each([
-  ['relay-spool', 'before-start'],
-  ['relay-spool', 'accepted-before-bind'],
-  ['desktop-spool', 'before-start'],
-  ['desktop-spool', 'accepted-before-bind']
-])('delivers the first kill through %s %s, then wakes retained evidence', async (kind, when) => {
-  const clock =
-    when === 'accepted-before-bind' ? vi.spyOn(Date, 'now').mockReturnValue(Date.now()) : undefined
-  const acceptedAt = Date.now()
-  const p = await setup(kind, when, {
-    advanceBeforeBind: () => clock?.mockReturnValue(acceptedAt + 10)
-  })
-  const before = p.row()!
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  expect(p.row()?.workingMode).toBe('monitoring')
-  expect(p.row()?.mainAgent).toEqual(before.mainAgent)
-  expect(p.row()?.lastAssistantMessage).toBe('READY')
-  expect(p.row()?.turnEndedAt).toBe(before.turnEndedAt)
-  const owner = p.entries.get(PANE)!
-  const offset = owner.parent.offset
-  // A delayed hook is the legitimate parked wake. No second kill is appended.
-  await p.post(hooks[1])
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  expect(p.entries.get(PANE)).toBe(owner)
-  expect(owner.parent.offset).toBe(offset)
-  if (when === 'accepted-before-bind') {
-    expect(p.prebind).toBe(true)
-  }
-})
-
-it.each(['desktop-http', 'relay-http', 'desktop-spool', 'relay-spool'])(
-  'retains accepted observation when %s fanout throws',
-  async (kind) => {
-    const p = await setup(kind, 'accepted-before-bind', { throwOnce: true })
-    expect(p.threw).toBe(true)
-    expect(p.entries.size).toBe(1)
-    await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-    expect(p.row()?.state).toBe('working') // Unknown root remains live; no parent hook was supplied.
-  }
-)
-
-it.each(['relay-spool', 'desktop-spool'])(
-  'keeps history and genuine within-second generations on %s',
-  async (kind) => {
-    const R = Math.floor(Date.now() / 1000) * 1000
-    const p = await setup(kind, 'before-start', { cutoff: R, killAt: R - 1001 })
-    await settle(() => expect(p.entries.get(PANE)?.parent.offset).toBeGreaterThan(0))
-    expect(p.entries.get(PANE)?.killedAt).toBeUndefined()
-    expect(p.row()?.subagents?.[0]?.state).toBe('working')
-    const child = join(p.transcript.slice(0, -6), 'subagents', 'agent-a123.jsonl')
-    await appendFile(
-      child,
-      lines([
-        {
-          type: 'user',
-          timestamp: new Date(R + 520).toISOString(),
-          message: { content: [{ type: 'text', text: 'Resume the work' }] }
-        }
-      ])
-    )
-    await appendFile(
-      p.transcript,
-      lines([{ ...p.oldKill, timestamp: new Date(R + 500).toISOString() }])
-    )
-    await settle(() => expect(p.entries.get(PANE)?.killedAt).toBe(R + 500))
-    expect(p.row()?.subagents?.[0]?.state).toBe('working')
-    // R's precision admits K, but only provider generation decides whether this work ends.
-    await appendFile(
-      p.transcript,
-      lines([{ ...p.oldKill, timestamp: new Date(R + 600).toISOString() }])
-    )
-    await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  }
-)
-
-it('initialization of an already-listening desktop activates parked runtime spool', async () => {
-  const p = await setup('desktop-spool', 'before-start', { disabled: true })
-  expect(p.entries.size).toBe(0)
-  p.desktop.setStatusHooksEnabled(true)
-  await settle(() => {
-    expect(p.entries.size).toBe(1)
-    expect(p.row()?.subagents ?? []).toEqual([])
-    expect(p.row()?.workingMode).toBe('monitoring')
-  })
-})
-
-it('caps future spool cutoffs and keeps HTTP cutoff provenance private', async () => {
-  const S = Date.now()
-  const p = await setup('relay-spool', 'before-start', { cutoff: S + 60000 })
-  expect(p.entries.get(PANE)?.observedAt).toBeLessThan(S + 60000)
-  await appendFile(p.transcript, lines([{ ...p.oldKill, timestamp: new Date().toISOString() }]))
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  const q = await setup('desktop-http', 'after-start')
-  await q.post(hooks[2], { receivedAt: 0, hookReceivedAt: 0 })
-  expect(q.entries.get(PANE)?.observedAt).toBeGreaterThan(S - 1000)
-  await appendFile(
-    q.transcript,
-    lines([{ ...q.oldKill, timestamp: new Date(S - 10000).toISOString() }])
-  )
-  await settle(() => expect(q.entries.get(PANE)?.parent.offset).toBeGreaterThan(0))
-  expect(q.row()?.subagents?.[0]?.state).toBe('working')
-})
-
-it('a real failed bind parks without resources and explicit retry delivers its first fact', async () => {
-  const p = await setup('relay-spool', 'before-start', { retryBind: true })
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  expect(p.row()?.workingMode).toBe('monitoring')
-})
-
-it('a held local child permission cannot reset the admitted owner', async () => {
-  const p = await setup('desktop-http', 'after-start')
-  await p.post({
-    hook_event_name: 'PermissionRequest',
-    agent_id: 'a123',
-    tool_name: 'Bash',
-    tool_use_id: 'approval',
-    tool_input: { command: 'false' }
-  })
-  const owner = p.entries.get(PANE)
-  const capture = vi.spyOn(ClaudeHelperKillPoller.prototype, 'schedule')
-  await p.post({
-    hook_event_name: 'PreToolUse',
-    tool_name: 'Bash',
-    tool_use_id: 'unrelated',
-    tool_input: { command: 'true' }
-  })
-  expect(p.row()?.state).toBe('waiting')
-  expect(capture).not.toHaveBeenCalled()
-  expect(p.entries.get(PANE)).toBe(owner)
-  await appendFile(p.transcript, lines([{ ...p.oldKill, timestamp: new Date().toISOString() }]))
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-})
-
-it('preferred-port fallback activates the original admitted observation', async () => {
-  const busy = createServer()
-  await new Promise<void>((resolve) => busy.listen(0, '127.0.0.1', resolve))
-  try {
-    const address = busy.address()
-    if (!address || typeof address === 'string') {
-      throw new Error('missing listener address')
-    }
-    const p = await setup('relay-spool', 'before-start', { busyPort: address.port })
-    expect(p.relay.usedPortFallback).toBe(true)
-    await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-    expect(p.row()?.workingMode).toBe('monitoring')
-  } finally {
-    await new Promise<void>((resolve) => busy.close(() => resolve()))
-  }
-})
-
-it.each(['desktop-http', 'relay-http'])(
-  'cached SessionStart activation on %s keeps its boundary and first later kill',
-  async (kind) => {
-    const p = await setup(kind, 'after-start')
-    const S = Date.now()
-    const clock = vi.spyOn(Date, 'now').mockReturnValue(S)
-    await p.post({ hook_event_name: 'SessionStart', source: 'resume' })
-    const owner = p.entries.get(PANE)!
-    expect(owner.observedAt).toBe(S)
-    clock.mockReturnValue(S + 10)
-    p.poller.activate()
-    p.poller.activate()
-    expect(p.entries.get(PANE)).toBe(owner)
-    expect(owner.observedAt).toBe(S)
-    await p.post(hooks[1])
-    await appendFile(
-      p.transcript,
-      lines([{ ...p.oldKill, timestamp: new Date(S + 1).toISOString() }])
-    )
-    await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-  }
-)
-
-it('reentrant mirror and OSC writes cannot borrow local hook admission', async () => {
-  const p = await setup('desktop-http', 'after-start')
-  const other = PANE.replace('111111111111', '222222222222')
-  let reentered = false
-  p.desktop.subscribeStatusRowMutations(() => {
-    if (reentered) {
-      return
-    }
-    reentered = true
-    p.desktop.ingestRemote(
-      {
-        paneKey: other,
-        providerSession: { key: 'session_id', id: 'other', transcriptPath: p.transcript },
-        payload: { agentType: 'claude', state: 'working' }
-      },
-      'other-host'
-    )
-    p.desktop.ingestTerminalStatus({
-      paneKey: other,
-      payload: { agentType: 'claude', state: 'working', prompt: '' }
-    })
-  })
-  await p.post({ hook_event_name: 'UserPromptSubmit', prompt: 'another real turn' })
-  expect(reentered).toBe(true)
-  expect(p.entries.size).toBe(1)
-  expect(p.desktop.getStatusSnapshotForPane(other)[0]?.state).toBe('working')
-  await appendFile(p.transcript, lines([{ ...p.oldKill, timestamp: new Date().toISOString() }]))
-  await settle(() => expect(p.row()?.subagents ?? []).toEqual([]))
-})
diff --git a/src/main/agent-hooks/server/testing/task-wakeup/server-claude-owed-notification-expiry.test.ts b/src/main/agent-hooks/server/testing/task-wakeup/server-claude-owed-notification-expiry.test.ts
deleted file mode 100644
index 0c9aaed459f..00000000000
--- a/src/main/agent-hooks/server/testing/task-wakeup/server-claude-owed-notification-expiry.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// No hook fires at lease expiry, so the server must release owed-notification holds itself.
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS } from '../../../../../shared/agent-hook-listener/providers/claude-owed-task-notifications'
-import { AgentHookServer, _internals } from '../../agent-hook-server'
-import { buildBody, PANE, postHookEvent, RUNNING_SHELL } from '../server.test-fixtures'
-
-vi.mock('../../../../telemetry/client', () => ({ track: vi.fn() }))
-vi.mock('../../../../telemetry/cohort-classifier', () => ({
-  getCohortAtEmit: vi.fn(() => ({ nth_repo_added: 2 }))
-}))
-// The fixture's owner process is fictional; the pane's owning Claude is still running.
-vi.mock('../../../../../shared/agent-status/process/agent-process-presence-probe', () => ({
-  probeAgentProcessPresence: vi.fn(async () => 'live')
-}))
-
-beforeEach(() => {
-  _internals.resetCachesForTests()
-  // Real loopback POSTs need fake time to advance.
-  vi.useFakeTimers({
-    shouldAdvanceTime: true,
-    toFake: ['setTimeout', 'clearTimeout', 'Date', 'performance']
-  })
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-})
-
-describe('Claude owed task notification expiry on the hook server', () => {
-  it('settles a pane whose launched shell vanished without a notification', async () => {
-    const server = new AgentHookServer()
-    await server.start({ env: 'production' })
-    const states: string[] = []
-    server.setListener((event) => states.push(event.payload.state))
-    const post = (payload: Record<string, unknown>) =>
-      postHookEvent(server, buildBody({ session_id: 'session-1', ...payload }))
-    try {
-      await post({ hook_event_name: 'UserPromptSubmit', prompt: 'start the dev server' })
-      await post({
-        hook_event_name: 'PostToolUse',
-        tool_name: 'Bash',
-        tool_response: { backgroundTaskId: RUNNING_SHELL.id }
-      })
-      await post({ hook_event_name: 'Stop', background_tasks: [RUNNING_SHELL] })
-      await post({ hook_event_name: 'UserPromptSubmit', prompt: 'thanks' })
-      await post({ hook_event_name: 'Stop', background_tasks: [] })
-      expect(server.getStatusSnapshotForPane(PANE)[0]?.state).toBe('working')
-
-      vi.advanceTimersByTime(CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS)
-
-      expect(server.getStatusSnapshotForPane(PANE)[0]?.state).toBe('done')
-      expect(states.at(-1)).toBe('done')
-    } finally {
-      server.stop()
-    }
-  })
-
-  it('drops what was owed when the owning Claude process exits', async () => {
-    const server = await heldByAnOwedShell()
-    try {
-      await server.post({ hook_event_name: 'SessionEnd', reason: 'prompt_input_exit' }, OWNER)
-      vi.advanceTimersByTime(CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS)
-
-      expect(server.row()).toMatchObject({ providerSessionOnly: true })
-    } finally {
-      server.stop()
-    }
-  })
-
-  it('keeps what is owed when a nested Claude in the same pane exits', async () => {
-    const server = await heldByAnOwedShell()
-    try {
-      await server.post({ hook_event_name: 'SessionEnd', reason: 'prompt_input_exit' }, 5151)
-      expect(server.row()).toMatchObject({ state: 'working' })
-      expect(server.row().providerSessionOnly).toBeUndefined()
-
-      vi.advanceTimersByTime(CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS)
-      expect(server.row()).toMatchObject({ state: 'done' })
-    } finally {
-      server.stop()
-    }
-  })
-})
-
-const OWNER = 4242
-
-async function heldByAnOwedShell() {
-  const server = new AgentHookServer()
-  await server.start({ env: 'production' })
-  const agentProcess = (pid: number) =>
-    JSON.stringify({ pid, platform: 'darwin', startTime: 'Fri Oct  2 12:00:00 2026' })
-  const post = (payload: Record<string, unknown>, pid = OWNER) =>
-    postHookEvent(
-      server,
-      buildBody({ session_id: 'session-1', ...payload }, { agentProcess: agentProcess(pid) })
-    )
-  await post({ hook_event_name: 'UserPromptSubmit', prompt: 'start the dev server' })
-  await post({
-    hook_event_name: 'PostToolUse',
-    tool_name: 'Bash',
-    tool_response: { backgroundTaskId: RUNNING_SHELL.id }
-  })
-  await post({ hook_event_name: 'Stop', background_tasks: [RUNNING_SHELL] })
-  await post({ hook_event_name: 'UserPromptSubmit', prompt: 'thanks' })
-  await post({ hook_event_name: 'Stop', background_tasks: [] })
-  const row = () => {
-    const entry = server.getStatusSnapshotForPane(PANE)[0]
-    if (!entry) {
-      throw new Error('the pane has no row')
-    }
-    return entry
-  }
-  return { post, row, stop: () => server.stop() }
-}
diff --git a/src/main/agent-hooks/tool-events/agent-tool-call-reader.ts b/src/main/agent-hooks/tool-events/agent-tool-call-reader.ts
index 3527e45afc6..20d680f5a4c 100644
--- a/src/main/agent-hooks/tool-events/agent-tool-call-reader.ts
+++ b/src/main/agent-hooks/tool-events/agent-tool-call-reader.ts
@@ -8,7 +8,7 @@ import {
   normalizeCopilotEventName,
   readCopilotToolCall,
   resolveCopilotEventName
-} from '../../../shared/agent-hook-listener/providers/copilot-tool-fields'
+} from '../../../shared/agent-hook-listener/providers/copilot/copilot-tool-fields'
 import type { agentToolAfterHookPayloadSchema } from '../../../shared/plugins/events/plugin-hook-payloads'
 
 const BEFORE_EVENTS = new Set([
diff --git a/src/main/agent-launch/agent-launch-surface-factories.ts b/src/main/agent-launch/agent-launch-surface-factories.ts
index ddb1797fb1f..26ac68e08fd 100644
--- a/src/main/agent-launch/agent-launch-surface-factories.ts
+++ b/src/main/agent-launch/agent-launch-surface-factories.ts
@@ -13,7 +13,7 @@ import type {
 import type { StructuredAgentId } from '../../shared/agent-session/lifecycle/agent-session-provider-handle'
 import type { StructuredAgentSessionFirstMessage } from '../../shared/agent-session/structured-agent-session-create'
 import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
-import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { toAgentLaunchPreferences } from '../../shared/agent-launch/choices/agent-launch-preferences'
 import { assertOpenCodeModelLaunchPreferencesAbsent } from '../opencode/model-launch/opencode-model-startup-plan'
 
diff --git a/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts b/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts
index dbd5f31dc38..b3d42b5b22b 100644
--- a/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts
+++ b/src/main/ai-vault/runtime-hosts/runtime-session-scanner.ts
@@ -14,7 +14,7 @@ import {
   listEnvironments,
   resolveEnvironment
 } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 import type {
   AiVaultPrepareSessionResumeRequest,
   AiVaultPrepareSessionResumeResult
diff --git a/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts
index 89b5f42c2b9..89f624c20bb 100644
--- a/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts
+++ b/src/main/ai-vault/runtime-hosts/runtime-session-search-call.ts
@@ -1,4 +1,4 @@
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 
 // Preserve RPC refusal codes so search recognizes older hosts that lack the method.
 export async function callRuntimeSessionSearch(
diff --git a/src/main/automations/ownership/workspace-provenance.ts b/src/main/automations/ownership/workspace-provenance.ts
index bcef2bcc939..e5ff5a48900 100644
--- a/src/main/automations/ownership/workspace-provenance.ts
+++ b/src/main/automations/ownership/workspace-provenance.ts
@@ -8,7 +8,7 @@ import type {
   AutomationWorkspaceProvenance,
   AutomationWorkspaceProvenanceRequest
 } from '../../../shared/worktree/types'
-import { ClientAutomationWorkspaceProvenance } from '../../../shared/rpc-contract/worktree-params'
+import { ClientAutomationWorkspaceProvenance } from '../../../shared/rpc-contract/workspaces/worktree-params'
 import {
   beginAutomationDispatchTokenUse,
   finishAutomationDispatchTokenUse,
diff --git a/src/main/browser/agent-browser/commands/agent-browser-bridge-capture-commands.ts b/src/main/browser/agent-browser/commands/agent-browser-bridge-capture-commands.ts
index 635ee2d0678..83b702b1238 100644
--- a/src/main/browser/agent-browser/commands/agent-browser-bridge-capture-commands.ts
+++ b/src/main/browser/agent-browser/commands/agent-browser-bridge-capture-commands.ts
@@ -1,4 +1,4 @@
-import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import { z } from 'zod'
 import { app, nativeImage, type WebContents } from 'electron'
 import type {
diff --git a/src/main/browser/agent-browser/commands/agent-browser-bridge-core-commands.ts b/src/main/browser/agent-browser/commands/agent-browser-bridge-core-commands.ts
index 8a7976f7b08..62ad82cf101 100644
--- a/src/main/browser/agent-browser/commands/agent-browser-bridge-core-commands.ts
+++ b/src/main/browser/agent-browser/commands/agent-browser-bridge-core-commands.ts
@@ -1,4 +1,4 @@
-import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import type {
   BrowserSnapshotResult,
   BrowserClickResult,
diff --git a/src/main/browser/agent-browser/observation/agent-browser-screenshot-arguments.ts b/src/main/browser/agent-browser/observation/agent-browser-screenshot-arguments.ts
index 7e787ef113e..0c2b9165240 100644
--- a/src/main/browser/agent-browser/observation/agent-browser-screenshot-arguments.ts
+++ b/src/main/browser/agent-browser/observation/agent-browser-screenshot-arguments.ts
@@ -1,4 +1,4 @@
-import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import { randomUUID } from 'node:crypto'
 import { readFile, rm } from 'node:fs/promises'
 import { join } from 'node:path'
diff --git a/src/main/browser/agent-browser/protocol/agent-browser-snapshot-arguments.ts b/src/main/browser/agent-browser/protocol/agent-browser-snapshot-arguments.ts
index dc6e4a53773..901ca662575 100644
--- a/src/main/browser/agent-browser/protocol/agent-browser-snapshot-arguments.ts
+++ b/src/main/browser/agent-browser/protocol/agent-browser-snapshot-arguments.ts
@@ -1,4 +1,4 @@
-import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 
 export function agentBrowserSnapshotArgs(options: BrowserSnapshotOptions): string[] {
   const args = ['snapshot']
diff --git a/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tabs.ts b/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tabs.ts
index b972e0e2257..af0ec949cff 100644
--- a/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tabs.ts
+++ b/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tabs.ts
@@ -122,6 +122,11 @@ export abstract class AgentBrowserBridgeTabs extends AgentBrowserBridgeState {
   getRemoteTabFaviconUrl(browserPageId: string): string | null {
     return this.browserManager.getBrowserPageRemoteTabFaviconUrl(browserPageId)
   }
+  getPageNavigationState(
+    browserPageId: string
+  ): { loading: boolean; canGoBack: boolean; canGoForward: boolean } | null {
+    return this.browserManager.getBrowserPageNavigationState(browserPageId)
+  }
   onTabChanged(webContentsId: number, worktreeId?: string): void {
     this.selectForPerson(webContentsId, worktreeId)
     this.options.onTabsChanged?.(worktreeId)
diff --git a/src/main/browser/client-hosts/commands/browser-host-command-result-staging.ts b/src/main/browser/client-hosts/commands/browser-host-command-result-staging.ts
new file mode 100644
index 00000000000..b13539501c4
--- /dev/null
+++ b/src/main/browser/client-hosts/commands/browser-host-command-result-staging.ts
@@ -0,0 +1,80 @@
+import type { BrowserClientHostCommandEvent } from '../../../../shared/browser/client-hosting/browser-client-host-protocol'
+import {
+  BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES,
+  BROWSER_CLIENT_AUTOMATION_RESULT_MAX_BYTES,
+  BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES,
+  truncateBrowserClientAutomationErrorMessage,
+  type BrowserClientAutomationResult as BrowserClientHostCommandResult
+} from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
+import { browserHostCommandResultIdentity } from './browser-host-command-result-submission'
+
+const BROWSER_HOST_COMMAND_RESULT_TOO_LARGE_CODE = 'browser_host_command_result_too_large'
+
+/** Sends an automation value too big for one result frame to the host ahead of its settlement. */
+export async function stageBrowserHostCommandResult(
+  command: BrowserClientHostCommandEvent,
+  result: BrowserClientHostCommandResult,
+  sendChunk: (params: unknown) => Promise<void>,
+  signal: AbortSignal
+): Promise<BrowserClientHostCommandResult> {
+  if (
+    result.status !== 'completed' ||
+    result.value === undefined ||
+    command.command.type !== 'automation'
+  ) {
+    return result
+  }
+  const bytes = Buffer.from(JSON.stringify(result.value), 'utf8')
+  const hostStages = command.command.stagedResults === true
+  if (
+    bytes.byteLength <= BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES ||
+    (!hostStages && bytes.byteLength <= BROWSER_CLIENT_AUTOMATION_RESULT_MAX_BYTES)
+  ) {
+    return result
+  }
+  if (!hostStages || bytes.byteLength > BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES) {
+    const limit = hostStages
+      ? BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES
+      : BROWSER_CLIENT_AUTOMATION_RESULT_MAX_BYTES
+    return failed(
+      BROWSER_HOST_COMMAND_RESULT_TOO_LARGE_CODE,
+      `The result (${formatMegabytes(bytes.byteLength)}) is larger than the ${formatMegabytes(limit)} this server accepts from a page on this device. Use --format jpeg, a selector, or a smaller viewport${hostStages ? '' : ', or update the server'}.`
+    )
+  }
+  const identity = browserHostCommandResultIdentity(command)
+  try {
+    for (
+      let offset = 0;
+      offset < bytes.byteLength;
+      offset += BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES
+    ) {
+      if (signal.aborted) {
+        return failed('browser_client_page_command_aborted')
+      }
+      const chunk = bytes.subarray(
+        offset,
+        offset + BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES
+      )
+      await sendChunk({ ...identity, offset, contentBase64: chunk.toString('base64') })
+    }
+  } catch (error) {
+    // Keep the host or transport code (e.g. too large, unavailable) so the agent sees why.
+    return failed(
+      error instanceof RemoteRuntimeClientError
+        ? error.code
+        : 'browser_host_command_result_staging_failed',
+      error instanceof Error ? error.message : String(error)
+    )
+  }
+  return { status: 'completed', stagedValueBytes: bytes.byteLength }
+}
+
+function failed(errorCode: string, message?: string): BrowserClientHostCommandResult {
+  const errorMessage = message ? truncateBrowserClientAutomationErrorMessage(message) : undefined
+  return { status: 'failed', errorCode, ...(errorMessage ? { errorMessage } : {}) }
+}
+
+function formatMegabytes(bytes: number): string {
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+}
diff --git a/src/main/browser/client-hosts/commands/browser-host-command-result-submission.ts b/src/main/browser/client-hosts/commands/browser-host-command-result-submission.ts
index 3364bba5f94..a75d8cfe90b 100644
--- a/src/main/browser/client-hosts/commands/browser-host-command-result-submission.ts
+++ b/src/main/browser/client-hosts/commands/browser-host-command-result-submission.ts
@@ -18,21 +18,7 @@ export async function submitBrowserHostCommandResult(
   const result = BrowserClientHostCommandResult.parse(candidate)
   const response = await sendRequest(
     'browser.clientHost.commandResult',
-    {
-      pageCommandProtocolVersion: command.pageCommandProtocolVersion,
-      ...(command.pageReconciliationProtocolVersion
-        ? { pageReconciliationProtocolVersion: command.pageReconciliationProtocolVersion }
-        : {}),
-      authorityRuntimeId: command.authorityRuntimeId,
-      authorityEpoch: command.authorityEpoch,
-      browserHostClientId: command.browserHostClientId,
-      browserHostGeneration: command.browserHostGeneration,
-      browserPageId: command.browserPageId,
-      pageHostGeneration: command.pageHostGeneration,
-      commandSequence: command.commandSequence,
-      commandId: command.commandId,
-      result
-    },
+    { ...browserHostCommandResultIdentity(command), result },
     timeoutMs
   )
   if (!response.ok) {
@@ -45,3 +31,21 @@ export async function submitBrowserHostCommandResult(
     throw new Error('Invalid browser host command result acknowledgement')
   }
 }
+
+/** The command identity a result, or a chunk of one, is filed under. */
+export function browserHostCommandResultIdentity(command: BrowserClientHostCommandEvent) {
+  return {
+    pageCommandProtocolVersion: command.pageCommandProtocolVersion,
+    ...(command.pageReconciliationProtocolVersion
+      ? { pageReconciliationProtocolVersion: command.pageReconciliationProtocolVersion }
+      : {}),
+    authorityRuntimeId: command.authorityRuntimeId,
+    authorityEpoch: command.authorityEpoch,
+    browserHostClientId: command.browserHostClientId,
+    browserHostGeneration: command.browserHostGeneration,
+    browserPageId: command.browserPageId,
+    pageHostGeneration: command.pageHostGeneration,
+    commandSequence: command.commandSequence,
+    commandId: command.commandId
+  }
+}
diff --git a/src/main/browser/client-hosts/leases/paired-runtime-browser-host-lease.ts b/src/main/browser/client-hosts/leases/paired-runtime-browser-host-lease.ts
index 4d8dd54a953..852cc235165 100644
--- a/src/main/browser/client-hosts/leases/paired-runtime-browser-host-lease.ts
+++ b/src/main/browser/client-hosts/leases/paired-runtime-browser-host-lease.ts
@@ -6,7 +6,6 @@ import {
   BrowserClientAutomationResult as BrowserClientHostCommandResult,
   type BrowserClientAutomationResult as BrowserClientHostCommandResultType
 } from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
-import { BROWSER_CLIENT_PAGE_METADATA_METHOD } from '../../../../shared/browser/client-hosting/browser-client-page-metadata-protocol'
 import { assertBrowserClientHostAttachOptions } from '../lifecycle/browser-client-host-attach-request'
 import {
   BrowserHostReconnectDelay,
@@ -79,12 +78,12 @@ export class PairedRuntimeBrowserHostLease {
   }
 
   /** Unversioned, unlike the file channel: an older runtime answers with a reportable error. */
-  sendPageMetadataRequest(params: unknown, timeoutMs: number) {
+  sendHostRequest(method: string, params: unknown, timeoutMs: number) {
     // close drops the connection synchronously.
     return requireBrowserHostLeaseSendRequest(
       this.connection?.sendRequest,
       'Remote runtime browser host lease is unavailable.'
-    )(BROWSER_CLIENT_PAGE_METADATA_METHOD, params, timeoutMs)
+    )(method, params, timeoutMs)
   }
 
   sendFileChannelRequest(method: string, params: unknown, timeoutMs: number) {
diff --git a/src/main/browser/client-hosts/lifecycle/paired-runtime-browser-client-host.ts b/src/main/browser/client-hosts/lifecycle/paired-runtime-browser-client-host.ts
index d26053a63dc..937f2045a25 100644
--- a/src/main/browser/client-hosts/lifecycle/paired-runtime-browser-client-host.ts
+++ b/src/main/browser/client-hosts/lifecycle/paired-runtime-browser-client-host.ts
@@ -3,7 +3,12 @@ import type {
   BrowserClientHostCommandEvent,
   BrowserClientHostLeaseAuthority
 } from '../../../../shared/browser/client-hosting/browser-client-host-protocol'
-import type { BrowserClientAutomationResult as BrowserClientHostCommandResult } from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import {
+  BROWSER_CLIENT_HOST_COMMAND_RESULT_CHUNK_METHOD,
+  type BrowserClientAutomationResult as BrowserClientHostCommandResult
+} from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import { BROWSER_CLIENT_PAGE_METADATA_METHOD } from '../../../../shared/browser/client-hosting/browser-client-page-metadata-protocol'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import type { RemoteRuntimeSubscriptionOptions } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
 import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
@@ -14,6 +19,7 @@ import type {
   DispatcherOptions
 } from '../commands/browser-client-host-command-state'
 import { PairedRuntimeBrowserHostLease } from '../leases/paired-runtime-browser-host-lease'
+import { stageBrowserHostCommandResult } from '../commands/browser-host-command-result-staging'
 
 type DispatcherLimits = Omit<DispatcherOptions, 'authority' | 'handler'>
 
@@ -124,7 +130,7 @@ export class PairedRuntimeBrowserClientHost {
     params: unknown,
     timeoutMs: number
   ): Promise<RuntimeRpcResponse<unknown>> {
-    return this.lease.sendPageMetadataRequest(params, timeoutMs)
+    return this.lease.sendHostRequest(BROWSER_CLIENT_PAGE_METADATA_METHOD, params, timeoutMs)
   }
 
   refreshPageInventory(): Promise<void> {
@@ -150,11 +156,28 @@ export class PairedRuntimeBrowserClientHost {
     this.options.onAuthority?.(authority)
     this.dispatcher = new BrowserClientHostCommandDispatcher({
       authority,
-      handler: this.options.handler,
+      handler: async (command, signal) =>
+        stageBrowserHostCommandResult(
+          command,
+          await this.options.handler(command, signal),
+          (params) => this.sendCommandResultChunk(params),
+          signal
+        ),
       ...this.options.dispatcher
     })
   }
 
+  private async sendCommandResultChunk(params: unknown): Promise<void> {
+    const response = await this.lease.sendHostRequest(
+      BROWSER_CLIENT_HOST_COMMAND_RESULT_CHUNK_METHOD,
+      params,
+      this.options.timeoutMs ?? 15_000
+    )
+    if (!response.ok) {
+      throw new RemoteRuntimeClientError(response.error.code, response.error.message)
+    }
+  }
+
   private dispatch(
     command: BrowserClientHostCommandEvent
   ): Promise<BrowserClientHostCommandResult> {
diff --git a/src/main/browser/client-pages/execution/browser-client-page-command-failure.ts b/src/main/browser/client-pages/execution/browser-client-page-command-failure.ts
index 1d73355598f..e168e9f75d0 100644
--- a/src/main/browser/client-pages/execution/browser-client-page-command-failure.ts
+++ b/src/main/browser/client-pages/execution/browser-client-page-command-failure.ts
@@ -1,15 +1,21 @@
-import type { BrowserClientAutomationResult as BrowserClientHostCommandResult } from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import {
+  truncateBrowserClientAutomationErrorMessage,
+  type BrowserClientAutomationResult as BrowserClientHostCommandResult
+} from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
 import type { BrowserExpectedUrlMismatch } from '../../../../shared/browser/client-hosting/browser-expected-url'
 
 export class BrowserClientPageCommandError extends Error {
   readonly expectedUrlMismatch?: BrowserExpectedUrlMismatch
+  /** The browser command's own message, so the host can show it with the code. */
+  readonly detail?: string
 
   constructor(
     message: string,
-    options?: ErrorOptions & { expectedUrlMismatch?: BrowserExpectedUrlMismatch }
+    options?: ErrorOptions & { expectedUrlMismatch?: BrowserExpectedUrlMismatch; detail?: string }
   ) {
     super(message, options)
     this.expectedUrlMismatch = options?.expectedUrlMismatch
+    this.detail = options?.detail
   }
 }
 
@@ -28,9 +34,14 @@ export function browserClientPageCommandFailure(
 ): BrowserClientHostCommandResult {
   const mismatch =
     error instanceof BrowserClientPageCommandError ? error.expectedUrlMismatch : undefined
+  const errorMessage =
+    error instanceof BrowserClientPageCommandError && error.detail
+      ? truncateBrowserClientAutomationErrorMessage(error.detail)
+      : undefined
   return {
     status: 'failed',
     errorCode: browserClientPageCommandFailureCode(error, signal),
+    ...(errorMessage ? { errorMessage } : {}),
     ...(mismatch ? { expectedUrlMismatch: mismatch } : {})
   }
 }
diff --git a/src/main/browser/document-preview/doc-preview-file-reader.test.ts b/src/main/browser/document-preview/doc-preview-file-reader.test.ts
index c4557857ddb..047c7ae0e0d 100644
--- a/src/main/browser/document-preview/doc-preview-file-reader.test.ts
+++ b/src/main/browser/document-preview/doc-preview-file-reader.test.ts
@@ -4,10 +4,10 @@ const mocks = vi.hoisted(() => ({
   callRuntimeEnvironment: vi.fn()
 }))
 
-vi.mock('../../ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../../ipc/runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: mocks.callRuntimeEnvironment
 }))
-vi.mock('../../ipc/runtime-environments/runtime-environment-registry-root', () => ({
+vi.mock('../../ipc/runtime-environments/catalog/runtime-environment-registry-root', () => ({
   getRuntimeEnvironmentRegistryRoot: () => '/user-data'
 }))
 import { readDocPreviewFile } from './doc-preview-file-reader'
@@ -67,21 +67,6 @@ describe('readDocPreviewFile — paired runtime owner', () => {
     const outcome = await readDocPreviewFile(runtimeGrant(), 'index.html')
 
     expect(outcome).toEqual({ ok: true, bytes: html, contentType: 'text/html; charset=utf-8' })
-    expect(mocks.callRuntimeEnvironment).toHaveBeenCalledWith(
-      '/user-data',
-      'env-1',
-      'files.readDocPreviewChunk',
-      {
-        worktree: 'id:wt-1',
-        relativePath: 'docs/index.html',
-        entryRelativePath: 'docs/index.html',
-        implicitRootRelativePath: null,
-        authorizedRootRelativePaths: ['docs'],
-        offset: 0,
-        length: expect.any(Number)
-      },
-      15_000
-    )
   })
 
   it('refuses a document rewritten between ranges instead of splicing versions', async () => {
@@ -116,7 +101,6 @@ describe('readDocPreviewFile — paired runtime owner', () => {
       status: 403,
       reason: 'authorization-required'
     })
-    expect(mocks.callRuntimeEnvironment).not.toHaveBeenCalled()
 
     authorizeDocPreviewDirectory(grant.id, 'assets/app.js')
     mocks.callRuntimeEnvironment.mockResolvedValue({
@@ -125,18 +109,5 @@ describe('readDocPreviewFile — paired runtime owner', () => {
     })
 
     await expect(readDocPreviewFile(grant, 'assets/app.js')).resolves.toMatchObject({ ok: true })
-    expect(mocks.callRuntimeEnvironment).toHaveBeenCalledWith(
-      '/user-data',
-      'env-1',
-      'files.readDocPreview',
-      {
-        worktree: 'id:wt-1',
-        relativePath: 'assets/app.js',
-        entryRelativePath: 'docs/index.html',
-        implicitRootRelativePath: 'docs',
-        authorizedRootRelativePaths: ['assets']
-      },
-      15_000
-    )
   })
 })
diff --git a/src/main/browser/document-preview/doc-preview-file-reader.ts b/src/main/browser/document-preview/doc-preview-file-reader.ts
index 69597092c42..548430a7da1 100644
--- a/src/main/browser/document-preview/doc-preview-file-reader.ts
+++ b/src/main/browser/document-preview/doc-preview-file-reader.ts
@@ -7,7 +7,7 @@ import {
   DOC_PREVIEW_FILE_CHANGED_MESSAGE,
   type DocPreviewFileChunk
 } from '../../../shared/document-preview/doc-preview-file-access'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 import { SSH_HOST_NOT_SERVED_MESSAGE } from '../../providers/ssh-host-not-served-error'
 import {
   getDocPreviewGrant,
@@ -18,7 +18,7 @@ import {
   toRuntimeWorktreeRelativePath,
   type DocPreviewGrant
 } from './doc-preview-grant-registry'
-import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 import { readDocPreviewTerminalFile } from './doc-preview-terminal-file-reader'
 import type { RuntimeDocPreviewReadParams } from './doc-preview-runtime-read-contract'
 
diff --git a/src/main/browser/document-preview/doc-preview-terminal-file-reader.test.ts b/src/main/browser/document-preview/doc-preview-terminal-file-reader.test.ts
index 9810a15d107..241b2cc77b3 100644
--- a/src/main/browser/document-preview/doc-preview-terminal-file-reader.test.ts
+++ b/src/main/browser/document-preview/doc-preview-terminal-file-reader.test.ts
@@ -7,10 +7,10 @@ import {
 } from './doc-preview-grant-registry'
 
 const mocks = vi.hoisted(() => ({ call: vi.fn() }))
-vi.mock('../../ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../../ipc/runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: mocks.call
 }))
-vi.mock('../../ipc/runtime-environments/runtime-environment-registry-root', () => ({
+vi.mock('../../ipc/runtime-environments/catalog/runtime-environment-registry-root', () => ({
   getRuntimeEnvironmentRegistryRoot: () => '/user-data'
 }))
 vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
@@ -60,10 +60,6 @@ function host(entries: Record<string, HostEntry>, read?: unknown): void {
   )
 }
 
-function methodsCalled(): string[] {
-  return mocks.call.mock.calls.map((call) => String(call[2]))
-}
-
 beforeEach(() => {
   vi.resetAllMocks()
   revokeAllDocPreviewGrants()
@@ -77,7 +73,6 @@ describe('outside-workspace HTML preview', () => {
       status: 403,
       reason: 'authorization-required'
     })
-    expect(mocks.call).not.toHaveBeenCalled()
 
     authorizeDocPreviewDirectory(page.id, 'assets/logo.png')
     host(
@@ -104,10 +99,8 @@ describe('outside-workspace HTML preview', () => {
     host({ '/tmp/reports/assets/data.json': { canonical: '/home/dev/.config/credentials.json' } })
 
     await expect(readDocPreviewFile(page, 'assets/data.json')).resolves.toMatchObject({
-      ok: false,
-      message: 'The preview file path changed on its host.'
+      ok: false
     })
-    expect(methodsCalled()).not.toContain('files.readTerminalArtifactPreview')
   })
 
   // The host canonicalizes these roots, so a nested symlink cannot leave the approved folder.
diff --git a/src/main/browser/document-preview/doc-preview-terminal-file-reader.ts b/src/main/browser/document-preview/doc-preview-terminal-file-reader.ts
index 3e024512e7b..0171f14a435 100644
--- a/src/main/browser/document-preview/doc-preview-terminal-file-reader.ts
+++ b/src/main/browser/document-preview/doc-preview-terminal-file-reader.ts
@@ -1,6 +1,6 @@
 import type { RuntimeFilePreviewResult } from '../../../shared/file-content/runtime-file-read'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
-import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/runtime-environment-registry-root'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
+import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 import {
   resolveCanonicalDocPreviewPath,
   resolveDocPreviewAuthorityPaths,
diff --git a/src/main/browser/guest-lifecycle/manager/browser-manager-queries.ts b/src/main/browser/guest-lifecycle/manager/browser-manager-queries.ts
index 39148d307f6..08b454f12b2 100644
--- a/src/main/browser/guest-lifecycle/manager/browser-manager-queries.ts
+++ b/src/main/browser/guest-lifecycle/manager/browser-manager-queries.ts
@@ -13,6 +13,7 @@ import {
   listBrowserRouteGuestPopups
 } from '../../routing/guest-authority/browser-route-guest-popup-ownership'
 import { browserPopupPageId, browserPopupPageWebContentsId } from '../popups/browser-popup-page-id'
+import { readGuestNavigationState } from '../navigation/browser-guest-navigation-state'
 
 export abstract class BrowserManagerQueries extends BrowserManagerRegistration {
   getGuestWebContentsId(browserTabId: string): number | null {
@@ -120,6 +121,17 @@ export abstract class BrowserManagerQueries extends BrowserManagerRegistration {
       : (this.remoteTabFaviconUrlByGuestId.get(webContentsId) ?? null)
   }
 
+  getBrowserPageNavigationState(
+    browserPageId: string
+  ): { loading: boolean; canGoBack: boolean; canGoForward: boolean } | null {
+    const webContentsId = this.webContentsIdByTabId.get(browserPageId)
+    const guest = webContentsId === undefined ? undefined : webContents.fromId(webContentsId)
+    if (!guest || guest.isDestroyed()) {
+      return null
+    }
+    return { loading: guest.isLoadingMainFrame(), ...readGuestNavigationState(guest) }
+  }
+
   getBrowserPageCertificateFailure(browserPageId: string): BrowserCertificateFailure | null {
     return this.certificateTrustController?.getFailure(browserPageId) ?? null
   }
@@ -181,6 +193,7 @@ export abstract class BrowserManagerQueries extends BrowserManagerRegistration {
   }
 
   protected notifyBrowserGuestStateChanged(webContentsId: number): void {
+    this.offscreenGuestStateNotices.cancel(String(webContentsId))
     if (!this.offscreenGuestIds.has(webContentsId)) {
       return
     }
diff --git a/src/main/browser/guest-lifecycle/manager/browser-manager-state.ts b/src/main/browser/guest-lifecycle/manager/browser-manager-state.ts
index 378f2bef58f..e0c93da3595 100644
--- a/src/main/browser/guest-lifecycle/manager/browser-manager-state.ts
+++ b/src/main/browser/guest-lifecycle/manager/browser-manager-state.ts
@@ -20,6 +20,7 @@ import type {
 import type { BrowserGrabCancelReason } from '../../../../shared/browser/element-grab/browser-grab-types'
 import { BrowserManagerViewportScrollState } from './viewport/browser-manager-viewport-scroll-state'
 import { BrowserGuestDevToolsDock } from '../devtools/browser-guest-devtools-dock'
+import { createKeyedTrailingEdgeCoalescer } from '../../../runtime/client/events/keyed-trailing-edge-coalescer'
 
 export type BrowserManagerSettings = {
   keybindings?: KeybindingOverrides
@@ -168,6 +169,11 @@ export abstract class BrowserManagerState extends BrowserManagerViewportScrollSt
   // Offscreen pages have no renderer to hold their icon for session-tab rows.
   protected readonly remoteTabFaviconUrlByGuestId = new Map<number, string>()
   protected browserGuestStateChangedListener: ((worktreeId: string) => void) | null = null
+  // Title and spinner churn on offscreen pages publishes at most about once a second.
+  protected readonly offscreenGuestStateNotices = createKeyedTrailingEdgeCoalescer(
+    (webContentsId) => this.notifyBrowserGuestStateChanged(Number(webContentsId)),
+    { flushMs: 250, maxWaitMs: 1000 }
+  )
   protected offscreenTabOpener: ((request: OffscreenBrowserTabOpenRequest) => void) | null = null
   protected certificateTrustController: BrowserCertificateTrustController | null = null
   protected siteDisplayController: BrowserSiteDisplayController | null = null
diff --git a/src/main/browser/guest-lifecycle/manager/navigation/browser-manager-guest-navigation-policy.ts b/src/main/browser/guest-lifecycle/manager/navigation/browser-manager-guest-navigation-policy.ts
index cf70c4ee0bc..49035073e57 100644
--- a/src/main/browser/guest-lifecycle/manager/navigation/browser-manager-guest-navigation-policy.ts
+++ b/src/main/browser/guest-lifecycle/manager/navigation/browser-manager-guest-navigation-policy.ts
@@ -195,12 +195,22 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
       }
     }
 
+    // Offscreen pages have no renderer; titles parse after commit and loads finish later.
+    const offscreenStateChangedHandler = (): void => {
+      if (this.offscreenGuestIds.has(guest.id)) {
+        this.offscreenGuestStateNotices.schedule(String(guest.id))
+      }
+    }
+
     guest.on('will-navigate', willNavigateHandler)
     guest.on('will-redirect', willRedirectHandler)
     guest.on('did-start-navigation', didStartNavigationHandler)
     guest.on('did-navigate', didNavigateHandler)
     guest.on('did-navigate-in-page', didNavigateInPageHandler)
     guest.on('page-favicon-updated', faviconUpdatedHandler)
+    guest.on('page-title-updated', offscreenStateChangedHandler)
+    guest.on('did-start-loading', offscreenStateChangedHandler)
+    guest.on('did-stop-loading', offscreenStateChangedHandler)
     guest.on('did-fail-load', didFailLoadHandler)
     // Why emit: an extension-blocked guest main frame commits no error page, so Electron reports
     // nothing; every did-fail-load reader (this policy, the pane, webNavigation) needs the failure.
@@ -234,6 +244,9 @@ export abstract class BrowserManagerGuestNavigationPolicy extends BrowserManager
         guest.off('did-navigate', didNavigateHandler)
         guest.off('did-navigate-in-page', didNavigateInPageHandler)
         guest.off('page-favicon-updated', faviconUpdatedHandler)
+        guest.off('page-title-updated', offscreenStateChangedHandler)
+        guest.off('did-start-loading', offscreenStateChangedHandler)
+        guest.off('did-stop-loading', offscreenStateChangedHandler)
         guest.off('did-fail-load', didFailLoadHandler)
         guest.off('will-prevent-unload', allowPageUnload)
       }
diff --git a/src/main/browser/guest-lifecycle/manager/popups/browser-manager-guest-popup-policy.ts b/src/main/browser/guest-lifecycle/manager/popups/browser-manager-guest-popup-policy.ts
index 57a4252c0ef..bb23cd8463a 100644
--- a/src/main/browser/guest-lifecycle/manager/popups/browser-manager-guest-popup-policy.ts
+++ b/src/main/browser/guest-lifecycle/manager/popups/browser-manager-guest-popup-policy.ts
@@ -3,11 +3,15 @@ import {
   normalizeExternalBrowserUrl,
   redactKagiSessionToken
 } from '../../../../../shared/browser-url'
-import { trackBrowserGuestInputGesture } from '../../input/browser-guest-input-gesture'
+import {
+  trackBrowserGuestInputGesture,
+  type ObservedBrowserGuestGesture
+} from '../../input/browser-guest-input-gesture'
 import {
   isNewBrowserTabPopupIntent,
   isBrowserTabPopupRequest,
-  normalizeBrowserPopupUrl
+  normalizeBrowserPopupUrl,
+  type NewBrowserTabPopupRequest
 } from '../../popups/browser-popup-new-tab-intent'
 import { SAFE_POPUP_WINDOW_OPTIONS } from '../../popups/presentation/browser-popup-window-policy'
 import { safeOrigin } from '../../browser-event-origin'
@@ -37,45 +41,16 @@ export abstract class BrowserManagerGuestPopupPolicy extends BrowserManagerNavig
     guest.setWindowOpenHandler(({ url, frameName, disposition, postBody, features, referrer }) => {
       // Spend activation even on popups so it cannot fund a later tab.
       const observed = gesture.consume()
+      if (this.openNewTabPopup(guest, { url, frameName, disposition, postBody }, observed)) {
+        return { action: 'deny' }
+      }
       const clicked = observed !== null
       // Only the desktop user's own click may bring a popup forward; agents and late opens wait.
       const showWhenAppActive = observed?.byAgent !== false
       const activateTab = disposition !== 'background-tab'
       const agentOpened = observed?.byAgent !== false && this.isAgentUsingGuest(guest.id)
-      const ownerContext = this.resolvePopupOwnerContext(guest.id)
-      const browserTabId = ownerContext?.browserTabId ?? null
+      const browserTabId = this.resolvePopupOwnerContext(guest.id)?.browserTabId ?? null
       const externalUrl = normalizeExternalBrowserUrl(url)
-      const newTabUrl = externalUrl ?? (isLocalFileLinkFromLocalPage(guest, url) ? url : null)
-      // Opener-dependent requests retain a child window instead of becoming tabs.
-      if (
-        ownerContext &&
-        newTabUrl &&
-        isNewBrowserTabPopupIntent({ url, frameName, disposition, postBody })
-      ) {
-        // Scripted opens persist as tabs, so opens without observed input consume a budget.
-        if (!clicked && !this.tryConsumePageInitiatedTab(ownerContext.rootGuestWebContentsId)) {
-          this.forwardOrQueuePopupEvent(guest.id, {
-            origin: safeOrigin(newTabUrl),
-            action: 'blocked'
-          })
-          return { action: 'deny' }
-        }
-        // A new tab's download would miss the agent's `download` claim, so save the link here.
-        if (this.isAwaitingDownloadFrom(guest.id, ownerContext.rootGuestWebContentsId)) {
-          guest.downloadURL(newTabUrl)
-          return { action: 'deny' }
-        }
-        if (
-          this.openLinkInOrcaTab(ownerContext.browserTabId, newTabUrl, activateTab, agentOpened)
-        ) {
-          this.forwardOrQueuePopupEvent(guest.id, {
-            origin: safeOrigin(newTabUrl),
-            action: 'opened-in-orca'
-          })
-        }
-        // A vanished renderer must not turn new-tab intent into a native popup.
-        return { action: 'deny' }
-      }
 
       // Native popups must not target local files.
       const canOpenAsChild = normalizeBrowserPopupUrl(url) !== null
@@ -148,6 +123,47 @@ export abstract class BrowserManagerGuestPopupPolicy extends BrowserManagerNavig
     }
   }
 
+  /** Answers a new-tab request as an Orca tab; false leaves opener-dependent requests to a child window. */
+  openNewTabPopup(
+    guest: Electron.WebContents,
+    request: NewBrowserTabPopupRequest,
+    observed: ObservedBrowserGuestGesture | null
+  ): boolean {
+    const ownerContext = this.resolvePopupOwnerContext(guest.id)
+    const newTabUrl =
+      normalizeExternalBrowserUrl(request.url) ??
+      (isLocalFileLinkFromLocalPage(guest, request.url) ? request.url : null)
+    if (!ownerContext || !newTabUrl || !isNewBrowserTabPopupIntent(request)) {
+      return false
+    }
+    // Scripted opens persist as tabs, so opens without observed input consume a budget.
+    if (!observed && !this.tryConsumePageInitiatedTab(ownerContext.rootGuestWebContentsId)) {
+      this.forwardOrQueuePopupEvent(guest.id, { origin: safeOrigin(newTabUrl), action: 'blocked' })
+      return true
+    }
+    // A new tab's download would miss the agent's `download` claim, so save the link here.
+    if (this.isAwaitingDownloadFrom(guest.id, ownerContext.rootGuestWebContentsId)) {
+      guest.downloadURL(newTabUrl)
+      return true
+    }
+    const agentOpened = observed?.byAgent !== false && this.isAgentUsingGuest(guest.id)
+    if (
+      this.openLinkInOrcaTab(
+        ownerContext.browserTabId,
+        newTabUrl,
+        request.disposition !== 'background-tab',
+        agentOpened
+      )
+    ) {
+      this.forwardOrQueuePopupEvent(guest.id, {
+        origin: safeOrigin(newTabUrl),
+        action: 'opened-in-orca'
+      })
+    }
+    // A vanished renderer must not turn new-tab intent into a native popup.
+    return true
+  }
+
   requestExternalAppLaunch(
     guest: Electron.WebContents,
     rawUrl: string | undefined,
diff --git a/src/main/browser/guest-lifecycle/popups/browser-popup-new-tab-intent.ts b/src/main/browser/guest-lifecycle/popups/browser-popup-new-tab-intent.ts
index c22e66e4092..dbc7bcee9d1 100644
--- a/src/main/browser/guest-lifecycle/popups/browser-popup-new-tab-intent.ts
+++ b/src/main/browser/guest-lifecycle/popups/browser-popup-new-tab-intent.ts
@@ -1,10 +1,12 @@
-// Keep named and OAuth popups attached to their opener; tab conversion returns null to the page.
-export function isNewBrowserTabPopupIntent(details: {
+export type NewBrowserTabPopupRequest = {
   url: string
   frameName: string
   disposition: string
   postBody?: Electron.PostBody | null
-}): boolean {
+}
+
+// Keep named and OAuth popups attached to their opener; tab conversion returns null to the page.
+export function isNewBrowserTabPopupIntent(details: NewBrowserTabPopupRequest): boolean {
   return (
     isBrowserTabPopupRequest(details) &&
     !isBlankBrowserPopupUrl(details.url) &&
diff --git a/src/main/browser/routing/guest-authority/browser-route-guest-popups.ts b/src/main/browser/routing/guest-authority/browser-route-guest-popups.ts
index 2c48482178e..ebe0199e4bd 100644
--- a/src/main/browser/routing/guest-authority/browser-route-guest-popups.ts
+++ b/src/main/browser/routing/guest-authority/browser-route-guest-popups.ts
@@ -3,11 +3,15 @@ import '../../../../shared/constants'
 import { ORCA_BROWSER_BLANK_URL } from '../../../../shared/browser/browser-blank-page'
 import {
   isBlankBrowserPopupUrl,
-  normalizeBrowserPopupUrl
+  normalizeBrowserPopupUrl,
+  type NewBrowserTabPopupRequest
 } from '../../guest-lifecycle/popups/browser-popup-new-tab-intent'
 import { enforceBrowserRouteWebRtcPolicy } from '../../network/egress/browser-route-webrtc-policy'
 import { trackBrowserGuestInputGesture } from '../../guest-lifecycle/input/browser-guest-input-gesture'
-import type { BrowserGuestInputGesture } from '../../guest-lifecycle/input/browser-guest-input-gesture'
+import type {
+  BrowserGuestInputGesture,
+  ObservedBrowserGuestGesture
+} from '../../guest-lifecycle/input/browser-guest-input-gesture'
 import {
   registerBrowserRouteGuestPopup,
   releaseBrowserRouteGuestPopup
@@ -28,6 +32,12 @@ export type BrowserRouteGuestPopupDependencies = {
   getPartitionForSession: (session: Session) => string | null
   /** Route guests replace the manager's popup handler, so a denial is otherwise entirely silent. */
   reportBlockedPopup?: (input: { openerWebContentsId: number; url: string }) => void
+  /** The manager's new-tab policy; true when it answered the request. */
+  openNewTabPopup?: (
+    source: WebContents,
+    request: NewBrowserTabPopupRequest,
+    observed: ObservedBrowserGuestGesture | null
+  ) => boolean
   openPopupWindow?: (
     options: PopupChildWindowOptions,
     targetUrl: string,
@@ -172,13 +182,23 @@ export function createBrowserRouteGuestPopupController(input: {
     return (details) => {
       const observed = gesture.consume()
       const normalized = normalizeBrowserPopupUrl(details?.url)
+      const permitted = !disposed && normalized !== null && navigationAllowed(normalized)
       if (
-        disposed ||
-        !normalized ||
-        popups.size >= MAX_BROWSER_ROUTE_GUEST_POPUPS ||
-        !navigationAllowed(normalized) ||
-        !observed
+        permitted &&
+        input.dependencies.openNewTabPopup?.(
+          source,
+          {
+            url: details?.url ?? normalized,
+            frameName: details?.frameName ?? '',
+            disposition: details?.disposition ?? '',
+            postBody: details?.postBody
+          },
+          observed
+        )
       ) {
+        return { action: 'deny' }
+      }
+      if (!permitted || popups.size >= MAX_BROWSER_ROUTE_GUEST_POPUPS || !observed) {
         if (!disposed) {
           reportBlockedPopup(details?.url)
         }
diff --git a/src/main/browser/routing/guest-authority/browser-route-webcontents-registry-dependencies.ts b/src/main/browser/routing/guest-authority/browser-route-webcontents-registry-dependencies.ts
index 43d0ab555cf..c0c3be335b0 100644
--- a/src/main/browser/routing/guest-authority/browser-route-webcontents-registry-dependencies.ts
+++ b/src/main/browser/routing/guest-authority/browser-route-webcontents-registry-dependencies.ts
@@ -4,6 +4,7 @@ import type {
   BrowserRoutePageOwnerIdentity
 } from './browser-route-page-authority'
 import type { BrowserRouteSessionRekey } from '../sessions/browser-route-session-state'
+import type { BrowserRouteGuestPopupDependencies } from './browser-route-guest-popups'
 
 export type BrowserRouteWebContentsRegistryDependencies = {
   getPartitionForSession(session: Session): string | null
@@ -16,5 +17,6 @@ export type BrowserRouteWebContentsRegistryDependencies = {
   retirePreparedPagesOwnedByRenderer(rendererWebContentsId: number): number
   /** Route-guest popup denials need an explicit notice on the owning page. */
   reportBlockedPopup?(input: { openerWebContentsId: number; url: string }): void
+  openNewTabPopup?: BrowserRouteGuestPopupDependencies['openNewTabPopup']
   maxGuests?: number
 }
diff --git a/src/main/browser/routing/guest-authority/browser-route-webcontents-registry.ts b/src/main/browser/routing/guest-authority/browser-route-webcontents-registry.ts
index 044ac5e099b..4aeded40a01 100644
--- a/src/main/browser/routing/guest-authority/browser-route-webcontents-registry.ts
+++ b/src/main/browser/routing/guest-authority/browser-route-webcontents-registry.ts
@@ -73,6 +73,7 @@ export class BrowserRouteWebContentsRegistry {
         getPartitionForSession: (routeSession) =>
           this.dependencies.getPartitionForSession(routeSession),
         reportBlockedPopup: (blocked) => this.dependencies.reportBlockedPopup?.(blocked),
+        openNewTabPopup: this.dependencies.openNewTabPopup,
         isPopupNavigationAllowed: (url) => this.navigationAllowed(state, url, false)
       })
     } catch {
diff --git a/src/main/browser/routing/partitions/browser-route-partition-storage-runtime.ts b/src/main/browser/routing/partitions/browser-route-partition-storage-runtime.ts
index 4d1b2ab8f97..76c985ec4d1 100644
--- a/src/main/browser/routing/partitions/browser-route-partition-storage-runtime.ts
+++ b/src/main/browser/routing/partitions/browser-route-partition-storage-runtime.ts
@@ -21,7 +21,7 @@ import {
   currentBrowserRoutePartitionBindingFilePath
 } from './browser-route-partition-binding-runtime'
 import { browserRoutePartitionStorageDependencies } from './browser-route-partition-storage-dependencies'
-import { getRuntimeEnvironmentRegistryRoot } from '../../../ipc/runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from '../../../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 
 export type BrowserRoutePartitionStorageClear = {
   clearedPartitions: string[]
diff --git a/src/main/browser/routing/sessions/browser-route-session-runtime.ts b/src/main/browser/routing/sessions/browser-route-session-runtime.ts
index 9ec15ac14fc..34b376641a3 100644
--- a/src/main/browser/routing/sessions/browser-route-session-runtime.ts
+++ b/src/main/browser/routing/sessions/browser-route-session-runtime.ts
@@ -88,7 +88,9 @@ export const browserRouteWebContentsRegistry = new BrowserRouteWebContentsRegist
   retirePreparedPage: (page) => browserRouteSessionRegistry.retirePreparedPage(page),
   retirePreparedPagesOwnedByRenderer: (rendererWebContentsId) =>
     browserRouteSessionRegistry.retirePreparedPagesOwnedByRenderer(rendererWebContentsId),
-  reportBlockedPopup: (blocked) => browserManager.reportRouteGuestPopupBlocked(blocked)
+  reportBlockedPopup: (blocked) => browserManager.reportRouteGuestPopupBlocked(blocked),
+  openNewTabPopup: (source, request, observed) =>
+    browserManager.openNewTabPopup(source, request, observed)
 })
 routeWebContentsRegistryRef.current = browserRouteWebContentsRegistry
 
diff --git a/src/main/claude/structured/claude-structured-agent-definition.ts b/src/main/claude/structured/claude-structured-agent-definition.ts
index d0bab52ff35..c1bef215b6c 100644
--- a/src/main/claude/structured/claude-structured-agent-definition.ts
+++ b/src/main/claude/structured/claude-structured-agent-definition.ts
@@ -12,6 +12,7 @@ export const CLAUDE_STRUCTURED_AGENT: DirectoryAccountAgentDefinition = {
     fork: 'checkpoint',
     compact: true,
     compactInstructions: true,
+    compactBesideBackgroundTasks: true,
     threadGoal: false,
     contextUsage: true,
     imagePrompts: true,
diff --git a/src/main/connector-cloud/connector-places.ts b/src/main/connector-cloud/connector-places.ts
index 3c184f8f874..155f63b129a 100644
--- a/src/main/connector-cloud/connector-places.ts
+++ b/src/main/connector-cloud/connector-places.ts
@@ -14,7 +14,7 @@ import {
 import { splitGitRemoteKey } from '../../shared/git/remotes/git-remote-identity'
 import { getRepoIdFromWorktreeId } from '../../shared/worktree/id'
 import { isFolderRepo } from '../../shared/repo-kind'
-import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { parseWslUncPath } from '../../shared/wsl-paths'
 import { readAllWorktreeMetaForHost } from '../persistence/host-qualified-worktree-meta'
 import type { RuntimeStore } from '../runtime/construction/runtime-store-contract'
diff --git a/src/main/ephemeral-vm/owned-runtime-cleanup.ts b/src/main/ephemeral-vm/owned-runtime-cleanup.ts
index e15bc719d46..b8488abea13 100644
--- a/src/main/ephemeral-vm/owned-runtime-cleanup.ts
+++ b/src/main/ephemeral-vm/owned-runtime-cleanup.ts
@@ -7,7 +7,7 @@ import type { EphemeralVmRuntimeRecord } from '../../shared/ephemeral-vm-runtime
 import { ephemeralVmFailureFromError } from '../../shared/ephemeral-vm-failure-copy'
 import { getRuntimeRecipeContext } from '../ipc/ephemeral-vm-recipe-context'
 import { invalidateRuntimeEnvironmentTransport } from '../ipc/runtime-environments/runtime-environments'
-import { retireRemovedRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-removal-cleanup'
+import { retireRemovedRuntimeEnvironment } from '../ipc/runtime-environments/catalog/runtime-environment-removal-cleanup'
 import { releaseEphemeralVmRuntimeEnvironments } from './runtime-environment-release'
 import { cleanupEphemeralVmRuntime } from './runtime-service'
 import { removeEphemeralVmRuntimeSshTarget } from './runtime-ssh-cleanup'
diff --git a/src/main/ephemeral-vm/recipe-workspace-removal-wiring.ts b/src/main/ephemeral-vm/recipe-workspace-removal-wiring.ts
index 9d2bd9dec80..3304526fe07 100644
--- a/src/main/ephemeral-vm/recipe-workspace-removal-wiring.ts
+++ b/src/main/ephemeral-vm/recipe-workspace-removal-wiring.ts
@@ -1,8 +1,8 @@
 import type { Store } from '../persistence/loading-store/store'
 import type { OrcaRuntimeService } from '../runtime/orca-runtime'
 import { RECIPE_REMOVAL_REQUEST_TIMEOUT_MS } from '../../shared/recipe-host-removal'
-import { callRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-transport-routing'
-import { getRuntimeEnvironmentRegistryRoot } from '../ipc/runtime-environments/runtime-environment-registry-root'
+import { callRuntimeEnvironment } from '../ipc/runtime-environments/requests/runtime-environment-transport-routing'
+import { getRuntimeEnvironmentRegistryRoot } from '../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 import { cleanupOwnedEphemeralVmRuntime } from './owned-runtime-cleanup'
 import {
   describeRecipeWorkspaceEnvironments,
diff --git a/src/main/ephemeral-vm/workspace-removal.ts b/src/main/ephemeral-vm/workspace-removal.ts
index 8d845dd68c3..628fff59855 100644
--- a/src/main/ephemeral-vm/workspace-removal.ts
+++ b/src/main/ephemeral-vm/workspace-removal.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import type { WorktreeRemove } from '../../shared/rpc-contract/worktree-params'
+import type { WorktreeRemove } from '../../shared/rpc-contract/workspaces/worktree-params'
 import { listEphemeralVmRuntimes } from '../../shared/ephemeral-vm-runtime-store'
 import {
   findEphemeralVmWorkspaceOwner,
diff --git a/src/main/ephemeral-vm/workspace-resume-lost-contact.test.ts b/src/main/ephemeral-vm/workspace-resume-lost-contact.test.ts
deleted file mode 100644
index 71435f43eac..00000000000
--- a/src/main/ephemeral-vm/workspace-resume-lost-contact.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// #34089: a VM its provider stopped or reclaimed stays recorded as running. Opening its workspace
-// must run the recipe's resume instead of returning the dead record unchanged.
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { SshConnectionStatus } from '../../shared/ssh-types'
-
-type MockState = {
-  record: Record<string, unknown>
-  sshStatus: SshConnectionStatus | undefined
-}
-
-const UP_RECORD = {
-  id: 'vm-1',
-  status: 'running',
-  connectionMode: 'ssh',
-  sshTargetId: 'runtime-ssh-vm-1',
-  runtimeEnvironmentId: 'env-vm'
-}
-
-const state = vi.hoisted((): MockState => ({
-  record: {
-    id: 'vm-1',
-    status: 'running',
-    connectionMode: 'ssh',
-    sshTargetId: 'runtime-ssh-vm-1',
-    runtimeEnvironmentId: 'env-vm'
-  },
-  sshStatus: undefined
-}))
-const mocks = vi.hoisted(() => ({
-  resume: vi.fn(),
-  connect: vi.fn(async () => ({ targetId: 'runtime-ssh-vm-1', environmentId: 'env-vm' })),
-  reconnectControl: vi.fn(),
-  refreshStatus: vi.fn(async () => ({})),
-  updateStatus: vi.fn((_userDataPath: string, _id: string, patch: Record<string, unknown>) => patch)
-}))
-
-vi.mock('electron', () => ({ app: { getPath: () => '/user-data' } }))
-vi.mock('../../shared/ephemeral-vm-runtime-store', () => ({
-  updateEphemeralVmRuntimeStatus: mocks.updateStatus
-}))
-vi.mock('../../shared/ephemeral-vm-workspace-runtime', () => ({
-  findWorkspaceEphemeralVmRuntime: () => state.record
-}))
-vi.mock('../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
-  resolveEnvironment: () => ({ id: 'env-vm', pairingRevision: 9, createdAt: 0 })
-}))
-vi.mock('../../shared/ephemeral-vm-recipes', () => ({
-  getEphemeralVmRecipeResultConnection: () => ({ type: 'ssh', target: { host: 'vm' } }),
-  getEphemeralVmRecipeResultPairingCode: () => null
-}))
-vi.mock('../ipc/ephemeral-vm-recipe-context', () => ({
-  getRuntimeRecipeContext: () => ({ repoPath: '/repo', recipe: { resume: './resume.sh' } })
-}))
-vi.mock('../ipc/runtime-environments/runtime-environments', () => ({
-  invalidateRuntimeEnvironmentTransport: vi.fn()
-}))
-vi.mock('../ipc/runtime-environments/runtime-environment-request-connections', () => ({
-  getRuntimeEnvironmentStatusOwner: () => ({ refresh: mocks.refreshStatus }),
-  reconnectRemoteRuntimeSharedControlConnection: mocks.reconnectControl
-}))
-vi.mock('../ssh/targets/ssh-target-registry', () => ({
-  getRegisteredSshState: () => (state.sshStatus ? { status: state.sshStatus } : undefined)
-}))
-vi.mock('./runtime-service', () => ({ resumeEphemeralVmRuntime: mocks.resume }))
-vi.mock('./runtime-ssh', () => ({
-  connectRuntimeOwnedSshTarget: mocks.connect,
-  refreshRuntimeOwnedSshTarget: vi.fn()
-}))
-
-import type { Store } from '../persistence/loading-store/store'
-import { resumeEphemeralVmWorkspace } from './workspace-resume'
-
-// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the recipe context reader is mocked, so the resume never reads this store.
-const STORE = {} as Store
-const REQUEST = { sshHeld: false, sshUserDisconnects: 0 }
-
-const RESUMED = {
-  ok: true,
-  skipped: false,
-  runtime: { id: 'vm-1', status: 'running', recipeResult: {} }
-}
-
-describe('opening a workspace whose VM host Orca gave up reaching', () => {
-  afterEach(() => {
-    vi.useRealTimers()
-    state.record = { ...UP_RECORD }
-    state.sshStatus = undefined
-    mocks.resume.mockReset()
-    mocks.connect.mockClear()
-    mocks.reconnectControl.mockClear()
-    mocks.refreshStatus.mockClear()
-    mocks.updateStatus.mockClear()
-  })
-
-  it('keeps the record as it was when the recovery fails, so reconnects go on', async () => {
-    state.sshStatus = 'reconnection-failed'
-    mocks.resume.mockResolvedValue({
-      ok: false,
-      error: 'resume failed',
-      runtime: { id: 'vm-1', status: 'resume_failed' }
-    })
-
-    await expect(resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)).rejects.toThrow(
-      'resume failed'
-    )
-    expect(mocks.updateStatus).toHaveBeenLastCalledWith('/user-data', 'vm-1', {
-      status: 'running'
-    })
-  })
-
-  it('keeps a failed connect after recovery from parking the VM as asleep', async () => {
-    state.sshStatus = 'reconnection-failed'
-    state.record = { ...UP_RECORD, status: 'suspend_failed' }
-    mocks.resume.mockResolvedValue(RESUMED)
-    mocks.connect.mockRejectedValueOnce(new Error('ssh unreachable'))
-
-    await expect(resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)).rejects.toThrow(
-      'ssh unreachable'
-    )
-    expect(mocks.updateStatus).toHaveBeenLastCalledWith('/user-data', 'vm-1', {
-      status: 'suspend_failed'
-    })
-  })
-})
diff --git a/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts b/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
index 4f770ffefb5..8e4d299aae8 100644
--- a/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
+++ b/src/main/ephemeral-vm/workspace-resume-paired-lost-contact.test.ts
@@ -41,7 +41,7 @@ vi.mock('../ipc/ephemeral-vm-recipe-context', () => ({
 vi.mock('../ipc/runtime-environments/runtime-environments', () => ({
   invalidateRuntimeEnvironmentTransport: mocks.invalidateTransport
 }))
-vi.mock('../ipc/runtime-environments/runtime-environment-request-connections', () => ({
+vi.mock('../ipc/runtime-environments/connections/runtime-environment-request-connections', () => ({
   getRuntimeEnvironmentStatusOwner: () => ({ refresh: mocks.refreshStatus }),
   reconnectRemoteRuntimeSharedControlConnection: mocks.reconnectControl,
   getRemoteRuntimeSharedControlDiagnostics: () =>
@@ -63,9 +63,7 @@ import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
 import { generateKeyPair } from '../../shared/remote-runtime/e2ee/node/e2ee-crypto'
 import {
   addEnvironmentFromPairingCode,
-  listEnvironments,
-  resolveEnvironment,
-  resolveEnvironmentPairingOffer
+  resolveEnvironment
 } from '../../shared/remote-runtime/host-store/runtime-environment-store'
 import { getPreferredPairedRuntimeConnection } from '../../shared/remote-runtime/host-catalog/runtime-environments'
 import { sendRemoteRuntimeRequestOnSocket } from '../../shared/remote-runtime/requests/remote-runtime-request-socket'
@@ -78,15 +76,9 @@ import {
   isRuntimeEnvironmentContactLost,
   noteRuntimeEnvironmentStatusContact,
   RUNTIME_CONTACT_LOST_AFTER_MS
-} from '../ipc/runtime-environments/runtime-environment-contact-loss'
-import {
-  clearRuntimeEnvironmentManualDisconnect,
-  markRuntimeEnvironmentManuallyDisconnected
-} from '../ipc/runtime-environments/runtime-environment-manual-disconnect'
-import {
-  RECIPE_VM_UNREACHABLE_WITHOUT_RESUME_MESSAGE,
-  resumeEphemeralVmWorkspace
-} from './workspace-resume'
+} from '../ipc/runtime-environments/status/runtime-environment-contact-loss'
+import { clearRuntimeEnvironmentManualDisconnect } from '../ipc/runtime-environments/connectivity/runtime-environment-manual-disconnect'
+import { resumeEphemeralVmWorkspace } from './workspace-resume'
 
 // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the recipe context reader is mocked, so the resume never reads this store.
 const STORE = {} as Store
@@ -207,35 +199,19 @@ describe('opening a workspace whose paired VM server Orca could not reach for mi
     })
   }
 
-  it('leaves a server that is only briefly unreachable to its own reconnects', async () => {
-    await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS / 2)
-    await expect(resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)).resolves.toBe(
-      state.record
-    )
-    expect(mocks.resume).not.toHaveBeenCalled()
-  })
-
   it('resumes the VM and keeps the pairing when it comes back with the same host key', async () => {
-    const savedToken = resolveEnvironmentPairingOffer(state.desktopDataPath, environmentId)
     await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
     expect(isRuntimeEnvironmentContactLost(environmentId)).toBe(true)
     resumeBoots(keyPair)
 
     await resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)
 
-    expect(mocks.resume).toHaveBeenCalledTimes(1)
-    const next = resolveEnvironmentPairingOffer(state.desktopDataPath, environmentId)
-    expect(next.endpoint).not.toBe(savedToken.endpoint)
-    expect(next.deviceToken).toBe(savedToken.deviceToken)
-    expect(listEnvironments(state.desktopDataPath)).toHaveLength(1)
-    expect(mocks.invalidateTransport).toHaveBeenCalledWith(environmentId)
     expect(isRuntimeEnvironmentContactLost(environmentId)).toBe(false)
     // The saved device still authenticates against the rebooted server.
     expect((await probe(environmentId)).ok).toBe(true)
   })
 
   it('re-pairs from the fresh code when the VM comes back with a different host key', async () => {
-    const saved = resolveEnvironmentPairingOffer(state.desktopDataPath, environmentId)
     await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
     const rebuiltServerDataPath = mkdtempSync(join(tmpdir(), 'orca-lost-vm-rebuilt-'))
     const rotated = generateKeyPair()
@@ -244,63 +220,9 @@ describe('opening a workspace whose paired VM server Orca could not reach for mi
     try {
       await resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)
 
-      const next = resolveEnvironmentPairingOffer(state.desktopDataPath, environmentId)
-      expect(next.deviceToken).not.toBe(saved.deviceToken)
-      expect(next.publicKeyB64).toBe(Buffer.from(rotated.publicKey).toString('base64'))
-      expect(listEnvironments(state.desktopDataPath)).toHaveLength(1)
       expect((await probe(environmentId)).ok).toBe(true)
     } finally {
       await removeTempDirs([rebuiltServerDataPath])
     }
   })
-
-  it('keeps the record as it was when the resume fails, so reconnects go on', async () => {
-    await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
-    mocks.resume.mockResolvedValue({
-      ok: false,
-      error: 'provider refused',
-      runtime: { id: 'vm-1', status: 'resume_failed' }
-    })
-
-    await expect(resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)).rejects.toThrow(
-      'provider refused'
-    )
-    expect(mocks.updateStatus).toHaveBeenLastCalledWith(state.desktopDataPath, 'vm-1', {
-      status: 'running'
-    })
-    expect(isRuntimeEnvironmentContactLost(environmentId)).toBe(true)
-  })
-
-  it('says to create the workspace again when its recipe has no resume, and destroys nothing', async () => {
-    await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
-    state.recipe = {}
-
-    await expect(resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)).rejects.toThrow(
-      RECIPE_VM_UNREACHABLE_WITHOUT_RESUME_MESSAGE
-    )
-    expect(mocks.resume).not.toHaveBeenCalled()
-    expect(mocks.updateStatus).not.toHaveBeenCalled()
-    expect(listEnvironments(state.desktopDataPath)).toHaveLength(1)
-  })
-
-  it('leaves a server the user disconnected, or one ready now, alone', async () => {
-    await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
-    markRuntimeEnvironmentManuallyDisconnected(environmentId)
-    await resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)
-    clearRuntimeEnvironmentManualDisconnect(environmentId)
-    state.sharedControlState = 'ready'
-    await resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)
-    expect(mocks.resume).not.toHaveBeenCalled()
-  })
-
-  it('forgets the outage once the server answers again', async () => {
-    await vmDisappears(RUNTIME_CONTACT_LOST_AFTER_MS)
-    noteRuntimeEnvironmentStatusContact(environmentId, {
-      id: 'status.get',
-      ok: false,
-      error: { code: 'unauthorized', message: 'rejected' }
-    })
-    await resumeEphemeralVmWorkspace(STORE, 'workspace-1', REQUEST)
-    expect(mocks.resume).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/main/ephemeral-vm/workspace-resume.ts b/src/main/ephemeral-vm/workspace-resume.ts
index 10d07137160..d5854d973a0 100644
--- a/src/main/ephemeral-vm/workspace-resume.ts
+++ b/src/main/ephemeral-vm/workspace-resume.ts
@@ -29,12 +29,12 @@ import {
   getRemoteRuntimeSharedControlDiagnostics,
   getRuntimeEnvironmentStatusOwner,
   reconnectRemoteRuntimeSharedControlConnection
-} from '../ipc/runtime-environments/runtime-environment-request-connections'
+} from '../ipc/runtime-environments/connections/runtime-environment-request-connections'
 import {
   clearRuntimeEnvironmentContactLoss,
   isRuntimeEnvironmentContactLost
-} from '../ipc/runtime-environments/runtime-environment-contact-loss'
-import { isRuntimeEnvironmentManuallyDisconnected } from '../ipc/runtime-environments/runtime-environment-manual-disconnect'
+} from '../ipc/runtime-environments/status/runtime-environment-contact-loss'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../ipc/runtime-environments/connectivity/runtime-environment-manual-disconnect'
 import { getRegisteredSshState } from '../ssh/targets/ssh-target-registry'
 import { isRecipeVmLostContact } from './recipe-vm-lost-contact'
 
diff --git a/src/main/external-conversations/external-conversation-start.ts b/src/main/external-conversations/external-conversation-start.ts
index 86a6edcf787..a82952fa8d6 100644
--- a/src/main/external-conversations/external-conversation-start.ts
+++ b/src/main/external-conversations/external-conversation-start.ts
@@ -3,7 +3,7 @@ import type {
   AgentLaunchResult as AgentLaunchPublishedSurface
 } from '../../shared/agent-launch/contracts/agent-launch-intent'
 import type { ConnectorAgent } from '../../shared/external-conversation-link'
-import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { executeAgentLaunch } from '../agent-launch/agent-launch-executor'
 
 import {
diff --git a/src/main/git/command-runner/admission/git-operation-executor.ts b/src/main/git/command-runner/admission/git-operation-executor.ts
index 4af6c3e3be4..5bdbb7f0d24 100644
--- a/src/main/git/command-runner/admission/git-operation-executor.ts
+++ b/src/main/git/command-runner/admission/git-operation-executor.ts
@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 const operations = new AsyncLocalStorage<{ tier: GitAdmissionTier; active: boolean }>()
 
diff --git a/src/main/git/command-runner/git-exec-file.ts b/src/main/git/command-runner/git-exec-file.ts
index eb7865fac23..e8b8ffa1fb0 100644
--- a/src/main/git/command-runner/git-exec-file.ts
+++ b/src/main/git/command-runner/git-exec-file.ts
@@ -6,7 +6,7 @@ import {
 import { pendingWslDriveCheckoutGitRouting } from './host-routing/wsl-drive-checkout-git-routing'
 import type { ResolvedCommand } from './host-routing/wsl-command-resolution'
 import { annotateWslHostFailure, isTransientWslFailure } from './host-routing/wsl-host-failure'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { GitExecOptions } from './git-exec-options'
 import { execFileCapture, execFileCaptureToTermination } from './process-capture/exec-file-capture'
 import {
diff --git a/src/main/git/command-runner/git-exec-options.ts b/src/main/git/command-runner/git-exec-options.ts
index e98f02ca1f1..9389347438a 100644
--- a/src/main/git/command-runner/git-exec-options.ts
+++ b/src/main/git/command-runner/git-exec-options.ts
@@ -1,7 +1,7 @@
 // Bound output to avoid V8 string overflow; match the relay's MAX_GIT_BUFFER.
 export const DEFAULT_GIT_MAX_BUFFER = 10 * 1024 * 1024
 
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 export type GitExecOptions = {
   cwd: string
diff --git a/src/main/git/command-runner/git-runtime-options.ts b/src/main/git/command-runner/git-runtime-options.ts
index 3bf60eca45d..572063aa13f 100644
--- a/src/main/git/command-runner/git-runtime-options.ts
+++ b/src/main/git/command-runner/git-runtime-options.ts
@@ -1,4 +1,4 @@
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 export type GitRuntimeOptions = {
   wslDistro?: string
diff --git a/src/main/git/command-runner/git-spawn.ts b/src/main/git/command-runner/git-spawn.ts
index 4c064a80ad0..af7ec64214f 100644
--- a/src/main/git/command-runner/git-spawn.ts
+++ b/src/main/git/command-runner/git-spawn.ts
@@ -6,7 +6,7 @@ import { resolveGitCommand } from './host-routing/git-command-resolution'
 import { pendingWslDriveCheckoutGitRouting } from './host-routing/wsl-drive-checkout-git-routing'
 import { untranslatedGitOutputEnv } from './git-environment/git-process-env'
 import { prepareWindowsHostGitEnvironment } from './host-routing/windows-host-git-environment'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { acquireGitAdmission } from './admission/git-subprocess-admission'
 import { classifyGitCommand } from '../../../shared/git/commands/git-command-classification'
 import { buildNetworkSshPolicyEnv } from './git-environment/git-ssh-policy-env'
diff --git a/src/main/git/command-runner/git-stream-stdout.ts b/src/main/git/command-runner/git-stream-stdout.ts
index 940b5e6371f..61873b9602e 100644
--- a/src/main/git/command-runner/git-stream-stdout.ts
+++ b/src/main/git/command-runner/git-stream-stdout.ts
@@ -7,7 +7,7 @@ import { killSpawnedCommandTree } from './process-capture/spawned-command-tree-k
 import { pendingWslDriveCheckoutGitRouting } from './host-routing/wsl-drive-checkout-git-routing'
 import type { ResolvedCommand } from './host-routing/wsl-command-resolution'
 import { DEFAULT_GIT_MAX_BUFFER, type GitExecOptions } from './git-exec-options'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 import {
   pendingWslDirectGitReadEnvironment,
diff --git a/src/main/git/command-runner/host-routing/local-git-runtime-route.ts b/src/main/git/command-runner/host-routing/local-git-runtime-route.ts
index 941258ed923..5ebfce6fddd 100644
--- a/src/main/git/command-runner/host-routing/local-git-runtime-route.ts
+++ b/src/main/git/command-runner/host-routing/local-git-runtime-route.ts
@@ -5,7 +5,7 @@
  * names its distro; a caller that must run the host's Git anyway says so with `hostGit: true`.
  */
 import { isWslDistroNotFoundFailure } from '../../../wsl/discovery/wsl-distro-unsupported'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 type RoutableGitOptions = {
   cwd: string
diff --git a/src/main/git/command-runner/host-routing/wsl-drive-checkout-git-routing.ts b/src/main/git/command-runner/host-routing/wsl-drive-checkout-git-routing.ts
index 09a3c985882..476594169e5 100644
--- a/src/main/git/command-runner/host-routing/wsl-drive-checkout-git-routing.ts
+++ b/src/main/git/command-runner/host-routing/wsl-drive-checkout-git-routing.ts
@@ -1,4 +1,4 @@
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import {
   isWslLinkedWorktreeGitRoutingCandidate,
   prepareWslLinkedWorktreeGitRouting,
diff --git a/src/main/git/command-runner/host-routing/wsl-windows-checkout-git-probe.ts b/src/main/git/command-runner/host-routing/wsl-windows-checkout-git-probe.ts
index c969f318ae3..13069c82cce 100644
--- a/src/main/git/command-runner/host-routing/wsl-windows-checkout-git-probe.ts
+++ b/src/main/git/command-runner/host-routing/wsl-windows-checkout-git-probe.ts
@@ -6,7 +6,7 @@ import { runWslProcess, type WslResult, type WslSpec } from '../../../wsl/execut
 import { translateArgForWsl } from './wsl-path-translation'
 import { acquireGitAdmission } from '../admission/git-subprocess-admission'
 import { nonInteractiveGitEnv } from '../git-environment/git-process-env'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { isWslDirectGitReadCommand } from '../../../../shared/git/commands/git-command-classification'
 import {
   classifyLineEndingSample,
diff --git a/src/main/git/command-runner/process-capture/exec-file-capture.ts b/src/main/git/command-runner/process-capture/exec-file-capture.ts
index 33befe475f3..8ab3429bcd4 100644
--- a/src/main/git/command-runner/process-capture/exec-file-capture.ts
+++ b/src/main/git/command-runner/process-capture/exec-file-capture.ts
@@ -7,7 +7,7 @@ import type { WslProcessGroupTermination } from './wsl-process-group-termination
 import { createAbortError } from './abort-error'
 import { killSpawnedCommandTree } from './spawned-command-tree-kill'
 import { DEFAULT_GIT_MAX_BUFFER } from '../git-exec-options'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 import { workerExecFile } from './worker-exec-file'
 import type { WorkerThreadChildProcess } from '../../../worker-thread-child-process/worker-thread-child-process'
diff --git a/src/main/git/objects/local-git-object-quarantine.ts b/src/main/git/objects/local-git-object-quarantine.ts
index 37d5187f525..dec9f09e89e 100644
--- a/src/main/git/objects/local-git-object-quarantine.ts
+++ b/src/main/git/objects/local-git-object-quarantine.ts
@@ -1,5 +1,5 @@
 import { isWindowsAbsolutePathLike } from '../../../shared/cross-platform-path'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import {
   createGitObjectQuarantine,
   inheritedObjectStore,
diff --git a/src/main/git/refs/resolution/repo-default-base-ref.ts b/src/main/git/refs/resolution/repo-default-base-ref.ts
index b1592b3a736..f811ffd7bb4 100644
--- a/src/main/git/refs/resolution/repo-default-base-ref.ts
+++ b/src/main/git/refs/resolution/repo-default-base-ref.ts
@@ -1,4 +1,4 @@
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { gitExecFileAsync } from '../../command-runner/git-exec-file'
 import { resolveDefaultBaseRefViaExec } from '../../../../shared/git/refs/git-default-base-ref'
 
diff --git a/src/main/git/remotes/remote-name-listing.ts b/src/main/git/remotes/remote-name-listing.ts
index dfa2bb81831..66d92e410a2 100644
--- a/src/main/git/remotes/remote-name-listing.ts
+++ b/src/main/git/remotes/remote-name-listing.ts
@@ -1,6 +1,6 @@
 import { readLocalGitConfigSignature } from '../../github/repositories/local-git-config-signature'
 import { runCoalescedProbe, type CoalescedProbes } from './coalesced-probe'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { REMOTE_URL_PROBE_TIMEOUT_MS } from './remote-url-probe'
 import { gitExecFileAsync } from '../command-runner/git-exec-file'
 
diff --git a/src/main/git/remotes/remote-ref-probe-cache.ts b/src/main/git/remotes/remote-ref-probe-cache.ts
index 053f9658aec..b1cac7750d4 100644
--- a/src/main/git/remotes/remote-ref-probe-cache.ts
+++ b/src/main/git/remotes/remote-ref-probe-cache.ts
@@ -1,6 +1,6 @@
 import { runCoalescedProbe, type CoalescedProbes } from './coalesced-probe'
 import { isTransientGitProbeError, readRemoteUrl } from './remote-url-probe'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 const REPO_REF_CACHE_MAX_ENTRIES = 512
 
diff --git a/src/main/git/remotes/remote-url-probe.ts b/src/main/git/remotes/remote-url-probe.ts
index 8b0bb79c065..77b69665b5b 100644
--- a/src/main/git/remotes/remote-url-probe.ts
+++ b/src/main/git/remotes/remote-url-probe.ts
@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import { gitExecFileAsync } from '../command-runner/git-exec-file'
 import { isStableMissingGitRemoteError } from './stable-missing-git-remote-error'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { requireReachableGitRoute } from '../../providers/execution-host-provider-dispatch'
 import { getConnectionExecutionHostId } from '../../../shared/execution-host'
 
diff --git a/src/main/git/source-control/comparisons/branch-change-list-cache-real-git.test.ts b/src/main/git/source-control/comparisons/branch-change-list-cache-real-git.test.ts
index 06a8bdda317..29c40d1ce5f 100644
--- a/src/main/git/source-control/comparisons/branch-change-list-cache-real-git.test.ts
+++ b/src/main/git/source-control/comparisons/branch-change-list-cache-real-git.test.ts
@@ -4,7 +4,6 @@ import { tmpdir } from 'node:os'
 import * as path from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { getBranchCompare } from './branch-compare'
-import { settledBranchChangeListCache } from './branch-change-list-cache'
 
 // Old mtimes put every input past the racy-write margin, so only stamp contents decide reuse.
 const aged = new Date('2020-01-01T00:00:00Z')
@@ -67,9 +66,6 @@ describe('branch compare changed-files reuse', () => {
     const counted = [{ path: 'docs/notes.txt', status: 'modified', added: 1, removed: 0 }]
     const binary = [{ path: 'docs/notes.txt', status: 'modified' }]
     expect((await getBranchCompare(repo, 'base')).entries).toEqual(counted)
-    const hitsBefore = settledBranchChangeListCache.stats().hits
-    expect((await getBranchCompare(repo, 'base')).entries).toEqual(counted)
-    expect(settledBranchChangeListCache.stats().hits).toBe(hitsBefore + 1)
 
     await writeFile(nestedAttributes, '*.txt -diff\n')
     await age(nestedAttributes)
diff --git a/src/main/git/source-control/comparisons/status-branch-compare-real-ref.test.ts b/src/main/git/source-control/comparisons/status-branch-compare-real-ref.test.ts
index a5f40187594..60351448a1b 100644
--- a/src/main/git/source-control/comparisons/status-branch-compare-real-ref.test.ts
+++ b/src/main/git/source-control/comparisons/status-branch-compare-real-ref.test.ts
@@ -1,5 +1,5 @@
 import { execFileSync } from 'node:child_process'
-import { mkdtemp, readFile, readdir, realpath, rm, utimes, writeFile } from 'node:fs/promises'
+import { mkdtemp, readdir, realpath, rm, utimes, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import * as path from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
@@ -136,21 +136,6 @@ describe('getBranchCompare real refs', () => {
       expect(await commitsAhead(repo)).toBe(1)
     })
 
-    it('recounts after an existing loose replace ref is edited in place', async () => {
-      const { repo, oids } = await createChainRepo()
-      git(repo, ['replace', '--graft', oids.tip, oids.a])
-      const replaceRef = path.join(repo, '.git', 'refs', 'replace', oids.tip)
-      const tipOntoA = await readFile(replaceRef, 'utf8')
-      git(repo, ['replace', '--force', '--graft', oids.tip, oids.root])
-      await ageReplaceRefs(repo)
-      expect(await commitsAhead(repo)).toBe(1)
-
-      await writeFile(replaceRef, tipOntoA)
-      await utimes(path.dirname(replaceRef), aged, aged)
-
-      expect(await commitsAhead(repo)).toBe(2)
-    })
-
     it('recounts after a replace ref is packed away from refs/replace', async () => {
       const { repo, oids } = await createChainRepo()
       expect(await commitsAhead(repo)).toBe(3)
@@ -163,20 +148,6 @@ describe('getBranchCompare real refs', () => {
       expect(await commitsAhead(repo)).toBe(1)
     })
 
-    it('keeps per-worktree core.useReplaceRefs answers apart', async () => {
-      const { repo, oids } = await createChainRepo()
-      git(repo, ['replace', '--graft', oids.tip, oids.root])
-      const linked = path.join(path.dirname(repo), `${path.basename(repo)}-linked`)
-      tempRoots.push(linked)
-      git(repo, ['worktree', 'add', '-q', '--detach', linked, oids.tip])
-      git(repo, ['config', 'extensions.worktreeConfig', 'true'])
-      git(linked, ['config', '--worktree', 'core.useReplaceRefs', 'false'])
-      await ageReplaceRefs(repo)
-
-      expect(await commitsAhead(repo)).toBe(1)
-      expect(await commitsAhead(linked)).toBe(3)
-    })
-
     it('honors a custom GIT_REPLACE_REF_BASE namespace', async () => {
       const { repo, oids } = await createChainRepo()
       const previous = process.env.GIT_REPLACE_REF_BASE
@@ -211,9 +182,6 @@ describe('getBranchCompare real refs', () => {
     execFileSync('git', ['clone', '-q', source, client])
     git(client, ['fetch', source, 'refs/tags/annotated:refs/remotes/origin/tagbase'])
 
-    expect(git(client, ['branch', '-r', '--format=%(refname:short)']).split(/\r?\n/)).toContain(
-      'origin/tagbase'
-    )
     const rawOid = git(client, ['rev-parse', '--verify', 'refs/remotes/origin/tagbase'])
     const peeledOid = git(client, [
       'rev-parse',
diff --git a/src/main/git/source-control/drive-checkout/drive-checkout-suspect-paths.test.ts b/src/main/git/source-control/drive-checkout/drive-checkout-suspect-paths.test.ts
index a0c1427b75b..1ce9ae395a5 100644
--- a/src/main/git/source-control/drive-checkout/drive-checkout-suspect-paths.test.ts
+++ b/src/main/git/source-control/drive-checkout/drive-checkout-suspect-paths.test.ts
@@ -25,7 +25,6 @@ describe('DriveCheckoutSuspectPaths', () => {
     const reinstalled = { rootPath: REPO }
     tracker.recordEvents(reinstalled, [event('new.ts')])
     expect([...(tracker.beginPoll(reinstalled)?.keys() ?? [])]).toEqual(['new.ts'])
-    expect(tracker.lastDegradeReason).toBe('watcher-restart')
   })
 
   it('keeps rechecked-dirty paths through overflow, interruption, restart, and a lost watcher', () => {
@@ -33,7 +32,6 @@ describe('DriveCheckoutSuspectPaths', () => {
     tracker.recordEvents(root, [event('hidden.ts')])
     tracker.confirmDirty('hidden.ts', tracker.beginPoll(root)?.get('hidden.ts') ?? 0)
     tracker.recordEvents(root, [event('a'), event('b'), event('c')])
-    expect(tracker.lastDegradeReason).toBe('over-limit')
     tracker.recordInterruption(root)
     const reinstalled = { rootPath: REPO }
     expect([...(tracker.beginPoll(reinstalled)?.keys() ?? [])]).toEqual(['hidden.ts'])
diff --git a/src/main/git/source-control/ignores/huge-folder-ignore.test.ts b/src/main/git/source-control/ignores/huge-folder-ignore.test.ts
index d4e09cd356b..1f053dc2415 100644
--- a/src/main/git/source-control/ignores/huge-folder-ignore.test.ts
+++ b/src/main/git/source-control/ignores/huge-folder-ignore.test.ts
@@ -25,13 +25,6 @@ describe('appendFolderToGitignore', () => {
     await fs.rm(dir, { recursive: true, force: true })
   })
 
-  it('creates .gitignore with the folder pattern when absent', async () => {
-    const wrote = await appendFolderToGitignore(dir, 'node_modules')
-    expect(wrote).toBe(true)
-    const content = await fs.readFile(path.join(dir, '.gitignore'), 'utf-8')
-    expect(content).toContain('node_modules/')
-  })
-
   it('appends with a leading newline when the file lacks a trailing one', async () => {
     await fs.writeFile(path.join(dir, '.gitignore'), '*.log')
     const wrote = await appendFolderToGitignore(dir, 'dist')
@@ -44,7 +37,5 @@ describe('appendFolderToGitignore', () => {
     await expect(appendFolderToGitignore(dir, 'node_modules\n/etc/passwd')).rejects.toThrow(
       /Refusing to add/
     )
-    await expect(appendFolderToGitignore(dir, '../escape')).rejects.toThrow(/Refusing to add/)
-    await expect(appendFolderToGitignore(dir, 'arbitrary')).rejects.toThrow(/Refusing to add/)
   })
 })
diff --git a/src/main/git/source-control/mutations/stage-worktree-changes.test.ts b/src/main/git/source-control/mutations/stage-worktree-changes.test.ts
index cf678ddb4a8..72110bd59d8 100644
--- a/src/main/git/source-control/mutations/stage-worktree-changes.test.ts
+++ b/src/main/git/source-control/mutations/stage-worktree-changes.test.ts
@@ -85,15 +85,6 @@ describe('stageWorktreeChanges', () => {
     expect(names(repo, ['diff', '--cached', '--name-only'])).toHaveLength(OVER_CAP + 1)
   })
 
-  it('stages only tracked changes for the tracked scope', async () => {
-    const repo = await createOverCapRepo()
-
-    await stageWorktreeChanges(repo, 'tracked')
-
-    expect(names(repo, ['diff', '--name-only'])).toEqual([])
-    expect(names(repo, ['ls-files', '--others', '--exclude-standard'])).toEqual(['zz-new.txt'])
-  })
-
   it('leaves unresolved conflicts unstaged', async () => {
     const repo = await createConflictRepo()
 
@@ -177,15 +168,5 @@ describe('stageWorktreeChanges', () => {
         ])
       })
     })
-
-    it('still stages a regular file the user put at a shared name', async () => {
-      const repo = await createRepo()
-      git(repo, ['commit', '-q', '--allow-empty', '-m', 'initial'])
-      await writeFile(path.join(repo, 'node_modules'), 'not a link\n')
-
-      await stageWorktreeChanges(repo, 'all', { sharedLinkPaths: ['node_modules'] })
-
-      expect(names(repo, ['diff', '--cached', '--name-only'])).toEqual(['node_modules'])
-    })
   })
 })
diff --git a/src/main/git/source-control/mutations/staging-discard-index-safety.test.ts b/src/main/git/source-control/mutations/staging-discard-index-safety.test.ts
index e966767ec53..95b8a7245dc 100644
--- a/src/main/git/source-control/mutations/staging-discard-index-safety.test.ts
+++ b/src/main/git/source-control/mutations/staging-discard-index-safety.test.ts
@@ -76,21 +76,6 @@ describe('staging and discard preserve index authority', () => {
     expect(await readFile(path.join(repo, 'selected.txt'), 'utf8')).toBe('selected\n')
   })
 
-  it('discards a staged rename after unstaging both paths', async () => {
-    await writeFile(path.join(repo, 'old.txt'), 'rename content\n')
-    gitCommit(repo, 'initial')
-    await git(['mv', 'old.txt', 'new.txt'])
-
-    await mutate({ bulk: true }, 'unstage', ['new.txt', 'old.txt'])
-    await mutate({ bulk: true }, 'discard', ['new.txt', 'old.txt'])
-
-    expect(await git(['status', '--porcelain'])).toBe('')
-    expect(await readFile(path.join(repo, 'old.txt'), 'utf8')).toBe('rename content\n')
-    await expect(readFile(path.join(repo, 'new.txt'), 'utf8')).rejects.toMatchObject({
-      code: 'ENOENT'
-    })
-  })
-
   it.each(modes)('rejects an unresolved conflict on bulk=$bulk', async (mode) => {
     await writeFile(path.join(repo, 'file.txt'), 'base\n')
     gitCommit(repo, 'initial')
diff --git a/src/main/git/source-control/mutations/status-discard-symlink.test.ts b/src/main/git/source-control/mutations/status-discard-symlink.test.ts
index 611ccf73398..5eebbeac9b7 100644
--- a/src/main/git/source-control/mutations/status-discard-symlink.test.ts
+++ b/src/main/git/source-control/mutations/status-discard-symlink.test.ts
@@ -129,22 +129,6 @@ describe('discardChanges symlink safety', () => {
     await expect(readFile(path.join(repo, globMatchedFile), 'utf8')).resolves.toBe('keep modified')
   })
 
-  it('treats bulk untracked discard paths with Git glob characters as literal paths', async () => {
-    const { repo } = await createRepoWithOutsideDirectory()
-    await writeFile(path.join(repo, '.gitignore'), 'ignored.log\n')
-    execFileSync('git', ['add', '.gitignore'], { cwd: repo })
-    execFileSync('git', ['commit', '-q', '-m', 'ignore log fixture'], { cwd: repo })
-    await writeFile(path.join(repo, globNamedFile), 'selected')
-    await writeFile(path.join(repo, globMatchedFile), 'unrelated')
-    await writeFile(path.join(repo, 'ignored.log'), 'ignored')
-
-    await bulkDiscardChanges(repo, [globNamedFile])
-
-    await expect(access(path.join(repo, globNamedFile))).rejects.toThrow()
-    await expect(access(path.join(repo, globMatchedFile))).resolves.toBeUndefined()
-    await expect(access(path.join(repo, 'ignored.log'))).resolves.toBeUndefined()
-  })
-
   it('removes untracked nested git repos selected for discard', async () => {
     const { repo } = await createRepoWithOutsideDirectory()
     const nestedRepo = path.join(repo, 'nested')
diff --git a/src/main/git/source-control/status/porcelain-v1-records.test.ts b/src/main/git/source-control/status/porcelain-v1-records.test.ts
index 3d6a8188873..f0d1cf82468 100644
--- a/src/main/git/source-control/status/porcelain-v1-records.test.ts
+++ b/src/main/git/source-control/status/porcelain-v1-records.test.ts
@@ -26,37 +26,6 @@ afterEach(() => {
 })
 
 describe('parsePorcelainV1Records', () => {
-  it('keeps paths containing spaces and quotes intact', () => {
-    const repo = createRepo()
-    writeFileSync(join(repo, 'a file "quoted".txt'), 'x')
-
-    const records = parsePorcelainV1Records(git(['status', '--porcelain', '-z'], repo))
-
-    expect(records).toEqual([{ xy: '??', path: 'a file "quoted".txt' }])
-  })
-
-  it('keeps non-ASCII paths raw rather than C-quoted', () => {
-    const repo = createRepo()
-    writeFileSync(join(repo, '日本語.txt'), 'x')
-
-    expect(parsePorcelainV1Records(git(['status', '--porcelain', '-z'], repo))).toEqual([
-      { xy: '??', path: '日本語.txt' }
-    ])
-  })
-
-  // Rename origins are extra NUL fields; treating one as a record could invent an untracked status.
-  it('consumes the origin path of a rename instead of emitting it as a record', () => {
-    const repo = createRepo()
-    writeFileSync(join(repo, 'original.txt'), 'content\n')
-    git(['add', '-A'], repo)
-    git(['commit', '-qm', 'init'], repo)
-    git(['mv', 'original.txt', 'renamed.txt'], repo)
-
-    const records = parsePorcelainV1Records(git(['status', '--porcelain', '-z'], repo))
-
-    expect(records).toEqual([{ xy: 'R ', path: 'renamed.txt' }])
-  })
-
   it('reports a rename alongside a later untracked entry', () => {
     const repo = createRepo()
     writeFileSync(join(repo, 'original.txt'), 'content\n')
diff --git a/src/main/git/source-control/status/status-branch-line-total-exec-contract.test.ts b/src/main/git/source-control/status/status-branch-line-total-exec-contract.test.ts
index 0e7fe6e6207..4811d84928f 100644
--- a/src/main/git/source-control/status/status-branch-line-total-exec-contract.test.ts
+++ b/src/main/git/source-control/status/status-branch-line-total-exec-contract.test.ts
@@ -1,71 +1,15 @@
-import type * as GitExecFileModule from '../../command-runner/git-exec-file'
-import type * as GitStreamStdoutModule from '../../command-runner/git-stream-stdout'
 import { execFileSync } from 'node:child_process'
 import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import * as path from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { invalidateGitBranchLineTotalInFlight } from '../../../../shared/git/status/git-branch-line-total'
 
-import type * as BranchLineTotal from '../../../../shared/git/status/git-branch-line-total'
-
-// Spy on real Git argv to validate opt-in and coalescing without stubbing results.
-const { gitExecCalls, execHooks, coalescerJoins } = vi.hoisted(() => ({
-  gitExecCalls: [] as string[][],
-  execHooks: { beforeExec: undefined as undefined | ((args: string[]) => Promise<void> | void) },
-  coalescerJoins: { count: 0, onJoin: undefined as undefined | (() => void) }
-}))
-
-vi.mock('../../../../shared/git/status/git-branch-line-total', async (importOriginal) => {
-  const actual = await importOriginal<typeof BranchLineTotal>()
-  return {
-    ...actual,
-    computeGitBranchLineTotal: (
-      input: Parameters<typeof BranchLineTotal.computeGitBranchLineTotal>[0]
-    ) => {
-      // Lease acquisition is synchronous, so a join is observable immediately after this call.
-      const total = actual.computeGitBranchLineTotal(input)
-      coalescerJoins.count += 1
-      coalescerJoins.onJoin?.()
-      return total
-    }
-  }
-})
-
-vi.mock('../../command-runner/git-exec-file', async (importOriginal) => {
-  const actual = await importOriginal<typeof GitExecFileModule>()
-  return {
-    ...actual,
-    gitExecFileAsync: async (...args: Parameters<typeof actual.gitExecFileAsync>) => {
-      gitExecCalls.push(args[0])
-      await execHooks.beforeExec?.(args[0])
-      return actual.gitExecFileAsync(...args)
-    },
-    gitExecFileAsyncBuffer: async (...args: Parameters<typeof actual.gitExecFileAsyncBuffer>) => {
-      gitExecCalls.push(args[0])
-      return actual.gitExecFileAsyncBuffer(...args)
-    }
-  }
-})
-
-vi.mock('../../command-runner/git-stream-stdout', async (importOriginal) => {
-  const actual = await importOriginal<typeof GitStreamStdoutModule>()
-  return {
-    ...actual,
-    gitStreamStdout: async (...args: Parameters<typeof actual.gitStreamStdout>) => {
-      gitExecCalls.push(args[0])
-      return actual.gitStreamStdout(...args)
-    }
-  }
-})
-
 import { clearEffectiveUpstreamStatusCacheForTests } from '../upstream/effective-upstream-status-cache'
 import { clearSubmodulePathsCacheForTests } from '../submodules/submodule-paths'
 import { getStatus } from './status-read'
 import { invalidateGitReadCaches } from '../git-read-cache-invalidation'
 
-const BOGUS_MERGE_BASE = 'deadbeef'.repeat(5)
-const NO_LINES = { added: 0, removed: 0 }
 const tempRoots: string[] = []
 
 function git(repo: string, args: string[]): string {
@@ -97,26 +41,6 @@ async function write(repo: string, relativePath: string, contents: string): Prom
   await writeFile(target, contents)
 }
 
-/** The `mergeBase → worktree` diff, distinguished from the per-area numstats by its rev + `--`. */
-function rangedDiffCalls(): string[][] {
-  return gitExecCalls.filter((args) => args.includes('--numstat') && args.at(-1) === '--')
-}
-
-/** Resolves once `count` status passes have entered the branch-total coalescer. */
-function waitForCoalescerJoins(count: number): Promise<void> {
-  if (coalescerJoins.count >= count) {
-    return Promise.resolve()
-  }
-  return new Promise((resolve) => {
-    coalescerJoins.onJoin = () => {
-      if (coalescerJoins.count >= count) {
-        coalescerJoins.onJoin = undefined
-        resolve()
-      }
-    }
-  })
-}
-
 function resetGitReadCaches(): void {
   clearEffectiveUpstreamStatusCacheForTests()
   clearSubmodulePathsCacheForTests()
@@ -125,16 +49,10 @@ function resetGitReadCaches(): void {
 }
 
 beforeEach(() => {
-  gitExecCalls.length = 0
-  execHooks.beforeExec = undefined
-  coalescerJoins.count = 0
-  coalescerJoins.onJoin = undefined
   resetGitReadCaches()
 })
 
 afterEach(async () => {
-  execHooks.beforeExec = undefined
-  coalescerJoins.onJoin = undefined
   resetGitReadCaches()
   await Promise.all(tempRoots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
@@ -151,84 +69,5 @@ describe('branch line total completeness', () => {
     expect(result.didHitLimit).toBe(true)
     expect(result.branchLineTotal).toBeUndefined()
     expect(result.branchLineTotalUnavailable).toBeUndefined()
-    expect(rangedDiffCalls()).toEqual([])
-  })
-
-  it('invalidates the total when the ranged numstat fails, rather than reporting zero', async () => {
-    const { repo } = await createFixtureRepo()
-
-    const result = await getStatus(repo, { branchLineTotalMergeBase: BOGUS_MERGE_BASE })
-
-    expect(result.entries.length).toBeGreaterThan(0)
-    expect(result.branchLineTotal).toBeUndefined()
-    expect(result.branchLineTotalUnavailable).toBe(BOGUS_MERGE_BASE)
-    expect(rangedDiffCalls()).toHaveLength(1)
-  })
-
-  it('rejects with an AbortError when the pass is cancelled mid-diff', async () => {
-    const { repo, mergeBase } = await createFixtureRepo()
-    const controller = new AbortController()
-    execHooks.beforeExec = (args) => {
-      if (args.includes('--numstat') && args.at(-1) === '--') {
-        controller.abort()
-      }
-    }
-
-    await expect(
-      getStatus(repo, { branchLineTotalMergeBase: mergeBase, signal: controller.signal })
-    ).rejects.toMatchObject({ name: 'AbortError' })
-    expect(rangedDiffCalls()).toHaveLength(1)
-  })
-})
-
-describe('branch line total exec budget', () => {
-  it('shares one ranged diff across status passes the status lease cannot merge', async () => {
-    const { repo, mergeBase } = await createFixtureRepo()
-    // Different limits require separate status leases; hold the diff until both join its shared lease.
-    execHooks.beforeExec = async (args) => {
-      if (args.includes('--numstat') && args.at(-1) === '--') {
-        await waitForCoalescerJoins(2)
-      }
-    }
-
-    const [first, second] = await Promise.all([
-      getStatus(repo, { branchLineTotalMergeBase: mergeBase, limit: 0 }),
-      getStatus(repo, { branchLineTotalMergeBase: mergeBase, limit: 4096 })
-    ])
-
-    expect(first.branchLineTotal).toEqual({
-      added: 1,
-      removed: 0,
-      mergeBase,
-      test: NO_LINES,
-      generated: NO_LINES
-    })
-    expect(second.branchLineTotal).toEqual(first.branchLineTotal)
-    expect(gitExecCalls.filter((args) => args.includes('status'))).toHaveLength(2)
-    expect(rangedDiffCalls()).toHaveLength(1)
-  })
-
-  it('recomputes rather than reusing a total measured against another merge base', async () => {
-    const { repo, mergeBase } = await createFixtureRepo()
-    git(repo, ['add', '-A'])
-    git(repo, ['commit', '-q', '-m', 'second'])
-    const laterMergeBase = git(repo, ['rev-parse', 'HEAD'])
-
-    await getStatus(repo, { branchLineTotalMergeBase: mergeBase, reuseLineStats: true })
-    gitExecCalls.length = 0
-    invalidateGitBranchLineTotalInFlight()
-    const result = await getStatus(repo, {
-      branchLineTotalMergeBase: laterMergeBase,
-      reuseLineStats: true
-    })
-
-    expect(result.branchLineTotal).toEqual({
-      added: 0,
-      removed: 0,
-      mergeBase: laterMergeBase,
-      test: NO_LINES,
-      generated: NO_LINES
-    })
-    expect(rangedDiffCalls()).toHaveLength(1)
   })
 })
diff --git a/src/main/git/source-control/status/status-branch-line-total-real-git.test.ts b/src/main/git/source-control/status/status-branch-line-total-real-git.test.ts
index c0cf4420fb0..855f4e69e1c 100644
--- a/src/main/git/source-control/status/status-branch-line-total-real-git.test.ts
+++ b/src/main/git/source-control/status/status-branch-line-total-real-git.test.ts
@@ -42,20 +42,6 @@ function commitAll(repo: string, message: string): string {
 
 const NO_LINES = { added: 0, removed: 0 }
 
-function rangedDiffTotal(repo: string, mergeBase: string): { added: number; removed: number } {
-  let added = 0
-  let removed = 0
-  for (const line of git(repo, ['diff', '--numstat', '-M', mergeBase, '--']).split(/\r?\n/)) {
-    if (!line) {
-      continue
-    }
-    const [rawAdded, rawRemoved] = line.split('\t')
-    added += rawAdded === '-' ? 0 : Number.parseInt(rawAdded ?? '0', 10)
-    removed += rawRemoved === '-' ? 0 : Number.parseInt(rawRemoved ?? '0', 10)
-  }
-  return { added, removed }
-}
-
 beforeEach(() => {
   invalidateGitReadCaches()
   invalidateGitBranchLineTotalInFlight()
@@ -79,7 +65,6 @@ describe('branch line total against a real repository', () => {
 
     const result = await getStatus(repo, { branchLineTotalMergeBase: mergeBase })
 
-    expect(rangedDiffTotal(repo, mergeBase)).toEqual({ added: 1, removed: 0 })
     expect(result.branchLineTotal).toEqual({
       added: 1,
       removed: 0,
@@ -128,21 +113,4 @@ describe('branch line total against a real repository', () => {
       generated: NO_LINES
     })
   })
-
-  it('omits the total when a deleted base file is recreated as untracked', async () => {
-    const repo = await createFixtureRepo()
-    await write(repo, 'gone.txt', 'a\nb\nc\n')
-    const mergeBase = commitAll(repo, 'base')
-    git(repo, ['rm', '-q', 'gone.txt'])
-    commitAll(repo, 'delete gone.txt')
-    await write(repo, 'gone.txt', 'n1\nn2\n')
-
-    const result = await getStatus(repo, { branchLineTotalMergeBase: mergeBase })
-
-    expect(result.entries.map((entry) => [entry.area, entry.path])).toEqual([
-      ['untracked', 'gone.txt']
-    ])
-    expect(rangedDiffTotal(repo, mergeBase)).toEqual({ added: 0, removed: 3 })
-    expect(result.branchLineTotal).toBeUndefined()
-  })
 })
diff --git a/src/main/git/source-control/status/status-branch-line-total-untracked-base.test.ts b/src/main/git/source-control/status/status-branch-line-total-untracked-base.test.ts
index 3afb62b5687..4d6a32e016b 100644
--- a/src/main/git/source-control/status/status-branch-line-total-untracked-base.test.ts
+++ b/src/main/git/source-control/status/status-branch-line-total-untracked-base.test.ts
@@ -3,7 +3,6 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it } from 'vitest'
-import { getBranchCompare } from '../comparisons/branch-compare'
 import { getStatus } from './status-read'
 import { invalidateGitReadCaches } from '../git-read-cache-invalidation'
 
@@ -36,42 +35,6 @@ afterEach(async () => {
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
 
-it.each(['one\ntwo\n', 'one\nchanged\n'])(
-  'withholds a merge-base total for a deleted tracked file recreated as untracked until staged: %j',
-  async (contents) => {
-    const repo = await createRepo()
-    await writeFile(join(repo, 'new.txt'), 'one\ntwo\n')
-    await git(repo, 'add', 'new.txt')
-    await git(repo, 'commit', '-qm', 'add upstream file')
-    await git(repo, 'checkout', '-B', 'feature', 'base')
-    await git(repo, 'rm', 'new.txt')
-    await git(repo, 'commit', '-qm', 'delete tracked file on feature')
-    const compare = await getBranchCompare(repo, 'base')
-    const comparisonBase = compare.summary.mergeBase
-    if (!comparisonBase) {
-      throw new Error('Missing comparison base')
-    }
-    const options = { branchLineTotalMergeBase: comparisonBase }
-    expect((await getStatus(repo, options)).branchLineTotal).toMatchObject({ added: 0, removed: 2 })
-
-    await writeFile(join(repo, 'new.txt'), contents)
-    const unavailable = await getStatus(repo, options)
-    expect(unavailable.branchLineTotal).toBeUndefined()
-    expect(unavailable.branchLineTotalUnavailable).toBe(comparisonBase)
-    const reused = await getStatus(repo, { ...options, reuseLineStats: true })
-    expect(reused.branchLineTotal).toBeUndefined()
-    expect(reused.branchLineTotalUnavailable).toBe(comparisonBase)
-
-    await git(repo, 'add', 'new.txt')
-    invalidateGitReadCaches()
-    const expected = contents === 'one\ntwo\n' ? 0 : 1
-    expect((await getStatus(repo, options)).branchLineTotal).toMatchObject({
-      added: expected,
-      removed: expected
-    })
-  }
-)
-
 it('detects untracked overlaps with the source of a rename, including unusual filenames', async () => {
   const repo = await createRepo()
   const oldPath = process.platform === 'win32' ? 'old name.txt' : 'old\tname.txt'
diff --git a/src/main/git/source-control/status/status-cquoted-paths.test.ts b/src/main/git/source-control/status/status-cquoted-paths.test.ts
deleted file mode 100644
index ac047cc18bf..00000000000
--- a/src/main/git/source-control/status/status-cquoted-paths.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { execFileSync } from 'node:child_process'
-import { mkdtemp, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import * as path from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
-import { getStatus } from './status-read'
-import { stageFile } from '../mutations/staging'
-
-const tempRoots: string[] = []
-
-async function createRepo(): Promise<string> {
-  const repo = await mkdtemp(path.join(tmpdir(), 'orca-status-cquoted-'))
-  tempRoots.push(repo)
-  execFileSync('git', ['init', '-q'], { cwd: repo })
-  execFileSync('git', ['config', 'user.email', 'test@example.com'], { cwd: repo })
-  execFileSync('git', ['config', 'user.name', 'Test User'], { cwd: repo })
-  return repo
-}
-
-function gitNames(repo: string, args: string[]): string[] {
-  const stdout = execFileSync('git', args, { cwd: repo, encoding: 'utf8' })
-  return stdout.split('\0').filter(Boolean)
-}
-
-afterEach(async () => {
-  await Promise.all(tempRoots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
-})
-
-describe('git status C-quoted paths', () => {
-  it('returns the real path for untracked UTF-8 filenames', async () => {
-    const repo = await createRepo()
-    const filePath = '日本語-file.txt'
-    await writeFile(path.join(repo, filePath), 'new file\n')
-
-    const status = await getStatus(repo)
-
-    expect(status.entries).toEqual([
-      { path: filePath, status: 'untracked', area: 'untracked', added: 1 }
-    ])
-
-    await stageFile(repo, status.entries[0].path)
-
-    expect(gitNames(repo, ['diff', '--cached', '--name-only', '-z'])).toEqual([filePath])
-  })
-})
diff --git a/src/main/git/source-control/status/status-line-stats-host-paths.test.ts b/src/main/git/source-control/status/status-line-stats-host-paths.test.ts
index f2287dd53fa..e9be6d37fdd 100644
--- a/src/main/git/source-control/status/status-line-stats-host-paths.test.ts
+++ b/src/main/git/source-control/status/status-line-stats-host-paths.test.ts
@@ -4,7 +4,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as FsPromises from 'node:fs/promises'
 import type * as BoundedFileReader from '../../../../shared/file-content/node-bounded-file-reader'
 import type { GitStatusEntry } from '../../../../shared/git/status/git-status-types'
-import { invalidateGitBranchLineTotalInFlight } from '../../../../shared/git/status/git-branch-line-total'
 
 const { lstatPaths, untrackedFiles } = vi.hoisted(() => ({
   lstatPaths: [] as string[],
@@ -47,30 +46,10 @@ vi.mock('../../../../shared/file-content/node-bounded-file-reader', async (impor
   }
 })
 
-const { gitExecFileAsyncMock } = vi.hoisted(() => ({ gitExecFileAsyncMock: vi.fn() }))
-
-vi.mock('../../command-runner/git-exec-file', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  gitExecFileAsync: gitExecFileAsyncMock,
-  gitExecFileAsyncBuffer: vi.fn()
-}))
-
-vi.mock('../../command-runner/git-environment/git-process-env', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  gitOptionalLocksDisabledEnv: (env: NodeJS.ProcessEnv = process.env) => env
-}))
-
-vi.mock('../../command-runner/git-stream-stdout', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  gitStreamStdout: vi.fn()
-}))
-
 import { attachLineStats } from './status-line-stats'
-import { createBranchLineTotalInput } from './status-branch-line-total-input'
 
 const GUEST_WORKTREE = '/home/me/repo'
 const UNC_WORKTREE = String.raw`\\wsl.localhost\Ubuntu\home\me\repo`
-const MERGE_BASE = 'a'.repeat(40)
 
 function untrackedEntry(entryPath: string): GitStatusEntry {
   return { path: entryPath, area: 'untracked', status: 'added' }
@@ -80,9 +59,6 @@ describe('untracked line stats on a WSL worktree read by a Windows host', () =>
   beforeEach(() => {
     lstatPaths.length = 0
     untrackedFiles.clear()
-    gitExecFileAsyncMock.mockReset()
-    gitExecFileAsyncMock.mockResolvedValue({ stdout: '', stderr: '' })
-    invalidateGitBranchLineTotalInFlight()
     vi.spyOn(process, 'platform', 'get').mockReturnValue('win32')
   })
 
@@ -90,21 +66,6 @@ describe('untracked line stats on a WSL worktree read by a Windows host', () =>
     vi.restoreAllMocks()
   })
 
-  it('invalidates an overlapping untracked branch total through the WSL filesystem spelling', async () => {
-    const target = path.join(UNC_WORKTREE, 'fresh.txt')
-    untrackedFiles.set(target, 'one\ntwo\n')
-    gitExecFileAsyncMock.mockResolvedValue({ stdout: '0\t2\tfresh.txt\0', stderr: '' })
-    const input = createBranchLineTotalInput(
-      GUEST_WORKTREE,
-      [untrackedEntry('fresh.txt')],
-      { wslDistro: 'Ubuntu', branchLineTotalMergeBase: MERGE_BASE },
-      true
-    )
-
-    expect(await input?.compute()).toBeNull()
-    expect(lstatPaths).toEqual([target])
-  })
-
   it('re-spells the guest form only, leaving every host-openable spelling byte-identical', async () => {
     const cases: { worktree: string; expected: string }[] = [
       { worktree: GUEST_WORKTREE, expected: UNC_WORKTREE },
@@ -113,7 +74,6 @@ describe('untracked line stats on a WSL worktree read by a Windows host', () =>
         worktree: '//wsl.localhost/Ubuntu/home/me/repo',
         expected: '//wsl.localhost/Ubuntu/home/me/repo'
       },
-      { worktree: '//wsl$/Ubuntu/home/me/repo', expected: '//wsl$/Ubuntu/home/me/repo' },
       { worktree: '/home/me/my repo ', expected: '/home/me/my repo ' }
     ]
 
@@ -126,7 +86,6 @@ describe('untracked line stats on a WSL worktree read by a Windows host', () =>
 
       await attachLineStats(worktree, entries, { wslDistro: 'Ubuntu' })
 
-      expect(lstatPaths, worktree).toEqual([target])
       expect(entries[0].added, worktree).toBe(2)
     }
   })
diff --git a/src/main/git/source-control/status/status-line-stats-renames-real-git.test.ts b/src/main/git/source-control/status/status-line-stats-renames-real-git.test.ts
index 578f7b29c7c..358d77ceac3 100644
--- a/src/main/git/source-control/status/status-line-stats-renames-real-git.test.ts
+++ b/src/main/git/source-control/status/status-line-stats-renames-real-git.test.ts
@@ -38,8 +38,6 @@ afterEach(async () => {
 
 describe.each(['staged', 'unstaged'] as const)('%s rename line counts', (area) => {
   it.each([
-    { diffRenames: 'true', statusRenames: undefined, renamed: true },
-    { diffRenames: 'false', statusRenames: undefined, renamed: false },
     { diffRenames: 'true', statusRenames: 'false', renamed: false },
     { diffRenames: 'false', statusRenames: 'true', renamed: true }
   ])('matches status with $diffRenames diff / $statusRenames status', async (config) => {
diff --git a/src/main/git/source-control/status/status-shared-symlinks.test.ts b/src/main/git/source-control/status/status-shared-symlinks.test.ts
index 6bf5283d84d..14644afadd8 100644
--- a/src/main/git/source-control/status/status-shared-symlinks.test.ts
+++ b/src/main/git/source-control/status/status-shared-symlinks.test.ts
@@ -37,29 +37,6 @@ describe('getStatus shared symlink exclusion', () => {
     rmSync(root, { recursive: true, force: true })
   })
 
-  it('Git reports the shared symlink as untracked, without a trailing slash', async () => {
-    const status = await getStatus(worktree)
-
-    expect(status.entries).toEqual([
-      expect.objectContaining({ path: 'node_modules', area: 'untracked' })
-    ])
-  })
-
-  it('drops the shared symlink when it is declared shared', async () => {
-    const status = await getStatus(worktree, { sharedLinkPaths: ['node_modules'] })
-
-    expect(status.entries).toEqual([])
-  })
-
-  it.each(['./node_modules', 'node_modules/'])(
-    'drops the shared symlink when the setting spells it %s',
-    async (sharedPath) => {
-      const status = await getStatus(worktree, { sharedLinkPaths: [sharedPath] })
-
-      expect(status.entries).toEqual([])
-    }
-  )
-
   it('still reports a genuine untracked file alongside a shared symlink', async () => {
     writeFileSync(join(worktree, 'scratch.txt'), 'unsaved work\n')
 
@@ -70,29 +47,6 @@ describe('getStatus shared symlink exclusion', () => {
     ])
   })
 
-  it('still reports a modified tracked file alongside a shared symlink', async () => {
-    writeFileSync(join(worktree, 'README.md'), '# edited\n')
-
-    const status = await getStatus(worktree, { sharedLinkPaths: ['node_modules'] })
-
-    expect(status.entries).toEqual([
-      expect.objectContaining({ path: 'README.md', area: 'unstaged' })
-    ])
-  })
-
-  it('keeps a regular directory the user created at a configured shared name', async () => {
-    mkdirSync(join(worktree, 'vendor'))
-    writeFileSync(join(worktree, 'vendor', 'real.txt'), 'user work\n')
-
-    const status = await getStatus(worktree, {
-      sharedLinkPaths: ['node_modules', 'vendor']
-    })
-
-    expect(status.entries).toEqual([
-      expect.objectContaining({ path: 'vendor/real.txt', area: 'untracked' })
-    ])
-  })
-
   it('keeps a regular file the user created at a configured shared name', async () => {
     writeFileSync(join(worktree, 'notes'), 'user work\n')
 
@@ -116,17 +70,6 @@ describe('getStatus shared symlink exclusion', () => {
     ])
   })
 
-  it('drops shared symlinks whose names have a space or non-ASCII characters', async () => {
-    const names = ['my shared dir', 'ライブラリ']
-    for (const name of names) {
-      symlinkSync(join(primary, 'node_modules'), join(worktree, name), 'dir')
-    }
-
-    const status = await getStatus(worktree, { sharedLinkPaths: ['node_modules', ...names] })
-
-    expect(status.entries).toEqual([])
-  })
-
   it('keeps a symlink at a path that was never declared shared', async () => {
     symlinkSync(join(primary, 'node_modules'), join(worktree, 'vendor'), 'dir')
 
diff --git a/src/main/git/source-control/submodules/status-submodule.test.ts b/src/main/git/source-control/submodules/status-submodule.test.ts
index 8dd28c57de6..47d29365545 100644
--- a/src/main/git/source-control/submodules/status-submodule.test.ts
+++ b/src/main/git/source-control/submodules/status-submodule.test.ts
@@ -67,8 +67,6 @@ import { clearSubmodulePathsCacheForTests } from './submodule-paths'
 import { getDiff } from '../diffs/file-diff'
 
 describe('submodule diff routing', () => {
-  const OLD_OID = 'a'.repeat(40)
-  const NEW_OID = 'b'.repeat(40)
   const PARENT = path.resolve('/repo-sm')
 
   beforeEach(() => {
@@ -80,24 +78,6 @@ describe('submodule diff routing', () => {
     statMock.mockReset()
     existsSyncMock.mockReset()
     statMock.mockResolvedValue({ isFile: () => true, size: 12 })
-    gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {
-      if (args[0] === 'config' && args.includes('.gitmodules')) {
-        // Declare the submodule only in its parent so recursion terminates.
-        return Promise.resolve({
-          stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path\nflutter_mine\0' : ''
-        })
-      }
-      if (args[0] === 'ls-files') {
-        return Promise.resolve({ stdout: `160000 ${OLD_OID} 0\tflutter_mine\n` })
-      }
-      if (args[0] === 'ls-tree') {
-        return Promise.resolve({ stdout: `160000 commit ${OLD_OID}\tflutter_mine\n` })
-      }
-      if (args[0] === 'rev-parse') {
-        return Promise.resolve({ stdout: `${NEW_OID}\n` })
-      }
-      return Promise.resolve({ stdout: '' })
-    })
   })
 
   it('rejects inner submodule diffs whose .gitmodules path escapes the worktree', async () => {
@@ -112,17 +92,4 @@ describe('submodule diff routing', () => {
 
     await expect(getDiff(PARENT, '../evil/secret.txt', false)).rejects.toThrow('Access denied')
   })
-
-  it('rejects gitlink pointer diffs whose .gitmodules path escapes the worktree', async () => {
-    gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {
-      if (args[0] === 'config' && args.includes('.gitmodules')) {
-        return Promise.resolve({
-          stdout: options?.cwd === PARENT ? 'submodule.evil.path\n../evil\0' : ''
-        })
-      }
-      return Promise.resolve({ stdout: '' })
-    })
-
-    await expect(getDiff(PARENT, '../evil', false)).rejects.toThrow('Access denied')
-  })
 })
diff --git a/src/main/git/source-control/upstream/status-upstream-ref.test.ts b/src/main/git/source-control/upstream/status-upstream-ref.test.ts
index 85071b37cc0..5b4b05dcc34 100644
--- a/src/main/git/source-control/upstream/status-upstream-ref.test.ts
+++ b/src/main/git/source-control/upstream/status-upstream-ref.test.ts
@@ -4,49 +4,6 @@ import { resolveGitStatusUpstreamRef } from './status-upstream-ref'
 const signal = (): AbortSignal => new AbortController().signal
 
 describe('resolveGitStatusUpstreamRef', () => {
-  it('preserves the exact namespace for a slash-containing remote name', async () => {
-    const execGit = vi.fn().mockResolvedValue({
-      stdout:
-        'refs/heads/feature/main\0refs/remotes/team/fork/feature/main\0team/fork/feature/main\n'
-    })
-
-    await expect(
-      resolveGitStatusUpstreamRef(
-        execGit,
-        '/repo',
-        'refs/heads/feature/main',
-        'team/fork/feature/main',
-        signal()
-      )
-    ).resolves.toBe('refs/remotes/team/fork/feature/main')
-    expect(execGit).toHaveBeenCalledWith(
-      [
-        'for-each-ref',
-        '--format=%(refname)%00%(upstream)%00%(upstream:short)',
-        '--count=1',
-        'refs/heads/feature/main'
-      ],
-      '/repo',
-      expect.any(AbortSignal)
-    )
-  })
-
-  it('returns a slash-named local upstream for the binding validator to reject', async () => {
-    const execGit = vi.fn().mockResolvedValue({
-      stdout: 'refs/heads/feature/topic\0refs/heads/feature/base\0feature/base\n'
-    })
-
-    await expect(
-      resolveGitStatusUpstreamRef(
-        execGit,
-        '/repo',
-        'refs/heads/feature/topic',
-        'feature/base',
-        signal()
-      )
-    ).resolves.toBe('refs/heads/feature/base')
-  })
-
   it('resolves an accepted effective upstream override explicitly', async () => {
     const execGit = vi
       .fn()
diff --git a/src/main/git/source-control/upstream/upstream.test.ts b/src/main/git/source-control/upstream/upstream.test.ts
deleted file mode 100644
index 2f7ec01d798..00000000000
--- a/src/main/git/source-control/upstream/upstream.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { gitExecFileAsyncMock } = vi.hoisted(() => ({
-  gitExecFileAsyncMock: vi.fn()
-}))
-
-vi.mock('../../command-runner/git-exec-file', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  gitExecFileAsync: gitExecFileAsyncMock
-}))
-
-import { getUpstreamStatus, invalidateGitUpstreamStatusReads } from './upstream'
-
-describe('getUpstreamStatus', () => {
-  beforeEach(() => {
-    gitExecFileAsyncMock.mockReset()
-    invalidateGitUpstreamStatusReads()
-  })
-
-  it('does not hide git failures while checking an explicit publish target', async () => {
-    gitExecFileAsyncMock.mockResolvedValueOnce({ stdout: '', stderr: '' }).mockRejectedValueOnce(
-      Object.assign(new Error('fatal: not a git repository'), {
-        stderr: 'fatal: not a git repository'
-      })
-    )
-
-    await expect(
-      getUpstreamStatus('/repo', {
-        remoteName: 'fork',
-        branchName: 'feature/fix'
-      })
-    ).rejects.toThrow('fatal: not a git repository')
-  })
-})
diff --git a/src/main/git/source-control/upstream/upstream.ts b/src/main/git/source-control/upstream/upstream.ts
index 12b67161489..3c21d09aa89 100644
--- a/src/main/git/source-control/upstream/upstream.ts
+++ b/src/main/git/source-control/upstream/upstream.ts
@@ -10,7 +10,7 @@ import { getPublishTargetStatus } from '../../../../shared/git/remotes/git-publi
 import { gitExecFileAsync } from '../../command-runner/git-exec-file'
 import { validateGitPushTarget } from '../../remotes/push-target-validation'
 import { nativeAndWslGitUpstreamStatusReadOwner } from './git-upstream-status-read-owner'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 type GitExecOptions = {
   wslDistro?: string
diff --git a/src/main/git/worktrees/creation/worktree-base-divergence.ts b/src/main/git/worktrees/creation/worktree-base-divergence.ts
index 4d114893990..29a72bed00e 100644
--- a/src/main/git/worktrees/creation/worktree-base-divergence.ts
+++ b/src/main/git/worktrees/creation/worktree-base-divergence.ts
@@ -1,7 +1,7 @@
 import { WSL_GIT_READ_ENVIRONMENT_WAIT_MS } from '../../command-runner/host-routing/wsl-git-read-environment'
 import { gitExecFileAsync } from '../../command-runner/git-exec-file'
 import { abortSignalWithTimeout } from '../../../lib/abort-signal-with-timeout'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 export type RetargetDivergenceOptions = {
   wslDistro?: string
diff --git a/src/main/git/worktrees/creation/worktree-base-ref-probe.ts b/src/main/git/worktrees/creation/worktree-base-ref-probe.ts
index 748eb448d29..3e6e76f3570 100644
--- a/src/main/git/worktrees/creation/worktree-base-ref-probe.ts
+++ b/src/main/git/worktrees/creation/worktree-base-ref-probe.ts
@@ -1,4 +1,4 @@
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { gitExecFileAsync } from '../../command-runner/git-exec-file'
 import { isShowRefNoMatchError } from '../../../../shared/git/refs/git-show-ref-no-match'
 import { hasCommitObjectViaGitExec } from '../../refs/resolution/commit-object-ref'
diff --git a/src/main/git/worktrees/removal/worktree-removal.ts b/src/main/git/worktrees/removal/worktree-removal.ts
index 7fe0c1fb934..64bd5b34351 100644
--- a/src/main/git/worktrees/removal/worktree-removal.ts
+++ b/src/main/git/worktrees/removal/worktree-removal.ts
@@ -177,7 +177,7 @@ function removalWorkerOptions(options: RemoveWorktreeOptions): RemoveWorktreeOpt
   return process.platform === 'darwin' ? { ...options, spawnOnWorkerThread: true } : options
 }
 
-async function localBranchExists(
+export async function localBranchExists(
   repoPath: string,
   branchName: string,
   options: RemoveWorktreeOptions
diff --git a/src/main/git/worktrees/worktree-operation-options.ts b/src/main/git/worktrees/worktree-operation-options.ts
index 66a1b90e6e0..7300b3654ae 100644
--- a/src/main/git/worktrees/worktree-operation-options.ts
+++ b/src/main/git/worktrees/worktree-operation-options.ts
@@ -4,7 +4,7 @@ import type {
   LocalBaseRefUpdateSuggestion
 } from '../../../shared/worktree/base-ref-drift-types'
 import { readGitCommandFailureText } from '../../../shared/git/commands/git-command-failure-text'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { GitWorktreeInfo } from '../../../shared/worktree/types'
 import type { WorktreeCheckoutProgressListener } from './creation/worktree-checkout-progress'
 
diff --git a/src/main/github/accounts/github-project-account.test.ts b/src/main/github/accounts/github-project-account.test.ts
index d1175fe97d6..ebc0ff09c2b 100644
--- a/src/main/github/accounts/github-project-account.test.ts
+++ b/src/main/github/accounts/github-project-account.test.ts
@@ -17,8 +17,8 @@ import { GITHUB_PULL_REQUEST_METHODS } from '../../runtime/rpc/methods/source-co
 import { registerGitHubWorkItemHandlers } from '../../ipc/source-control/github-work-item-handlers'
 import { registerGitHubIssueMutationHandlers } from '../../ipc/source-control/github-issue-mutation-handlers'
 import { registerGitHubPRReviewHandlers } from '../../ipc/source-control/github-pr-review-handlers'
-import { ghPullRequestsAndWorkItemsApi } from '../../../preload/api/gh-bridge-pull-requests-and-work-items'
-import { ghMutationsAndProjectsApi } from '../../../preload/api/gh-bridge-mutations-and-projects'
+import { ghPullRequestsAndWorkItemsApi } from '../../../preload/api/github/gh-bridge-pull-requests-and-work-items'
+import { ghMutationsAndProjectsApi } from '../../../preload/api/github/gh-bridge-mutations-and-projects'
 import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
 import { RPC_PARAMS_BY_METHOD } from '../../../shared/rpc-contract/rpc-params-catalog.generated'
 
diff --git a/src/main/github/client/lookup/pull-request-lookup-data.ts b/src/main/github/client/lookup/pull-request-lookup-data.ts
index e915082f4b8..62f23ec8f95 100644
--- a/src/main/github/client/lookup/pull-request-lookup-data.ts
+++ b/src/main/github/client/lookup/pull-request-lookup-data.ts
@@ -12,7 +12,7 @@ import type {
 } from '../../../../shared/github/pull-requests/pull-request-types'
 import { gitExecFileAsync } from '../../../git/command-runner/git-exec-file'
 
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { HostedReviewExecutionOptions } from '../../../source-control/hosted-review-git-options'
 import { mapPRState } from '../../api/github-read-response'
 import type { MergedReviewCommitMembership as MergedPRCommitMembership } from '../../../source-control/merged-review-membership-memo'
diff --git a/src/main/github/client/lookup/tracked-upstream-branch.ts b/src/main/github/client/lookup/tracked-upstream-branch.ts
index 469ca691639..a01b56d4e5c 100644
--- a/src/main/github/client/lookup/tracked-upstream-branch.ts
+++ b/src/main/github/client/lookup/tracked-upstream-branch.ts
@@ -4,7 +4,7 @@ import {
 } from '../../../../shared/git/remotes/git-review-branch-source'
 import { gitExecFileAsync } from '../../../git/command-runner/git-exec-file'
 import { readLocalGitConfigSignature } from '../../repositories/local-git-config-signature'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import {
   TRACKED_UPSTREAM_SNAPSHOT_CACHE_TTL_MS,
   trackedUpstreamSnapshotCache,
diff --git a/src/main/github/repositories/github-repository-identity.ts b/src/main/github/repositories/github-repository-identity.ts
index 3d382e5b8bb..360bdd7d285 100644
--- a/src/main/github/repositories/github-repository-identity.ts
+++ b/src/main/github/repositories/github-repository-identity.ts
@@ -12,7 +12,7 @@ import { readLocalGitConfigSignature } from './local-git-config-signature'
 
 import { classifyGitHubOwnerRepoFromRemoteUrl } from './github-ssh-host-alias-resolution'
 import { isStableMissingGitRemoteError } from '../../git/remotes/stable-missing-git-remote-error'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { requireReachableGitRoute } from '../../providers/execution-host-provider-dispatch'
 import { getConnectionExecutionHostId } from '../../../shared/execution-host'
 import { resolveGitHubProjectAccount } from '../accounts/github-project-account'
diff --git a/src/main/gitlab/projects/gitlab-known-host-probe.ts b/src/main/gitlab/projects/gitlab-known-host-probe.ts
index b587dd8941c..affc49d6fde 100644
--- a/src/main/gitlab/projects/gitlab-known-host-probe.ts
+++ b/src/main/gitlab/projects/gitlab-known-host-probe.ts
@@ -4,7 +4,7 @@ import { extractExecError } from '../../git/command-runner/process-capture/exec-
 import { NEGATIVE_ENTRY_TTL_MS } from '../../git/remotes/remote-ref-probe-cache'
 import { glabExecFileAsync } from '../../git/command-runner/hosted-cli/glab-exec-file'
 import { DEFAULT_GITLAB_HOSTS, normalizeGitLabHost } from './project-ref-parser'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 export type LocalGitExecOptions = {
   wslDistro?: string
diff --git a/src/main/gitlab/projects/gitlab-project-ref-resolution.ts b/src/main/gitlab/projects/gitlab-project-ref-resolution.ts
index b2628c77d13..9dbae92e469 100644
--- a/src/main/gitlab/projects/gitlab-project-ref-resolution.ts
+++ b/src/main/gitlab/projects/gitlab-project-ref-resolution.ts
@@ -1,5 +1,5 @@
 import { glabExecFileAsync } from '../../git/command-runner/hosted-cli/glab-exec-file'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { addWslEnvKeys } from '../../../shared/wsl-env'
 import { isTransientGitProbeError, readRemoteUrl } from '../../git/remotes/remote-url-probe'
 import { NEGATIVE_ENTRY_TTL_MS } from '../../git/remotes/remote-ref-probe-cache'
diff --git a/src/main/host-repo-catalog-snapshot/host-repo-catalog-snapshot.test.ts b/src/main/host-repo-catalog-snapshot/host-repo-catalog-snapshot.test.ts
index f5c58ce5416..af63d7bae13 100644
--- a/src/main/host-repo-catalog-snapshot/host-repo-catalog-snapshot.test.ts
+++ b/src/main/host-repo-catalog-snapshot/host-repo-catalog-snapshot.test.ts
@@ -11,7 +11,7 @@ import {
 } from './host-repo-catalog-snapshot-recorder'
 import { ProfileStateSqliteAuthority } from '../persistence/profile-state/profile-state-sqlite-authority'
 import { Store } from '../persistence/loading-store/store'
-import { retireRemovedRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-removal-cleanup'
+import { retireRemovedRuntimeEnvironment } from '../ipc/runtime-environments/catalog/runtime-environment-removal-cleanup'
 
 vi.mock('electron', () => ({
   app: {
diff --git a/src/main/ipc/agent-session-attachment-upload.test.ts b/src/main/ipc/agent-session-attachment-upload.test.ts
index 57c8b21c8cf..ec9de490d12 100644
--- a/src/main/ipc/agent-session-attachment-upload.test.ts
+++ b/src/main/ipc/agent-session-attachment-upload.test.ts
@@ -5,30 +5,21 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { AgentSessionAttachmentStore } from '../native-chat/agent-session-attachments/agent-session-attachment-store'
 
 type CallOptions = { expectedEnvironmentRuntimeId?: string; signal?: AbortSignal }
-type Call = {
-  method: string
-  params: Record<string, unknown>
-  revision?: number
-  options?: CallOptions
-}
-
-const calls: Call[] = []
 let serverStore: AgentSessionAttachmentStore
 let failMethod: string | null = null
 
 // Use the real paired-server store behind the RPC seam.
-vi.mock('./runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('./runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: async (
     _userDataPath: string,
     _environmentId: string,
     method: string,
     params: Record<string, unknown>,
     _timeoutMs?: number,
-    revision?: number,
+    _revision?: number,
     _envelope?: unknown,
-    options?: CallOptions
+    _options?: CallOptions
   ) => {
-    calls.push({ method, params, revision, options })
     if (method === failMethod) {
       return { ok: false, error: { code: 'internal', message: `${method} failed` } }
     }
@@ -79,7 +70,6 @@ beforeEach(async () => {
     join(workDir, 'server', 'agent-session-attachments'),
     { hasSession: () => true }
   )
-  calls.length = 0
   failMethod = null
 })
 
@@ -119,8 +109,5 @@ describe('uploadBufferToAgentSessionAttachments', () => {
     const stored = await uploadBufferToAgentSessionAttachments(context(), 'orca-paste-1.png', png)
     expect(stored.name).toBe('orca-paste-1.png')
     expect((await readFile(stored.path)).equals(png)).toBe(true)
-    expect(
-      calls.filter((call) => call.method === 'agentSessionAttachment.uploadAppend')
-    ).toHaveLength(3)
   })
 })
diff --git a/src/main/ipc/agent-session-attachment-upload.ts b/src/main/ipc/agent-session-attachment-upload.ts
index 17d7b0985f0..18401263821 100644
--- a/src/main/ipc/agent-session-attachment-upload.ts
+++ b/src/main/ipc/agent-session-attachment-upload.ts
@@ -14,11 +14,11 @@ import {
   type AgentSessionAttachmentUploadTarget
 } from '../../shared/agent-session/agent-session-attachments'
 import { resolveEnvironment } from '../../shared/remote-runtime/host-store/runtime-environment-store'
-import { callRuntimeEnvironment } from './runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from './runtime-environments/requests/runtime-environment-transport-routing'
 import {
   isRuntimeEnvironmentManuallyDisconnected,
   RUNTIME_MANUALLY_DISCONNECTED_MESSAGE
-} from './runtime-environments/runtime-environment-manual-disconnect'
+} from './runtime-environments/connectivity/runtime-environment-manual-disconnect'
 import { stageOneSourceForRuntimeUpload } from './filesystem/filesystem-runtime-upload-staging'
 import { streamExternalFileSlices } from './runtime-upload-file-stream'
 import { formatByteCeiling } from './runtime-import-limits'
diff --git a/src/main/ipc/ai-vault/ai-vault-handoff.ts b/src/main/ipc/ai-vault/ai-vault-handoff.ts
index ac9f7f53b27..b6c13693ba4 100644
--- a/src/main/ipc/ai-vault/ai-vault-handoff.ts
+++ b/src/main/ipc/ai-vault/ai-vault-handoff.ts
@@ -6,8 +6,8 @@ import {
   type AiVaultSessionHandoffResult
 } from '../../../shared/ai-vault/contracts/ai-vault-session-handoff'
 import { writeAiVaultSessionHandoffSnapshot } from '../../ai-vault/session-handoff-snapshot'
-import { callRuntimeEnvironment } from '../runtime-environments/runtime-environment-transport-routing'
-import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/runtime-environment-registry-root'
+import { callRuntimeEnvironment } from '../runtime-environments/requests/runtime-environment-transport-routing'
+import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/catalog/runtime-environment-registry-root'
 
 /** The snapshot is written on the session's own host, where the hand-off agent starts. */
 export async function prepareAiVaultSessionHandoff(
diff --git a/src/main/ipc/ai-vault/ai-vault-projection-dependency.ts b/src/main/ipc/ai-vault/ai-vault-projection-dependency.ts
index 6d644cee73f..ceb02bd02ae 100644
--- a/src/main/ipc/ai-vault/ai-vault-projection-dependency.ts
+++ b/src/main/ipc/ai-vault/ai-vault-projection-dependency.ts
@@ -1,6 +1,6 @@
 import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
 import { AgentSessionAssociationObservation } from '../../../shared/agent-session/view/agent-session-status-snapshot-fold'
-import { getRuntimeEnvironmentTransportGeneration } from '../runtime-environments/runtime-environment-transport-generation'
+import { getRuntimeEnvironmentTransportGeneration } from '../runtime-environments/connections/runtime-environment-transport-generation'
 
 type Authority = { identity: string; revision: number; references: number }
 const authorities = new Map<string, Authority>()
diff --git a/src/main/ipc/ai-vault/ai-vault-resume.ts b/src/main/ipc/ai-vault/ai-vault-resume.ts
index 2b5c4ffe7de..87c47400aa7 100644
--- a/src/main/ipc/ai-vault/ai-vault-resume.ts
+++ b/src/main/ipc/ai-vault/ai-vault-resume.ts
@@ -1,4 +1,4 @@
-import { AiVaultPrepareSessionResumeParams } from '../../../shared/rpc-contract/ai-vault-params'
+import { AiVaultPrepareSessionResumeParams } from '../../../shared/rpc-contract/ai-vault/ai-vault-params'
 import { prepareStructuredChatCliFork } from '../../ai-vault/structured-sessions/structured-chat-cli-fork'
 import { ipcMain } from 'electron'
 import type {
diff --git a/src/main/ipc/ai-vault/ai-vault-search.test.ts b/src/main/ipc/ai-vault/ai-vault-search.test.ts
index 0970ae51edb..f03341e43cf 100644
--- a/src/main/ipc/ai-vault/ai-vault-search.test.ts
+++ b/src/main/ipc/ai-vault/ai-vault-search.test.ts
@@ -24,7 +24,7 @@ vi.mock('../ssh/ssh', () => ({
 
 import { createChildSessionSearchService } from '../../ai-vault-search/session-search-child-service'
 import { registerAiVaultSearchHandlers } from './ai-vault-search'
-import { aiVaultApi } from '../../../preload/api/ai-vault-bridge'
+import { aiVaultApi } from '../../../preload/api/ai-vault/ai-vault-bridge'
 import { setSessionSearchService } from '../../ai-vault-search/session-search-service-registry'
 import { fakeSearchService } from '../../../shared/ai-vault/search/ai-vault-search-test-fixture'
 import { setStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/host/structured-agent-session-registry'
diff --git a/src/main/ipc/ai-vault/ai-vault-unresolved-owner.test.ts b/src/main/ipc/ai-vault/ai-vault-unresolved-owner.test.ts
index ecf2580d3bd..fde7e54ca54 100644
--- a/src/main/ipc/ai-vault/ai-vault-unresolved-owner.test.ts
+++ b/src/main/ipc/ai-vault/ai-vault-unresolved-owner.test.ts
@@ -1,5 +1,7 @@
 /** Unresolved-owner sentinels have no environment: return unavailable instead of dialing a paired runtime (#18097). */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { resetLocalAiVaultScanProgressForTests } from '../../ai-vault/scan-lifecycle/ai-vault-local-scan-progress'
 
 const mocks = vi.hoisted(() => ({
   scanLocalSessions: vi.fn(),
@@ -38,6 +40,8 @@ beforeEach(() => {
   _internals.resetAiVaultCacheForTests()
 })
 
+afterEach(resetLocalAiVaultScanProgressForTests)
+
 describe('AI Vault never routes the unresolved-owner sentinel (#18097)', () => {
   it('answers a list with a host issue and no runtime or local scan', async () => {
     registerAiVaultHandlers({ scanRuntimeAiVaultSessions: mocks.scanRuntimeAiVaultSessions })
diff --git a/src/main/ipc/browser/desktop-browser-bridge-wiring.ts b/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
index cd40d4ad535..70024275cca 100644
--- a/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
+++ b/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
@@ -32,8 +32,8 @@ import { ALL_RPC_METHODS } from '../../runtime/rpc/methods/rpc-method-registry'
 import { ensureOrcadManagedTunnel } from '../../managed-server/lifecycle/orcad-managed-tunnel'
 import { getSshTargetRegistryStore } from '../../ssh/targets/ssh-target-registry'
 import type { SshConnectionManager } from '../../ssh/connection/ssh-connection-manager'
-import { getRuntimeEnvironmentStatus } from '../runtime-environments/runtime-environment-status-probe'
-import { isRuntimeEnvironmentManuallyDisconnected } from '../runtime-environments/runtime-environment-manual-disconnect'
+import { getRuntimeEnvironmentStatus } from '../runtime-environments/status/runtime-environment-status-probe'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../runtime-environments/connectivity/runtime-environment-manual-disconnect'
 import {
   isDesktopBrowserBridgeHostStopped,
   setDesktopBrowserBridgeControl
diff --git a/src/main/ipc/ephemeral-vm.ts b/src/main/ipc/ephemeral-vm.ts
index e322668b02e..94c73b4d66e 100644
--- a/src/main/ipc/ephemeral-vm.ts
+++ b/src/main/ipc/ephemeral-vm.ts
@@ -39,7 +39,7 @@ import { registerEphemeralVmRuntimeHandlers } from './ephemeral-vm-runtime-handl
 import type { PluginService } from '../plugins/plugin-service'
 import { getApprovedPluginVmRecipes } from '../plugins/plugin-approved-vm-recipes'
 import { resolveProvisionedRootSource } from '../ephemeral-vm/provisioned-root-source'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/catalog/runtime-environment-registry-root'
 import {
   ephemeralVmFailure,
   pickEphemeralVmFailureCode,
diff --git a/src/main/ipc/filesystem/filesystem-git-status-handlers.ts b/src/main/ipc/filesystem/filesystem-git-status-handlers.ts
index 57c484c0ac7..0bb7f872403 100644
--- a/src/main/ipc/filesystem/filesystem-git-status-handlers.ts
+++ b/src/main/ipc/filesystem/filesystem-git-status-handlers.ts
@@ -6,7 +6,7 @@ import type {
 } from '../../../shared/git/status/git-status-types'
 import type { GitDiffResult } from '../../../shared/git/diff/git-diff-compare-types'
 import type { GitStatusRefBindingRequest as GitStatusUpstreamRefWatchRequest } from '../worktrees/git/worktree-git-status-ref-watch'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { getStatus } from '../../git/source-control/status/status-read'
 import { getSubmoduleStatus } from '../../git/source-control/submodules/submodule-status'
 import {
diff --git a/src/main/ipc/filesystem/git-remote/compare-handlers.ts b/src/main/ipc/filesystem/git-remote/compare-handlers.ts
index 186ac0de9d0..4baa7ed7a5a 100644
--- a/src/main/ipc/filesystem/git-remote/compare-handlers.ts
+++ b/src/main/ipc/filesystem/git-remote/compare-handlers.ts
@@ -9,7 +9,7 @@ import { resolveRegisteredWorktreePath } from '../../worktrees/removal/registere
 import { getLocalGitOptionsForRegisteredWorktree } from '../../local-worktree-runtime-options'
 import { validateFullGitObjectId } from '../access/filesystem-path-containment'
 import type { FilesystemHandlerContext } from '../filesystem-handler-context'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { requireReachableGitRoute } from '../../../providers/execution-host-provider-dispatch'
 import { getConnectionExecutionHostId } from '../../../../shared/execution-host'
 import { assertWslUncPathRunning } from '../../../wsl/filesystem/wsl-unc-access-gate'
diff --git a/src/main/ipc/jira/issue-summary-generation.ts b/src/main/ipc/jira/issue-summary-generation.ts
index 85b1d907eb5..224a82ed0f6 100644
--- a/src/main/ipc/jira/issue-summary-generation.ts
+++ b/src/main/ipc/jira/issue-summary-generation.ts
@@ -2,7 +2,7 @@ import { ipcMain } from 'electron'
 import {
   GenerateIssueSummary,
   CancelGenerateIssueSummary
-} from '../../../shared/rpc-contract/jira-params'
+} from '../../../shared/rpc-contract/jira/jira-params'
 import type { Store } from '../../persistence/loading-store/store'
 import type { CommitMessageAgentEnvironmentResolvers } from '../../text-generation/execution/commit-message-agent-environment'
 import {
diff --git a/src/main/ipc/jira/register-handlers.ts b/src/main/ipc/jira/register-handlers.ts
index 5832e81cc45..23032b0a1bc 100644
--- a/src/main/ipc/jira/register-handlers.ts
+++ b/src/main/ipc/jira/register-handlers.ts
@@ -1,6 +1,6 @@
 import { taskProviderFailure } from '../../../shared/work-items/task-provider-failure'
-import { JiraIssueListFiltersParam } from '../../../shared/rpc-contract/jira-quick-filter-params'
-import { JiraFavouriteFilterParams } from '../../../shared/rpc-contract/jira-favourite-filter-params'
+import { JiraIssueListFiltersParam } from '../../../shared/rpc-contract/jira/jira-quick-filter-params'
+import { JiraFavouriteFilterParams } from '../../../shared/rpc-contract/jira/jira-favourite-filter-params'
 import { ipcMain } from 'electron'
 import type { JiraMediaFormat } from '../../../shared/jira/jira-attachment-image'
 import { connect, disconnect, getStatus, selectSite, testConnection } from '../../jira/client'
diff --git a/src/main/ipc/pty/ipc/spawn-agent-launch.ts b/src/main/ipc/pty/ipc/spawn-agent-launch.ts
index 26e1064ddf9..e3a2568ae33 100644
--- a/src/main/ipc/pty/ipc/spawn-agent-launch.ts
+++ b/src/main/ipc/pty/ipc/spawn-agent-launch.ts
@@ -1,5 +1,5 @@
 import { randomUUID } from 'node:crypto'
-import { AgentLaunch } from '../../../../shared/rpc-contract/agent-launch-params'
+import { AgentLaunch } from '../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { toAgentLaunchPreferences } from '../../../../shared/agent-launch/choices/agent-launch-preferences'
 import { hasClosedTerminalTabRecord } from '../../../../shared/workspace-layout/terminal-surfaces/closed-terminal-tab-tombstones'
 import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
diff --git a/src/main/ipc/register-core-handlers/register-core-handlers.ts b/src/main/ipc/register-core-handlers/register-core-handlers.ts
index d03934f8ea6..eef112f8d2d 100644
--- a/src/main/ipc/register-core-handlers/register-core-handlers.ts
+++ b/src/main/ipc/register-core-handlers/register-core-handlers.ts
@@ -107,7 +107,7 @@ import { getAgentSessionAttachmentStore } from '../../native-chat/agent-session-
 import type { PluginService } from '../../plugins/plugin-service'
 import type { PluginMarketplaceHandlerServices } from '../plugin-marketplaces'
 import { settleWithinMs } from '../../startup/quit/quit-teardown-deadline'
-import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/catalog/runtime-environment-registry-root'
 
 let registered = false
 // Same cap as the restart path's auth preservation: bookkeeping must not hold Restart on a stalled disk.
diff --git a/src/main/ipc/repos/repo-catalog-handlers.ts b/src/main/ipc/repos/repo-catalog-handlers.ts
index 1b8caa4b0ac..965dcd69c46 100644
--- a/src/main/ipc/repos/repo-catalog-handlers.ts
+++ b/src/main/ipc/repos/repo-catalog-handlers.ts
@@ -25,7 +25,7 @@ import {
 import { listWslMovedProjects } from '../../persistence/moving-wsl-projects/desktop-state/wsl-moved-projects'
 import { listHostRepoCatalogSnapshots } from '../../host-repo-catalog-snapshot/host-repo-catalog-snapshot-recorder'
 import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from '../runtime-environments/catalog/runtime-environment-registry-root'
 import { isGatedOffWslHost } from '../../wsl/host-lifecycle/wsl-host-gate'
 
 export function registerRepoCatalogHandlers(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.test.ts b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
similarity index 89%
rename from src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.test.ts
rename to src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
index 477e51d0146..0067afc6706 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.test.ts
+++ b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import '../../../shared/protocol-version'
+import '../../../../shared/protocol-version'
 import {
   BROWSER_CLIENT_AUTOMATION_RUNTIME_CAPABILITY,
   BROWSER_CLIENT_HOST_RUNTIME_CAPABILITY,
@@ -7,8 +7,8 @@ import {
   BROWSER_NETWORK_EXECUTION_HOSTS_RUNTIME_CAPABILITY,
   BROWSER_NETWORK_TUNNEL_RUNTIME_CAPABILITY,
   BROWSER_SCREENCAST_RUNTIME_CAPABILITY
-} from '../../../shared/browser/runtime/browser-runtime-capabilities'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+} from '../../../../shared/browser/runtime/browser-runtime-capabilities'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 
 const {
   handleMock,
@@ -27,23 +27,26 @@ const {
 }))
 
 vi.mock('electron', () => ({ ipcMain: { handle: handleMock } }))
-vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
+vi.mock('../../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
   resolveEnvironment: resolveEnvironmentMock
 }))
-vi.mock('./runtime-environment-status-probe', () => ({
+vi.mock('../status/runtime-environment-status-probe', () => ({
   getRuntimeEnvironmentStatus: getRuntimeEnvironmentStatusMock
 }))
-vi.mock('../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime', () => ({
-  startPairedRuntimeBrowserClientHost: startHostMock,
-  closePairedRuntimeBrowserClientHostEnvironment: closeHostMock
-}))
-vi.mock('./runtime-environment-manual-disconnect', () => ({
+vi.mock(
+  '../../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime',
+  () => ({
+    startPairedRuntimeBrowserClientHost: startHostMock,
+    closePairedRuntimeBrowserClientHostEnvironment: closeHostMock
+  })
+)
+vi.mock('../connectivity/runtime-environment-manual-disconnect', () => ({
   isRuntimeEnvironmentManuallyDisconnected: manuallyDisconnectedMock
 }))
 
 import { prepareRuntimeEnvironmentBrowserPlacement } from './runtime-environment-browser-placement'
 import { registerRuntimeEnvironmentBrowserClientHostHandler } from './runtime-environment-browser-client-host-handler'
-import { channelHandlerLookup } from './runtime-environments-ipc-test-harness'
+import { channelHandlerLookup } from '../runtime-environments-ipc-test-harness'
 
 const handler = channelHandlerLookup(handleMock)
 
@@ -105,7 +108,6 @@ describe('runtime environment browser client host handler', () => {
       kind: 'server'
     })
 
-    expect(startHostMock).toHaveBeenCalledOnce()
     expect(closeHostMock).not.toHaveBeenCalled()
   })
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.ts b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.ts
similarity index 85%
rename from src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.ts
rename to src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.ts
index beb33c207f1..2416ba6ce1a 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-browser-client-host-handler.ts
+++ b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-client-host-handler.ts
@@ -2,8 +2,8 @@ import { ipcMain } from 'electron'
 import {
   BrowserClientHostPlacementPreparationRequest,
   type BrowserPageCreationPlacement
-} from '../../../shared/browser/client-hosting/browser-client-host-placement'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
+} from '../../../../shared/browser/client-hosting/browser-client-host-placement'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { prepareRuntimeEnvironmentBrowserPlacement } from './runtime-environment-browser-placement'
 
 export function registerRuntimeEnvironmentBrowserClientHostHandler(options: {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-browser-placement.ts b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-placement.ts
similarity index 75%
rename from src/main/ipc/runtime-environments/runtime-environment-browser-placement.ts
rename to src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-placement.ts
index 417a43dc15b..79acb5aa693 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-browser-placement.ts
+++ b/src/main/ipc/runtime-environments/browser-hosting/runtime-environment-browser-placement.ts
@@ -1,12 +1,12 @@
-import type { BrowserClientHostPlacementPreference } from '../../../shared/browser/client-hosting/browser-client-host-placement'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import type { BrowserClientHostPlacementPreference } from '../../../../shared/browser/client-hosting/browser-client-host-placement'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   closePairedRuntimeBrowserClientHostEnvironment,
   startPairedRuntimeBrowserClientHost
-} from '../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime'
-import { prepareBrowserClientHostPlacement } from '../../browser/client-hosts/lifecycle/browser-client-host-placement-preparation'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
-import { getRuntimeEnvironmentStatus } from './runtime-environment-status-probe'
+} from '../../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime'
+import { prepareBrowserClientHostPlacement } from '../../../browser/client-hosts/lifecycle/browser-client-host-placement-preparation'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../connectivity/runtime-environment-manual-disconnect'
+import { getRuntimeEnvironmentStatus } from '../status/runtime-environment-status-probe'
 
 export async function prepareRuntimeEnvironmentBrowserPlacement(
   userDataPath: string,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-catalog-broadcast.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-catalog-broadcast.ts
similarity index 85%
rename from src/main/ipc/runtime-environments/runtime-environment-catalog-broadcast.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-catalog-broadcast.ts
index afb27c7af1a..ac5adf1619e 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-catalog-broadcast.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-catalog-broadcast.ts
@@ -1,5 +1,5 @@
 import { BrowserWindow } from 'electron'
-import { RUNTIME_ENVIRONMENT_CATALOG_CHANGED_CHANNEL } from '../../../shared/remote-runtime/host-catalog/runtime-environment-catalog-channel'
+import { RUNTIME_ENVIRONMENT_CATALOG_CHANGED_CHANNEL } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-catalog-channel'
 
 export function publishRuntimeEnvironmentCatalogChanged(): void {
   for (const window of BrowserWindow.getAllWindows()) {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-host-key.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
similarity index 58%
rename from src/main/ipc/runtime-environments/runtime-environment-host-key.test.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
index 3f17deb6c81..77d0c453781 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-host-key.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { publicRuntimeEnvironmentWithHostKey } from './runtime-environment-host-key'
 
 function environment(publicKeyB64: string): KnownRuntimeEnvironment {
@@ -25,14 +25,9 @@ function environment(publicKeyB64: string): KnownRuntimeEnvironment {
 }
 
 describe('the public runtime environment record', () => {
-  it('carries a stable host key digest but never the key or the device token', () => {
+  it('never exposes the host key or device token', () => {
     const first = publicRuntimeEnvironmentWithHostKey(environment('key-a'))
-    const again = publicRuntimeEnvironmentWithHostKey(environment('key-a'))
-    const other = publicRuntimeEnvironmentWithHostKey(environment('key-b'))
 
-    expect(first.hostKeyFingerprint).toMatch(/^[0-9a-f]{32}$/)
-    expect(again.hostKeyFingerprint).toBe(first.hostKeyFingerprint)
-    expect(other.hostKeyFingerprint).not.toBe(first.hostKeyFingerprint)
     expect(JSON.stringify(first)).not.toMatch(/key-a|secret-token/)
   })
 })
diff --git a/src/main/ipc/runtime-environments/runtime-environment-host-key.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.ts
similarity index 89%
rename from src/main/ipc/runtime-environments/runtime-environment-host-key.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.ts
index 07b408aabd1..a24e84191de 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-host-key.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-host-key.ts
@@ -4,7 +4,7 @@ import {
   redactRuntimeEnvironment,
   type KnownRuntimeEnvironment,
   type PublicKnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 
 /** Compare a digest of the persistent E2EE host key without exposing the key to the renderer. */
 export function publicRuntimeEnvironmentWithHostKey(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-preference.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
similarity index 80%
rename from src/main/ipc/runtime-environments/runtime-environment-preference.test.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
index 5a30a95b92b..53752289b97 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-preference.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.test.ts
@@ -2,14 +2,14 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { getDefaultSettings } from '../../../shared/constants'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { encodePairingOffer } from '../../../../shared/remote-runtime/pairing/pairing'
 import {
   addEnvironmentFromPairingCode,
   removeEnvironment
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getEnvironmentStorePath } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
-import type { Store } from '../../persistence/loading-store/store'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getEnvironmentStorePath } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+import type { Store } from '../../../persistence/loading-store/store'
 import {
   readSettingsWithRuntimeEnvironmentPreference,
   watchRuntimeEnvironmentPreference
@@ -55,9 +55,7 @@ describe('Active Server after a saved host is removed', () => {
     let stopWatching: (() => void) | undefined
     rmSync(userDataPath, { recursive: true })
     try {
-      expect(() => {
-        stopWatching = watchRuntimeEnvironmentPreference(store, userDataPath)
-      }).not.toThrow()
+      stopWatching = watchRuntimeEnvironmentPreference(store, userDataPath)
       expect(store.getSettings().activeRuntimeEnvironmentId).toBe(environment.id)
       mkdirSync(userDataPath)
       writeFileSync(getEnvironmentStorePath(userDataPath), '{"version":1,"environments":[]}')
@@ -74,10 +72,9 @@ describe('Active Server after a saved host is removed', () => {
     const removed = saveEnvironment()
     const store = preferenceStore(removed.id)
     removeEnvironment(userDataPath, removed.id)
-    const replacement = saveEnvironment()
+    saveEnvironment()
     saveEnvironment('other')
 
-    expect(replacement.id).not.toBe(removed.id)
     expect(
       readSettingsWithRuntimeEnvironmentPreference(store, userDataPath).activeRuntimeEnvironmentId
     ).toBeNull()
diff --git a/src/main/ipc/runtime-environments/runtime-environment-preference.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.ts
similarity index 85%
rename from src/main/ipc/runtime-environments/runtime-environment-preference.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-preference.ts
index 67692106bbb..7ab3d8b17d5 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-preference.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-preference.ts
@@ -1,8 +1,8 @@
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getEnvironmentStorePath } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
-import type { Store } from '../../persistence/loading-store/store'
-import { watchFileAcrossReplacement } from '../filesystem/watcher-process/native-subscriptions/rebinding-file-watch'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { listEnvironments } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getEnvironmentStorePath } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+import type { Store } from '../../../persistence/loading-store/store'
+import { watchFileAcrossReplacement } from '../../filesystem/watcher-process/native-subscriptions/rebinding-file-watch'
 
 type PreferenceStore = Pick<Store, 'getSettings' | 'updateSettings'>
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-redundant-managed-removal.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-redundant-managed-removal.ts
similarity index 71%
rename from src/main/ipc/runtime-environments/runtime-environment-redundant-managed-removal.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-redundant-managed-removal.ts
index ac8d27dea7a..e9fec7e6ddd 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-redundant-managed-removal.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-redundant-managed-removal.ts
@@ -2,10 +2,10 @@ import {
   redactRuntimeEnvironment,
   type KnownRuntimeEnvironment,
   type RuntimeEnvironmentRemoval
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { findManagedSshTwin } from '../../../shared/remote-runtime/host-catalog/runtime-environment-host-key-match'
-import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getManagedServerActions } from '../../runtime/hosts/management/managed-server-actions-registry'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { findManagedSshTwin } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-host-key-match'
+import { listEnvironments } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getManagedServerActions } from '../../../runtime/hosts/management/managed-server-actions-registry'
 
 /**
  * Removes one of two saved entries for a managed server reached through two SSH aliases.
diff --git a/src/main/ipc/runtime-environments/runtime-environment-registry-root.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-registry-root.ts
similarity index 84%
rename from src/main/ipc/runtime-environments/runtime-environment-registry-root.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-registry-root.ts
index 62c6537347d..74369835b3d 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-registry-root.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-registry-root.ts
@@ -1,5 +1,5 @@
 import { app } from 'electron'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 
 /** Where the paired-runtime registry lives; read per call, after `app.setName` settles the casing. */
 export function getRuntimeEnvironmentRegistryRoot(): string {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-removal-cleanup.ts
similarity index 69%
rename from src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-removal-cleanup.ts
index 38d96c12287..4c0cc4632fa 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-removal-cleanup.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-removal-cleanup.ts
@@ -1,15 +1,16 @@
-import { desktopChatCreationHistory } from '../../runtime/client/navigation/desktop-chat-creation-history'
-import { revokeRemoteFilePreviewGrants } from '../../media/media-preview-protocol'
-import { clearBrowserRoutePartitionStorageForEnvironment } from '../../browser/routing/partitions/browser-route-partition-storage-runtime'
-import { retireBrowserRoutePartitionStorageForEnvironment } from '../../browser/routing/partitions/browser-route-partition-storage-retirement'
-import { clearRuntimeEnvironmentCapabilityEvidence } from './runtime-environment-capability-evidence'
-import { clearRuntimeEnvironmentManualDisconnect } from './runtime-environment-manual-disconnect'
-import { toRuntimeExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
+import { desktopChatCreationHistory } from '../../../runtime/client/navigation/desktop-chat-creation-history'
+import '../../../media/media-preview-protocol'
+import { revokeRemoteFilePreviewGrants } from '../../../media/preview-grant-registry'
+import { clearBrowserRoutePartitionStorageForEnvironment } from '../../../browser/routing/partitions/browser-route-partition-storage-runtime'
+import { retireBrowserRoutePartitionStorageForEnvironment } from '../../../browser/routing/partitions/browser-route-partition-storage-retirement'
+import { clearRuntimeEnvironmentCapabilityEvidence } from '../connections/runtime-environment-capability-evidence'
+import { clearRuntimeEnvironmentManualDisconnect } from '../connectivity/runtime-environment-manual-disconnect'
+import { toRuntimeExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
 import {
   forgetRemoteLayoutSnapshot,
   type RemoteLayoutSnapshotStore
-} from '../../remote-layout-snapshot/remote-layout-snapshot-recorder'
-import type { HostRepoCatalogSnapshotStore } from '../../host-repo-catalog-snapshot/host-repo-catalog-snapshot-recorder'
+} from '../../../remote-layout-snapshot/remote-layout-snapshot-recorder'
+import type { HostRepoCatalogSnapshotStore } from '../../../host-repo-catalog-snapshot/host-repo-catalog-snapshot-recorder'
 
 export type RemovedServerStore = RemoteLayoutSnapshotStore &
   Pick<HostRepoCatalogSnapshotStore, 'setHostRepoCatalogSnapshot'> & {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-session-reconcile.test.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
similarity index 78%
rename from src/main/ipc/runtime-environments/runtime-environment-session-reconcile.test.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
index b5fd6e7434b..ebda92046f1 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-session-reconcile.test.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.test.ts
@@ -3,12 +3,12 @@ import * as fs from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import { addEnvironmentFromPairingCode } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import '../../../shared/remote-runtime/host-store/runtime-environment-store-file'
-import { getEnvironmentStorePath } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
-import { getRuntimeEnvironmentSidecarPath } from '../../../shared/remote-runtime/host-store/runtime-environment-sidecar'
-import { pairingCode } from './runtime-environments-ipc-test-harness'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { addEnvironmentFromPairingCode } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import '../../../../shared/remote-runtime/host-store/runtime-environment-store-file'
+import { getEnvironmentStorePath } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+import { getRuntimeEnvironmentSidecarPath } from '../../../../shared/remote-runtime/host-store/runtime-environment-sidecar'
+import { pairingCode } from '../runtime-environments-ipc-test-harness'
 import { reconcileOrphanedRuntimeSessions } from './runtime-environment-session-reconcile'
 
 // Lets a test make the registry vanish between a presence check and its read.
@@ -50,8 +50,6 @@ describe('reconciling orphaned runtime sessions at startup', () => {
       'runtime:removed-env'
     ])
     expect(reconcileOrphanedRuntimeSessions(store, userDataPath)).toEqual(['runtime:removed-env'])
-    expect(store.removeWorkspaceSessionHost).toHaveBeenCalledTimes(1)
-    expect(store.removeWorkspaceSessionHost).toHaveBeenCalledWith('runtime:removed-env')
   })
 
   it('deletes nothing when the environment store is missing or unreadable', () => {
@@ -63,7 +61,6 @@ describe('reconciling orphaned runtime sessions at startup', () => {
     writeFileSync(getEnvironmentStorePath(corrupt), '{not json', { mode: 0o600 })
     vi.spyOn(console, 'warn').mockImplementation(() => undefined)
     expect(reconcileOrphanedRuntimeSessions(store, corrupt)).toEqual([])
-    expect(store.removeWorkspaceSessionHost).not.toHaveBeenCalled()
   })
 
   it('keeps sessions of saved servers this build cannot read or currently hides', () => {
@@ -90,6 +87,5 @@ describe('reconciling orphaned runtime sessions at startup', () => {
     ])
 
     expect(reconcileOrphanedRuntimeSessions(store, userDataPath)).toEqual(['runtime:removed-env'])
-    expect(store.removeWorkspaceSessionHost).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/src/main/ipc/runtime-environments/runtime-environment-session-reconcile.ts b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/runtime-environment-session-reconcile.ts
rename to src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.ts
index fd3dcf7194d..0362285fbf6 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-session-reconcile.ts
+++ b/src/main/ipc/runtime-environments/catalog/runtime-environment-session-reconcile.ts
@@ -1,6 +1,6 @@
 /** Crashes and older unlink flows can leave runtime session partitions that listings advertise as orphaned hosts. */
-import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
-import { readEnvironmentStoreRecords } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+import { readEnvironmentStoreRecords } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
 
 type SessionHostStore = {
   getWorkspaceSessionHostIds: () => ExecutionHostId[]
diff --git a/src/main/ipc/runtime-environments/runtime-environment-capability-evidence.test.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
similarity index 94%
rename from src/main/ipc/runtime-environments/runtime-environment-capability-evidence.test.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
index 7cbfc0833c8..205297c751d 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-capability-evidence.test.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.test.ts
@@ -1,6 +1,6 @@
-import { pairedRuntimeConnectionFromOffer } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import { pairedRuntimeConnectionFromOffer } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import { beforeEach, describe, expect, it } from 'vitest'
-import type { PairingOffer } from '../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
+import type { PairingOffer } from '../../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
 import {
   advanceRuntimeEnvironmentCapabilityIncarnation,
   applyRuntimeEnvironmentCapabilityVerdict,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-capability-evidence.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.ts
similarity index 97%
rename from src/main/ipc/runtime-environments/runtime-environment-capability-evidence.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.ts
index 67e3cdc1e48..ac3a589c354 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-capability-evidence.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-capability-evidence.ts
@@ -1,4 +1,4 @@
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 
 export type RuntimeEnvironmentCapabilityVerdict = 'capable' | 'absent'
 
diff --git a/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts
new file mode 100644
index 00000000000..48cdfb1e44c
--- /dev/null
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.test.ts
@@ -0,0 +1,92 @@
+import { RemoteRuntimeSharedControlConnection } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-connection'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  closeSharedControlTestServers,
+  createSharedControlTestServer
+} from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
+import { resetRuntimeEnvironmentCapabilityEvidence } from './runtime-environment-capability-evidence'
+import { clearRuntimeEnvironmentManualDisconnect } from '../connectivity/runtime-environment-manual-disconnect'
+import {
+  closeRemoteRuntimeRequestConnection,
+  sendRemoteRuntimeSharedControlRequestOnRuntime
+} from './runtime-environment-request-connections'
+
+const ENVIRONMENT_ID = 'standing-intent-test'
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  closeRemoteRuntimeRequestConnection(ENVIRONMENT_ID)
+  clearRuntimeEnvironmentManualDisconnect(ENVIRONMENT_ID)
+  resetRuntimeEnvironmentCapabilityEvidence()
+  await closeSharedControlTestServers()
+})
+
+describe('runtime environment shared-control connection cache', () => {
+  it.each([
+    ['the probed runtime', 'runtime-a', true],
+    ['a replacement runtime behind the same endpoint', 'runtime-b', false]
+  ])(
+    'sends a runtime-pinned call only when its socket reached %s',
+    async (_label, reached, sent) => {
+      const server = await createSharedControlTestServer({
+        resultForRequest: (method) =>
+          method === 'status.get' ? { runtimeId: reached } : { method }
+      })
+
+      const response = await sendRemoteRuntimeSharedControlRequestOnRuntime(
+        ENVIRONMENT_ID,
+        server.pairing,
+        { method: 'files.write', params: { relativePath: 'a.ts' }, timeoutMs: 1000 },
+        'runtime-a'
+      )
+
+      expect(response === null).toBe(!sent)
+      expect(server.requests.some((request) => request.method === 'files.write')).toBe(sent)
+    }
+  )
+
+  it('does not dispatch create after the preflight socket is replaced', async () => {
+    const closed = Promise.withResolvers<void>()
+    const server = await createSharedControlTestServer({
+      onClientClose: () => closed.resolve(),
+      resultForRequest: (method) => (method === 'status.get' ? { runtimeId: 'runtime-a' } : {})
+    })
+    const original = RemoteRuntimeSharedControlConnection.prototype.request
+    vi.spyOn(RemoteRuntimeSharedControlConnection.prototype, 'request').mockImplementation(
+      function <TResult>(
+        this: RemoteRuntimeSharedControlConnection,
+        ...args: Parameters<typeof original>
+      ): Promise<RuntimeRpcResponse<TResult>> {
+        const invoke = original.bind(this)
+        const response = invoke<TResult>(...args)
+        if (args[0] !== 'status.get') {
+          return response
+        }
+        return response.then(async (status) => {
+          server.closeClients()
+          await closed.promise
+          this.reconnectNow()
+          return status
+        })
+      }
+    )
+    await expect(
+      sendRemoteRuntimeSharedControlRequestOnRuntime(
+        ENVIRONMENT_ID,
+        server.pairing,
+        {
+          method: 'agentSession.create',
+          params: {
+            forkFrom: { sessionId: 'child', throughItemId: 'legacy:opencode:source:reply-1' }
+          },
+          timeoutMs: 1000
+        },
+        'runtime-a'
+      )
+    ).resolves.toBeNull()
+    expect(server.requests.filter((request) => request.method === 'agentSession.create')).toEqual(
+      []
+    )
+  })
+})
diff --git a/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.ts
similarity index 86%
rename from src/main/ipc/runtime-environments/runtime-environment-request-connections.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.ts
index 60217af8047..74886ba98c8 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-request-connections.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-request-connections.ts
@@ -1,26 +1,26 @@
 import { runtimeEnvironmentConnectionPairingKey as getPairingKey } from './runtime-environment-capability-evidence'
-import type { RuntimeEnvironmentCall } from './runtime-environment-call'
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeHostStatusOwner } from '../../../shared/remote-runtime/host-status/runtime-host-status-owner'
-import type { RuntimeStatus } from '../../../shared/runtime-types'
-import { createRuntimeEnvironmentStatusOwner } from './runtime-environment-status-owner'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
+import type { RuntimeEnvironmentCall } from '../requests/runtime-environment-call'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getPreferredPairedRuntimeConnection } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeHostStatusOwner } from '../../../../shared/remote-runtime/host-status/runtime-host-status-owner'
+import type { RuntimeStatus } from '../../../../shared/runtime-session-contracts'
+import { createRuntimeEnvironmentStatusOwner } from '../status/runtime-environment-status-owner'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
 import type {
   RuntimeOrchestrationEnvelope,
   RuntimeRequestPreparation,
   RuntimeRpcResponse
-} from '../../../shared/runtime-rpc-envelope'
-import { RemoteRuntimeRequestConnection } from '../../../shared/remote-runtime/requests/remote-runtime-request-connection'
-import { RemoteRuntimeSharedControlConnection } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-connection'
-import { probeAllRemoteRuntimeSocketsNow } from '../../../shared/remote-runtime/remote-runtime-socket-liveness'
+} from '../../../../shared/runtime-rpc-envelope'
+import { RemoteRuntimeRequestConnection } from '../../../../shared/remote-runtime/requests/remote-runtime-request-connection'
+import { RemoteRuntimeSharedControlConnection } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-connection'
+import { probeAllRemoteRuntimeSocketsNow } from '../../../../shared/remote-runtime/remote-runtime-socket-liveness'
 import type {
   RemoteRuntimeSharedConnectionDiagnostics,
   RemoteRuntimeSharedSubscription
-} from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
-import { publishRuntimeEnvironmentDiagnostics } from './runtime-environment-diagnostics-broadcast'
+} from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../connectivity/runtime-environment-manual-disconnect'
+import { publishRuntimeEnvironmentDiagnostics } from '../status/runtime-environment-diagnostics-broadcast'
 import { sharedControlEnvironmentPolicy } from './runtime-environment-shared-control-policy'
 import {
   clearSharedControlAnswerSource,
@@ -30,8 +30,8 @@ import {
   advanceRuntimeEnvironmentTransportGeneration,
   getRuntimeEnvironmentTransportGeneration
 } from './runtime-environment-transport-generation'
-import { noteRuntimeEnvironmentSharedControlContact } from './runtime-environment-contact-loss'
-import { declareWslHostClient } from '../../wsl/host-lifecycle/wsl-host-client-declaration'
+import { noteRuntimeEnvironmentSharedControlContact } from '../status/runtime-environment-contact-loss'
+import { declareWslHostClient } from '../../../wsl/host-lifecycle/wsl-host-client-declaration'
 
 type CachedRuntimeConnection = {
   pairingKey: string
diff --git a/src/main/ipc/runtime-environments/runtime-environment-shared-control-answers.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-answers.ts
similarity index 100%
rename from src/main/ipc/runtime-environments/runtime-environment-shared-control-answers.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-answers.ts
diff --git a/src/main/ipc/runtime-environments/runtime-environment-shared-control-envelope.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-envelope.ts
similarity index 78%
rename from src/main/ipc/runtime-environments/runtime-environment-shared-control-envelope.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-envelope.ts
index 1895e27e6ac..e6ea898b06b 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-shared-control-envelope.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-envelope.ts
@@ -1,5 +1,5 @@
-import { isOrchestrationMutation } from '../../../shared/orchestration/orchestration-rpc-contract'
-import type { RuntimeOrchestrationEnvelope } from '../../../shared/runtime-rpc-envelope'
+import { isOrchestrationMutation } from '../../../../shared/orchestration/orchestration-rpc-contract'
+import type { RuntimeOrchestrationEnvelope } from '../../../../shared/runtime-rpc-envelope'
 
 // Relay mutations safe on shared control: synchronous, idempotent by request id and cursor. Long-running ones (workerStart) stay one-shot for keepalive timeouts and host abort.
 const SHARED_CONTROL_RELAY_MUTATIONS = [
diff --git a/src/main/ipc/runtime-environments/runtime-environment-shared-control-policy.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-policy.ts
similarity index 65%
rename from src/main/ipc/runtime-environments/runtime-environment-shared-control-policy.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-policy.ts
index c9614ee7774..4274e00409d 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-shared-control-policy.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-policy.ts
@@ -1,9 +1,9 @@
-import type { RemoteRuntimeSharedControlConnectionOptions } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import type { RemoteRuntimeSharedControlConnectionOptions } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
 import { isRuntimeEnvironmentCapabilityPaused } from './runtime-environment-capability-evidence'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
-import { handleSharedControlRefusal } from './runtime-environment-pairing-refusal-registry'
-import { traceSharedControlSocketClose } from './runtime-environment-control-socket-close-trace'
-import { isRecipeVmServerAsleep } from '../../ephemeral-vm/recipe-vm-asleep'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../connectivity/runtime-environment-manual-disconnect'
+import { handleSharedControlRefusal } from '../pairing/runtime-environment-pairing-refusal-registry'
+import { traceSharedControlSocketClose } from '../status/runtime-environment-control-socket-close-trace'
+import { isRecipeVmServerAsleep } from '../../../ephemeral-vm/recipe-vm-asleep'
 
 /** When a shared control socket may reconnect, who answers a refused token, and where closes go. */
 export function sharedControlEnvironmentPolicy(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-shared-control-support.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-support.ts
similarity index 79%
rename from src/main/ipc/runtime-environments/runtime-environment-shared-control-support.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-support.ts
index 036704beb13..06480578cfb 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-shared-control-support.ts
+++ b/src/main/ipc/runtime-environments/connections/runtime-environment-shared-control-support.ts
@@ -1,6 +1,6 @@
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 import {
   getAcceptedRuntimeEnvironmentCapabilityOutcome,
   resetRuntimeEnvironmentCapabilityEvidence,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-transport-generation.ts b/src/main/ipc/runtime-environments/connections/runtime-environment-transport-generation.ts
similarity index 100%
rename from src/main/ipc/runtime-environments/runtime-environment-transport-generation.ts
rename to src/main/ipc/runtime-environments/connections/runtime-environment-transport-generation.ts
diff --git a/src/main/ipc/runtime-environments/runtime-environment-connectivity-handlers.ts b/src/main/ipc/runtime-environments/connectivity/runtime-environment-connectivity-handlers.ts
similarity index 84%
rename from src/main/ipc/runtime-environments/runtime-environment-connectivity-handlers.ts
rename to src/main/ipc/runtime-environments/connectivity/runtime-environment-connectivity-handlers.ts
index 3fb21a36fee..7b8f9636387 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-connectivity-handlers.ts
+++ b/src/main/ipc/runtime-environments/connectivity/runtime-environment-connectivity-handlers.ts
@@ -1,62 +1,63 @@
 import {
   manuallyDisconnectedResponse,
   runtimeEnvironmentCallFailure
-} from './runtime-environment-call-failure'
-import { desktopChatCreationHistory } from '../../runtime/client/navigation/desktop-chat-creation-history'
+} from '../requests/runtime-environment-call-failure'
+import { desktopChatCreationHistory } from '../../../runtime/client/navigation/desktop-chat-creation-history'
 import { ipcMain } from 'electron'
 import {
   addEnvironmentFromPairingCode,
   listEnvironments,
   removeEnvironment,
   resolveEnvironment
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   redactRuntimeEnvironment,
   type PublicKnownRuntimeEnvironment,
   type RuntimeEnvironmentRemoval
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import {
   connectThroughOwningService,
   removeThroughOwningService
 } from './runtime-environment-host-service-ops'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
-import type { Store } from '../../persistence/loading-store/store'
-import { retireRemovedRuntimeEnvironment } from './runtime-environment-removal-cleanup'
-import { removeRedundantManagedPairing } from './runtime-environment-redundant-managed-removal'
-import { readSettingsWithRuntimeEnvironmentPreference } from './runtime-environment-preference'
-import { verifyAndAddRuntimeEnvironmentFromPairingCode } from './runtime-environment-pairing-verification'
-import { publishVerifiedPairing } from './runtime-environment-verified-pairing-publish'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import type { RuntimeStatus } from '../../../../shared/runtime-session-contracts'
+import type { Store } from '../../../persistence/loading-store/store'
+import { retireRemovedRuntimeEnvironment } from '../catalog/runtime-environment-removal-cleanup'
+import { removeRedundantManagedPairing } from '../catalog/runtime-environment-redundant-managed-removal'
+import { readSettingsWithRuntimeEnvironmentPreference } from '../catalog/runtime-environment-preference'
+import { verifyAndAddRuntimeEnvironmentFromPairingCode } from '../pairing/runtime-environment-pairing-verification'
+import { publishVerifiedPairing } from '../pairing/runtime-environment-verified-pairing-publish'
 import {
   closeRemoteRuntimeRequestConnection,
   getRuntimeEnvironmentStatusSnapshots
-} from './runtime-environment-request-connections'
+} from '../connections/runtime-environment-request-connections'
 import {
   clearRuntimeEnvironmentManualDisconnect,
   isRuntimeEnvironmentManuallyDisconnected
 } from './runtime-environment-manual-disconnect'
-import { callRuntimeEnvironment } from './runtime-environment-transport-routing'
-import { getRuntimeEnvironmentStatus } from './runtime-environment-status-probe'
-import { noteRuntimeEnvironmentConnectRequested } from './runtime-environment-pairing-refusal-registry'
-import { publicRuntimeEnvironmentWithHostKey } from './runtime-environment-host-key'
-import { withWslOrcadAccountEnv } from '../../wsl/orcad/wsl-orcad-account-env'
-import { clearSshCredentialDeclinedForEnvironment } from '../../ssh/authentication/ssh-credential-decline'
+import { callRuntimeEnvironment } from '../requests/runtime-environment-transport-routing'
+import { getRuntimeEnvironmentStatus } from '../status/runtime-environment-status-probe'
+import { noteRuntimeEnvironmentConnectRequested } from '../pairing/runtime-environment-pairing-refusal-registry'
+import { publicRuntimeEnvironmentWithHostKey } from '../catalog/runtime-environment-host-key'
+import { withWslOrcadAccountEnv } from '../../../wsl/orcad/wsl-orcad-account-env'
+import { clearSshCredentialDeclinedForEnvironment } from '../../../ssh/authentication/ssh-credential-decline'
 import {
   disconnectManagedHostOfEnvironmentForUser,
   disconnectRuntimeEnvironmentForUser,
   liftSshUserDisconnectForEnvironment
-} from '../ssh/ssh-host-user-disconnect'
+} from '../../ssh/ssh-host-user-disconnect'
 import {
   observeWslOrcadHostResponse,
   wslOrcadHostSupports
-} from '../../wsl/orcad/wsl-orcad-host-environments'
-import { assertWslHostReachable, isGatedOffWslHost } from '../../wsl/host-lifecycle/wsl-host-gate'
+} from '../../../wsl/orcad/wsl-orcad-host-environments'
+import {
+  assertWslHostReachable,
+  isGatedOffWslHost
+} from '../../../wsl/host-lifecycle/wsl-host-gate'
 import {
   isHostSpawnFencedForWslMoveUndo,
   wslMoveUndoSpawnFencedResponse
-} from '../../persistence/moving-wsl-projects/cutover-recovery/wsl-move-undo-spawn-fence'
-
-export { isRuntimeEnvironmentManuallyDisconnected }
+} from '../../../persistence/moving-wsl-projects/cutover-recovery/wsl-move-undo-spawn-fence'
 
 type ConnectivityHandlerOptions = {
   store: Store
diff --git a/src/main/ipc/runtime-environments/runtime-environment-host-service-ops.ts b/src/main/ipc/runtime-environments/connectivity/runtime-environment-host-service-ops.ts
similarity index 67%
rename from src/main/ipc/runtime-environments/runtime-environment-host-service-ops.ts
rename to src/main/ipc/runtime-environments/connectivity/runtime-environment-host-service-ops.ts
index 379f0e0320a..26378000419 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-host-service-ops.ts
+++ b/src/main/ipc/runtime-environments/connectivity/runtime-environment-host-service-ops.ts
@@ -1,7 +1,7 @@
-import { classifyRuntimeEnvironmentHost } from '../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { WslHostServerStop } from '../../../shared/wsl-host-types'
-import { getWslHostService } from '../../wsl/host-lifecycle/wsl-host-service-instance'
+import { classifyRuntimeEnvironmentHost } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { WslHostServerStop } from '../../../../shared/wsl-host-types'
+import { getWslHostService } from '../../../wsl/host-lifecycle/wsl-host-service-instance'
 
 /** Explicit connection may boot the WSL distro. */
 export async function connectThroughOwningService(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-manual-disconnect.ts b/src/main/ipc/runtime-environments/connectivity/runtime-environment-manual-disconnect.ts
similarity index 96%
rename from src/main/ipc/runtime-environments/runtime-environment-manual-disconnect.ts
rename to src/main/ipc/runtime-environments/connectivity/runtime-environment-manual-disconnect.ts
index ea9b2aa67f7..e45b4e330fc 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-manual-disconnect.ts
+++ b/src/main/ipc/runtime-environments/connectivity/runtime-environment-manual-disconnect.ts
@@ -1,7 +1,7 @@
 import {
   requestDesktopBrowserBridgeReconcile,
   resetDesktopBrowserBridgeEnvironment
-} from '../browser/desktop-browser-bridge-reconcile'
+} from '../../browser/desktop-browser-bridge-reconcile'
 
 export const RUNTIME_MANUALLY_DISCONNECTED_MESSAGE = 'Runtime environment is manually disconnected.'
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-recovery-handler.ts b/src/main/ipc/runtime-environments/connectivity/runtime-environment-recovery-handler.ts
similarity index 78%
rename from src/main/ipc/runtime-environments/runtime-environment-recovery-handler.ts
rename to src/main/ipc/runtime-environments/connectivity/runtime-environment-recovery-handler.ts
index 2ce3b9e65a1..49f18f4cf93 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-recovery-handler.ts
+++ b/src/main/ipc/runtime-environments/connectivity/runtime-environment-recovery-handler.ts
@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron'
-import { retryRemoteRuntimeSharedControlConnectionsNow } from './runtime-environment-request-connections'
-import { retrySshConnectionsAfterNetworkReturn } from '../ssh/ssh-host-sleep-reconnect'
+import { retryRemoteRuntimeSharedControlConnectionsNow } from '../connections/runtime-environment-request-connections'
+import { retrySshConnectionsAfterNetworkReturn } from '../../ssh/ssh-host-sleep-reconnect'
 
 const RETRY_CONNECTIONS_NOW_CHANNEL = 'runtimeEnvironments:retryConnectionsNow'
 
diff --git a/src/main/ipc/runtime-environments/managed-orcad-actions.ts b/src/main/ipc/runtime-environments/managed-orcad/managed-orcad-actions.ts
similarity index 81%
rename from src/main/ipc/runtime-environments/managed-orcad-actions.ts
rename to src/main/ipc/runtime-environments/managed-orcad/managed-orcad-actions.ts
index f56124684a0..bae5718b2eb 100644
--- a/src/main/ipc/runtime-environments/managed-orcad-actions.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/managed-orcad-actions.ts
@@ -3,33 +3,33 @@ import {
   forgetManagedOrcadEnvironment,
   forgetRedundantManagedOrcadEnvironment,
   stopManagedOrcadEnvironment
-} from '../../managed-server/lifecycle/orcad-runtime-decommission'
-import { getManagedOrcadRuntimeStatus } from '../../managed-server/lifecycle/orcad-runtime-status'
-import { recoverManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-managed-recovery'
-import { rollbackManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-managed-rollback'
-import { updateManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-runtime-maintenance'
-import { getOrcadSshDeployment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+} from '../../../managed-server/lifecycle/orcad-runtime-decommission'
+import { getManagedOrcadRuntimeStatus } from '../../../managed-server/lifecycle/orcad-runtime-status'
+import { recoverManagedOrcadEnvironment } from '../../../managed-server/lifecycle/orcad-managed-recovery'
+import { rollbackManagedOrcadEnvironment } from '../../../managed-server/lifecycle/orcad-managed-rollback'
+import { updateManagedOrcadEnvironment } from '../../../managed-server/lifecycle/orcad-runtime-maintenance'
+import { getOrcadSshDeployment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import type {
   OrcadManagedRestartResult,
   OrcadManagedStaleLockReclaimRequest,
   OrcadManagedStaleLockReclaimResult
-} from '../../../shared/orcad-managed-runtime'
-import { restartManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-managed-launch-session'
-import { forgetManagedOrcadAutomaticFailures } from '../../managed-server/lifecycle/orcad-managed-tunnel'
-import { runManagedOrcadStaleLockReclaim } from '../../managed-server/lifecycle/orcad-managed-stale-lock-reclaim'
+} from '../../../../shared/orcad-managed-runtime'
+import { restartManagedOrcadEnvironment } from '../../../managed-server/lifecycle/orcad-managed-launch-session'
+import { forgetManagedOrcadAutomaticFailures } from '../../../managed-server/lifecycle/orcad-managed-tunnel'
+import { runManagedOrcadStaleLockReclaim } from '../../../managed-server/lifecycle/orcad-managed-stale-lock-reclaim'
 import { clearLaunchSessionNote } from './runtime-environment-managed-tunnel'
-import { forgetLaunchSessionVerdict } from '../ssh/ssh-host-launch-session-note'
+import { forgetLaunchSessionVerdict } from '../../ssh/ssh-host-launch-session-note'
 import {
   liftUserHoldsForServerAction,
   resumeRuntimeEnvironmentStatus
-} from '../ssh/ssh-host-user-disconnect'
-import { releaseUnlinkedHostTransport } from '../ssh/ssh-session-teardown'
-import type { ManagedServerActions } from '../../runtime/hosts/management/managed-server-actions-registry'
+} from '../../ssh/ssh-host-user-disconnect'
+import { releaseUnlinkedHostTransport } from '../../ssh/ssh-session-teardown'
+import type { ManagedServerActions } from '../../../runtime/hosts/management/managed-server-actions-registry'
 import {
   retireRemovedRuntimeEnvironment,
   type RemovedServerStore
-} from './runtime-environment-removal-cleanup'
+} from '../catalog/runtime-environment-removal-cleanup'
 
 export type ManagedOrcadActionOptions = {
   getUserDataPath: () => string
diff --git a/src/main/ipc/runtime-environments/orcad-delta-move-handlers.ts b/src/main/ipc/runtime-environments/managed-orcad/orcad-delta-move-handlers.ts
similarity index 78%
rename from src/main/ipc/runtime-environments/orcad-delta-move-handlers.ts
rename to src/main/ipc/runtime-environments/managed-orcad/orcad-delta-move-handlers.ts
index 8db09eafd25..71d2009b623 100644
--- a/src/main/ipc/runtime-environments/orcad-delta-move-handlers.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/orcad-delta-move-handlers.ts
@@ -3,24 +3,24 @@ import { ipcMain } from 'electron'
 import type {
   OrcadDeltaMovePreview,
   OrcadDeltaMoveResult
-} from '../../../shared/orcad-managed-runtime'
-import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { requireManagedOrcadInfrastructure } from '../../managed-server/lifecycle/orcad-managed-runtime-context'
-import { ensureOrcadManagedTunnel } from '../../managed-server/lifecycle/orcad-managed-tunnel'
+} from '../../../../shared/orcad-managed-runtime'
+import { listEnvironments } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { requireManagedOrcadInfrastructure } from '../../../managed-server/lifecycle/orcad-managed-runtime-context'
+import { ensureOrcadManagedTunnel } from '../../../managed-server/lifecycle/orcad-managed-tunnel'
 import {
   keepOrcadServerVersion,
   runOrcadDeltaMove
-} from '../../managed-server/migration/cutover/orcad-migration-delta-move'
-import { planOrcadDeltaMove } from '../../managed-server/migration/cutover/orcad-migration-delta-plan'
-import { censusHostRelayTerminalsFor } from '../../ssh/legacy-relay/endpoints/ssh-host-relay-census-for-target'
+} from '../../../managed-server/migration/cutover/orcad-migration-delta-move'
+import { planOrcadDeltaMove } from '../../../managed-server/migration/cutover/orcad-migration-delta-plan'
+import { censusHostRelayTerminalsFor } from '../../../ssh/legacy-relay/endpoints/ssh-host-relay-census-for-target'
 import {
   orcadMigrationDestinationFor,
   orcadServerAutomationEnablerFor
-} from '../../managed-server/lifecycle/orcad-runtime-conversion-wiring'
-import { enableMovedOrcadAutomationsForTarget } from '../../persistence/migrating-orcad-catalog/retained-source/orcad-migration-moved-automations'
+} from '../../../managed-server/lifecycle/orcad-runtime-conversion-wiring'
+import { enableMovedOrcadAutomationsForTarget } from '../../../persistence/migrating-orcad-catalog/retained-source/orcad-migration-moved-automations'
 import { requiredString } from './orcad-runtime-lifecycle-handlers'
 import { publishResolvedChangedHostStatus } from './runtime-environment-managed-tunnel'
-import { runTargetLifecycle } from '../ssh/ssh-target-lifecycle-queue'
+import { runTargetLifecycle } from '../../ssh/ssh-target-lifecycle-queue'
 
 export function registerOrcadDeltaMoveHandlers(getUserDataPath: () => string): void {
   ipcMain.handle(
diff --git a/src/main/ipc/runtime-environments/orcad-leave-behind-handlers.ts b/src/main/ipc/runtime-environments/managed-orcad/orcad-leave-behind-handlers.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/orcad-leave-behind-handlers.ts
rename to src/main/ipc/runtime-environments/managed-orcad/orcad-leave-behind-handlers.ts
index 780cdade1b3..9b60a86ad13 100644
--- a/src/main/ipc/runtime-environments/orcad-leave-behind-handlers.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/orcad-leave-behind-handlers.ts
@@ -1,6 +1,6 @@
 /** IPC for "Move anyway": the user confirms that saved state a move can't carry stays on this desktop. */
 import { ipcMain } from 'electron'
-import { getSshTargetRegistryStore } from '../../ssh/targets/ssh-target-registry'
+import { getSshTargetRegistryStore } from '../../../ssh/targets/ssh-target-registry'
 import { requiredString } from './orcad-runtime-lifecycle-handlers'
 
 export function registerOrcadLeaveBehindHandlers(): void {
diff --git a/src/main/ipc/runtime-environments/orcad-runtime-conversion-handlers.ts b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-conversion-handlers.ts
similarity index 70%
rename from src/main/ipc/runtime-environments/orcad-runtime-conversion-handlers.ts
rename to src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-conversion-handlers.ts
index 514945350c0..4e3cb314d67 100644
--- a/src/main/ipc/runtime-environments/orcad-runtime-conversion-handlers.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-conversion-handlers.ts
@@ -2,10 +2,10 @@ import { ipcMain } from 'electron'
 import type {
   OrcadManagedConversionResult,
   OrcadManagedPendingMigrationRow
-} from '../../../shared/orcad-managed-runtime'
-import { listPendingManagedOrcadMigrations } from '../../managed-server/lifecycle/orcad-managed-migration-status'
-import { convertSshTargetToManagedOrcad } from '../../managed-server/lifecycle/orcad-runtime-conversion'
-import { conversionCollaborators } from '../../managed-server/lifecycle/orcad-runtime-conversion-wiring'
+} from '../../../../shared/orcad-managed-runtime'
+import { listPendingManagedOrcadMigrations } from '../../../managed-server/lifecycle/orcad-managed-migration-status'
+import { convertSshTargetToManagedOrcad } from '../../../managed-server/lifecycle/orcad-runtime-conversion'
+import { conversionCollaborators } from '../../../managed-server/lifecycle/orcad-runtime-conversion-wiring'
 import { requiredString } from './orcad-runtime-lifecycle-handlers'
 
 export function registerOrcadRuntimeConversionHandlers(getUserDataPath: () => string): void {
diff --git a/src/main/ipc/runtime-environments/orcad-runtime-lifecycle-handlers.ts b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-lifecycle-handlers.ts
similarity index 76%
rename from src/main/ipc/runtime-environments/orcad-runtime-lifecycle-handlers.ts
rename to src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-lifecycle-handlers.ts
index 7b49728998f..da4346f197d 100644
--- a/src/main/ipc/runtime-environments/orcad-runtime-lifecycle-handlers.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-lifecycle-handlers.ts
@@ -1,7 +1,7 @@
 import { ipcMain } from 'electron'
-import type { OrcadManagedRuntimeStatus } from '../../../shared/orcad-managed-runtime'
-import { createManagedOrcadEnvironment } from '../../managed-server/lifecycle/orcad-runtime-deployment'
-import { getManagedOrcadRuntimeStatus } from '../../managed-server/lifecycle/orcad-runtime-status'
+import type { OrcadManagedRuntimeStatus } from '../../../../shared/orcad-managed-runtime'
+import { createManagedOrcadEnvironment } from '../../../managed-server/lifecycle/orcad-runtime-deployment'
+import { getManagedOrcadRuntimeStatus } from '../../../managed-server/lifecycle/orcad-runtime-status'
 
 export function registerOrcadRuntimeLifecycleHandlers(options: {
   getUserDataPath: () => string
diff --git a/src/main/ipc/runtime-environments/orcad-runtime-maintenance-handlers.ts b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-maintenance-handlers.ts
similarity index 96%
rename from src/main/ipc/runtime-environments/orcad-runtime-maintenance-handlers.ts
rename to src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-maintenance-handlers.ts
index 0dd3de7bc49..28163e475b8 100644
--- a/src/main/ipc/runtime-environments/orcad-runtime-maintenance-handlers.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/orcad-runtime-maintenance-handlers.ts
@@ -1,5 +1,5 @@
 import { ipcMain } from 'electron'
-import { registerManagedServerActions } from '../../runtime/hosts/management/managed-server-actions-registry'
+import { registerManagedServerActions } from '../../../runtime/hosts/management/managed-server-actions-registry'
 import {
   createManagedOrcadActions,
   reclaimManagedOrcadStaleLock,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-managed-tunnel.ts b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-managed-tunnel.ts
similarity index 85%
rename from src/main/ipc/runtime-environments/runtime-environment-managed-tunnel.ts
rename to src/main/ipc/runtime-environments/managed-orcad/runtime-environment-managed-tunnel.ts
index 21c7d4622f8..9a003ec40b0 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-managed-tunnel.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-managed-tunnel.ts
@@ -1,48 +1,48 @@
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   getOrcadSshDeployment,
   type KnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { classifyRuntimeEnvironmentHost } from '../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { classifyRuntimeEnvironmentHost } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
 import type {
   SshManagedServerStatus,
   SshManagedServerUpdateNote,
   SshTarget
-} from '../../../shared/ssh-types'
-import { managedServerUpdateDeps } from '../../ssh/host-server/managed-server-update-deps'
+} from '../../../../shared/ssh-types'
+import { managedServerUpdateDeps } from '../../../ssh/host-server/managed-server-update-deps'
 import {
   ensureOrcadManagedTunnel,
   rebuildOrcadManagedTunnel
-} from '../../managed-server/lifecycle/orcad-managed-tunnel'
-import { verifyOrcadManagedServing } from '../../managed-server/lifecycle/orcad-managed-serving-verify'
+} from '../../../managed-server/lifecycle/orcad-managed-tunnel'
+import { verifyOrcadManagedServing } from '../../../managed-server/lifecycle/orcad-managed-serving-verify'
 import {
   getManagedOrcadCrashLoopBrake,
   OrcadCrashLoopError
-} from '../../managed-server/lifecycle/orcad-managed-crash-loop'
+} from '../../../managed-server/lifecycle/orcad-managed-crash-loop'
 import {
   MANAGED_ORCAD_NOT_ACTIVATED_DETAIL,
   setManagedOrcadStartListener,
   type OrcadManagedServing
-} from '../../managed-server/lifecycle/orcad-managed-serving'
+} from '../../../managed-server/lifecycle/orcad-managed-serving'
 import {
   redeployStoppedManagedOrcad,
   updateManagedOrcadOnRestore
-} from '../../managed-server/lifecycle/orcad-managed-update-on-restore'
+} from '../../../managed-server/lifecycle/orcad-managed-update-on-restore'
 import {
   getSshHostServerStatus,
   setSshHostServerStatus
-} from '../../ssh/host-server/ssh-host-server-status'
-import { getSshTargetRegistryStore } from '../../ssh/targets/ssh-target-registry'
-import { connectionManager, getCurrentMainWindow } from '../ssh/ssh-ipc-context'
+} from '../../../ssh/host-server/ssh-host-server-status'
+import { getSshTargetRegistryStore } from '../../../ssh/targets/ssh-target-registry'
+import { connectionManager, getCurrentMainWindow } from '../../ssh/ssh-ipc-context'
 import {
   getWslHostPhoneGate,
   getWslHostService
-} from '../../wsl/host-lifecycle/wsl-host-service-instance'
-import { assertWslHostReachable } from '../../wsl/host-lifecycle/wsl-host-gate'
-import { wslHostPhoneRefusal } from '../../wsl/host-lifecycle/wsl-host-phone-reach'
-import { broadcastSshState } from '../ssh/ssh-renderer-broadcast'
-import { restoreManagedHostPortForwards } from '../ssh/ssh-managed-port-forward-restore'
-import { recipeVmWakeIntentFor } from '../../../shared/remote-runtime/recipe-vm-wake'
+} from '../../../wsl/host-lifecycle/wsl-host-service-instance'
+import { assertWslHostReachable } from '../../../wsl/host-lifecycle/wsl-host-gate'
+import { wslHostPhoneRefusal } from '../../../wsl/host-lifecycle/wsl-host-phone-reach'
+import { broadcastSshState } from '../../ssh/ssh-renderer-broadcast'
+import { restoreManagedHostPortForwards } from '../../ssh/ssh-managed-port-forward-restore'
+import { recipeVmWakeIntentFor } from '../../../../shared/remote-runtime/recipe-vm-wake'
 import { prepareRecipeVm } from './runtime-environment-recipe-vm-wake'
 
 /** `wslStart: 'never'` serves a WSL host only while it runs: a paired phone never boots a distro.
@@ -175,7 +175,7 @@ async function prepareNetworkServerForCall(
     if (targetId) {
       // Publish the warning after update status settles; import lazily to break the publishing cycle.
       void Promise.resolve(update)
-        .then(() => import('../ssh/ssh-host-launch-session-note'))
+        .then(() => import('../../ssh/ssh-host-launch-session-note'))
         .then(({ noteEndedLaunchSshSession }) =>
           noteEndedLaunchSshSession(targetId, environment.id)
         )
@@ -194,7 +194,7 @@ function restoreForwardsOverTunnel(environment: KnownRuntimeEnvironment): void {
 
 async function forgetLaunchSessionVerdictLazily(targetId: string): Promise<void> {
   // Import lazily because the note module publishes through this module.
-  const { forgetLaunchSessionVerdict } = await import('../ssh/ssh-host-launch-session-note')
+  const { forgetLaunchSessionVerdict } = await import('../../ssh/ssh-host-launch-session-note')
   forgetLaunchSessionVerdict(targetId)
 }
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
similarity index 80%
rename from src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts
rename to src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
index 365f916716a..dfce1a07551 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.test.ts
@@ -3,38 +3,29 @@
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { removeTempDirs } from '../../../shared/testing/remove-temp-dirs.test-support'
+import { removeTempDirs } from '../../../../shared/testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
-import { PAIRING_OFFER_VERSION } from '../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
-import { upsertEphemeralVmRuntime } from '../../../shared/ephemeral-vm-runtime-store'
-import type { EphemeralVmRuntimeStatus } from '../../../shared/ephemeral-vm-runtimes'
-import { registerRecipeVmWaker } from '../../runtime/workspaces/sleep/recipe-vm-waker-registry'
+import { encodePairingOffer } from '../../../../shared/remote-runtime/pairing/pairing'
+import { PAIRING_OFFER_VERSION } from '../../../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
+import { upsertEphemeralVmRuntime } from '../../../../shared/ephemeral-vm-runtime-store'
+import type { EphemeralVmRuntimeStatus } from '../../../../shared/ephemeral-vm-runtimes'
+import { registerRecipeVmWaker } from '../../../runtime/workspaces/sleep/recipe-vm-waker-registry'
 import type {
   RecipeVmOpening,
   RecipeVmState
-} from '../../runtime/workspaces/sleep/recipe-vm-operations'
+} from '../../../runtime/workspaces/sleep/recipe-vm-operations'
 import { prepareRecipeVm } from './runtime-environment-recipe-vm-wake'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 import {
   forgetRecipeVmWakePairingsForTests,
   noteRecipeVmWakePairing
-} from '../../ephemeral-vm/recipe-vm-wake-pairings'
+} from '../../../ephemeral-vm/recipe-vm-wake-pairings'
 import {
   clearRuntimeEnvironmentManualDisconnect,
   markRuntimeEnvironmentManuallyDisconnected
-} from './runtime-environment-manual-disconnect'
+} from '../connectivity/runtime-environment-manual-disconnect'
 
 const VM_ENVIRONMENT = { id: 'env-vm', source: 'ephemeral-vm' as const }
-const SSH_VM_ENVIRONMENT = {
-  id: 'env-ssh-vm',
-  orcadDeployment: {
-    sshTargetId: 'runtime-ssh-vm-2',
-    sshTargetGeneration: 1,
-    localPort: 41_000,
-    remotePort: 6768
-  }
-}
 
 let userDataPath = ''
 
@@ -115,8 +106,6 @@ describe('a request to a recipe VM environment', () => {
     async (status) => {
       recordVm(status)
       await expect(codeOf('none')).resolves.toBe('runtime_environment_asleep')
-      expect(state).toHaveBeenCalledWith('workspace-of-vm-1', true)
-      expect(holdOpen).not.toHaveBeenCalled()
     }
   )
 
@@ -140,7 +129,6 @@ describe('a request to a recipe VM environment', () => {
     markRuntimeEnvironmentManuallyDisconnected(VM_ENVIRONMENT.id)
     try {
       await expect(codeOf('wake')).resolves.toBe('runtime_manually_disconnected')
-      expect(holdOpen).not.toHaveBeenCalled()
     } finally {
       clearRuntimeEnvironmentManualDisconnect(VM_ENVIRONMENT.id)
     }
@@ -198,15 +186,8 @@ describe('a request to a recipe VM environment', () => {
     }
   })
 
-  it("finds an SSH-connected VM by its runtime-owned target's environment", async () => {
-    recordVm('suspended', SSH_VM_ENVIRONMENT.id, 'vm-2')
-    await expect(codeOf('wake', SSH_VM_ENVIRONMENT)).resolves.toBeNull()
-    expect(holdOpen).toHaveBeenCalledWith('workspace-of-vm-2', true, 180_000, undefined)
-  })
-
   it('never treats a user-paired server as a VM, even under a recorded id', async () => {
     recordVm('suspended', 'env-manual')
     await expect(codeOf('none', { id: 'env-manual', source: 'manual' })).resolves.toBeNull()
-    expect(state).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.ts b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.ts
similarity index 87%
rename from src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.ts
rename to src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.ts
index f906a8612f9..86d72053ac2 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.ts
+++ b/src/main/ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake.ts
@@ -1,10 +1,10 @@
 import {
   findEnvironmentEphemeralVmRuntime,
   isEphemeralVmSuspended
-} from '../../../shared/ephemeral-vm-environment-sleep'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+} from '../../../../shared/ephemeral-vm-environment-sleep'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 import {
   RECIPE_VM_OPEN_HOLD_MS,
   RUNTIME_ENVIRONMENT_ASLEEP_ERROR_CODE,
@@ -15,18 +15,18 @@ import {
   RUNTIME_ENVIRONMENT_WAKING_ERROR_CODE,
   RUNTIME_ENVIRONMENT_WAKING_MESSAGE,
   type RecipeVmWakeIntent
-} from '../../../shared/remote-runtime/recipe-vm-wake'
-import { getRecipeVmWaker } from '../../runtime/workspaces/sleep/recipe-vm-waker-registry'
-import { latestRecipeVmWake } from '../../ephemeral-vm/recipe-vm-wake-pairings'
+} from '../../../../shared/remote-runtime/recipe-vm-wake'
+import { getRecipeVmWaker } from '../../../runtime/workspaces/sleep/recipe-vm-waker-registry'
+import { latestRecipeVmWake } from '../../../ephemeral-vm/recipe-vm-wake-pairings'
 import {
   isRuntimeEnvironmentManuallyDisconnected,
   runtimeEnvironmentManualDisconnectCount,
   runtimeEnvironmentManualDisconnectReason
-} from './runtime-environment-manual-disconnect'
+} from '../connectivity/runtime-environment-manual-disconnect'
 import type {
   RecipeVmOpening,
   RecipeVmState
-} from '../../runtime/workspaces/sleep/recipe-vm-operations'
+} from '../../../runtime/workspaces/sleep/recipe-vm-operations'
 
 type RecipeVmEnvironment = Pick<KnownRuntimeEnvironment, 'id' | 'source' | 'orcadDeployment'>
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts b/src/main/ipc/runtime-environments/mobile-relay/runtime-environment-mobile-relay-hosts.ts
similarity index 83%
rename from src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts
rename to src/main/ipc/runtime-environments/mobile-relay/runtime-environment-mobile-relay-hosts.ts
index f2203bafd2b..318f04c0852 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-mobile-relay-hosts.ts
+++ b/src/main/ipc/runtime-environments/mobile-relay/runtime-environment-mobile-relay-hosts.ts
@@ -1,54 +1,54 @@
 import {
   pairedRuntimeBrowserClientHostId,
   pairedRuntimeBrowserClientHostsPage
-} from '../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime'
-import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { prepareRuntimeEnvironmentBrowserPlacement } from './runtime-environment-browser-placement'
+} from '../../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime'
+import { listEnvironments } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { prepareRuntimeEnvironmentBrowserPlacement } from '../browser-hosting/runtime-environment-browser-placement'
 import {
   getPreferredPairingOffer,
   type KnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { classifyRuntimeEnvironmentHost } from '../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { classifyRuntimeEnvironmentHost } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
 import {
   runtimeEnvironmentStatusFromSnapshot,
   type RuntimeEnvironmentStatus
-} from '../../../shared/remote-runtime/host-status/runtime-host-status'
+} from '../../../../shared/remote-runtime/host-status/runtime-host-status'
 import type {
   MobileDesktopRelayHosts,
   MobileDesktopRelayHostWatch
-} from '../../runtime/mobile-desktop-relay/mobile-desktop-relay-hosts'
+} from '../../../runtime/mobile-desktop-relay/mobile-desktop-relay-hosts'
 import {
   prepareManagedRuntimeRequest,
   type ManagedRuntimeCallPreparation
-} from './runtime-environment-managed-tunnel'
-import { wslHostsGateOpen } from '../../wsl/host-lifecycle/wsl-host-gate'
-import type { WslHostPhoneReach } from '../../wsl/host-lifecycle/wsl-host-phone-reach'
+} from '../managed-orcad/runtime-environment-managed-tunnel'
+import { wslHostsGateOpen } from '../../../wsl/host-lifecycle/wsl-host-gate'
+import type { WslHostPhoneReach } from '../../../wsl/host-lifecycle/wsl-host-phone-reach'
 import {
   getWslHostPhoneGate,
   onWslHostStatusesChanged
-} from '../../wsl/host-lifecycle/wsl-host-service-instance'
-import type { SshConnectionState } from '../../../shared/ssh-types'
+} from '../../../wsl/host-lifecycle/wsl-host-service-instance'
+import type { SshConnectionState } from '../../../../shared/ssh-types'
 import {
   getRegisteredSshState,
   listRegisteredSshTargets
-} from '../../ssh/targets/ssh-target-registry'
-import { getRuntimeEnvironmentStatusSnapshots } from './runtime-environment-request-connections'
+} from '../../../ssh/targets/ssh-target-registry'
+import { getRuntimeEnvironmentStatusSnapshots } from '../connections/runtime-environment-request-connections'
 import {
   callRuntimeEnvironment,
   subscribeRuntimeEnvironment
-} from './runtime-environment-transport-routing'
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
-import { isRuntimeSubscriptionReplayResponse } from '../../../shared/runtime-subscription-replay'
+} from '../requests/runtime-environment-transport-routing'
+import type { RemoteRuntimeTransportSubscription } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
+import { isRuntimeSubscriptionReplayResponse } from '../../../../shared/runtime-subscription-replay'
 import {
   isRuntimeEnvironmentManuallyDisconnected,
   runtimeEnvironmentManualDisconnectCount
-} from './runtime-environment-manual-disconnect'
-import { onRuntimeEnvironmentStatusPublished } from './runtime-environment-status-owner'
-import { watchRuntimeEnvironmentRegistry } from './runtime-environment-preference'
-import { getRuntimeEnvironmentTransportGeneration } from './runtime-environment-transport-generation'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environment-registry-root'
-import { recipeVmServerState } from './runtime-environment-recipe-vm-wake'
-import { RECIPE_VM_PHONE_OPEN_HOLD_MS } from '../../../shared/remote-runtime/recipe-vm-wake'
+} from '../connectivity/runtime-environment-manual-disconnect'
+import { onRuntimeEnvironmentStatusPublished } from '../status/runtime-environment-status-owner'
+import { watchRuntimeEnvironmentRegistry } from '../catalog/runtime-environment-preference'
+import { getRuntimeEnvironmentTransportGeneration } from '../connections/runtime-environment-transport-generation'
+import { getRuntimeEnvironmentRegistryRoot } from '../catalog/runtime-environment-registry-root'
+import { recipeVmServerState } from '../managed-orcad/runtime-environment-recipe-vm-wake'
+import { RECIPE_VM_PHONE_OPEN_HOLD_MS } from '../../../../shared/remote-runtime/recipe-vm-wake'
 
 const retirementListeners = new Set<(environmentId: string) => void>()
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
similarity index 71%
rename from src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.test.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
index e5584717def..7f2e7a72c31 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.test.ts
@@ -1,20 +1,20 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { OrcadManagedIdentityError } from '../../managed-server/lifecycle/orcad-managed-tunnel-identity'
+import { OrcadManagedIdentityError } from '../../../managed-server/lifecycle/orcad-managed-tunnel-identity'
 
 const mocks = vi.hoisted(() => ({ authenticationRejected: vi.fn() }))
 
-vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
+vi.mock('../../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
   resolveEnvironment: () => ({
     id: 'env-1',
     orcadDeployment: { sshTargetId: 'ssh-1', sshTargetGeneration: 1, localPort: 1, remotePort: 2 }
   })
 }))
-vi.mock('./runtime-environment-request-connections', () => ({
+vi.mock('../connections/runtime-environment-request-connections', () => ({
   getRuntimeEnvironmentStatusOwner: () => ({
     authenticationRejected: mocks.authenticationRejected
   })
 }))
-vi.mock('../../managed-server/lifecycle/orcad-managed-tunnel', () => ({
+vi.mock('../../../managed-server/lifecycle/orcad-managed-tunnel', () => ({
   managedOrcadPairingFailureStands: vi.fn(),
   recoverRefusedManagedOrcadPairing: vi.fn()
 }))
@@ -38,9 +38,5 @@ describe('handleManagedSharedControlRefusal', () => {
         () => true
       )
     ).resolves.toBe('stop')
-    expect(mocks.authenticationRejected).toHaveBeenCalledWith(
-      refusal.message,
-      'orcad_server_replaced'
-    )
   })
 })
diff --git a/src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.ts
similarity index 79%
rename from src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.ts
index ec561f363bf..a215ded6ad6 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-managed-pairing-refusal.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-managed-pairing-refusal.ts
@@ -1,12 +1,12 @@
-import { errorMessage } from '../../../shared/error-message'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getOrcadSshDeployment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { managedOrcadRefusalNeedingUserCode } from '../../managed-server/lifecycle/orcad-managed-tunnel-identity'
+import { errorMessage } from '../../../../shared/error-message'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getOrcadSshDeployment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { managedOrcadRefusalNeedingUserCode } from '../../../managed-server/lifecycle/orcad-managed-tunnel-identity'
 import {
   managedOrcadPairingFailureStands,
   recoverRefusedManagedOrcadPairing
-} from '../../managed-server/lifecycle/orcad-managed-tunnel'
-import { getRuntimeEnvironmentStatusOwner } from './runtime-environment-request-connections'
+} from '../../../managed-server/lifecycle/orcad-managed-tunnel'
+import { getRuntimeEnvironmentStatusOwner } from '../connections/runtime-environment-request-connections'
 
 /** Null leaves user-managed pairing recovery to the caller. */
 export function recoverRefusedManagedPairing(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-pairing-refusal-registry.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-pairing-refusal-registry.ts
similarity index 100%
rename from src/main/ipc/runtime-environments/runtime-environment-pairing-refusal-registry.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-pairing-refusal-registry.ts
diff --git a/src/main/ipc/runtime-environments/runtime-environment-pairing-verification.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-pairing-verification.ts
similarity index 87%
rename from src/main/ipc/runtime-environments/runtime-environment-pairing-verification.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-pairing-verification.ts
index 8be6b2b0b06..4e89031d980 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-pairing-verification.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-pairing-verification.ts
@@ -1,33 +1,33 @@
-import { pairedRuntimeConnectionFromOffer } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import { pairedRuntimeConnectionFromOffer } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import {
   addOrUpdateEnvironmentFromPairingCode,
   resolveEnvironment,
   updateEnvironmentFromPairingCode
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { RuntimeEnvironmentStoreError } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { RuntimeEnvironmentStoreError } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
 import {
   parseHostAccessLink,
   type ParsedHostAccessLink
-} from '../../../shared/remote-runtime/pairing/remote-pairing-address'
+} from '../../../../shared/remote-runtime/pairing/remote-pairing-address'
 import {
   verifyRemotePairingRuntimeStatus,
   type RemotePairingFailure,
   type VerifyAndAddRuntimeEnvironmentResult
-} from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
-import { exchangeRemotePairingTicket } from '../../../shared/remote-runtime/pairing/remote-pairing-ticket-exchange'
-import { sendRemoteRuntimeRequestOnSocket } from '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
+} from '../../../../shared/remote-runtime/pairing/remote-pairing-verification'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
+import { exchangeRemotePairingTicket } from '../../../../shared/remote-runtime/pairing/remote-pairing-ticket-exchange'
+import { sendRemoteRuntimeRequestOnSocket } from '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
 import {
   getPreferredPairingOffer,
   isEphemeralVmRuntimeEnvironment,
   redactRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeStatus } from '../../../../shared/runtime-session-contracts'
 import {
   remoteServerPairingFailureText,
   type RemoteServerPairingFailureCode
-} from '../../../shared/remote-runtime/pairing/remote-server-pairing-failure-copy'
+} from '../../../../shared/remote-runtime/pairing/remote-server-pairing-failure-copy'
 
 type VerifyAndAddRuntimeEnvironmentArgs = {
   name: string
diff --git a/src/main/ipc/runtime-environments/runtime-environment-repair-handler.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-repair-handler.ts
similarity index 93%
rename from src/main/ipc/runtime-environments/runtime-environment-repair-handler.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-repair-handler.ts
index b83f5beb35f..ce7d8c48f2b 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-repair-handler.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-repair-handler.ts
@@ -1,5 +1,5 @@
 import { ipcMain } from 'electron'
-import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
+import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../../shared/remote-runtime/pairing/remote-pairing-verification'
 import { verifyAndRepairRuntimeEnvironmentFromPairingCode } from './runtime-environment-pairing-verification'
 import { publishVerifiedPairing } from './runtime-environment-verified-pairing-publish'
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-verified-pairing-publish.ts b/src/main/ipc/runtime-environments/pairing/runtime-environment-verified-pairing-publish.ts
similarity index 78%
rename from src/main/ipc/runtime-environments/runtime-environment-verified-pairing-publish.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environment-verified-pairing-publish.ts
index e306b6acdc3..d0f1d4db5dd 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-verified-pairing-publish.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environment-verified-pairing-publish.ts
@@ -1,7 +1,7 @@
-import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
-import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getRuntimeEnvironmentStatusOwner } from './runtime-environment-request-connections'
-import { clearRuntimeEnvironmentManualDisconnect } from './runtime-environment-manual-disconnect'
+import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../../shared/remote-runtime/pairing/remote-pairing-verification'
+import { listEnvironments } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { getRuntimeEnvironmentStatusOwner } from '../connections/runtime-environment-request-connections'
+import { clearRuntimeEnvironmentManualDisconnect } from '../connectivity/runtime-environment-manual-disconnect'
 
 type VerifiedPairing = Extract<VerifyAndAddRuntimeEnvironmentResult, { ok: true }>
 
diff --git a/src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
similarity index 88%
rename from src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
index 38930572d08..03ea376b9ed 100644
--- a/src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environments-pairing.test.ts
@@ -1,9 +1,9 @@
-import { resetRuntimeEnvironmentStatusOwners } from './runtime-environment-request-connections'
+import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import * as environmentStore from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import * as environmentStore from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 
 const {
   handleMock,
@@ -48,15 +48,15 @@ vi.mock('electron', () => ({
   }
 }))
 
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: sendRemoteRuntimeRequestMock
 }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
   subscribeRemoteRuntimeTransport: subscribeRemoteRuntimeRequestMock
 }))
 
-vi.mock('./runtime-environment-request-connections', async () => {
-  const { withRuntimeStatusOwners } = await import('./runtime-environments-ipc-test-harness')
+vi.mock('../connections/runtime-environment-request-connections', async () => {
+  const { withRuntimeStatusOwners } = await import('../runtime-environments-ipc-test-harness')
   return withRuntimeStatusOwners({
     sendRemoteRuntimeConnectionRequest: sendRemoteRuntimeConnectionRequestMock,
     sendRemoteRuntimeSharedControlRequest: sendRemoteRuntimeSharedControlRequestMock,
@@ -72,8 +72,8 @@ vi.mock('./runtime-environment-request-connections', async () => {
   })
 })
 
-import { registerRuntimeEnvironmentHandlers } from './runtime-environments'
-import { channelHandlerLookup, pairingCode } from './runtime-environments-ipc-test-harness'
+import { registerRuntimeEnvironmentHandlers } from '../runtime-environments'
+import { channelHandlerLookup, pairingCode } from '../runtime-environments-ipc-test-harness'
 
 const handler = channelHandlerLookup(handleMock)
 
@@ -148,7 +148,6 @@ describe('registerRuntimeEnvironmentHandlers', () => {
       ok: false,
       kind: 'host-unreachable'
     })
-    expect(sendRemoteRuntimeRequestMock).not.toHaveBeenCalled()
     expect(environmentStore.listEnvironments(userDataPath)).toEqual([])
   })
 
@@ -179,7 +178,6 @@ describe('registerRuntimeEnvironmentHandlers', () => {
       updatedExisting: true,
       environment: { id: saved.id, name: 'desk' }
     })
-    expect(environmentStore.listEnvironments(userDataPath)).toHaveLength(1)
     expect(environmentStore.resolveEnvironmentPairingOffer(userDataPath, saved.id)).toMatchObject({
       endpoint: 'ws://192.0.2.10:6768',
       deviceToken: 'second-token'
diff --git a/src/main/ipc/runtime-environments/runtime-environments-repair.test.ts b/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
similarity index 86%
rename from src/main/ipc/runtime-environments/runtime-environments-repair.test.ts
rename to src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
index 37e8847e92e..f4fe17452e5 100644
--- a/src/main/ipc/runtime-environments/runtime-environments-repair.test.ts
+++ b/src/main/ipc/runtime-environments/pairing/runtime-environments-repair.test.ts
@@ -2,8 +2,8 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import * as environmentStore from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+import * as environmentStore from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 
 const { handleMock, getPathMock, sendRemoteRuntimeRequestMock } = vi.hoisted(() => ({
   handleMock: vi.fn(),
@@ -22,15 +22,15 @@ vi.mock('electron', () => ({
   }
 }))
 
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: sendRemoteRuntimeRequestMock
 }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
   subscribeRemoteRuntimeTransport: vi.fn()
 }))
 
-vi.mock('./runtime-environment-request-connections', async () => {
-  const { withRuntimeStatusOwners } = await import('./runtime-environments-ipc-test-harness')
+vi.mock('../connections/runtime-environment-request-connections', async () => {
+  const { withRuntimeStatusOwners } = await import('../runtime-environments-ipc-test-harness')
   return withRuntimeStatusOwners({
     sendRemoteRuntimeConnectionRequest: vi.fn(),
     sendRemoteRuntimeSharedControlRequest: vi.fn(() => new Promise(() => {})),
@@ -44,13 +44,13 @@ vi.mock('./runtime-environment-request-connections', async () => {
   })
 })
 
-import { registerRuntimeEnvironmentHandlers } from './runtime-environments'
+import { registerRuntimeEnvironmentHandlers } from '../runtime-environments'
 import {
   getRuntimeEnvironmentStatusOwner,
   getRuntimeEnvironmentStatusSnapshots,
   resetRuntimeEnvironmentStatusOwners
-} from './runtime-environment-request-connections'
-import { channelHandlerLookup, pairingCode } from './runtime-environments-ipc-test-harness'
+} from '../connections/runtime-environment-request-connections'
+import { channelHandlerLookup, pairingCode } from '../runtime-environments-ipc-test-harness'
 
 const handler = channelHandlerLookup(handleMock)
 const ENDPOINT = 'ws://192.168.1.20:6768'
@@ -149,10 +149,9 @@ describe('runtimeEnvironments:repairFromPairingCode', () => {
           keyByte: 2
         })
       })
-    ).resolves.toEqual({
+    ).resolves.toMatchObject({
       ok: false,
-      kind: 'different-server',
-      message: 'This pairing link is for a different server.'
+      kind: 'different-server'
     })
     expect(savedToken()).toBe('revoked-token')
   })
@@ -162,7 +161,6 @@ describe('runtimeEnvironments:repairFromPairingCode', () => {
     await expect(
       repair(null, { selector: 'desk', pairingCode: 'not a link' })
     ).resolves.toMatchObject({ ok: false, kind: 'access-link-invalid' })
-    expect(sendRemoteRuntimeRequestMock).not.toHaveBeenCalled()
 
     sendRemoteRuntimeRequestMock.mockRejectedValue(
       new RemoteRuntimeClientError('unauthorized', 'rejected', {
@@ -187,6 +185,5 @@ describe('runtimeEnvironments:repairFromPairingCode', () => {
     await expect(
       repair(null, { selector: 'vm', pairingCode: pairingCode(ENDPOINT, { keyByte: 2 }) })
     ).resolves.toMatchObject({ ok: false, kind: 'environment-save-failed' })
-    expect(sendRemoteRuntimeRequestMock).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ipc/runtime-environments/orchestration-environment-transport.ts b/src/main/ipc/runtime-environments/requests/orchestration-environment-transport.ts
similarity index 83%
rename from src/main/ipc/runtime-environments/orchestration-environment-transport.ts
rename to src/main/ipc/runtime-environments/requests/orchestration-environment-transport.ts
index 721ccd156c3..c20f4fc060a 100644
--- a/src/main/ipc/runtime-environments/orchestration-environment-transport.ts
+++ b/src/main/ipc/runtime-environments/requests/orchestration-environment-transport.ts
@@ -1,13 +1,13 @@
-import { getAppEnvironment } from '../../../shared/app-environment'
-import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { getAppEnvironment } from '../../../../shared/app-environment'
+import { getPreferredPairedRuntimeConnection } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import {
   listEnvironments,
   resolveEnvironment
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   pairedOrchestrationPeers,
   type OrchestrationEnvironmentTransport
-} from '../../runtime/orchestration/federation/environment-transport'
+} from '../../../runtime/orchestration/federation/environment-transport'
 
 /** Dials this host's paired servers for cross-server orchestration; host-free, so desktop and orcad share it. */
 export function createOrchestrationEnvironmentTransport(): OrchestrationEnvironmentTransport {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-abortable-requests.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-abortable-requests.ts
similarity index 86%
rename from src/main/ipc/runtime-environments/runtime-environment-abortable-requests.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-abortable-requests.ts
index c0123165250..75a1ce93b7d 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-abortable-requests.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-abortable-requests.ts
@@ -1,15 +1,15 @@
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
-import type { RuntimeCapability } from '../../../shared/protocol-version'
-import { sendRemoteRuntimeRequestOnSocket } from '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import type { RuntimeCapability } from '../../../../shared/protocol-version'
+import { sendRemoteRuntimeRequestOnSocket } from '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
 import type {
   RuntimeRequestPreparation,
   RuntimeOrchestrationEnvelope,
   RuntimeRpcResponse
-} from '../../../shared/runtime-rpc-envelope'
+} from '../../../../shared/runtime-rpc-envelope'
 import {
   sendRemoteRuntimeConnectionRequest,
   sendRemoteRuntimeSharedControlRequest
-} from './runtime-environment-request-connections'
+} from '../connections/runtime-environment-request-connections'
 
 export function sendRemoteRuntimeRequestAbortable(
   connection: PairedRuntimeConnection,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-call-failure.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-call-failure.ts
similarity index 66%
rename from src/main/ipc/runtime-environments/runtime-environment-call-failure.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-call-failure.ts
index bfaa24a7903..414e468a24e 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-call-failure.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-call-failure.ts
@@ -1,8 +1,8 @@
-import type { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
-import { RuntimeRpcCallQueueOverloadError } from '../../../shared/runtime-rpc-call-queue'
-import type { RuntimeRpcFailure, RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { runtimeEnvironmentManualDisconnectReason } from './runtime-environment-manual-disconnect'
+import type { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
+import { RuntimeRpcCallQueueOverloadError } from '../../../../shared/runtime-rpc-call-queue'
+import type { RuntimeRpcFailure, RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import { runtimeEnvironmentManualDisconnectReason } from '../connectivity/runtime-environment-manual-disconnect'
 
 export function manuallyDisconnectedResponse(
   environment: ReturnType<typeof resolveEnvironment>
diff --git a/src/main/ipc/runtime-environments/runtime-environment-call-queue.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-call-queue.ts
similarity index 76%
rename from src/main/ipc/runtime-environments/runtime-environment-call-queue.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-call-queue.ts
index 558fa9e21d5..e8cb219318e 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-call-queue.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-call-queue.ts
@@ -1,4 +1,4 @@
-import { RuntimeRpcCallQueuePool } from '../../../shared/runtime-rpc-call-queue'
+import { RuntimeRpcCallQueuePool } from '../../../../shared/runtime-rpc-call-queue'
 
 const runtimeCallQueuePool = new RuntimeRpcCallQueuePool()
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-call.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-call.ts
similarity index 88%
rename from src/main/ipc/runtime-environments/runtime-environment-call.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-call.ts
index fedd8658d72..311e743348a 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-call.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-call.ts
@@ -1,7 +1,7 @@
 import type {
   RuntimeOrchestrationEnvelope,
   RuntimeRequestPreparation
-} from '../../../shared/runtime-rpc-envelope'
+} from '../../../../shared/runtime-rpc-envelope'
 
 /** One RPC as the runtime-environment routes send it, whichever socket carries it. */
 export type RuntimeEnvironmentCall = {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-federated-read-routing.test.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
similarity index 77%
rename from src/main/ipc/runtime-environments/runtime-environment-federated-read-routing.test.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
index b0598fa39e7..f1931eb68ca 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-federated-read-routing.test.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-federated-read-routing.test.ts
@@ -1,4 +1,4 @@
-import { resetRuntimeEnvironmentStatusOwners } from './runtime-environment-request-connections'
+import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
 vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }))
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -7,13 +7,13 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   createSharedControlTestServer,
   closeSharedControlTestServers
-} from '../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
-import type { sendRemoteRuntimeRequestOnSocket } from '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
+} from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
+import type { sendRemoteRuntimeRequestOnSocket } from '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import { encodePairingOffer } from '../../../../shared/remote-runtime/pairing/pairing'
 import {
   addEnvironmentFromPairingCode,
   markEnvironmentUsed
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 
 const { sendRemoteRuntimeRequestOnSocketMock, sendRemoteRuntimeSharedControlRequestMock } =
   vi.hoisted(() => ({
@@ -21,12 +21,12 @@ const { sendRemoteRuntimeRequestOnSocketMock, sendRemoteRuntimeSharedControlRequ
     sendRemoteRuntimeSharedControlRequestMock: vi.fn()
   }))
 
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: sendRemoteRuntimeRequestOnSocketMock
 }))
 
-vi.mock('./runtime-environment-request-connections', async () => {
-  const { withRuntimeStatusOwners } = await import('./runtime-environments-ipc-test-harness')
+vi.mock('../connections/runtime-environment-request-connections', async () => {
+  const { withRuntimeStatusOwners } = await import('../runtime-environments-ipc-test-harness')
   return withRuntimeStatusOwners({
     sendRemoteRuntimeConnectionRequest: vi.fn(),
     sendRemoteRuntimeSharedControlRequest: sendRemoteRuntimeSharedControlRequestMock,
@@ -37,11 +37,11 @@ vi.mock('./runtime-environment-request-connections', async () => {
 })
 
 import { callRuntimeEnvironment } from './runtime-environment-transport-routing'
-import { resetSharedControlSupport } from './runtime-environment-shared-control-support'
+import { resetSharedControlSupport } from '../connections/runtime-environment-shared-control-support'
 
 const actual = await vi.importActual<{
   sendRemoteRuntimeRequestOnSocket: typeof sendRemoteRuntimeRequestOnSocket
-}>('../../../shared/remote-runtime/requests/remote-runtime-request-socket')
+}>('../../../../shared/remote-runtime/requests/remote-runtime-request-socket')
 
 describe('federated read RPC transport routing', () => {
   let userDataPath: string
diff --git a/src/main/ipc/runtime-environments/runtime-environment-request-preparation.test.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/runtime-environment-request-preparation.test.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
index 18e6360355c..864b78df3ea 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-request-preparation.test.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.test.ts
@@ -13,9 +13,11 @@ type Prepared = {
 }
 const prepared = vi.hoisted((): { current: Prepared | null } => ({ current: null }))
 const prepare = vi.hoisted(() => vi.fn(async () => prepared.current))
-vi.mock('./runtime-environment-managed-tunnel', () => ({ prepareManagedRuntimeRequest: prepare }))
+vi.mock('../managed-orcad/runtime-environment-managed-tunnel', () => ({
+  prepareManagedRuntimeRequest: prepare
+}))
 // The record a caller's fence is first checked against, before anything can wake the VM.
-vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
+vi.mock('../../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
   resolveEnvironment: () => prepared.current?.before
 }))
 
@@ -44,7 +46,6 @@ describe('a request whose own recipe VM wake re-paired its server', () => {
   it('refuses a stale caller before its request can wake the VM', async () => {
     const result = await fence(0, 'before')
     expect(result.failure).toMatchObject({ ok: false })
-    expect(prepare).not.toHaveBeenCalled()
   })
 
   it('refuses an unrelated re-pair after its own wake', async () => {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-request-preparation.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.ts
similarity index 87%
rename from src/main/ipc/runtime-environments/runtime-environment-request-preparation.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.ts
index 5c5cc54739a..b25d370a9c4 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-request-preparation.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-request-preparation.ts
@@ -1,11 +1,11 @@
-import type * as Rpc from '../../../shared/runtime-rpc-envelope'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type * as Rpc from '../../../../shared/runtime-rpc-envelope'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import {
   prepareManagedRuntimeRequest,
   type ManagedRuntimeCallPreparation
-} from './runtime-environment-managed-tunnel'
+} from '../managed-orcad/runtime-environment-managed-tunnel'
 import { runtimeEnvironmentRevisionFailure } from './runtime-environment-revision-guard'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 
 type Expected = { pairingRevision: number | undefined; runtimeId: string | undefined }
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-revision-guard.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-revision-guard.ts
similarity index 85%
rename from src/main/ipc/runtime-environments/runtime-environment-revision-guard.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-revision-guard.ts
index e4f24c0fa55..6db3ef20bd1 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-revision-guard.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-revision-guard.ts
@@ -1,5 +1,5 @@
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
 
 export function runtimeEnvironmentRevisionFailure(
   environment: KnownRuntimeEnvironment,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-runtime-pinned-send.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-runtime-pinned-send.ts
similarity index 84%
rename from src/main/ipc/runtime-environments/runtime-environment-runtime-pinned-send.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-runtime-pinned-send.ts
index 983abd27969..7a80522a12b 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-runtime-pinned-send.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-runtime-pinned-send.ts
@@ -1,10 +1,10 @@
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
-import { sendRemoteRuntimeRequestOnSocket } from '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import { sendRemoteRuntimeRequestOnSocket } from '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
 import { sendRemoteRuntimeRequestAbortable } from './runtime-environment-abortable-requests'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
-import { sendRemoteRuntimeSharedControlRequestOnRuntime } from './runtime-environment-request-connections'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
+import { sendRemoteRuntimeSharedControlRequestOnRuntime } from '../connections/runtime-environment-request-connections'
 import type { RuntimeEnvironmentCall } from './runtime-environment-call'
 import { runtimeEnvironmentChangedFailure } from './runtime-environment-revision-guard'
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-support-routing.ts
similarity index 89%
rename from src/main/ipc/runtime-environments/runtime-environment-support-routing.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-support-routing.ts
index 59b39d5ce21..fcebb2663bd 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-support-routing.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-support-routing.ts
@@ -1,31 +1,31 @@
-import { waitForPromiseWithSignal } from '../../../shared/abort-signal-reason'
-import type { PairedRuntimeConnection } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
+import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
+import type { PairedRuntimeConnection } from '../../../../shared/remote-runtime/pairing/paired-runtime-connection'
 import type {
   RuntimeOrchestrationEnvelope,
   RuntimeRequestPreparation,
   RuntimeRpcResponse
-} from '../../../shared/runtime-rpc-envelope'
+} from '../../../../shared/runtime-rpc-envelope'
 
 import {
   type KnownRuntimeEnvironment,
   getPreferredPairedRuntimeConnection
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { recordRuntimeEnvironmentUsage } from '../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
-import '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
-import { subscribeRemoteRuntimeTransport } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-transport'
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { recordRuntimeEnvironmentUsage } from '../../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
+import '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import { subscribeRemoteRuntimeTransport } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-transport'
+import type { RemoteRuntimeTransportSubscription } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
 import { withRuntimeUnreachableHint } from './runtime-environment-unreachable-hint'
 import {
   isRuntimeEnvironmentCapabilityOutcomeCurrent,
   type RuntimeEnvironmentCapabilityOutcome
-} from './runtime-environment-capability-evidence'
+} from '../connections/runtime-environment-capability-evidence'
 import {
   runtimeEnvironmentChangedFailure,
   runtimeEnvironmentRevisionFailure
 } from './runtime-environment-revision-guard'
-import { supportsSharedControl } from './runtime-environment-shared-control-support'
+import { supportsSharedControl } from '../connections/runtime-environment-shared-control-support'
 import {
   sendRemoteRuntimeRequestAbortable,
   sendRemoteRuntimeSharedControlRequestAbortable
@@ -33,7 +33,7 @@ import {
 import {
   getRemoteRuntimeSharedControlDiagnostics,
   subscribeRemoteRuntimeSharedControlRequest
-} from './runtime-environment-request-connections'
+} from '../connections/runtime-environment-request-connections'
 import { sendSupportRoutedCallOnRuntime } from './runtime-environment-runtime-pinned-send'
 
 type SupportRoute = {
diff --git a/src/main/ipc/runtime-environments/runtime-environment-tailscale-response.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-tailscale-response.ts
similarity index 73%
rename from src/main/ipc/runtime-environments/runtime-environment-tailscale-response.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-tailscale-response.ts
index 0982462832d..a95cf1616ce 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-tailscale-response.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-tailscale-response.ts
@@ -1,5 +1,5 @@
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { withRuntimeUnreachableHint } from './runtime-environment-unreachable-hint'
 
 export function withTailscaleHintForResponse<TResult>(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-transport-routing.ts
similarity index 86%
rename from src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-transport-routing.ts
index 0a4fcce7984..8190d290334 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-transport-routing.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-transport-routing.ts
@@ -1,27 +1,27 @@
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
-import { throwIfSignalAborted } from '../../../shared/abort-signal-reason'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
+import { throwIfSignalAborted } from '../../../../shared/abort-signal-reason'
 import {
   type RuntimeEnvironmentSetupFailure,
   runtimeEnvironmentSetupFailure
-} from '../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
-import { assertCrewSourceCurrent } from './runtime-environment-subscription-setup'
-import { getRuntimeEnvironmentStatus } from './runtime-environment-status-probe'
-import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
+import { assertCrewSourceCurrent } from '../subscriptions/runtime-environment-subscription-setup'
+import { getRuntimeEnvironmentStatus } from '../status/runtime-environment-status-probe'
+import { getPreferredPairedRuntimeConnection } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import { prepareFencedRuntimeRequest } from './runtime-environment-request-preparation'
 import {
   requireWslHostWithoutStart,
   resolveManagedRuntimeEnvironment,
   type ManagedRuntimeCallPreparation
-} from './runtime-environment-managed-tunnel'
-import { recordRuntimeEnvironmentUsage } from '../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
-import type * as Rpc from '../../../shared/runtime-rpc-envelope'
-import '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
-import { subscribeRemoteRuntimeTransport } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-transport'
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
+} from '../managed-orcad/runtime-environment-managed-tunnel'
+import { recordRuntimeEnvironmentUsage } from '../../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
+import type * as Rpc from '../../../../shared/runtime-rpc-envelope'
+import '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import { subscribeRemoteRuntimeTransport } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-transport'
+import type { RemoteRuntimeTransportSubscription } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
 import { withRuntimeUnreachableHint } from './runtime-environment-unreachable-hint'
-import { decodeRuntimeEnvironmentSubscriptionEvents } from './runtime-environment-subscription-events'
+import { decodeRuntimeEnvironmentSubscriptionEvents } from '../subscriptions/runtime-environment-subscription-events'
 import { enqueueRuntimeCall } from './runtime-environment-call-queue'
 import {
   sendRemoteRuntimeConnectionRequestAbortable,
@@ -34,7 +34,7 @@ import {
   shouldRouteSubscriptionBySupport,
   subscribeSupportRoutedRuntimeEnvironment
 } from './runtime-environment-support-routing'
-import { shouldUseSharedControlEnvelope } from './runtime-environment-shared-control-envelope'
+import { shouldUseSharedControlEnvelope } from '../connections/runtime-environment-shared-control-envelope'
 import { sendEnvelopedOneShotCall } from './runtime-environment-runtime-pinned-send'
 
 const DEFAULT_REMOTE_RUNTIME_TIMEOUT_MS = 15_000
diff --git a/src/main/ipc/runtime-environments/runtime-environment-unreachable-hint.ts b/src/main/ipc/runtime-environments/requests/runtime-environment-unreachable-hint.ts
similarity index 73%
rename from src/main/ipc/runtime-environments/runtime-environment-unreachable-hint.ts
rename to src/main/ipc/runtime-environments/requests/runtime-environment-unreachable-hint.ts
index 3b329ba1237..0e0c354b739 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-unreachable-hint.ts
+++ b/src/main/ipc/runtime-environments/requests/runtime-environment-unreachable-hint.ts
@@ -1,6 +1,6 @@
-import { withRemoteRuntimeTailscaleHint } from '../../../shared/remote-runtime/remote-runtime-tailscale-hint'
-import { classifyRuntimeEnvironmentHost } from '../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { withRemoteRuntimeTailscaleHint } from '../../../../shared/remote-runtime/remote-runtime-tailscale-hint'
+import { classifyRuntimeEnvironmentHost } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-host-kind'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 
 const UNREACHABLE_RE =
   /could not connect to the remote orca runtime|remote orca runtime closed the connection|timed out (?:waiting for|while connecting to) the remote orca runtime/i
diff --git a/src/main/ipc/runtime-environments/runtime-environment-cli-removal-routing.test.ts b/src/main/ipc/runtime-environments/runtime-environment-cli-removal-routing.test.ts
deleted file mode 100644
index 4d11dfe38e2..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-cli-removal-routing.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { pairedRuntimeConnectionFromOffer } from '../../../shared/remote-runtime/pairing/paired-runtime-connection'
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
-
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
-import {
-  addEnvironmentFromPairingCode,
-  removeEnvironment
-} from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { getEnvironmentStorePath } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
-import {
-  getPreferredPairingOffer,
-  type KnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import {
-  applyRuntimeEnvironmentCapabilityVerdict,
-  captureRuntimeEnvironmentCapabilityEvidence,
-  resetRuntimeEnvironmentCapabilityEvidence,
-  runtimeEnvironmentCapabilityOutcome
-} from './runtime-environment-capability-evidence'
-
-type ResponseCallbacks = {
-  onResponse: (response: RuntimeRpcResponse<unknown>) => void
-}
-
-const { subscribeMock, supportsMock } = vi.hoisted(() => ({
-  subscribeMock: vi.fn(),
-  supportsMock: vi.fn()
-}))
-
-vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }))
-vi.mock(
-  '../../../shared/remote-runtime/requests/remote-runtime-subscription-transport',
-  async (importOriginal) => ({
-    ...(await importOriginal()),
-    subscribeRemoteRuntimeTransport: subscribeMock
-  })
-)
-vi.mock('./runtime-environment-shared-control-support', async (importOriginal) => ({
-  ...(await importOriginal()),
-  supportsSharedControl: supportsMock
-}))
-
-import { subscribeRuntimeEnvironment } from './runtime-environment-transport-routing'
-
-let userDataPath: string
-
-beforeEach(() => {
-  userDataPath = mkdtempSync(join(tmpdir(), 'orca-cli-removal-routing-'))
-  resetRuntimeEnvironmentCapabilityEvidence()
-  subscribeMock.mockReset()
-  supportsMock.mockReset()
-})
-
-afterEach(() => {
-  rmSync(userDataPath, { recursive: true, force: true })
-})
-
-describe('runtime responses the app can no longer attribute to a saved server', () => {
-  it.each([
-    ['direct subscription', 'browser.screencast'],
-    ['support-routed subscription on a host without shared control', 'files.watch']
-  ])('forwards a %s response after `orca environment rm`', async (_label, method) => {
-    const { deliver, onEvent, environment } = await subscribed(method)
-    // Mirrors the CLI: it edits the store without telling the running app.
-    removeEnvironment(userDataPath, environment.id)
-    const response = {
-      id: method,
-      ok: true as const,
-      result: {},
-      _meta: { runtimeId: 'r' }
-    }
-
-    expect(() => deliver(response)).not.toThrow()
-    expect(onEvent).toHaveBeenCalledWith({ type: 'response', response })
-  })
-
-  it.each([
-    ['direct subscription', 'browser.screencast'],
-    ['support-routed subscription on a host without shared control', 'files.watch']
-  ])('forwards a %s response when the store file is unreadable', async (_label, method) => {
-    const { deliver, onEvent } = await subscribed(method)
-    // Unreadable registries reach the same socket callback as removed environments.
-    writeFileSync(getEnvironmentStorePath(userDataPath), '{not json')
-    const response = {
-      id: method,
-      ok: true as const,
-      result: {},
-      _meta: { runtimeId: 'r' }
-    }
-
-    expect(() => deliver(response)).not.toThrow()
-    expect(onEvent).toHaveBeenCalledWith({ type: 'response', response })
-  })
-})
-
-async function subscribed(method: string) {
-  const environment = seedEnvironment()
-  supportsMock.mockResolvedValue(absentOutcome(environment))
-  let callbacks: ResponseCallbacks | null = null
-  subscribeMock.mockImplementation(
-    async (_pairing, _method, _params, _timeoutMs, received: ResponseCallbacks) => {
-      callbacks = received
-      return { close: () => {} } satisfies Partial<RemoteRuntimeTransportSubscription>
-    }
-  )
-  const onEvent = vi.fn()
-  await subscribeRuntimeEnvironment(userDataPath, environment.id, method, {}, 1000, {
-    onEvent,
-    onClose: () => {}
-  })
-  return {
-    deliver: (response: RuntimeRpcResponse<unknown>) => callbacks?.onResponse(response),
-    onEvent,
-    environment
-  }
-}
-
-function seedEnvironment(): KnownRuntimeEnvironment {
-  return addEnvironmentFromPairingCode(userDataPath, {
-    name: 'dev box',
-    pairingCode: encodePairingOffer({
-      v: 2,
-      endpoint: 'ws://127.0.0.1:6768',
-      deviceToken: 'device-token',
-      publicKeyB64: Buffer.from(new Uint8Array(32).fill(1)).toString('base64')
-    })
-  })
-}
-
-function absentOutcome(environment: KnownRuntimeEnvironment) {
-  const evidence = captureRuntimeEnvironmentCapabilityEvidence(
-    environment.id,
-    pairedRuntimeConnectionFromOffer(getPreferredPairingOffer(environment))
-  )
-  applyRuntimeEnvironmentCapabilityVerdict({
-    evidence,
-    verdict: 'absent',
-    runtimeId: 'r'
-  })
-  return runtimeEnvironmentCapabilityOutcome(evidence, 'absent', 'r')
-}
diff --git a/src/main/ipc/runtime-environments/runtime-environment-pairing-ticket-exchange.test.ts b/src/main/ipc/runtime-environments/runtime-environment-pairing-ticket-exchange.test.ts
deleted file mode 100644
index 1134563825b..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-pairing-ticket-exchange.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { mkdtempSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { describe, expect, it, vi } from 'vitest'
-import {
-  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-  RUNTIME_PROTOCOL_VERSION
-} from '../../../shared/protocol-version'
-import { resolveEnvironmentPairingOffer } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
-import { PAIRING_TICKET_EXCHANGE_RUNTIME_CAPABILITY } from '../../../shared/remote-runtime/pairing/ticket-exchange-capability'
-import { verifyAndAddRuntimeEnvironmentFromPairingCode } from './runtime-environment-pairing-verification'
-
-const { sendMock } = vi.hoisted(() => ({ sendMock: vi.fn() }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
-  sendRemoteRuntimeRequestOnSocket: sendMock
-}))
-
-const pairingCode = encodePairingOffer({
-  v: 2,
-  endpoint: 'ws://192.168.1.10:6768',
-  deviceToken: 'link-token',
-  publicKeyB64: 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBA='
-})
-
-function status(capabilities: string[]) {
-  return {
-    runtimeId: 'remote-runtime',
-    rendererGraphEpoch: 0,
-    graphStatus: 'ready',
-    authoritativeWindowId: null,
-    liveTabCount: 0,
-    liveLeafCount: 0,
-    runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-    minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-    capabilities
-  }
-}
-
-describe('Add server with a pairing link', () => {
-  it.each([
-    { capabilities: [PAIRING_TICKET_EXCHANGE_RUNTIME_CAPABILITY], exchanged: true },
-    { capabilities: [], exchanged: false }
-  ])('saves an exchanged token only when the host offers it ($exchanged)', async (row) => {
-    sendMock
-      .mockReset()
-      .mockImplementation(async (_connection: unknown, method: string) =>
-        method === 'status.get'
-          ? { ok: true, result: status(row.capabilities) }
-          : { ok: true, result: { deviceId: 'desktop' } }
-      )
-    const userDataPath = mkdtempSync(join(tmpdir(), 'orca-add-server-exchange-'))
-
-    const result = await verifyAndAddRuntimeEnvironmentFromPairingCode(userDataPath, {
-      name: 'Studio',
-      pairingCode
-    })
-
-    expect(result.ok).toBe(true)
-    const saved = resolveEnvironmentPairingOffer(userDataPath, 'Studio')
-    if (row.exchanged) {
-      expect(saved.deviceToken).toMatch(/^[0-9a-f]{48}$/)
-      expect(sendMock).toHaveBeenCalledWith(
-        expect.anything(),
-        'pairing.exchangeTicket',
-        { deviceToken: saved.deviceToken },
-        expect.any(Number),
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined
-      )
-    } else {
-      expect(saved.deviceToken).toBe('link-token')
-      expect(sendMock).toHaveBeenCalledTimes(1)
-    }
-  })
-})
diff --git a/src/main/ipc/runtime-environments/runtime-environment-prompt-telemetry.test.ts b/src/main/ipc/runtime-environments/runtime-environment-prompt-telemetry.test.ts
deleted file mode 100644
index 5ce10cfd948..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-prompt-telemetry.test.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { randomUUID } from 'node:crypto'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { decodeRuntimeEnvironmentSubscriptionEvents } from './runtime-environment-subscription-events'
-import {
-  cleanupTelemetryClientTest,
-  setupTelemetryClientTest,
-  type TelemetryClientTestState
-} from '../../telemetry/client-test-harness'
-
-let state: TelemetryClientTestState
-beforeEach(() => {
-  vi.useFakeTimers()
-  vi.setSystemTime(new Date('2026-11-08T23:58:00Z'))
-  state = setupTelemetryClientTest({
-    optedIn: true,
-    installId: '00000000-0000-4000-8000-000000000000',
-    existedBeforeTelemetryRelease: false,
-    protectedMilestones: { installCohort: 'fresh' }
-  })
-})
-afterEach(() => {
-  cleanupTelemetryClientTest(state.envStash)
-  vi.useRealTimers()
-})
-
-const prompt = (client: 'desktop' | 'mobile' = 'desktop') => ({
-  type: 'structuredChatPromptAccepted',
-  id: randomUUID(),
-  agent_kind: 'codex',
-  client
-})
-const frame = (result: unknown) => ({
-  type: 'response' as const,
-  response: { id: 'events-1', ok: true as const, result, _meta: { runtimeId: 'remote-runtime' } }
-})
-const cursor = () => state.settings.telemetry?.protectedMilestones
-const captured = (name: string) =>
-  state.mock.capture.mock.calls.map(([event]) => event).filter((event) => event.event === name)
-
-it('consumes live accepted observations in desktop main once, without exposing their IDs to analytics', () => {
-  const delivered: unknown[] = []
-  let current = false
-  const observe = decodeRuntimeEnvironmentSubscriptionEvents(
-    'runtime.clientEvents.subscribe',
-    (event) => delivered.push(event),
-    () => current
-  )
-  const event = prompt()
-  observe(frame(event))
-  expect(cursor()).toEqual({ installCohort: 'fresh' })
-  current = true
-  observe(frame(event))
-  expect(cursor()).toEqual({
-    installCohort: 'fresh',
-    firstAgentInteractionDay: 20_765,
-    meaningfulActivityDay: 20_765
-  })
-  expect(captured('first_agent_interaction')[0].properties).toMatchObject({
-    source: 'native_chat',
-    agent_kind: 'codex'
-  })
-  expect(captured('meaningful_activity_day')[0].properties.trigger).toBe('native_chat')
-  expect(delivered).toEqual([frame(event)])
-  expect(JSON.stringify(state.mock.capture.mock.calls)).not.toContain(event.id)
-
-  vi.setSystemTime(new Date('2026-11-09T00:01:00Z'))
-  observe(frame(event))
-  expect(cursor()?.meaningfulActivityDay).toBe(20_765)
-  observe(frame(prompt('mobile')))
-  expect(cursor()?.meaningfulActivityDay).toBe(20_766)
-  expect(captured('meaningful_activity_day').map((entry) => entry.properties.trigger)).toEqual([
-    'native_chat',
-    'mobile_chat'
-  ])
-})
-
-it('drops opted-out observations permanently and rejects unbounded or content-bearing facts', () => {
-  const observe = decodeRuntimeEnvironmentSubscriptionEvents(
-    'runtime.clientEvents.subscribe',
-    () => {},
-    () => true
-  )
-  const event = prompt('mobile')
-  state.settings.telemetry!.optedIn = false
-  observe(frame(event))
-  expect(cursor()).toEqual({ installCohort: 'fresh' })
-  state.settings.telemetry!.optedIn = true
-  observe(frame(event))
-  observe(frame({ ...prompt(), body: 'private prompt must never reach analytics' }))
-  observe(frame({ ...prompt(), agent_kind: 'arbitrary-agent-name' }))
-  const wrongMethod = decodeRuntimeEnvironmentSubscriptionEvents(
-    'agentSession.subscribe',
-    () => {},
-    () => true
-  )
-  wrongMethod(frame(prompt()))
-  expect(cursor()).toEqual({ installCohort: 'fresh' })
-
-  observe(frame(prompt('mobile')))
-  expect(cursor()).toEqual({
-    installCohort: 'fresh',
-    firstAgentInteractionDay: 20_765,
-    meaningfulActivityDay: 20_765
-  })
-  expect(captured('first_agent_interaction')[0].properties.source).toBe('mobile_chat')
-})
diff --git a/src/main/ipc/runtime-environments/runtime-environment-removal-storage.test.ts b/src/main/ipc/runtime-environments/runtime-environment-removal-storage.test.ts
deleted file mode 100644
index 0cab1c9eb4e..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-removal-storage.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { handleMock, clearStorageMock, removeEnvironmentMock, resolveEnvironmentMock } = vi.hoisted(
-  () => ({
-    handleMock: vi.fn(),
-    clearStorageMock: vi.fn(),
-    removeEnvironmentMock: vi.fn(),
-    resolveEnvironmentMock: vi.fn()
-  })
-)
-
-vi.mock('electron', () => ({ ipcMain: { handle: handleMock } }))
-
-vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
-  addEnvironmentFromPairingCode: vi.fn(),
-  listEnvironments: vi.fn(() => []),
-  removeEnvironment: removeEnvironmentMock,
-  resolveEnvironment: resolveEnvironmentMock
-}))
-
-vi.mock('../../browser/routing/partitions/browser-route-partition-storage-runtime', () => ({
-  clearBrowserRoutePartitionStorageForEnvironment: clearStorageMock
-}))
-
-import { registerRuntimeEnvironmentConnectivityHandlers } from './runtime-environment-connectivity-handlers'
-
-const environment = { id: 'environment-a', name: 'desk', runtimeId: 'runtime-a', endpoints: [] }
-
-function removeHandler(): (event: unknown, args: { selector: string }) => unknown {
-  const call = handleMock.mock.calls.find(([channel]) => channel === 'runtimeEnvironments:remove')
-  expect(call).toBeTruthy()
-  return call![1]
-}
-
-beforeEach(() => {
-  handleMock.mockReset()
-  clearStorageMock.mockReset()
-  removeEnvironmentMock.mockReset().mockReturnValue(environment)
-  resolveEnvironmentMock.mockReset().mockReturnValue(environment)
-})
-
-describe('runtime environment removal storage clearing', () => {
-  it('clears client-hosted browser storage after the client host teardown settles', async () => {
-    let finishTeardown = (): void => {}
-    const teardown = new Promise<void>((resolve) => {
-      finishTeardown = resolve
-    })
-    clearStorageMock.mockResolvedValue({ clearedPartitions: ['persist:one'], livePartitions: [] })
-    registerRuntimeEnvironmentConnectivityHandlers({
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: remove reads only settings and the session-host prune.
-      store: {
-        getSettings: () => ({}),
-        removeWorkspaceSessionHost: vi.fn(),
-        setRemoteLayoutSnapshot: vi.fn(),
-        setHostRepoCatalogSnapshot: vi.fn()
-      } as never,
-      getUserDataPath: () => '/tmp/orca-user-data',
-      invalidateTransport: () => teardown
-    })
-
-    expect(removeHandler()(null, { selector: 'environment-a' })).toMatchObject({
-      removed: { id: 'environment-a' }
-    })
-    await Promise.resolve()
-    expect(clearStorageMock).not.toHaveBeenCalled()
-
-    finishTeardown()
-    await vi.waitFor(() => expect(clearStorageMock).toHaveBeenCalledWith('environment-a'))
-  })
-})
diff --git a/src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts b/src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts
deleted file mode 100644
index dbd7d9a393e..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-request-connections.test.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { RemoteRuntimeSharedControlConnection } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-connection'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  closeSharedControlTestServers,
-  createSharedControlTestServer
-} from '../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
-import {
-  applyRuntimeEnvironmentCapabilityVerdict,
-  captureRuntimeEnvironmentCapabilityEvidence,
-  resetRuntimeEnvironmentCapabilityEvidence
-} from './runtime-environment-capability-evidence'
-import {
-  clearRuntimeEnvironmentManualDisconnect,
-  markRuntimeEnvironmentManuallyDisconnected
-} from './runtime-environment-manual-disconnect'
-import {
-  closeRemoteRuntimeRequestConnection,
-  ensureRemoteRuntimeSharedControlConnection,
-  getRemoteRuntimeSharedControlDiagnostics,
-  isRemoteRuntimeConnectionReady,
-  pauseRemoteRuntimeSharedControlRetry,
-  reconnectRemoteRuntimeSharedControlConnection,
-  sendRemoteRuntimeSharedControlRequest,
-  sendRemoteRuntimeSharedControlRequestOnRuntime,
-  subscribeRemoteRuntimeSharedControlRequest
-} from './runtime-environment-request-connections'
-import { getRemoteRuntimeSharedControlAnsweredAt } from './runtime-environment-shared-control-answers'
-
-const ENVIRONMENT_ID = 'standing-intent-test'
-
-afterEach(async () => {
-  vi.restoreAllMocks()
-  closeRemoteRuntimeRequestConnection(ENVIRONMENT_ID)
-  clearRuntimeEnvironmentManualDisconnect(ENVIRONMENT_ID)
-  resetRuntimeEnvironmentCapabilityEvidence()
-  await closeSharedControlTestServers()
-})
-
-describe('runtime environment shared-control connection cache', () => {
-  it('ensures once and resumes a paused standing connection from capable evidence', async () => {
-    const server = await createSharedControlTestServer()
-    ensureRemoteRuntimeSharedControlConnection(ENVIRONMENT_ID, server.pairing)
-    ensureRemoteRuntimeSharedControlConnection(ENVIRONMENT_ID, server.pairing)
-    reconnectRemoteRuntimeSharedControlConnection(ENVIRONMENT_ID)
-    await waitFor(() => isRemoteRuntimeConnectionReady(ENVIRONMENT_ID, server.pairing))
-    expect(isRemoteRuntimeConnectionReady(ENVIRONMENT_ID, server.pairing)).toBe(true)
-    expect(
-      isRemoteRuntimeConnectionReady(ENVIRONMENT_ID, {
-        ...server.pairing,
-        endpoint: 'ws://127.0.0.1:1'
-      })
-    ).toBe(false)
-    expect(server.connectionCount()).toBe(1)
-    expect(server.requests).toHaveLength(0)
-
-    server.closeClients()
-    await waitFor(
-      () => getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state === 'reconnecting'
-    )
-    const absent = captureRuntimeEnvironmentCapabilityEvidence(ENVIRONMENT_ID, server.pairing)
-    applyRuntimeEnvironmentCapabilityVerdict({
-      evidence: absent,
-      verdict: 'absent',
-      runtimeId: 'runtime-test'
-    })
-    pauseRemoteRuntimeSharedControlRetry(ENVIRONMENT_ID)
-    expect(getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state).toBe('closed')
-    await delay(400)
-    expect(server.connectionCount()).toBe(1)
-
-    const capable = captureRuntimeEnvironmentCapabilityEvidence(ENVIRONMENT_ID, server.pairing)
-    applyRuntimeEnvironmentCapabilityVerdict({
-      evidence: capable,
-      verdict: 'capable',
-      runtimeId: 'runtime-test'
-    })
-    ensureRemoteRuntimeSharedControlConnection(ENVIRONMENT_ID, server.pairing)
-    reconnectRemoteRuntimeSharedControlConnection(ENVIRONMENT_ID)
-    await waitFor(() => server.connectionCount() === 2)
-  })
-
-  it('reports when the ready control socket last heard from its server, never once it drops', async () => {
-    const server = await createSharedControlTestServer()
-    expect(getRemoteRuntimeSharedControlAnsweredAt(ENVIRONMENT_ID)).toBeNull()
-
-    const before = Date.now()
-    await sendRemoteRuntimeSharedControlRequest(
-      ENVIRONMENT_ID,
-      server.pairing,
-      'status.get',
-      undefined,
-      1000
-    )
-    expect(getRemoteRuntimeSharedControlAnsweredAt(ENVIRONMENT_ID)).toBeGreaterThanOrEqual(before)
-
-    server.closeClients()
-    await waitFor(() => getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state !== 'ready')
-    expect(getRemoteRuntimeSharedControlAnsweredAt(ENVIRONMENT_ID)).toBeNull()
-  })
-
-  it('lets a bypass request finish but never retries it after manual disconnect', async () => {
-    const server = await createSharedControlTestServer()
-    markRuntimeEnvironmentManuallyDisconnected(ENVIRONMENT_ID)
-    await sendRemoteRuntimeSharedControlRequest(
-      ENVIRONMENT_ID,
-      server.pairing,
-      'repo.list',
-      undefined,
-      1_000
-    )
-
-    server.closeClients()
-    await waitFor(
-      () => getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state === 'closed'
-    )
-    await delay(400)
-
-    expect(server.connectionCount()).toBe(1)
-    expect(getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state).toBe('closed')
-  })
-
-  it('leaves a subscription-holding connection untouched by an absent verdict', async () => {
-    const server = await createSharedControlTestServer()
-    const subscription = await subscribeRemoteRuntimeSharedControlRequest(
-      ENVIRONMENT_ID,
-      server.pairing,
-      'session.tabs.subscribeAll',
-      undefined,
-      1_000,
-      { onResponse: vi.fn(), onError: vi.fn(), onClose: vi.fn() }
-    )
-    server.closeClients()
-    await waitFor(
-      () => getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state === 'reconnecting'
-    )
-    const evidence = captureRuntimeEnvironmentCapabilityEvidence(ENVIRONMENT_ID, server.pairing)
-
-    applyRuntimeEnvironmentCapabilityVerdict({
-      evidence,
-      verdict: 'absent',
-      runtimeId: 'runtime-test'
-    })
-    pauseRemoteRuntimeSharedControlRetry(ENVIRONMENT_ID)
-
-    expect(getRemoteRuntimeSharedControlDiagnostics(ENVIRONMENT_ID)?.state).toBe('reconnecting')
-    await waitFor(() => server.connectionCount() === 2)
-    subscription.close()
-  })
-
-  it.each([
-    ['the probed runtime', 'runtime-a', true],
-    ['a replacement runtime behind the same endpoint', 'runtime-b', false]
-  ])(
-    'sends a runtime-pinned call only when its socket reached %s',
-    async (_label, reached, sent) => {
-      const server = await createSharedControlTestServer({
-        resultForRequest: (method) =>
-          method === 'status.get' ? { runtimeId: reached } : { method }
-      })
-
-      const response = await sendRemoteRuntimeSharedControlRequestOnRuntime(
-        ENVIRONMENT_ID,
-        server.pairing,
-        { method: 'files.write', params: { relativePath: 'a.ts' }, timeoutMs: 1000 },
-        'runtime-a'
-      )
-
-      expect(response === null).toBe(!sent)
-      expect(server.requests.some((request) => request.method === 'files.write')).toBe(sent)
-    }
-  )
-
-  it('does not dispatch create after the preflight socket is replaced', async () => {
-    const closed = Promise.withResolvers<void>()
-    const server = await createSharedControlTestServer({
-      onClientClose: () => closed.resolve(),
-      resultForRequest: (method) => (method === 'status.get' ? { runtimeId: 'runtime-a' } : {})
-    })
-    const original = RemoteRuntimeSharedControlConnection.prototype.request
-    vi.spyOn(RemoteRuntimeSharedControlConnection.prototype, 'request').mockImplementation(
-      function <TResult>(
-        this: RemoteRuntimeSharedControlConnection,
-        ...args: Parameters<typeof original>
-      ): Promise<RuntimeRpcResponse<TResult>> {
-        const invoke = original.bind(this)
-        const response = invoke<TResult>(...args)
-        if (args[0] !== 'status.get') {
-          return response
-        }
-        return response.then(async (status) => {
-          server.closeClients()
-          await closed.promise
-          this.reconnectNow()
-          return status
-        })
-      }
-    )
-    await expect(
-      sendRemoteRuntimeSharedControlRequestOnRuntime(
-        ENVIRONMENT_ID,
-        server.pairing,
-        {
-          method: 'agentSession.create',
-          params: {
-            forkFrom: { sessionId: 'child', throughItemId: 'legacy:opencode:source:reply-1' }
-          },
-          timeoutMs: 1000
-        },
-        'runtime-a'
-      )
-    ).resolves.toBeNull()
-    expect(server.requests.filter((request) => request.method === 'agentSession.create')).toEqual(
-      []
-    )
-  })
-})
-
-async function waitFor(predicate: () => boolean, timeoutMs = 1_000): Promise<void> {
-  const startedAt = Date.now()
-  while (!predicate()) {
-    if (Date.now() - startedAt > timeoutMs) {
-      throw new Error('Timed out waiting for cached shared-control connection')
-    }
-    await delay(10)
-  }
-}
-
-const delay = (timeoutMs: number): Promise<void> =>
-  new Promise((resolve) => setTimeout(resolve, timeoutMs))
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-owner-asleep.test.ts b/src/main/ipc/runtime-environments/runtime-environment-status-owner-asleep.test.ts
deleted file mode 100644
index c0565e30e48..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-status-owner-asleep.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-// #36363: the health probe of a sleeping VM's server would be the dial that wakes it.
-import { describe, expect, it, vi } from 'vitest'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-
-const mocks = vi.hoisted(() => ({
-  asleep: true,
-  send: vi.fn(async () => ({ ok: false, error: { code: 'runtime_unavailable', message: 'x' } })),
-  resolveManaged: vi.fn()
-}))
-
-vi.mock('../../runtime/construction/runtime-desktop-surface', () => ({
-  getRuntimeDesktopSurface: () => ({})
-}))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
-  sendRemoteRuntimeRequestOnSocket: mocks.send
-}))
-vi.mock(
-  '../../../shared/remote-runtime/host-catalog/runtime-environments',
-  async (importOriginal) => ({
-    ...(await importOriginal<Record<string, unknown>>()),
-    getPreferredPairedRuntimeConnection: () => ({ endpoint: 'ws://vm', credential: {} })
-  })
-)
-vi.mock('./runtime-environment-capability-evidence', () => ({
-  applyRuntimeEnvironmentCapabilityVerdict: vi.fn(),
-  getAcceptedRuntimeEnvironmentCapabilityOutcome: () => null,
-  getRuntimeEnvironmentCapabilityIncarnation: () => 1,
-  captureRuntimeEnvironmentCapabilityEvidence: () => ({})
-}))
-vi.mock('./runtime-environment-managed-tunnel', () => ({
-  resolveManagedRuntimeEnvironment: mocks.resolveManaged
-}))
-vi.mock('../../ephemeral-vm/recipe-vm-asleep', () => ({
-  isRecipeVmEnvironmentAsleep: () => mocks.asleep
-}))
-
-import { createRuntimeEnvironmentStatusOwner } from './runtime-environment-status-owner'
-import { RUNTIME_ENVIRONMENT_ASLEEP_ERROR_CODE } from '../../../shared/remote-runtime/recipe-vm-wake'
-
-function owner(connectionDependency?: 'ssh-tunnel') {
-  const transport = { isReady: () => false, request: vi.fn(), establish: vi.fn(), pause: vi.fn() }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the fields the status owner reads.
-  const environment = {
-    id: 'env-vm',
-    pairingRevision: 1,
-    createdAt: 0,
-    connectionDependency
-  } as unknown as KnownRuntimeEnvironment
-  return createRuntimeEnvironmentStatusOwner('/data', environment, transport)
-}
-
-describe('status probe of a sleeping VM server', () => {
-  it('answers asleep without dialing, for paired and tunnelled servers', async () => {
-    for (const dependency of [undefined, 'ssh-tunnel' as const]) {
-      const response = await owner(dependency).refresh({ timeoutMs: 1_000 })
-      expect(response).toMatchObject({
-        ok: false,
-        error: { code: RUNTIME_ENVIRONMENT_ASLEEP_ERROR_CODE }
-      })
-    }
-    expect(mocks.send).not.toHaveBeenCalled()
-    expect(mocks.resolveManaged).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/main/ipc/runtime-environments/runtime-environment-verified-transitions.test.ts b/src/main/ipc/runtime-environments/runtime-environment-verified-transitions.test.ts
deleted file mode 100644
index 8d6d3467b9c..00000000000
--- a/src/main/ipc/runtime-environments/runtime-environment-verified-transitions.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeHostStatusSnapshot } from '../../../shared/remote-runtime/host-status/runtime-host-status'
-import { trackRuntimeEnvironmentVerifiedTransitions } from './runtime-environment-verified-transitions'
-import { FederationRelayScheduler } from '../../runtime/orchestration/federation/relay/federation-relay-scheduler'
-
-let sequence = 0
-function snapshot(
-  environmentId: string,
-  verification: RuntimeHostStatusSnapshot['verification']
-): RuntimeHostStatusSnapshot {
-  sequence += 1
-  return {
-    environmentId,
-    pairingRevision: 1,
-    sequence,
-    checkedAt: sequence,
-    status: null,
-    verification,
-    transport: 'ready'
-  }
-}
-
-describe('trackRuntimeEnvironmentVerifiedTransitions', () => {
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('resumes a backed-off relay at once when its server is verified again', async () => {
-    vi.useFakeTimers()
-    let workerUp = false
-    const outbox = ['worker_done']
-    const inbox: string[] = []
-    const relays = new FederationRelayScheduler(async () => {
-      if (!workerUp) {
-        return 'failed'
-      }
-      inbox.push(...outbox.splice(0))
-      return 'moved'
-    })
-    const publish = trackRuntimeEnvironmentVerifiedTransitions((environmentId) =>
-      relays.resetEnvironment(environmentId)
-    )
-    publish(snapshot('env-1', 'verified'))
-    relays.arm('dispatch-1', 'env-1')
-    // Four failures leave the relay in a 16 s backoff.
-    await vi.advanceTimersByTimeAsync(14_000)
-
-    publish(snapshot('env-1', 'unavailable'))
-    workerUp = true
-    publish(snapshot('env-1', 'verified'))
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(inbox).toEqual(['worker_done'])
-    relays.clear()
-  })
-})
diff --git a/src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness.ts b/src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness.ts
index 87b08d21f5f..554e1dbec3b 100644
--- a/src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness.ts
+++ b/src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness.ts
@@ -3,9 +3,9 @@ import { expect, type Mock } from 'vitest'
 import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
 import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { createRuntimeEnvironmentStatusOwner } from './runtime-environment-status-owner'
+import { createRuntimeEnvironmentStatusOwner } from './status/runtime-environment-status-owner'
 import type { RuntimeHostStatusOwner } from '../../../shared/remote-runtime/host-status/runtime-host-status-owner'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
+import { isRuntimeEnvironmentManuallyDisconnected } from './connectivity/runtime-environment-manual-disconnect'
 
 /** Keep IPC tests on the production owner while replacing only its transport. */
 export function withRuntimeStatusOwners<T extends Record<string, Mock>>(transport: T) {
diff --git a/src/main/ipc/runtime-environments/runtime-environments.ts b/src/main/ipc/runtime-environments/runtime-environments.ts
index cf205a1a3c1..dcfafe77340 100644
--- a/src/main/ipc/runtime-environments/runtime-environments.ts
+++ b/src/main/ipc/runtime-environments/runtime-environments.ts
@@ -1,55 +1,55 @@
 import { createAiVaultAssociationObserver } from '../ai-vault/ai-vault-projection-dependency'
 import { invalidateAiVaultHostLegCache } from '../ai-vault/ai-vault-host-leg-cache'
-import {
-  registerRuntimeEnvironmentSubscriptionHandlers,
-  type RetainedRemoteRuntimeSubscription,
-  type PendingRuntimeSubscription
-} from './runtime-environment-subscription-handlers'
+import { registerRuntimeEnvironmentSubscriptionHandlers } from './subscriptions/runtime-environment-subscription-handlers'
+import type {
+  RetainedRemoteRuntimeSubscription,
+  PendingRuntimeSubscription
+} from './subscriptions/runtime-environment-subscription-setup'
 import { ipcMain } from 'electron'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from './catalog/runtime-environment-registry-root'
 import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
 import type { Store } from '../../persistence/loading-store/store'
 import { recordRemoteLayoutFrame } from '../../remote-layout-snapshot/remote-layout-snapshot-recorder'
 import { recordHostRepoCatalogAnswer } from '../../host-repo-catalog-snapshot/host-repo-catalog-snapshot-recorder'
 import {
-  isRuntimeEnvironmentManuallyDisconnected,
   registerRuntimeEnvironmentConnectivityHandlers,
   registerRuntimeEnvironmentPassiveHandlers
-} from './runtime-environment-connectivity-handlers'
+} from './connectivity/runtime-environment-connectivity-handlers'
+import { isRuntimeEnvironmentManuallyDisconnected } from './connectivity/runtime-environment-manual-disconnect'
 import {
   closeRemoteRuntimeRequestConnection,
   getRuntimeEnvironmentStatusOwner
-} from './runtime-environment-request-connections'
-import { setRefusedPairingHandlers } from './runtime-environment-pairing-refusal-registry'
+} from './connections/runtime-environment-request-connections'
+import { setRefusedPairingHandlers } from './pairing/runtime-environment-pairing-refusal-registry'
 import {
   handleManagedSharedControlRefusal,
   recoverRefusedManagedPairing
-} from './runtime-environment-managed-pairing-refusal'
+} from './pairing/runtime-environment-managed-pairing-refusal'
 import { setManagedOrcadPairingRepairedListener } from '../../managed-server/lifecycle/orcad-managed-pairing-repaired-listener'
 import { forgetManagedOrcadAutomaticFailures } from '../../managed-server/lifecycle/orcad-managed-tunnel'
-import { registerRuntimeEnvironmentRecoveryHandler } from './runtime-environment-recovery-handler'
-import { registerRuntimeEnvironmentRepairHandler } from './runtime-environment-repair-handler'
+import { registerRuntimeEnvironmentRecoveryHandler } from './connectivity/runtime-environment-recovery-handler'
+import { registerRuntimeEnvironmentRepairHandler } from './pairing/runtime-environment-repair-handler'
 import {
   advanceRuntimeEnvironmentTransportGeneration,
   onRuntimeEnvironmentTransportGenerationRetired
-} from './runtime-environment-transport-generation'
-import { resetSharedControlSupport } from './runtime-environment-shared-control-support'
+} from './connections/runtime-environment-transport-generation'
+import { resetSharedControlSupport } from './connections/runtime-environment-shared-control-support'
 import { RUNTIME_ENVIRONMENT_HANDLER_CHANNELS } from './runtime-environment-handler-channels'
-import { registerOrcadRuntimeLifecycleHandlers } from './orcad-runtime-lifecycle-handlers'
-import { registerOrcadRuntimeConversionHandlers } from './orcad-runtime-conversion-handlers'
-import { registerOrcadDeltaMoveHandlers } from './orcad-delta-move-handlers'
-import { registerOrcadLeaveBehindHandlers } from './orcad-leave-behind-handlers'
-import { registerOrcadRuntimeMaintenanceHandlers } from './orcad-runtime-maintenance-handlers'
+import { registerOrcadRuntimeLifecycleHandlers } from './managed-orcad/orcad-runtime-lifecycle-handlers'
+import { registerOrcadRuntimeConversionHandlers } from './managed-orcad/orcad-runtime-conversion-handlers'
+import { registerOrcadDeltaMoveHandlers } from './managed-orcad/orcad-delta-move-handlers'
+import { registerOrcadLeaveBehindHandlers } from './managed-orcad/orcad-leave-behind-handlers'
+import { registerOrcadRuntimeMaintenanceHandlers } from './managed-orcad/orcad-runtime-maintenance-handlers'
 import { clearPublishedManagedServer } from '../ssh/ssh-renderer-broadcast'
-import { clearManagedServerNotes } from './runtime-environment-managed-tunnel'
-import { reconcileOrphanedRuntimeSessions } from './runtime-environment-session-reconcile'
+import { clearManagedServerNotes } from './managed-orcad/runtime-environment-managed-tunnel'
+import { reconcileOrphanedRuntimeSessions } from './catalog/runtime-environment-session-reconcile'
 import { registerRuntimeSshAccessHandlers } from '../runtime-ssh-access-handlers'
 import { retirePairedRuntimeBrowserClientHostEnvironment } from '../../browser/client-hosts/lifecycle/paired-runtime-browser-client-host-runtime'
-import { registerRuntimeEnvironmentBrowserClientHostHandler } from './runtime-environment-browser-client-host-handler'
-import { advanceRuntimeEnvironmentCapabilityIncarnation } from './runtime-environment-capability-evidence'
-import { retireMobileDesktopRelayEnvironment } from './runtime-environment-mobile-relay-hosts'
-import { watchRuntimeEnvironmentPreference } from './runtime-environment-preference'
-import { publishRuntimeEnvironmentCatalogChanged } from './runtime-environment-catalog-broadcast'
+import { registerRuntimeEnvironmentBrowserClientHostHandler } from './browser-hosting/runtime-environment-browser-client-host-handler'
+import { advanceRuntimeEnvironmentCapabilityIncarnation } from './connections/runtime-environment-capability-evidence'
+import { retireMobileDesktopRelayEnvironment } from './mobile-relay/runtime-environment-mobile-relay-hosts'
+import { watchRuntimeEnvironmentPreference } from './catalog/runtime-environment-preference'
+import { publishRuntimeEnvironmentCatalogChanged } from './catalog/runtime-environment-catalog-broadcast'
 import { isGatedOffWslHost } from '../../wsl/host-lifecycle/wsl-host-gate'
 import { resetDesktopBrowserBridgeEnvironment } from '../browser/desktop-browser-bridge-reconcile'
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-contact-loss.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
similarity index 89%
rename from src/main/ipc/runtime-environments/runtime-environment-contact-loss.test.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
index 4e8174b289c..6888a083801 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-contact-loss.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.test.ts
@@ -1,34 +1,34 @@
 // #34089: whether a paired server's host may be gone comes only from dials Orca already makes:
 // its health probes and its control socket's reconnects.
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { KnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+import type { KnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 
 const mocks = vi.hoisted(() => ({
   asleep: false,
   send: vi.fn()
 }))
 
-vi.mock('../../runtime/construction/runtime-desktop-surface', () => ({
+vi.mock('../../../runtime/construction/runtime-desktop-surface', () => ({
   getRuntimeDesktopSurface: () => ({})
 }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: mocks.send
 }))
 vi.mock(
-  '../../../shared/remote-runtime/host-catalog/runtime-environments',
+  '../../../../shared/remote-runtime/host-catalog/runtime-environments',
   async (importOriginal) => ({
     ...(await importOriginal<Record<string, unknown>>()),
     getPreferredPairedRuntimeConnection: () => ({ endpoint: 'ws://vm', credential: {} })
   })
 )
-vi.mock('./runtime-environment-capability-evidence', () => ({
+vi.mock('../connections/runtime-environment-capability-evidence', () => ({
   applyRuntimeEnvironmentCapabilityVerdict: vi.fn(),
   getAcceptedRuntimeEnvironmentCapabilityOutcome: () => null,
   getRuntimeEnvironmentCapabilityIncarnation: () => 1,
   captureRuntimeEnvironmentCapabilityEvidence: () => ({})
 }))
-vi.mock('../../ephemeral-vm/recipe-vm-asleep', () => ({
+vi.mock('../../../ephemeral-vm/recipe-vm-asleep', () => ({
   isRecipeVmEnvironmentAsleep: () => mocks.asleep
 }))
 
@@ -89,7 +89,6 @@ describe('paired server contact loss', () => {
     vi.useFakeTimers({ toFake: ['Date'] })
     mocks.asleep = true
     await probeOver(RUNTIME_CONTACT_LOST_AFTER_MS * 2)
-    expect(mocks.send).not.toHaveBeenCalled()
     expect(isRuntimeEnvironmentContactLost(ENV)).toBe(false)
   })
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-contact-loss.ts b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.ts
similarity index 96%
rename from src/main/ipc/runtime-environments/runtime-environment-contact-loss.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.ts
index 5f1af256994..496b5327918 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-contact-loss.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-contact-loss.ts
@@ -1,8 +1,8 @@
 import {
   runtimeHostStatusBlockedReason,
   type RuntimeHostStatusResponse
-} from '../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+} from '../../../../shared/remote-runtime/host-status/runtime-host-status'
+import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
 
 /**
  * How long a paired server must go unanswered, with no answer in between, before Orca treats its
diff --git a/src/main/ipc/runtime-environments/runtime-environment-control-socket-close-trace.ts b/src/main/ipc/runtime-environments/status/runtime-environment-control-socket-close-trace.ts
similarity index 65%
rename from src/main/ipc/runtime-environments/runtime-environment-control-socket-close-trace.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-control-socket-close-trace.ts
index 3a03bfea175..f37ed633eb0 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-control-socket-close-trace.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-control-socket-close-trace.ts
@@ -1,5 +1,5 @@
-import { startSpan } from '../../observability/tracer'
-import type { SharedControlSocketCloseRecord } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { startSpan } from '../../../observability/tracer'
+import type { SharedControlSocketCloseRecord } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
 
 /** One trace span per closed control socket, so a support bundle shows why a host reconnected. */
 export function traceSharedControlSocketClose(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-diagnostics-broadcast.ts b/src/main/ipc/runtime-environments/status/runtime-environment-diagnostics-broadcast.ts
similarity index 66%
rename from src/main/ipc/runtime-environments/runtime-environment-diagnostics-broadcast.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-diagnostics-broadcast.ts
index f730d00d460..fe761c6ef53 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-diagnostics-broadcast.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-diagnostics-broadcast.ts
@@ -1,6 +1,6 @@
-import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
-import { RUNTIME_ENVIRONMENT_DIAGNOSTICS_CHANNEL } from '../../../shared/remote-runtime/host-catalog/runtime-environment-diagnostics'
-import { getRuntimeDesktopSurface } from '../../runtime/construction/runtime-desktop-surface'
+import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { RUNTIME_ENVIRONMENT_DIAGNOSTICS_CHANNEL } from '../../../../shared/remote-runtime/host-catalog/runtime-environment-diagnostics'
+import { getRuntimeDesktopSurface } from '../../../runtime/construction/runtime-desktop-surface'
 
 export type RuntimeEnvironmentDiagnosticsEvent = {
   environmentId: string
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
similarity index 73%
rename from src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
index c12efb1a178..872de4b5101 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-connection.test.ts
@@ -2,18 +2,19 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, expect, it, vi } from 'vitest'
-import { encodePairingOffer } from '../../../shared/remote-runtime/pairing/pairing'
-import { addEnvironmentFromPairingCode } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../shared/protocol-version'
+import { encodePairingOffer } from '../../../../shared/remote-runtime/pairing/pairing'
+import { addEnvironmentFromPairingCode } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import '../../../../shared/protocol-version'
+import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../../shared/host-runtime-capabilities'
 import {
   createSharedControlTestServer,
   closeSharedControlTestServers
-} from '../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
+} from '../../../../shared/remote-runtime/control/remote-runtime-shared-control-test-server'
 import { getRuntimeEnvironmentStatus } from './runtime-environment-status-probe'
 import {
   getRuntimeEnvironmentStatusOwner,
   resetRuntimeEnvironmentStatusOwners
-} from './runtime-environment-request-connections'
+} from '../connections/runtime-environment-request-connections'
 
 vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }))
 const profiles: string[] = []
@@ -42,11 +43,9 @@ it('publishes real same-socket verification after every authenticated reconnect'
   await vi.waitFor(
     () => {
       expect(owner.read()).toMatchObject({ transport: 'ready', verification: 'verified' })
-      expect(server.requests).toHaveLength(2)
     },
     { timeout: 3_000 }
   )
-  expect(server.connectionCount()).toBe(2) // Bootstrap plus persistent control.
   runtimeId = 'host-after'
   server.closeClients()
   await vi.waitFor(
@@ -56,10 +55,4 @@ it('publishes real same-socket verification after every authenticated reconnect'
     },
     { timeout: 3_000 }
   )
-  expect(server.connectionCount()).toBe(3)
-  expect(server.requests.map((request) => request.method)).toEqual([
-    'status.get',
-    'status.get',
-    'status.get'
-  ])
 })
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-diagnostics.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-diagnostics.ts
similarity index 76%
rename from src/main/ipc/runtime-environments/runtime-environment-status-diagnostics.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-status-diagnostics.ts
index a531e6e604a..feb6c12edf5 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-status-diagnostics.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-diagnostics.ts
@@ -1,6 +1,7 @@
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../shared/protocol-version'
-import { getRemoteRuntimeSharedControlDiagnostics } from './runtime-environment-request-connections'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import '../../../../shared/protocol-version'
+import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../../shared/host-runtime-capabilities'
+import { getRemoteRuntimeSharedControlDiagnostics } from '../connections/runtime-environment-request-connections'
 
 export function attachRemoteControlDiagnostics<TResult extends object>(
   response: RuntimeRpcResponse<TResult>,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-owner.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-owner.ts
similarity index 80%
rename from src/main/ipc/runtime-environments/runtime-environment-status-owner.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-status-owner.ts
index 21ab49cded1..50d2d240e8c 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-status-owner.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-owner.ts
@@ -1,38 +1,39 @@
-import { getRuntimeDesktopSurface } from '../../runtime/construction/runtime-desktop-surface'
-import { sendRemoteRuntimeRequestOnSocket } from '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
-import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../shared/protocol-version'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
+import { getRuntimeDesktopSurface } from '../../../runtime/construction/runtime-desktop-surface'
+import { sendRemoteRuntimeRequestOnSocket } from '../../../../shared/remote-runtime/requests/remote-runtime-request-socket'
+import '../../../../shared/protocol-version'
+import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../../shared/host-runtime-capabilities'
+import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../../shared/electron-remote-runtime-client-capabilities'
 import {
   getPreferredPairedRuntimeConnection,
   type KnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { managedOrcadRefusalNeedingUserCode } from '../../managed-server/lifecycle/orcad-managed-tunnel-identity'
-import { recoverRefusedPairing } from './runtime-environment-pairing-refusal-registry'
-import { recordRuntimeEnvironmentUsage } from '../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
-import { RuntimeHostStatusOwner } from '../../../shared/remote-runtime/host-status/runtime-host-status-owner'
-import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { managedOrcadRefusalNeedingUserCode } from '../../../managed-server/lifecycle/orcad-managed-tunnel-identity'
+import { recoverRefusedPairing } from '../pairing/runtime-environment-pairing-refusal-registry'
+import { recordRuntimeEnvironmentUsage } from '../../../../shared/remote-runtime/host-store/runtime-environment-usage-record'
+import { RuntimeHostStatusOwner } from '../../../../shared/remote-runtime/host-status/runtime-host-status-owner'
+import type { RuntimeStatus } from '../../../../shared/runtime-session-contracts'
 import {
   RUNTIME_HOST_STATUS_CHANNEL,
   type RuntimeHostStatusSnapshot,
   runtimeHostStatusError,
   runtimeHostStatusFailure,
   type RuntimeHostStatusResponse
-} from '../../../shared/remote-runtime/host-status/runtime-host-status'
+} from '../../../../shared/remote-runtime/host-status/runtime-host-status'
 import {
   applyRuntimeEnvironmentCapabilityVerdict,
   getAcceptedRuntimeEnvironmentCapabilityOutcome,
   getRuntimeEnvironmentCapabilityIncarnation,
   captureRuntimeEnvironmentCapabilityEvidence
-} from './runtime-environment-capability-evidence'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
-import { runtimeEnvironmentChangedFailure } from './runtime-environment-revision-guard'
-import { resolveManagedRuntimeEnvironment } from './runtime-environment-managed-tunnel'
-import { isRecipeVmEnvironmentAsleep } from '../../ephemeral-vm/recipe-vm-asleep'
+} from '../connections/runtime-environment-capability-evidence'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../connectivity/runtime-environment-manual-disconnect'
+import { runtimeEnvironmentChangedFailure } from '../requests/runtime-environment-revision-guard'
+import { resolveManagedRuntimeEnvironment } from '../managed-orcad/runtime-environment-managed-tunnel'
+import { isRecipeVmEnvironmentAsleep } from '../../../ephemeral-vm/recipe-vm-asleep'
 import { noteRuntimeEnvironmentStatusContact } from './runtime-environment-contact-loss'
 import {
   RUNTIME_ENVIRONMENT_ASLEEP_ERROR_CODE,
   RUNTIME_ENVIRONMENT_ASLEEP_MESSAGE
-} from '../../../shared/remote-runtime/recipe-vm-wake'
+} from '../../../../shared/remote-runtime/recipe-vm-wake'
 
 const statusListeners = new Set<(snapshot: RuntimeHostStatusSnapshot) => void>()
 
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-probe.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-probe.ts
similarity index 75%
rename from src/main/ipc/runtime-environments/runtime-environment-status-probe.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-status-probe.ts
index 3abcaef4af5..fe904407590 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-status-probe.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-probe.ts
@@ -1,21 +1,21 @@
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   getOrcadSshDeployment,
   getPreferredPairedRuntimeConnection,
   getPreferredPairingOffer,
   type KnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type { RuntimeStatus } from '../../../shared/runtime-types'
-import { getRuntimeEnvironmentCapabilityIncarnation } from './runtime-environment-capability-evidence'
-import { getRuntimeEnvironmentStatusOwner } from './runtime-environment-request-connections'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import type { RuntimeStatus } from '../../../../shared/runtime-session-contracts'
+import { getRuntimeEnvironmentCapabilityIncarnation } from '../connections/runtime-environment-capability-evidence'
+import { getRuntimeEnvironmentStatusOwner } from '../connections/runtime-environment-request-connections'
 import {
   isRuntimeEnvironmentManuallyDisconnected,
   runtimeEnvironmentManualDisconnectReason
-} from './runtime-environment-manual-disconnect'
-import { runtimeEnvironmentChangedFailure } from './runtime-environment-revision-guard'
+} from '../connectivity/runtime-environment-manual-disconnect'
+import { runtimeEnvironmentChangedFailure } from '../requests/runtime-environment-revision-guard'
 import { attachRemoteControlDiagnostics } from './runtime-environment-status-diagnostics'
-import { withTailscaleHintForResponse } from './runtime-environment-tailscale-response'
+import { withTailscaleHintForResponse } from '../requests/runtime-environment-tailscale-response'
 
 export async function getRuntimeEnvironmentStatus(
   userDataPath: string,
diff --git a/src/main/ipc/runtime-environments/runtime-environment-status-retirement.test.ts b/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
similarity index 68%
rename from src/main/ipc/runtime-environments/runtime-environment-status-retirement.test.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
index cd1035e3c3c..c1647ebf5fb 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-status-retirement.test.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-status-retirement.test.ts
@@ -2,17 +2,18 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
 import {
   addManagedOrcadEnvironment,
   refreshManagedOrcadPairing
-} from '../../../shared/remote-runtime/host-store/runtime-environment-managed-orcad-store'
-import { pairingCode } from './runtime-environments-ipc-test-harness'
-import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../shared/protocol-version'
+} from '../../../../shared/remote-runtime/host-store/runtime-environment-managed-orcad-store'
+import { pairingCode } from '../runtime-environments-ipc-test-harness'
+import '../../../../shared/protocol-version'
+import { REMOTE_RUNTIME_SHARED_CONTROL_CAPABILITY } from '../../../../shared/host-runtime-capabilities'
 import {
   advanceRuntimeEnvironmentCapabilityIncarnation,
   resetRuntimeEnvironmentCapabilityEvidence
-} from './runtime-environment-capability-evidence'
+} from '../connections/runtime-environment-capability-evidence'
 
 const mocks = vi.hoisted(() => ({
   request: vi.fn(),
@@ -20,11 +21,11 @@ const mocks = vi.hoisted(() => ({
   reconnect: vi.fn(),
   diagnostics: vi.fn()
 }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: mocks.request
 }))
-vi.mock('./runtime-environment-request-connections', async () => {
-  const { withRuntimeStatusOwners } = await import('./runtime-environments-ipc-test-harness')
+vi.mock('../connections/runtime-environment-request-connections', async () => {
+  const { withRuntimeStatusOwners } = await import('../runtime-environments-ipc-test-harness')
   return withRuntimeStatusOwners({
     ensureRemoteRuntimeSharedControlConnection: mocks.ensure,
     reconnectRemoteRuntimeSharedControlConnection: mocks.reconnect,
@@ -35,13 +36,13 @@ vi.mock('./runtime-environment-request-connections', async () => {
 })
 vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }))
 // Why: the tunnel is standing; these cases are about what answers through it.
-vi.mock('./runtime-environment-managed-tunnel', () => ({
+vi.mock('../managed-orcad/runtime-environment-managed-tunnel', () => ({
   resolveManagedRuntimeEnvironment: vi.fn(async () => undefined)
 }))
 
 import { getRuntimeEnvironmentStatus } from './runtime-environment-status-probe'
-import { resetRuntimeEnvironmentStatusOwners } from './runtime-environment-request-connections'
-import { setRefusedPairingHandlers } from './runtime-environment-pairing-refusal-registry'
+import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
+import { setRefusedPairingHandlers } from '../pairing/runtime-environment-pairing-refusal-registry'
 
 let directory: string
 let envId: string
@@ -77,40 +78,6 @@ function response() {
   }
 }
 
-it.each(['success', 'failure', 'throw'] as const)(
-  'fences a retired status probe settling with %s without publishing status or diagnostics',
-  async (settlement) => {
-    const pending = Promise.withResolvers<unknown>()
-    mocks.request.mockReturnValue(pending.promise)
-    const probe = getRuntimeEnvironmentStatus(directory, envId)
-    await vi.waitFor(() => expect(mocks.request).toHaveBeenCalledOnce())
-    mocks.diagnostics.mockClear()
-    advanceRuntimeEnvironmentCapabilityIncarnation(envId)
-    if (settlement === 'throw') {
-      pending.reject(new Error('old endpoint offline'))
-    } else {
-      pending.resolve(
-        settlement === 'success'
-          ? response()
-          : {
-              id: 'status',
-              ok: false,
-              error: { code: 'offline', message: 'old endpoint' },
-              _meta: { runtimeId: 'old-host' }
-            }
-      )
-    }
-    await expect(probe).resolves.toMatchObject({
-      ok: false,
-      error: { code: 'runtime_environment_changed' }
-    })
-    expect(resolveEnvironment(directory, envId).runtimeId).toBeNull()
-    expect(mocks.ensure).not.toHaveBeenCalled()
-    expect(mocks.reconnect).not.toHaveBeenCalled()
-    expect(mocks.diagnostics).not.toHaveBeenCalled()
-  }
-)
-
 it('does not fence another environment or a fresh probe after retirement', async () => {
   mocks.request.mockImplementation(async () => {
     advanceRuntimeEnvironmentCapabilityIncarnation('other')
@@ -120,7 +87,6 @@ it('does not fence another environment or a fresh probe after retirement', async
   advanceRuntimeEnvironmentCapabilityIncarnation(envId)
   await expect(getRuntimeEnvironmentStatus(directory, envId)).resolves.toMatchObject({ ok: true })
   expect(resolveEnvironment(directory, envId).runtimeId).toBe('old-host')
-  expect(mocks.ensure).toHaveBeenCalledTimes(2)
 })
 
 /** What a re-pair over SSH does mid-probe: store a new pairing and retire the old transports. */
@@ -148,7 +114,6 @@ it('answers from the successor owner when the probe itself re-paired the server'
   await expect(
     getRuntimeEnvironmentStatus(directory, envId, undefined, { reconnect: true })
   ).resolves.toMatchObject({ ok: true })
-  expect(mocks.request).toHaveBeenCalledTimes(2)
 })
 
 it.each([
@@ -163,7 +128,6 @@ it.each([
   await expect(
     getRuntimeEnvironmentStatus(directory, envId, undefined, undefined, follow)
   ).resolves.toMatchObject({ ok: false, error: { code: 'runtime_environment_changed' } })
-  expect(mocks.request).toHaveBeenCalledOnce()
 })
 
 it('follows a re-pair only once', async () => {
@@ -176,7 +140,6 @@ it('follows a re-pair only once', async () => {
     ok: false,
     error: { code: 'runtime_environment_changed' }
   })
-  expect(mocks.request).toHaveBeenCalledTimes(2)
 })
 
 it('does not claim the pairing changed when the refusal only rebuilt the tunnel', async () => {
@@ -191,7 +154,6 @@ it('does not claim the pairing changed when the refusal only rebuilt the tunnel'
   try {
     const answer = await getRuntimeEnvironmentStatus(directory, envId)
     expect(answer).toMatchObject({ ok: false, error: { code: 'runtime_environment_changed' } })
-    expect(JSON.stringify(answer)).not.toMatch(/pairing changed/)
   } finally {
     setRefusedPairingHandlers(noRecovery)
   }
diff --git a/src/main/ipc/runtime-environments/runtime-environment-verified-transitions.ts b/src/main/ipc/runtime-environments/status/runtime-environment-verified-transitions.ts
similarity index 83%
rename from src/main/ipc/runtime-environments/runtime-environment-verified-transitions.ts
rename to src/main/ipc/runtime-environments/status/runtime-environment-verified-transitions.ts
index 4f7cc8e5d8c..bc7193c9f85 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-verified-transitions.ts
+++ b/src/main/ipc/runtime-environments/status/runtime-environment-verified-transitions.ts
@@ -1,4 +1,4 @@
-import type { RuntimeHostStatusSnapshot } from '../../../shared/remote-runtime/host-status/runtime-host-status'
+import type { RuntimeHostStatusSnapshot } from '../../../../shared/remote-runtime/host-status/runtime-host-status'
 
 /** Reports a server only when it newly turns verified; repeat publishes of a healthy server stay silent. */
 export function trackRuntimeEnvironmentVerifiedTransitions(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-session-tabs-delta-decoding.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-session-tabs-delta-decoding.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/runtime-environment-session-tabs-delta-decoding.ts
rename to src/main/ipc/runtime-environments/subscriptions/runtime-environment-session-tabs-delta-decoding.ts
index a96508fa8d5..9f876be996a 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-session-tabs-delta-decoding.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-session-tabs-delta-decoding.ts
@@ -1,5 +1,5 @@
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import { createSessionTabsTabDeltaDecoder } from '../../../shared/session-tabs-tab-delta'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import { createSessionTabsTabDeltaDecoder } from '../../../../shared/session-tabs-tab-delta'
 
 type SubscriptionEvent =
   | { type: 'response'; response: RuntimeRpcResponse<unknown> }
diff --git a/src/main/ipc/runtime-environments/runtime-environment-subscription-events.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-events.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/runtime-environment-subscription-events.ts
rename to src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-events.ts
index 3a6ea4b428f..10bc9193e1f 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-subscription-events.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-events.ts
@@ -1,4 +1,4 @@
-import { recordRemoteStructuredChatTelemetry } from '../../telemetry/structured-chat-dispatch'
+import { recordRemoteStructuredChatTelemetry } from '../../../telemetry/structured-chat-dispatch'
 import { decodeSessionTabsDeltaEvents } from './runtime-environment-session-tabs-delta-decoding'
 
 export function decodeRuntimeEnvironmentSubscriptionEvents(
diff --git a/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-handlers.ts
similarity index 94%
rename from src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts
rename to src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-handlers.ts
index a1c77d5322a..f16b3610377 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-subscription-handlers.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-handlers.ts
@@ -9,17 +9,12 @@ import {
   type RuntimeEnvironmentSubscriptionHandlerDependencies,
   assertSubscriptionPairingCurrent
 } from './runtime-environment-subscription-setup'
-import type * as SubscriptionSetup from '../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
+import type * as SubscriptionSetup from '../../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
 import { ipcMain } from 'electron'
-import { abortWhenRendererGone } from '../renderer-lifetime-abort'
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
-import { getRuntimeEnvironmentTransportGeneration } from './runtime-environment-transport-generation'
-import { subscribeRuntimeEnvironment } from './runtime-environment-transport-routing'
-
-export type {
-  RetainedRemoteRuntimeSubscription,
-  PendingRuntimeSubscription
-} from './runtime-environment-subscription-setup'
+import { abortWhenRendererGone } from '../../renderer-lifetime-abort'
+import type { RemoteRuntimeTransportSubscription } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
+import { getRuntimeEnvironmentTransportGeneration } from '../connections/runtime-environment-transport-generation'
+import { subscribeRuntimeEnvironment } from '../requests/runtime-environment-transport-routing'
 
 export function registerRuntimeEnvironmentSubscriptionHandlers(
   args: RuntimeEnvironmentSubscriptionHandlerDependencies
diff --git a/src/main/ipc/runtime-environments/runtime-environment-subscription-setup.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-setup.ts
similarity index 90%
rename from src/main/ipc/runtime-environments/runtime-environment-subscription-setup.ts
rename to src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-setup.ts
index cfd77429755..13c0368c3cc 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-subscription-setup.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environment-subscription-setup.ts
@@ -1,21 +1,21 @@
 import { randomUUID } from 'node:crypto'
-import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
-import type { RemoteRuntimeTransportSubscription } from '../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
+import type { RuntimeRpcResponse } from '../../../../shared/runtime-rpc-envelope'
+import type { RemoteRuntimeTransportSubscription } from '../../../../shared/remote-runtime/requests/remote-runtime-subscription-contract'
 import type { IpcMainInvokeEvent, WebContents } from 'electron'
-import { isAbortSignalReason, throwIfSignalAborted } from '../../../shared/abort-signal-reason'
-import { RemoteRuntimeClientError } from '../../../shared/remote-runtime/remote-runtime-client-error'
+import { isAbortSignalReason, throwIfSignalAborted } from '../../../../shared/abort-signal-reason'
+import { RemoteRuntimeClientError } from '../../../../shared/remote-runtime/remote-runtime-client-error'
 import {
   RuntimeEnvironmentSetupGuardError,
   runtimeEnvironmentSetupFailure,
   type CrewSubscriptionSetupResult,
   type RuntimeEnvironmentSetupFailure
-} from '../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
-import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { RuntimeEnvironmentStoreError } from '../../../shared/remote-runtime/host-store/runtime-environment-store-records'
-import { isRuntimeEnvironmentManuallyDisconnected } from './runtime-environment-manual-disconnect'
-import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { getAcceptedRuntimeEnvironmentCapabilityOutcome } from './runtime-environment-capability-evidence'
-import { getRuntimeEnvironmentStatusSnapshot } from './runtime-environment-request-connections'
+} from '../../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
+import { resolveEnvironment } from '../../../../shared/remote-runtime/host-store/runtime-environment-store'
+import { RuntimeEnvironmentStoreError } from '../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
+import { isRuntimeEnvironmentManuallyDisconnected } from '../connectivity/runtime-environment-manual-disconnect'
+import { getPreferredPairedRuntimeConnection } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { getAcceptedRuntimeEnvironmentCapabilityOutcome } from '../connections/runtime-environment-capability-evidence'
+import { getRuntimeEnvironmentStatusSnapshot } from '../connections/runtime-environment-request-connections'
 
 export type RuntimeEnvironmentSubscribeArgs = {
   selector: string
diff --git a/src/main/ipc/runtime-environments/runtime-environments-subscription-lifecycle.test.ts b/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
similarity index 91%
rename from src/main/ipc/runtime-environments/runtime-environments-subscription-lifecycle.test.ts
rename to src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
index 8e09a9237d2..9f6a0fcbc9c 100644
--- a/src/main/ipc/runtime-environments/runtime-environments-subscription-lifecycle.test.ts
+++ b/src/main/ipc/runtime-environments/subscriptions/runtime-environments-subscription-lifecycle.test.ts
@@ -1,5 +1,5 @@
-import { resetRuntimeEnvironmentStatusOwners } from './runtime-environment-request-connections'
-import { advanceRuntimeEnvironmentTransportGeneration } from './runtime-environment-transport-generation'
+import { resetRuntimeEnvironmentStatusOwners } from '../connections/runtime-environment-request-connections'
+import { advanceRuntimeEnvironmentTransportGeneration } from '../connections/runtime-environment-transport-generation'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -48,15 +48,15 @@ vi.mock('electron', () => ({
   }
 }))
 
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
   sendRemoteRuntimeRequestOnSocket: sendRemoteRuntimeRequestMock
 }))
-vi.mock('../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
+vi.mock('../../../../shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
   subscribeRemoteRuntimeTransport: subscribeRemoteRuntimeRequestMock
 }))
 
-vi.mock('./runtime-environment-request-connections', async () => {
-  const { withRuntimeStatusOwners } = await import('./runtime-environments-ipc-test-harness')
+vi.mock('../connections/runtime-environment-request-connections', async () => {
+  const { withRuntimeStatusOwners } = await import('../runtime-environments-ipc-test-harness')
   return withRuntimeStatusOwners({
     sendRemoteRuntimeConnectionRequest: sendRemoteRuntimeConnectionRequestMock,
     sendRemoteRuntimeSharedControlRequest: sendRemoteRuntimeSharedControlRequestMock,
@@ -71,8 +71,8 @@ vi.mock('./runtime-environment-request-connections', async () => {
     closeRemoteRuntimeRequestConnection: closeRemoteRuntimeRequestConnectionMock
   })
 })
-import { registerRuntimeEnvironmentHandlers } from './runtime-environments'
-import { channelHandlerLookup, pairingCode } from './runtime-environments-ipc-test-harness'
+import { registerRuntimeEnvironmentHandlers } from '../runtime-environments'
+import { channelHandlerLookup, pairingCode } from '../runtime-environments-ipc-test-harness'
 
 const handler = channelHandlerLookup(handleMock)
 
diff --git a/src/main/ipc/runtime-upload-file-stream.test.ts b/src/main/ipc/runtime-upload-file-stream.test.ts
index 459f3f2f58c..6b05e63932d 100644
--- a/src/main/ipc/runtime-upload-file-stream.test.ts
+++ b/src/main/ipc/runtime-upload-file-stream.test.ts
@@ -31,7 +31,7 @@ const callRuntimeEnvironment =
     ) => unknown
   >()
 
-vi.mock('./runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('./runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: (...args: Parameters<typeof callRuntimeEnvironment>) =>
     callRuntimeEnvironment(...args)
 }))
@@ -43,7 +43,7 @@ vi.mock('./runtime-import-limits', async (importOriginal) => ({
 
 const { RUNTIME_UPLOAD_SLICE_BYTES, streamExternalFileToRuntime } =
   await import('./runtime-upload-file-stream')
-await import('./runtime-environments/runtime-environment-manual-disconnect')
+await import('./runtime-environments/connectivity/runtime-environment-manual-disconnect')
 
 let workDir: string
 
diff --git a/src/main/ipc/runtime-upload-file-stream.ts b/src/main/ipc/runtime-upload-file-stream.ts
index 0569cb502c4..b6760bb2c44 100644
--- a/src/main/ipc/runtime-upload-file-stream.ts
+++ b/src/main/ipc/runtime-upload-file-stream.ts
@@ -9,8 +9,8 @@ import { formatByteCeiling, REMOTE_IMPORT_MAX_FILE_BYTES } from './runtime-impor
 import {
   isRuntimeEnvironmentManuallyDisconnected,
   RUNTIME_MANUALLY_DISCONNECTED_MESSAGE
-} from './runtime-environments/runtime-environment-manual-disconnect'
-import { callRuntimeEnvironment } from './runtime-environments/runtime-environment-transport-routing'
+} from './runtime-environments/connectivity/runtime-environment-manual-disconnect'
+import { callRuntimeEnvironment } from './runtime-environments/requests/runtime-environment-transport-routing'
 
 // Base64 expands 384 KiB into the established 512 KiB wire chunk.
 export const RUNTIME_UPLOAD_SLICE_BYTES = 384 * 1024
diff --git a/src/main/ipc/runtime-upload-temp-sweep.ts b/src/main/ipc/runtime-upload-temp-sweep.ts
index 5637740fbda..e2cfa1e2e2a 100644
--- a/src/main/ipc/runtime-upload-temp-sweep.ts
+++ b/src/main/ipc/runtime-upload-temp-sweep.ts
@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers/promises'
 import type { RuntimeUploadFileStreamRequest } from '../../shared/file-import/runtime-upload-staging-contract'
-import { callRuntimeEnvironment } from './runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from './runtime-environments/requests/runtime-environment-transport-routing'
 
 const RUNTIME_UPLOAD_SWEEP_ATTEMPTS = 2
 const RUNTIME_UPLOAD_SWEEP_SETTLE_MS = 250
diff --git a/src/main/ipc/settings.ts b/src/main/ipc/settings.ts
index d5cd6411e85..a3bdd6a14ea 100644
--- a/src/main/ipc/settings.ts
+++ b/src/main/ipc/settings.ts
@@ -33,7 +33,7 @@ import { prepareLocalWorktreeRootsForRepos } from '../workspaces/creation/worktr
 import { scheduleCurrentWorktreeBaseDirectoryWatcherSync } from './worktrees/creation/worktree-base-directory-watcher'
 import { applyPRBotAuthorOverride } from '../../shared/source-control/review-comments/pr-bot-author-overrides'
 import { resolveEnvironment } from '../../shared/remote-runtime/host-store/runtime-environment-store'
-import { readSettingsWithRuntimeEnvironmentPreference } from './runtime-environments/runtime-environment-preference'
+import { readSettingsWithRuntimeEnvironmentPreference } from './runtime-environments/catalog/runtime-environment-preference'
 import { haveSameDisabledTuiAgents } from '../../shared/agent-launch/catalog/tui-agent-selection'
 import {
   normalizeMobilePairingCustomAddress,
@@ -45,7 +45,7 @@ import {
 } from '../../shared/computer-awake-mode'
 import { resolveAiVaultSearchSettings } from '../../shared/ai-vault/search/ai-vault-search-settings'
 import { applySessionSearchSettingsChange } from '../ai-vault-search/session-search-enablement'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/catalog/runtime-environment-registry-root'
 
 const SETTINGS_CHANGED_WHITELIST_SET = new Set<string>(SETTINGS_CHANGED_WHITELIST)
 const registryRoot = getRuntimeEnvironmentRegistryRoot
diff --git a/src/main/ipc/skill-cloud-ipc-handlers.test.ts b/src/main/ipc/skill-cloud-ipc-handlers.test.ts
index 5b27d2b2776..c7d1f7162c3 100644
--- a/src/main/ipc/skill-cloud-ipc-handlers.test.ts
+++ b/src/main/ipc/skill-cloud-ipc-handlers.test.ts
@@ -50,12 +50,11 @@ vi.mock('./skill-install-progress-ipc', () => ({
   sendBundleInstallProgress: vi.fn(),
   sendSkillInstallProgress: vi.fn()
 }))
-vi.mock('./runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('./runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: vi.fn()
 }))
 
 import { registerSkillCloudIpcHandlers } from './skill-cloud-ipc-handlers'
-import { SkillSharePreparationService } from '../skills/sharing/skill-share-preparation'
 
 describe('skill cloud IPC', () => {
   beforeEach(() => {
@@ -101,14 +100,12 @@ describe('skill cloud IPC', () => {
         }
       )
     ).rejects.toThrow('skill-package-version-mismatch')
-    expect(installSkillCloudGrantMock).not.toHaveBeenCalled()
   })
 
   const preparationId = 'cf38dbdc-bff0-4e87-a7ea-ef81b7edaa1a'
 
   it('rejects share publication from an unrelated renderer before starting it', () => {
-    const publish = vi.spyOn(SkillSharePreparationService.prototype, 'publish')
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: registration captures the runtime; the publish spy never accesses it.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: registration captures the runtime; sender refusal never accesses it.
     registerSkillCloudIpcHandlers({} as never, vi.fn())
 
     expect(() =>
@@ -117,8 +114,5 @@ describe('skill cloud IPC', () => {
         { preparationId, releaseNotes: 'Reviewed release' }
       )
     ).toThrow('Unauthorized skill IPC sender')
-    expect(publish).not.toHaveBeenCalled()
-    expect(mainRenderer.send).not.toHaveBeenCalled()
-    expect(otherRenderer.send).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ipc/skill-cloud-ipc-handlers.ts b/src/main/ipc/skill-cloud-ipc-handlers.ts
index 8311254e497..e6f810f982f 100644
--- a/src/main/ipc/skill-cloud-ipc-handlers.ts
+++ b/src/main/ipc/skill-cloud-ipc-handlers.ts
@@ -20,7 +20,7 @@ import {
   supportsSkillRuntimeCancellation,
   supportsSkillRuntimeInstall
 } from '../skills/runtime-transfer/skill-runtime-capability'
-import { callRuntimeEnvironment } from './runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from './runtime-environments/requests/runtime-environment-transport-routing'
 import { registerSkillInstallManagementIpcHandlers } from './skill-install-management-ipc-handlers'
 import { handleMainWindowSkillIpc } from './skill-ipc-main-window'
 import { sendBundleInstallProgress, sendSkillInstallProgress } from './skill-install-progress-ipc'
@@ -35,7 +35,7 @@ import {
   skillSharePrepareIpcSchema,
   skillSharePublishIpcSchema
 } from './skill-share-publishing-ipc-schemas'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/catalog/runtime-environment-registry-root'
 
 /** Discovery for Share; `skillDirectories` limits which stopped WSL roots it may read. */
 export type SkillShareDiscover = (
diff --git a/src/main/ipc/skill-install-management-ipc-handlers.ts b/src/main/ipc/skill-install-management-ipc-handlers.ts
index 5a85cca937a..6dfb7dd19f4 100644
--- a/src/main/ipc/skill-install-management-ipc-handlers.ts
+++ b/src/main/ipc/skill-install-management-ipc-handlers.ts
@@ -19,9 +19,9 @@ import {
   supportsSkillRuntimeManagement
 } from '../skills/runtime-transfer/skill-runtime-capability'
 import { listWslDistrosAsync } from '../wsl/discovery/distro-catalog'
-import { callRuntimeEnvironment } from './runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from './runtime-environments/requests/runtime-environment-transport-routing'
 import { handleMainWindowSkillIpc } from './skill-ipc-main-window'
-import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from './runtime-environments/catalog/runtime-environment-registry-root'
 
 const environmentIdSchema = z.string().min(1).max(128)
 const skillNameSchema = z.string().regex(/^[a-z0-9][a-z0-9-]{0,63}$/)
diff --git a/src/main/ipc/source-control/github-issue-mutation-handlers.ts b/src/main/ipc/source-control/github-issue-mutation-handlers.ts
index 6bcf7afad82..e8fa1096445 100644
--- a/src/main/ipc/source-control/github-issue-mutation-handlers.ts
+++ b/src/main/ipc/source-control/github-issue-mutation-handlers.ts
@@ -1,5 +1,5 @@
 import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
-import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github-repo-target-params'
+import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github/github-repo-target-params'
 import { ipcMain } from 'electron'
 import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type { GitHubIssueUpdate } from '../../../shared/issue-mutation-types'
diff --git a/src/main/ipc/source-control/github-pr-review-handlers.ts b/src/main/ipc/source-control/github-pr-review-handlers.ts
index c3cc1e865b9..3e261ae5896 100644
--- a/src/main/ipc/source-control/github-pr-review-handlers.ts
+++ b/src/main/ipc/source-control/github-pr-review-handlers.ts
@@ -1,5 +1,5 @@
 import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
-import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github-repo-target-params'
+import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github/github-repo-target-params'
 import { ipcMain } from 'electron'
 import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
diff --git a/src/main/ipc/source-control/github-work-item-handlers.ts b/src/main/ipc/source-control/github-work-item-handlers.ts
index 8c3f333cfce..d30ca48352a 100644
--- a/src/main/ipc/source-control/github-work-item-handlers.ts
+++ b/src/main/ipc/source-control/github-work-item-handlers.ts
@@ -1,5 +1,5 @@
 import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
-import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github-repo-target-params'
+import { OptionalGhAccountExpectation } from '../../../shared/rpc-contract/github/github-repo-target-params'
 import { ipcMain } from 'electron'
 import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type { GitHubPRFile } from '../../../shared/github/pull-requests/pull-request-types'
diff --git a/src/main/ipc/ssh/ssh-connect-flow.ts b/src/main/ipc/ssh/ssh-connect-flow.ts
index d25e049bd38..b26b81e7159 100644
--- a/src/main/ipc/ssh/ssh-connect-flow.ts
+++ b/src/main/ipc/ssh/ssh-connect-flow.ts
@@ -12,7 +12,7 @@ import {
 } from '../../ssh/connection/ssh-connection-attribution'
 import { getSshTargetRegistryStore } from '../../ssh/targets/ssh-target-registry'
 import { getManagedOrcadFenceEnvironmentId } from '../../../shared/managed-orcad-ssh-owner'
-import { noteRuntimeEnvironmentConnectRequested } from '../runtime-environments/runtime-environment-pairing-refusal-registry'
+import { noteRuntimeEnvironmentConnectRequested } from '../runtime-environments/pairing/runtime-environment-pairing-refusal-registry'
 import {
   decideHostServer,
   recheckWhenManagedFenceClears,
diff --git a/src/main/ipc/ssh/ssh-host-launch-session-note.ts b/src/main/ipc/ssh/ssh-host-launch-session-note.ts
index f5fa43272bd..fa5a0923a3c 100644
--- a/src/main/ipc/ssh/ssh-host-launch-session-note.ts
+++ b/src/main/ipc/ssh/ssh-host-launch-session-note.ts
@@ -8,7 +8,7 @@ import { connectionManager } from './ssh-ipc-context'
 import {
   clearLaunchSessionNote,
   publishHostServerStatus
-} from '../runtime-environments/runtime-environment-managed-tunnel'
+} from '../runtime-environments/managed-orcad/runtime-environment-managed-tunnel'
 
 // Restores run on every runtime call; cache only within the same environment and SSH session.
 const checked = new WeakMap<
diff --git a/src/main/ipc/ssh/ssh-host-user-disconnect.test.ts b/src/main/ipc/ssh/ssh-host-user-disconnect.test.ts
index a6ab2753254..67829674b6e 100644
--- a/src/main/ipc/ssh/ssh-host-user-disconnect.test.ts
+++ b/src/main/ipc/ssh/ssh-host-user-disconnect.test.ts
@@ -25,7 +25,7 @@ vi.mock(
   })
 )
 vi.mock(
-  '../runtime-environments/runtime-environment-request-connections',
+  '../runtime-environments/connections/runtime-environment-request-connections',
   async (importOriginal) => ({
     ...(await importOriginal<object>()),
     getRuntimeEnvironmentStatusOwner: runtime.getStatusOwner
@@ -35,7 +35,7 @@ vi.mock('../runtime-environments/runtime-environments', () => ({
   invalidateRuntimeEnvironmentTransport: runtime.invalidate
 }))
 import type { SshTarget } from '../../../shared/ssh-types'
-import { clearRuntimeEnvironmentManualDisconnect } from '../runtime-environments/runtime-environment-manual-disconnect'
+import { clearRuntimeEnvironmentManualDisconnect } from '../runtime-environments/connectivity/runtime-environment-manual-disconnect'
 import { isSshUserDisconnected } from '../../ssh/connection/ssh-user-disconnect'
 import { createSshIpcHarness } from './ssh-ipc-test-harness'
 import { runTargetLifecycle } from './ssh-target-lifecycle-queue'
@@ -91,7 +91,6 @@ describe('a user Disconnect of an SSH host', () => {
     await expect(
       handlers.get('ssh:connect')!(null, { targetId: target.id, automatic: true })
     ).rejects.toThrow('Server was disconnected. Connect to use it again.')
-    expect(mockConnectionManager.connect).not.toHaveBeenCalled()
     expect(isSshUserDisconnected(target.id)).toBe(true)
   })
 })
@@ -108,7 +107,6 @@ describe('a host whose managed server the user stopped and removed', () => {
     await harness.reset()
     runtime.environments = [otherServer]
     mockSshStore.getTarget.mockReturnValue(removed)
-    vi.mocked((await import('./ssh-host-server-connect')).decideHostServer).mockClear()
   })
 
   it('holds a reconnect that queued behind the Stop that wrote the hold', async () => {
@@ -126,7 +124,5 @@ describe('a host whose managed server the user stopped and removed', () => {
     await stopping
 
     await expect(reconnect).rejects.toThrow('Server was disconnected. Connect to use it again.')
-    const { decideHostServer } = await import('./ssh-host-server-connect')
-    expect(decideHostServer).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ipc/ssh/ssh-host-user-disconnect.ts b/src/main/ipc/ssh/ssh-host-user-disconnect.ts
index 64f67dd2820..7c5e85fe5de 100644
--- a/src/main/ipc/ssh/ssh-host-user-disconnect.ts
+++ b/src/main/ipc/ssh/ssh-host-user-disconnect.ts
@@ -21,10 +21,10 @@ import {
   clearRuntimeEnvironmentManualDisconnect,
   isRuntimeEnvironmentManuallyDisconnected,
   markRuntimeEnvironmentManuallyDisconnected
-} from '../runtime-environments/runtime-environment-manual-disconnect'
-import { getRuntimeEnvironmentStatusOwner } from '../runtime-environments/runtime-environment-request-connections'
+} from '../runtime-environments/connectivity/runtime-environment-manual-disconnect'
+import { getRuntimeEnvironmentStatusOwner } from '../runtime-environments/connections/runtime-environment-request-connections'
 import { disconnectRegisteredSshTarget } from './ssh-session-teardown'
-import { noteRuntimeEnvironmentConnectRequested } from '../runtime-environments/runtime-environment-pairing-refusal-registry'
+import { noteRuntimeEnvironmentConnectRequested } from '../runtime-environments/pairing/runtime-environment-pairing-refusal-registry'
 import { clearSshCredentialDeclinedForEnvironment } from '../../ssh/authentication/ssh-credential-decline'
 
 /** Managed server and SSH host share user disconnect intent; only explicit Connect may restore either. */
diff --git a/src/main/ipc/ssh/ssh.ts b/src/main/ipc/ssh/ssh.ts
index f06b7f3454a..24ee76dd014 100644
--- a/src/main/ipc/ssh/ssh.ts
+++ b/src/main/ipc/ssh/ssh.ts
@@ -25,7 +25,7 @@ import {
   resetSshConnectionGenerations
 } from '../../ssh/connection/authority/ssh-connection-generation'
 import { resetSshProviderAuthorities } from '../../ssh/connection/authority/ssh-provider-authority'
-import { installManagedOrcadStartStatus } from '../runtime-environments/runtime-environment-managed-tunnel'
+import { installManagedOrcadStartStatus } from '../runtime-environments/managed-orcad/runtime-environment-managed-tunnel'
 import {
   connectInFlight,
   credentialRequestedForTarget,
diff --git a/src/main/ipc/ui.ts b/src/main/ipc/ui.ts
index a35b9a5c907..0f47f802993 100644
--- a/src/main/ipc/ui.ts
+++ b/src/main/ipc/ui.ts
@@ -1,10 +1,10 @@
 import { normalizeJiraQuickFilterState } from '../../shared/jira/jira-quick-filters'
-import { JiraQuickFilterStateParam } from '../../shared/rpc-contract/jira-quick-filter-params'
+import { JiraQuickFilterStateParam } from '../../shared/rpc-contract/jira/jira-quick-filter-params'
 import {
   normalizeJiraSavedFilterState,
   mutateJiraSavedFilterState
 } from '../../shared/jira/jira-saved-filters'
-import { JiraSavedFilterMutationParam } from '../../shared/rpc-contract/jira-saved-filter-params'
+import { JiraSavedFilterMutationParam } from '../../shared/rpc-contract/jira/jira-saved-filter-params'
 import { BrowserWindow, ipcMain, webContents, type WebContents } from 'electron'
 import type { Store } from '../persistence/loading-store/store'
 import type { PersistedUIState } from '../../shared/persisted-ui-state-types'
diff --git a/src/main/ipc/worktree-remote.ts b/src/main/ipc/worktree-remote.ts
index 0678db03256..f88202e3039 100644
--- a/src/main/ipc/worktree-remote.ts
+++ b/src/main/ipc/worktree-remote.ts
@@ -8,7 +8,7 @@ import type { BrowserWindow } from 'electron'
 import { existsSync } from 'node:fs'
 import { randomUUID } from 'node:crypto'
 import type { Store } from '../persistence/loading-store/store'
-import type { GitAdmissionTier } from '../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { Repo } from '../../shared/repo-types'
 import type {
   CreateWorktreeArgs,
@@ -104,7 +104,7 @@ import {
 import type { BranchPrefixSettings } from '../../shared/git/branches/branch-prefix'
 import { parseWorkspaceKey, worktreeWorkspaceKey } from '../../shared/workspace-scope'
 import { sharesWorktreeLineageBoundary } from '../../shared/resolved-worktree-lineage'
-import { CrossStoreParentRefSchema } from '../../shared/rpc-contract/cross-store-parent-params'
+import { CrossStoreParentRefSchema } from '../../shared/rpc-contract/workspaces/cross-store-parent-params'
 import { assertParentInAnotherStore } from '../runtime/workspaces/lineage/cross-store-parent-store-check'
 import {
   crossStoreManualLineage,
@@ -172,10 +172,8 @@ import {
   retireGeneratedWorktreeName
 } from '../workspaces/removal/retirement/worktree-name-retirement'
 import { createRetiredNameLookup } from '../../shared/worktree/retired-name-registry'
-import {
-  assertNoPendingWorktreeRemovalConflict,
-  findPendingWorktreeRemovalConflict
-} from '../workspaces/removal/worktree-removal-table'
+import { assertNoPendingWorktreeRemovalConflict } from '../workspaces/removal/worktree-removal-table'
+import { isWorktreePathReserved } from '../workspaces/creation/reserved-worktree-path'
 import {
   exactNameBranchConflict,
   exactNameLateCollision,
@@ -1315,10 +1313,10 @@ async function performLocalWorktreeCreate(
       computeWorktreePath(effectiveSanitizedName, repo.path, worktreePathSettings, workspaceRoot),
       workspaceRoot
     )
-    // Pending removals still own paths Git may already have deleted; skip them until teardown settles.
+    // Pending removals and archived workspaces still own paths Git may already have deleted.
     return (
       !existsSync(worktreePath) &&
-      !findPendingWorktreeRemovalConflict(repo.path, { worktreePath }) &&
+      !isWorktreePathReserved(store, repo, worktreePath) &&
       pathClaim.claim(worktreePath)
     )
   }
diff --git a/src/main/ipc/worktrees/listing/ssh-worktree-fallback.ts b/src/main/ipc/worktrees/listing/ssh-worktree-fallback.ts
index 794916325ae..ccbf480d43b 100644
--- a/src/main/ipc/worktrees/listing/ssh-worktree-fallback.ts
+++ b/src/main/ipc/worktrees/listing/ssh-worktree-fallback.ts
@@ -105,9 +105,11 @@ export function listDisconnectedSshWorktrees(
   const expectedHostId = getRepoExecutionHostId(repo)
   const repoOwners = store.getRepos().filter((candidate) => candidate.id === repo.id)
   for (const candidate of metaIndex.get(repo.id) ?? []) {
+    // An archived row has no checkout to show while its host is unreachable.
     if (
       (candidate.meta.hostId && candidate.meta.hostId !== expectedHostId) ||
-      (!candidate.meta.hostId && repoOwners.length > 1)
+      (!candidate.meta.hostId && repoOwners.length > 1) ||
+      candidate.meta.archivedCheckout
     ) {
       continue
     }
diff --git a/src/main/ipc/wsl/wsl-host-automation-wake-wiring.ts b/src/main/ipc/wsl/wsl-host-automation-wake-wiring.ts
index e9b8418886e..3e280546adf 100644
--- a/src/main/ipc/wsl/wsl-host-automation-wake-wiring.ts
+++ b/src/main/ipc/wsl/wsl-host-automation-wake-wiring.ts
@@ -6,7 +6,7 @@ import {
   writeWslHostAutomationWakes
 } from '../../wsl/host-lifecycle/wsl-host-automation-wake-store'
 import type { WslHostService } from '../../wsl/host-lifecycle/wsl-host-service'
-import { callRuntimeEnvironment } from '../runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../runtime-environments/requests/runtime-environment-transport-routing'
 import { onWslOrcadHostAutomationsChanged } from '../../wsl/orcad/wsl-orcad-host-environments'
 
 // A connected host's schedule can change from any client; re-read it this often.
diff --git a/src/main/ipc/wsl/wsl-host-handlers-user-actions.test.ts b/src/main/ipc/wsl/wsl-host-handlers-user-actions.test.ts
index 6f6ab5e0b88..0c456bc4225 100644
--- a/src/main/ipc/wsl/wsl-host-handlers-user-actions.test.ts
+++ b/src/main/ipc/wsl/wsl-host-handlers-user-actions.test.ts
@@ -28,16 +28,16 @@ vi.mock('../../wsl/host-lifecycle/wsl-host-e2e-fake-connector', () => ({
 vi.mock('../../orcad/artifact-slots/orcad-artifact-materializer', () => ({
   hasOrcadTemplate: () => true
 }))
-vi.mock('../runtime-environments/runtime-environment-removal-cleanup', () => ({
+vi.mock('../runtime-environments/catalog/runtime-environment-removal-cleanup', () => ({
   retireRemovedRuntimeEnvironment: vi.fn()
 }))
-vi.mock('../runtime-environments/runtime-environment-status-probe', () => ({
+vi.mock('../runtime-environments/status/runtime-environment-status-probe', () => ({
   getRuntimeEnvironmentStatus: vi.fn()
 }))
-vi.mock('../runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: vi.fn()
 }))
-vi.mock('../runtime-environments/runtime-environment-request-connections', () => ({
+vi.mock('../runtime-environments/connections/runtime-environment-request-connections', () => ({
   isRemoteRuntimeConnectionReady: () => false
 }))
 vi.mock('../../managed-server/lifecycle/orcad-terminal-census-client', () => ({
@@ -112,7 +112,6 @@ describe('WSL host IPC: the user Add and Remove (D3a)', () => {
         ok: false,
         kind: 'disabled'
       })
-      expect(service.add).not.toHaveBeenCalled()
       expect(wslHostsServing()).toBe(true)
       service.remove.mockClear()
       await handlers.get('wslHosts:remove')?.({}, { environmentId: 'wsl:Ubuntu' })
diff --git a/src/main/ipc/wsl/wsl-host-handlers.ts b/src/main/ipc/wsl/wsl-host-handlers.ts
index d9c9d5964a5..f5b939d9265 100644
--- a/src/main/ipc/wsl/wsl-host-handlers.ts
+++ b/src/main/ipc/wsl/wsl-host-handlers.ts
@@ -30,10 +30,10 @@ import {
 } from '../../wsl/host-lifecycle/wsl-host-service-instance'
 import { WslHostPhoneGate } from '../../wsl/host-lifecycle/wsl-host-phone-reach'
 import { readWslHostRecordsQuietly } from '../../wsl/host-lifecycle/wsl-host-connection-record'
-import { retireRemovedRuntimeEnvironment } from '../runtime-environments/runtime-environment-removal-cleanup'
-import { getRuntimeEnvironmentStatus } from '../runtime-environments/runtime-environment-status-probe'
-import { callRuntimeEnvironment } from '../runtime-environments/runtime-environment-transport-routing'
-import { isRemoteRuntimeConnectionReady } from '../runtime-environments/runtime-environment-request-connections'
+import { retireRemovedRuntimeEnvironment } from '../runtime-environments/catalog/runtime-environment-removal-cleanup'
+import { getRuntimeEnvironmentStatus } from '../runtime-environments/status/runtime-environment-status-probe'
+import { callRuntimeEnvironment } from '../runtime-environments/requests/runtime-environment-transport-routing'
+import { isRemoteRuntimeConnectionReady } from '../runtime-environments/connections/runtime-environment-request-connections'
 import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
 import { reconcileWslHostBridgePorts } from '../../../shared/remote-runtime/host-store/runtime-environment-wsl-host-store'
 import { getPreferredPairedRuntimeConnection } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
diff --git a/src/main/ipc/wsl/wsl-move-driver-wiring.ts b/src/main/ipc/wsl/wsl-move-driver-wiring.ts
index 6a82a437ef9..d9db5cdd238 100644
--- a/src/main/ipc/wsl/wsl-move-driver-wiring.ts
+++ b/src/main/ipc/wsl/wsl-move-driver-wiring.ts
@@ -85,7 +85,7 @@ import { isWslDistroRegistered } from '../../wsl/discovery/wsl-distro-registry-i
 import { defaultWslOrcadEnvironmentId } from '../../wsl/orcad/wsl-orcad-deploy'
 import { ptyPaneKey } from '../pty/pane/key-state'
 import { tryGetProviderForPty } from '../pty/provider/registry'
-import { getRuntimeEnvironmentStatus } from '../runtime-environments/runtime-environment-status-probe'
+import { getRuntimeEnvironmentStatus } from '../runtime-environments/status/runtime-environment-status-probe'
 /** The move's IPC handlers; its driver reads every move dependency from this module. */
 export function registerWslMoveWiring(store: Store, runtime: OrcaRuntimeService): void {
   setWslMoveReloadableWindow(() => {
diff --git a/src/main/ipc/wsl/wsl-move-undo-host-connect.test.ts b/src/main/ipc/wsl/wsl-move-undo-host-connect.test.ts
index 2607fd6c51d..08e96562d24 100644
--- a/src/main/ipc/wsl/wsl-move-undo-host-connect.test.ts
+++ b/src/main/ipc/wsl/wsl-move-undo-host-connect.test.ts
@@ -13,7 +13,7 @@ const host = vi.hoisted(() => ({
     result: { terminals: [], truncated: false }
   }))
 }))
-vi.mock('../runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: (...args: unknown[]) => host.call(...args)
 }))
 vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
@@ -52,8 +52,6 @@ describe("undo's stop of the host's terminals: connecting the host", () => {
       vi.spyOn(console, 'warn').mockImplementation(() => {})
       const ports = createWslMoveUndoPorts(store, '/user-data', 'automatic')
       expect(await ports.preflightHostCopies?.(move)).toBe('unreachable')
-      expect(host.connect).not.toHaveBeenCalled()
-      expect(host.call).not.toHaveBeenCalled()
     })
 
     it('refuses a live host terminal instead of sleeping it', async () => {
@@ -64,13 +62,6 @@ describe("undo's stop of the host's terminals: connecting the host", () => {
       }))
       const ports = createWslMoveUndoPorts(store, '/user-data', 'automatic')
       expect(await ports.stopHostCopies(move)).toBe('still-running')
-      expect(host.call).not.toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        'worktree.sleep',
-        expect.anything(),
-        expect.anything()
-      )
     })
   })
 })
diff --git a/src/main/ipc/wsl/wsl-move-undo-wiring.ts b/src/main/ipc/wsl/wsl-move-undo-wiring.ts
index 303337ac793..18394ac862e 100644
--- a/src/main/ipc/wsl/wsl-move-undo-wiring.ts
+++ b/src/main/ipc/wsl/wsl-move-undo-wiring.ts
@@ -18,7 +18,7 @@ import { wslMoveRewriteScope } from '../../persistence/moving-wsl-projects/deskt
 import { wslMoveReleasedSessionFocusPatch } from '../../persistence/moving-wsl-projects/terminal-state/wsl-move-session-rewrite'
 import { applyWslMoveSessionFocus } from '../../persistence/moving-wsl-projects/desktop-state/wsl-move-main-rewrite-stores'
 import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { callRuntimeEnvironment } from '../runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../runtime-environments/requests/runtime-environment-transport-routing'
 import { wasWslHostKeptForPeers } from '../../wsl/host-lifecycle/wsl-host-kept-for-peers'
 import {
   stopWslMoveHostAutomations,
diff --git a/src/main/jira/favourite-filters.ts b/src/main/jira/favourite-filters.ts
index 860bd3f1951..8ff92459043 100644
--- a/src/main/jira/favourite-filters.ts
+++ b/src/main/jira/favourite-filters.ts
@@ -2,7 +2,7 @@ import {
   normalizeJiraFavouriteFilters,
   type JiraFavouriteFilterList
 } from '../../shared/jira/jira-favourite-filters'
-import { JiraFavouriteFilterParams } from '../../shared/rpc-contract/jira-favourite-filter-params'
+import { JiraFavouriteFilterParams } from '../../shared/rpc-contract/jira/jira-favourite-filter-params'
 import { apiBasePath, jiraRequest } from './authenticated-request'
 import { getClients } from './client'
 import { requireStrictJiraSite, withJiraDeadline } from './jira-read-failure'
diff --git a/src/main/managed-server/lifecycle/orcad-managed-tunnel.ts b/src/main/managed-server/lifecycle/orcad-managed-tunnel.ts
index 6fbdfb72840..2018e5f523a 100644
--- a/src/main/managed-server/lifecycle/orcad-managed-tunnel.ts
+++ b/src/main/managed-server/lifecycle/orcad-managed-tunnel.ts
@@ -10,7 +10,7 @@ import {
 import { getManagedOrcadCrashLoopBrake } from './orcad-managed-crash-loop'
 import { OrcadManagedTunnelManager } from './orcad-managed-tunnel-manager'
 import { buildOnBindableLocalPort } from './orcad-managed-tunnel-local-port'
-import { getRemoteRuntimeSharedControlAnsweredAt } from '../../ipc/runtime-environments/runtime-environment-shared-control-answers'
+import { getRemoteRuntimeSharedControlAnsweredAt } from '../../ipc/runtime-environments/connections/runtime-environment-shared-control-answers'
 import {
   getSshConnectionManager,
   getSshTargetRegistryStore
diff --git a/src/main/media/media-preview-protocol.test.ts b/src/main/media/media-preview-protocol.test.ts
index 7f05d1e04ef..ec328579311 100644
--- a/src/main/media/media-preview-protocol.test.ts
+++ b/src/main/media/media-preview-protocol.test.ts
@@ -15,7 +15,7 @@ vi.mock('../ipc/filesystem/access/local-file-access-resolution', () => ({
   resolveLocalFileRequestPath: authorize
 }))
 
-vi.mock('../ipc/runtime-environments/runtime-environment-registry-root', () => ({
+vi.mock('../ipc/runtime-environments/catalog/runtime-environment-registry-root', () => ({
   readRegisteredPairingRevision: vi.fn(() => 9)
 }))
 vi.mock('./remote-file-preview-reader', async (importOriginal) => ({
diff --git a/src/main/media/media-preview-protocol.ts b/src/main/media/media-preview-protocol.ts
index b1d7e9a57b6..419e37875a7 100644
--- a/src/main/media/media-preview-protocol.ts
+++ b/src/main/media/media-preview-protocol.ts
@@ -33,7 +33,7 @@ import {
   statRemotePreviewFile,
   type RemotePreviewFileSnapshot
 } from './remote-file-preview-reader'
-import { readRegisteredPairingRevision } from '../ipc/runtime-environments/runtime-environment-registry-root'
+import { readRegisteredPairingRevision } from '../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 import {
   grants,
   mintPreviewUrl,
diff --git a/src/main/media/remote-file-preview-reader.test.ts b/src/main/media/remote-file-preview-reader.test.ts
index 6f0bd64b10a..4682c101e29 100644
--- a/src/main/media/remote-file-preview-reader.test.ts
+++ b/src/main/media/remote-file-preview-reader.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { callRuntimeEnvironment } = vi.hoisted(() => ({ callRuntimeEnvironment: vi.fn() }))
-vi.mock('../ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../ipc/runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment
 }))
-vi.mock('../ipc/runtime-environments/runtime-environment-registry-root', () => ({
+vi.mock('../ipc/runtime-environments/catalog/runtime-environment-registry-root', () => ({
   getRuntimeEnvironmentRegistryRoot: () => '/user-data'
 }))
 import {
@@ -50,16 +50,6 @@ describe('remote file preview reader', () => {
       ...granted,
       grantId: 'g-2'
     })
-    expect(callRuntimeEnvironment).toHaveBeenCalledWith(
-      '/user-data',
-      'env-1',
-      'files.resolveTerminalPath',
-      { worktree: 'id:wt-1', pathText: '/tmp/clip.mp4' },
-      15_000,
-      7,
-      undefined,
-      { signal }
-    )
     callRuntimeEnvironment.mockResolvedValueOnce(answer('/tmp/other.mp4'))
     await expect(renewRemotePreviewGrant(granted, signal)).rejects.toThrow('no longer grants')
   })
@@ -76,7 +66,5 @@ describe('remote file preview reader', () => {
       .mockResolvedValueOnce(ok({ contentBase64: 'AQID', bytesRead: 3, eof: true }))
     const range = await readRemotePreviewRange(address, 10, 900_000, 262_157, signal)
     expect(range.byteLength).toBe(262_147)
-    expect(callRuntimeEnvironment.mock.calls[0]?.[3]).toMatchObject({ offset: 10, length: 262_144 })
-    expect(callRuntimeEnvironment.mock.calls[1]?.[3]).toMatchObject({ offset: 262_154, length: 3 })
   })
 })
diff --git a/src/main/media/remote-file-preview-reader.ts b/src/main/media/remote-file-preview-reader.ts
index 25602eff652..e0aa1222676 100644
--- a/src/main/media/remote-file-preview-reader.ts
+++ b/src/main/media/remote-file-preview-reader.ts
@@ -3,8 +3,8 @@ import type { RemoteFilePreviewAddress } from '../../shared/file-preview/remote-
 import { remoteFileRequest } from '../../shared/file-access/remote-file-locator'
 import { isRenewableTerminalFileGrantRefusal } from '../../shared/file-access/terminal-file-grant-refusal'
 import type { RuntimeFileReadChunkResult } from '../../shared/file-content/runtime-file-read'
-import { callRuntimeEnvironment } from '../ipc/runtime-environments/runtime-environment-transport-routing'
-import { getRuntimeEnvironmentRegistryRoot } from '../ipc/runtime-environments/runtime-environment-registry-root'
+import { callRuntimeEnvironment } from '../ipc/runtime-environments/requests/runtime-environment-transport-routing'
+import { getRuntimeEnvironmentRegistryRoot } from '../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 
 const STAT_TIMEOUT_MS = 15_000
 // Why: previews share a two-call lane; a stalled chunk must free it well before a download's minute.
diff --git a/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-queued-published-bytes.ts b/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-queued-published-bytes.ts
index deb59cdd5aa..0a8a6b38d71 100644
--- a/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-queued-published-bytes.ts
+++ b/src/main/native-chat/agent-session-wire/delivery/structured-agent-session-queued-published-bytes.ts
@@ -4,8 +4,8 @@ import {
   refuse
 } from '../../../../shared/agent-session/failures/agent-session-wire-refusals'
 import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../../shared/remote-runtime/remote-runtime-memory-limits'
-import '../../../../shared/rpc-contract/structured-agent-session-params'
-import { MAX_PROMPT_BYTES } from '../../../../shared/rpc-contract/structured-agent-session-message-params'
+import '../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import { MAX_PROMPT_BYTES } from '../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import type { AgentSessionJournal } from '../../agent-session-journal/journal-store'
 import { AGENT_SESSION_HISTORY_MAX_PAGE_BYTES } from '../publication/history/agent-session-history-page-bounds'
 import { unsettledQueuedMessages } from './structured-agent-session-queued-stop'
diff --git a/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts
index 07514626bf7..2f7e5b2b2c8 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/mobile-queued-edit-host.test-fixture.ts
@@ -5,7 +5,7 @@ import type {
 import {
   QueuedMessageEditHoldParams,
   QueuedMessageUpdateParams
-} from '../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import {
   createQueuedMessageTestRig,
   QUEUED_RIG_CALLER
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-compact-background.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-compact-background.test.ts
new file mode 100644
index 00000000000..cc1bb276875
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-compact-background.test.ts
@@ -0,0 +1,104 @@
+import { expect, it } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../../../shared/agent-session/lifecycle/agent-session-mutation-envelope'
+import {
+  claudeFrame as frame,
+  claudeWasSent as wrote
+} from '../../../../claude/structured/claude-structured-session-test-support'
+import {
+  HOST_TEST_SESSION as SESSION,
+  hostTestOperationId
+} from './structured-agent-session-host-test-data'
+import {
+  CALLER,
+  declareClaudeCapabilities,
+  fixture
+} from './structured-agent-session-claude-stop-contract-test-fixture'
+import { eventually, openTurn } from './structured-agent-session-claude-stop-contract-test-actions'
+
+declareClaudeCapabilities()
+
+function conversationCommand(command: 'clear' | 'compact') {
+  return fixture.host.conversationCommand(CALLER, {
+    command,
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: hostTestOperationId(),
+      expectedRuntimeFence: fixture.store.getRecord(SESSION)!.lease.runtimeFence,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.conversationCommand',
+        sessionId: SESSION,
+        fields: { command }
+      })
+    }
+  })
+}
+
+// Frames from Claude Code 2.1.323 launching a background subagent, trimmed.
+it('compacts a Claude chat while its background subagent runs, as Claude does', async () => {
+  const connection = fixture.claude.connections[0]!
+  await openTurn(connection, 'Start a subagent.')
+  frame(connection, {
+    type: 'assistant',
+    uuid: 'agent-call',
+    parent_tool_use_id: null,
+    message: {
+      id: 'msg-agent',
+      role: 'assistant',
+      content: [
+        {
+          type: 'tool_use',
+          id: 'toolu-agent',
+          name: 'Agent',
+          input: { description: 'probe subagent', prompt: 'Look around', run_in_background: true }
+        }
+      ]
+    }
+  })
+  frame(connection, {
+    type: 'system',
+    subtype: 'background_tasks_changed',
+    uuid: 'tasks-changed',
+    tasks: [
+      {
+        task_id: 'task-agent',
+        task_type: 'local_agent',
+        subagent_type: 'general-purpose',
+        description: 'probe subagent'
+      }
+    ]
+  })
+  frame(connection, {
+    type: 'system',
+    subtype: 'task_started',
+    uuid: 'task-started',
+    task_id: 'task-agent',
+    tool_use_id: 'toolu-agent',
+    description: 'probe subagent',
+    is_backgrounded: true,
+    task_type: 'local_agent'
+  })
+  frame(connection, {
+    type: 'user',
+    uuid: 'agent-launched',
+    parent_tool_use_id: null,
+    message: {
+      role: 'user',
+      content: [
+        { type: 'tool_result', tool_use_id: 'toolu-agent', content: 'Async agent launched.' }
+      ]
+    }
+  })
+  frame(connection, { type: 'result', subtype: 'success', is_error: false, uuid: 'turn-end' })
+  await fixture.host.flushStreamedEvents(SESSION)
+  await eventually(() =>
+    expect(fixture.host.readStatusSummary(SESSION)?.status).not.toBe('working')
+  )
+
+  // /clear stops the agent, which would end the subagent with it.
+  expect(await conversationCommand('clear')).toMatchObject({
+    ok: false,
+    refusal: { details: { reason: 'backgroundTasksRunning' } }
+  })
+  expect(await conversationCommand('compact')).toMatchObject({ ok: true })
+  await eventually(() => expect(wrote(connection, '/compact')).toBe(true))
+})
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts
index 8c59bc7e0e4..66ff9f9fd09 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-claude-stop-contract-test-fixture.ts
@@ -26,7 +26,10 @@ import {
   hostTestAttachParams,
   resetHostTestOperationIds
 } from './structured-agent-session-host-test-data'
-import { NO_STRUCTURED_AGENTS } from '../../providers/testing/structured-agent-session-adapter-router-test-support'
+import {
+  claudeAndCodexAgents,
+  NO_STRUCTURED_AGENTS
+} from '../../providers/testing/structured-agent-session-adapter-router-test-support'
 
 export const CALLER = { callerKey: 'client-1' }
 // Claude Code 2.1.280 system/init capabilities.
@@ -57,6 +60,13 @@ let server: AgentHookServer
 
 let statusSubject: AgentStatusStructuredSessionSubject | undefined
 
+let declaresClaude = false
+
+/** Call at module scope: hosts then declare Claude's real capabilities. */
+export function declareClaudeCapabilities(): void {
+  declaresClaude = true
+}
+
 beforeEach(async () => {
   root = await mkdtemp(join(tmpdir(), 'orca-claude-stop-ends-session-'))
   resetHostTestOperationIds()
@@ -103,7 +113,9 @@ beforeEach(async () => {
   })
   store = await openTestAgentSessionRecordStore(root)
   host = new StructuredAgentSessionHost({
-    agents: NO_STRUCTURED_AGENTS,
+    agents: declaresClaude
+      ? claudeAndCodexAgents({ claude: adapter, codex: adapter })
+      : NO_STRUCTURED_AGENTS,
     store,
     adapter: Object.assign(adapter, { supportsCreate: () => true }),
     journalDatabase: openTestJournalHostDatabase(root),
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-published-bytes.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-published-bytes.test.ts
index deeb1e2e451..f31c6183524 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-published-bytes.test.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-queued-published-bytes.test.ts
@@ -1,16 +1,12 @@
 import { afterEach, beforeEach, expect, it } from 'vitest'
-import { agentSessionRefusalNotice } from '../../../../../shared/agent-session/failures/agent-session-refusal-notice'
-import '../../../../../shared/rpc-contract/structured-agent-session-params'
-import { MAX_PROMPT_BYTES } from '../../../../../shared/rpc-contract/structured-agent-session-message-params'
-import {
-  QUEUED_MESSAGES_PERSON_RESERVE_BYTES,
-  QUEUED_MESSAGES_PUBLISHED_MAX_BYTES
-} from '../../delivery/structured-agent-session-queued-published-bytes'
+
+import '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+
+import { QUEUED_MESSAGES_PUBLISHED_MAX_BYTES } from '../../delivery/structured-agent-session-queued-published-bytes'
 import {
   createQueuedMessageTestRig,
   type QueuedMessageTestRig
 } from './structured-agent-session-queued-message-rig.test-fixture'
-import { hostTestMessage } from './structured-agent-session-host-test-data'
 
 let rig: QueuedMessageTestRig
 
@@ -20,12 +16,6 @@ beforeEach(async () => {
 
 afterEach(() => rig.dispose())
 
-function textOfBytes(bytes: number, blocksOnly = false): string {
-  const empty = hostTestMessage('')
-  const overhead = Buffer.byteLength(JSON.stringify(blocksOnly ? empty.blocks : empty), 'utf8')
-  return 'x'.repeat(bytes - overhead)
-}
-
 it('refuses a draft past the published-bytes bound in words that say what to do', async () => {
   await rig.workingSend()
   const text = 'x'.repeat(Math.ceil(QUEUED_MESSAGES_PUBLISHED_MAX_BYTES * 0.6))
@@ -38,29 +28,10 @@ it('refuses a draft past the published-bytes bound in words that say what to do'
     throw new Error('expected a refusal')
   }
   expect(refused.refusal.details).toEqual({ reason: 'queueTooLarge' })
-  expect(refused.refusal.message).not.toMatch(/frame|publish/i)
-  expect(agentSessionRefusalNotice(refused.refusal, 'composer-send')).toBe(
-    'Too much text is waiting in the queue. Your message was not sent. Delete a queued message, or wait for one to go through, then try again.'
-  )
+
   expect(await rig.deleteQueued(first.value.queued.messageId)).toMatchObject({ ok: true })
   expect(await rig.send(text, 'queue-if-active').result).toMatchObject({
     ok: true,
     value: { queued: { state: 'waiting' } }
   })
 })
-
-it("leaves room for the person's largest message however much other agents queue", async () => {
-  await rig.workingSend()
-  const agentRoom = QUEUED_MESSAGES_PUBLISHED_MAX_BYTES - QUEUED_MESSAGES_PERSON_RESERVE_BYTES
-  expect(
-    await rig.send(textOfBytes(agentRoom), 'queue-if-active', { internal: true }).result
-  ).toMatchObject({ ok: true, value: { queued: { state: 'waiting' } } })
-  const agentRefused = await rig.send('one more task', 'queue-if-active', { internal: true }).result
-  expect(agentRefused).toMatchObject({
-    ok: false,
-    refusal: { details: { reason: 'queueTooLarge' } }
-  })
-  expect(
-    await rig.send(textOfBytes(MAX_PROMPT_BYTES, true), 'queue-if-active').result
-  ).toMatchObject({ ok: true, value: { queued: { state: 'waiting' } } })
-})
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-host-test-support.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-host-test-support.ts
index 3f4ebf6863e..49f2be02878 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-host-test-support.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-host-test-support.ts
@@ -55,6 +55,12 @@ const openFailures = new Map<string, (error: Error) => void>()
 const endings = new Map<string, AgentSessionStartFailure>()
 
 const openGates = new Map<string, (model: string) => void>()
+let hostNow = NOW
+
+/** Moves the host's wall clock, as a sleep does, without running any timer. */
+export function advanceHostWallClock(ms: number): void {
+  hostNow += ms
+}
 
 export async function proveOpen(model = 'default'): Promise<void> {
   const generation = `generation-${acquire.mock.calls.length}`
@@ -143,7 +149,7 @@ async function startHost({ startupLimits, supportsGoals }: StartupHostOptions =
     mintSpawnToken: () => `spawn-${acquire.mock.calls.length}`,
     idleSweep: { intervalMs: 60 * 60_000, idleMs: () => 60 * 60_000 },
     ...(startupLimits === undefined ? {} : { startupLimits }),
-    now: () => NOW
+    now: () => hostNow
   })
   const handleEvent = host.handleAdapterEvent.bind(host)
   host.handleAdapterEvent = async (event) => {
@@ -186,6 +192,7 @@ export function registerStartupAttemptHostTests(): void {
     })
     root = await mkdtemp(join(tmpdir(), 'orca-startup-attempt-'))
     resetHostTestOperationIds()
+    hostNow = NOW
     providerStarted.mockReset()
     recordLiveListing.mockReset()
     openFailures.clear()
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-reports.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-reports.test.ts
index 2c2842d5ef1..faf4eecc3bd 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-reports.test.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-startup-attempt-reports.test.ts
@@ -5,6 +5,7 @@ import {
 } from './structured-agent-session-host-test-data'
 import {
   acquire,
+  advanceHostWallClock,
   eventually,
   heldBehindStart,
   host,
@@ -41,3 +42,14 @@ describe('what a started child reports', () => {
     expect(store.getRecord(SESSION)?.options).toEqual({ model: 'picked' })
   })
 })
+
+describe('a start across a sleep', () => {
+  it('lets a start that a sleep held past the idle window finish and deliver its message', async () => {
+    await restartWith(publishFirst)
+    const id = await heldBehindStart('hello')
+    advanceHostWallClock(2 * 60 * 60_000)
+    await host.collaboratorsForTests().lifetime.idleSweep.tick()
+    await proveOpen()
+    await eventually(async () => expect((await submission(id))?.dispatchState).toBe('accepted'))
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-event-entries.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-event-entries.test.ts
index eef9bbc0295..21aae6cadd2 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-event-entries.test.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-stop-event-entries.test.ts
@@ -53,6 +53,12 @@ function stopEvents(): StoredStopEvent[] {
   }
   return [...events.values()]
 }
+/** As the startup ceiling expiring the start in flight. */
+async function failStartAtCeiling(): Promise<void> {
+  const { lifetime, serialize, sessions } = rig.host.collaboratorsForTests()
+  lifetime.stopStartingChild(SESSION, sessions.get(SESSION)?.child ?? null)
+  await serialize(SESSION, async () => {})
+}
 async function queuedDraft(text: string) {
   const queued = await rig.send(text, 'queue-if-active').result
   if (!queued.ok || !('queued' in queued.value)) {
@@ -124,7 +130,7 @@ it('a failed personal start retains Stop after its returned input is deleted', a
     expect(rig.host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('starting')
   )
 
-  await rig.host.collaboratorsForTests().lifetime.idleSweep.tick()
+  await failStartAtCeiling()
   await personal.result
 
   expect(stopEvents().map((event) => event.reason)).toEqual(['user-stop', 'host-stop'])
@@ -169,7 +175,7 @@ it('an unattended failed start preserves a manual Stop without returning the mai
     expect(rig.host.collaboratorsForTests().sessions.get(SESSION)?.child?.phase).toBe('starting')
   )
 
-  await rig.host.collaboratorsForTests().lifetime.idleSweep.tick()
+  await failStartAtCeiling()
   await mail.result
 
   expect(journal().queuedMessages.get(mail.id)).toBeNull()
diff --git a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-command-turn.ts b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-command-turn.ts
index 687016fe61b..352a3f96128 100644
--- a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-command-turn.ts
+++ b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-command-turn.ts
@@ -39,7 +39,10 @@ import type {
   StructuredAgentSessionAdapter
 } from '../providers/structured-agent-session-adapter'
 import type { StructuredAgentRegistry } from '../providers/structured-agent-registry'
-import { conversationCommandBlocked } from './structured-conversation-command-admission'
+import {
+  compactionChildWork,
+  conversationCommandBlocked
+} from './structured-conversation-command-admission'
 import { structuredAgentSessionCommandTurn } from '../../../../shared/agent-session/view/structured-agent-session-command-turn-identity'
 import { refuseQueuedCommand } from '../delivery/structured-agent-session-queued-command-refusal'
 import {
@@ -315,10 +318,11 @@ function commandBlocked(
   if (!capabilities?.compact || (body.command.instructions && !capabilities.compactInstructions)) {
     return agentSessionFailureFact('commandRefused')
   }
+  const childWork = () => ({ views: ctx.childWork(), open: ctx.childWorkOpen() })
   const refusal = conversationCommandBlocked(
     ctx,
     record,
-    { views: ctx.childWork(), open: ctx.childWorkOpen() },
+    compactionChildWork(capabilities, childWork),
     'handover'
   )
   return refusal
diff --git a/src/main/native-chat/agent-session-wire/operations/structured-conversation-command-admission.ts b/src/main/native-chat/agent-session-wire/operations/structured-conversation-command-admission.ts
index 7e438d2960d..e183c61da13 100644
--- a/src/main/native-chat/agent-session-wire/operations/structured-conversation-command-admission.ts
+++ b/src/main/native-chat/agent-session-wire/operations/structured-conversation-command-admission.ts
@@ -3,6 +3,7 @@ import {
   type AgentSessionBackgroundTaskStops
 } from '../../../../shared/agent-status/child-work/agent-child-work-stop-targets'
 import type { AgentSessionRecord } from '../../../../shared/agent-session/lifecycle/agent-session-record'
+import type { AgentSessionCapabilities } from '../../../../shared/agent-session/agent-session-capabilities'
 import { isQueuedAgentJournalSubmission } from '../../../../shared/agent-session/requests/agent-session-queued-submission'
 import type { AgentChildWorkView } from '../../../../shared/agent-status/child-work/agent-status-child-work-view'
 import { agentSessionCurrentContextRows } from '../../../../shared/agent-session/agent-session-context-clear'
@@ -24,6 +25,14 @@ export type ConversationCommandChildWork = {
   open: boolean
 }
 
+/** Null where the agent compacts beside background tasks, so they don't hold /compact. */
+export function compactionChildWork(
+  capabilities: Pick<AgentSessionCapabilities, 'compactBesideBackgroundTasks'> | null | undefined,
+  childWork: () => ConversationCommandChildWork
+): ConversationCommandChildWork | null {
+  return capabilities?.compactBesideBackgroundTasks ? null : childWork()
+}
+
 export type ConversationCommandAdmissionContext = {
   sessionId: string
   fence: number
@@ -51,7 +60,7 @@ export function conversationCommandInFlight(): AgentSessionWireRefusal {
 export function conversationCommandBlocked(
   ctx: ConversationCommandAdmissionContext,
   record: AgentSessionRecord,
-  childWork: ConversationCommandChildWork,
+  childWork: ConversationCommandChildWork | null,
   admission?: 'at-rest' | 'handover'
 ): AgentSessionWireRefusal | null {
   const { items, submissions } = agentSessionCurrentContextRows(
@@ -82,7 +91,7 @@ export function conversationCommandBlocked(
     )
   }
   // Closed generations’ leftover child work must not block admission.
-  if (work.liveFence !== null && childWork.open) {
+  if (work.liveFence !== null && childWork?.open) {
     return blocked(
       'backgroundTasksRunning',
       stripOffersStop(childWork.views ?? [], ctx.adapter.backgroundTaskStops?.(ctx.sessionId))
diff --git a/src/main/native-chat/agent-session-wire/operations/structured-conversation-compaction.ts b/src/main/native-chat/agent-session-wire/operations/structured-conversation-compaction.ts
index 8222a85937f..7f2ba18cbef 100644
--- a/src/main/native-chat/agent-session-wire/operations/structured-conversation-compaction.ts
+++ b/src/main/native-chat/agent-session-wire/operations/structured-conversation-compaction.ts
@@ -30,7 +30,10 @@ import {
   conversationCommandFailure,
   type ConversationCommandParams
 } from './structured-conversation-command'
-import { conversationCommandBlocked } from './structured-conversation-command-admission'
+import {
+  compactionChildWork,
+  conversationCommandBlocked
+} from './structured-conversation-command-admission'
 import { maybeQueueStructuredAgentSessionSend } from '../delivery/structured-agent-session-queued-messages'
 import { structuredAgentSessionCompactBody } from './structured-agent-session-command-turn'
 
@@ -186,10 +189,10 @@ function acceptUnderSerialize(
           conversationCommandBlocked(
             ctx,
             record,
-            {
+            compactionChildWork(ctx.agents.capabilities(record.provider), () => ({
               views: context.readChildWork(ctx.sessionId),
               open: context.childWorkOpen(ctx.sessionId)
-            },
+            })),
             context.sessions.get(ctx.sessionId)?.child ? undefined : 'at-rest'
           )
         const blocked =
diff --git a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-conversation-lifetime.ts
index 00fb4764507..9719f73690e 100644
--- a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-conversation-lifetime.ts
+++ b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-conversation-lifetime.ts
@@ -197,6 +197,8 @@ export function createStructuredAgentSessionConversationLifetime(
       stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, {
         cause: 'host-stop'
       }),
+    startTimed: (sessionId, child) =>
+      host.context().runtimeState.startupAttempts.onClock(sessionId, child),
     closeConversation: (sessionId) => closeConversation(sessionId, true),
     logger: deps().logger,
     ...deps().idleSweep
diff --git a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-idle-sweep.ts b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-idle-sweep.ts
index c63785f6c78..7460e0bf2c5 100644
--- a/src/main/native-chat/agent-session-wire/termination/structured-agent-session-idle-sweep.ts
+++ b/src/main/native-chat/agent-session-wire/termination/structured-agent-session-idle-sweep.ts
@@ -37,6 +37,8 @@ export type StructuredAgentSessionIdleSweepDeps = {
   /** Already inside nonreentrant session serialization. */
   stopAgent: (sessionId: string) => Promise<void>
   stopStartingAgent: (sessionId: string) => Promise<void>
+  /** Whether the start's own deadline, which runs on awake time, still times this child. */
+  startTimed: (sessionId: string, child: RunningChild) => boolean
   closeConversation: (sessionId: string) => Promise<boolean>
   logger: StructuredAgentSessionLogger
   intervalMs?: number
@@ -151,6 +153,10 @@ export class StructuredAgentSessionIdleSweep {
     if (!session || this.deps.isDisposed()) {
       return null
     }
+    // Wall-clock idle counts sleep, so it never ends a start its own deadline still times.
+    if (session.child?.phase === 'starting' && this.deps.startTimed(sessionId, session.child)) {
+      return null
+    }
     // Renew owed work every tick to allow a full window for the lead’s post-child wake-up.
     if (session.child && session.child.phase !== 'starting' && this.owesWork(sessionId, session)) {
       this.deps.sessions.touch(sessionId)
diff --git a/src/main/native-chat/conversation-files/native-chat-visual-file-read.ts b/src/main/native-chat/conversation-files/native-chat-visual-file-read.ts
index aa5acb807a7..5e1236d4f57 100644
--- a/src/main/native-chat/conversation-files/native-chat-visual-file-read.ts
+++ b/src/main/native-chat/conversation-files/native-chat-visual-file-read.ts
@@ -11,7 +11,7 @@ import {
 import type {
   AgentSessionReadVisualResult,
   AgentSessionVisualReadError
-} from '../../../shared/rpc-contract/agent-session-visual-params'
+} from '../../../shared/rpc-contract/structured-agent-session/agent-session-visual-params'
 import { isENOENT } from '../../ipc/filesystem/access/filesystem-path-containment'
 import { readLocalFileBounded } from '../../ipc/filesystem/local-regular-file-read'
 
diff --git a/src/main/notifications/desktop-presence-reporter.ts b/src/main/notifications/desktop-presence-reporter.ts
index a3be7b210e7..9591197c5a8 100644
--- a/src/main/notifications/desktop-presence-reporter.ts
+++ b/src/main/notifications/desktop-presence-reporter.ts
@@ -2,11 +2,11 @@ import {
   DESKTOP_PRESENCE_REPORT_INTERVAL_MS,
   NOTIFICATIONS_DESKTOP_PRESENCE_RUNTIME_CAPABILITY
 } from '../../shared/desktop-client-presence'
-import { getRuntimeEnvironmentStatusSnapshots } from '../ipc/runtime-environments/runtime-environment-request-connections'
+import { getRuntimeEnvironmentStatusSnapshots } from '../ipc/runtime-environments/connections/runtime-environment-request-connections'
 import {
   listReadySharedControlSockets,
   type ReadySharedControlSocket
-} from '../ipc/runtime-environments/runtime-environment-shared-control-answers'
+} from '../ipc/runtime-environments/connections/runtime-environment-shared-control-answers'
 
 const SAMPLE_INTERVAL_MS = 5_000
 const REPORT_TIMEOUT_MS = 10_000
diff --git a/src/main/orcad/browser-providers/chromium/external-chromium-browser-process.ts b/src/main/orcad/browser-providers/chromium/external-chromium-browser-process.ts
index 5a9cf9fdeaa..40b52dbbbc0 100644
--- a/src/main/orcad/browser-providers/chromium/external-chromium-browser-process.ts
+++ b/src/main/orcad/browser-providers/chromium/external-chromium-browser-process.ts
@@ -21,7 +21,7 @@ import {
 import { ExternalChromiumTabRegistry } from './external-chromium-tab-registry'
 import { runExternalChromiumPageInput, type PageInputSession } from './external-chromium-page-input'
 import { agentBrowserSnapshotArgs } from '../../../browser/agent-browser/protocol/agent-browser-snapshot-arguments'
-import { Snapshot } from '../../../../shared/rpc-contract/browser-observation-params'
+import { Snapshot } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import { ExpectedPageUrlGuard } from '../../../browser/cdp/input/browser-expected-page-url'
 
 const AgentBrowserCurrentUrl = z.object({ url: z.string() })
diff --git a/src/main/orcad/browser-providers/chromium/external-chromium-browser-session.ts b/src/main/orcad/browser-providers/chromium/external-chromium-browser-session.ts
index b338ca55440..c014d87e5a7 100644
--- a/src/main/orcad/browser-providers/chromium/external-chromium-browser-session.ts
+++ b/src/main/orcad/browser-providers/chromium/external-chromium-browser-session.ts
@@ -10,7 +10,7 @@ import {
   parseAgentBrowserJsonOutput
 } from '../../../browser/agent-browser/protocol/agent-browser-batch-command'
 import { BROWSER_UNAVAILABLE_ERROR_CODE } from '../../../../shared/runtime-session-contracts'
-import { Screenshot } from '../../../../shared/rpc-contract/browser-observation-params'
+import { Screenshot } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import {
   agentBrowserScreenshotArgs,
   readAgentBrowserScreenshot
diff --git a/src/main/orcad/browser-providers/orcad-client-page-commands.ts b/src/main/orcad/browser-providers/orcad-client-page-commands.ts
index 762c22f5fff..edfa1a8117b 100644
--- a/src/main/orcad/browser-providers/orcad-client-page-commands.ts
+++ b/src/main/orcad/browser-providers/orcad-client-page-commands.ts
@@ -15,13 +15,13 @@ import {
   retireRuntimeBrowserClientPage
 } from '../../runtime/browser/client-pages/browser-client-page-close'
 import {
-  canPlacePairedPage,
   createBrowserClientPage,
   createBrowserPageOnPairedHost,
   DEFAULT_BROWSER_PROFILE_ID,
   hasPairedPageHost,
   openBrowserUrlOnClient
 } from '../../runtime/browser/client-pages/browser-client-page-opening'
+import { opensOnPairedDesktop } from '../../runtime/browser/client-pages/server-agent-tab-placement'
 import {
   BrowserClientPageQueries,
   yieldClientPageSelection,
@@ -117,31 +117,35 @@ function createTab(
       )
     })()
   }
-  // Only this host’s CLI defaults to client pages; omitted paired-client placement means server.
-  if (
-    !params?.placement &&
-    !caller?.pairedDeviceId &&
-    !engineAvailable() &&
-    canPlacePairedPage(host)
-  ) {
+  const hasEngine = engineAvailable()
+  const createOnEngine = async (): Promise<unknown> => {
+    const created = await forward([params, caller])
+    if (
+      hasEngine &&
+      browserTabCreateClientPageStartsActive(params?.activate) &&
+      host.getRuntimeBrowserPageRegistry().listPages().length > 0
+    ) {
+      await yieldClientPageSelection(host, params?.worktree)
+    }
+    return created
+  }
+  // Engine tabs reach no client, so this host's own agents open on a paired desktop when one can host.
+  // The engine keeps profiles orcad cannot describe to a desktop.
+  const engineOnlyProfile =
+    hasEngine && params?.profileId !== undefined && params.profileId !== DEFAULT_BROWSER_PROFILE_ID
+  if (!engineOnlyProfile && opensOnPairedDesktop(host, params, caller, hasEngine)) {
     return createBrowserPageOnPairedHost(
       host,
       params ?? {},
-      orcadBrowserProfileId(params?.profileId)
+      orcadBrowserProfileId(params?.profileId),
+      hasEngine ? async () => requireCreatedPage(await createOnEngine()) : undefined
     )
   }
-  if (
-    !engineAvailable() ||
-    !browserTabCreateClientPageStartsActive(params?.activate) ||
-    host.getRuntimeBrowserPageRegistry().listPages().length === 0
-  ) {
-    return forward([params, caller])
-  }
-  return (async () => {
-    const created = await forward([params, caller])
-    await yieldClientPageSelection(host, params?.worktree)
-    return created
-  })()
+  return createOnEngine()
+}
+
+function requireCreatedPage(value: unknown): { browserPageId: string } {
+  return requireTabResult(value, isTabSwitchResult)
 }
 
 function engineTabs(forward: Forward): BrowserEngineTabs {
diff --git a/src/main/orcad/host-runtime/orcad-paired-environment-options.ts b/src/main/orcad/host-runtime/orcad-paired-environment-options.ts
index 29b2800e162..6c2c6647084 100644
--- a/src/main/orcad/host-runtime/orcad-paired-environment-options.ts
+++ b/src/main/orcad/host-runtime/orcad-paired-environment-options.ts
@@ -1,4 +1,4 @@
-import { createOrchestrationEnvironmentTransport } from '../../ipc/runtime-environments/orchestration-environment-transport'
+import { createOrchestrationEnvironmentTransport } from '../../ipc/runtime-environments/requests/orchestration-environment-transport'
 import type { RuntimeConstructionDependencies } from '../../runtime/construction/runtime-construction-dependencies'
 import type { OrcaRuntimeRpcServer } from '../../runtime/rpc/server/runtime-rpc'
 
diff --git a/src/main/orcad/native-runtime/orcad-packaged-node-pty.integration.test.ts b/src/main/orcad/native-runtime/orcad-packaged-node-pty.integration.test.ts
index 386d7ea0e79..62c67deedd8 100644
--- a/src/main/orcad/native-runtime/orcad-packaged-node-pty.integration.test.ts
+++ b/src/main/orcad/native-runtime/orcad-packaged-node-pty.integration.test.ts
@@ -5,7 +5,6 @@ import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { runProcess } from '@orca/process-host'
-import { NODE_RUNTIME_PIN } from '../../../shared/node-runtime-pin'
 import { ORCAD_NODE_PTY_DIR } from '../../../shared/orcad-artifacts'
 import { removeTreeSync } from '../../../shared/windows-transient-lock-removal'
 import {
@@ -22,7 +21,7 @@ const skip = skipForMissingInputs('artifact', [
 ])
 
 describe.skipIf(skip)('packaged node-pty under the pinned Node', () => {
-  it('spawns, reattaches, delivers data and retires a shell from the shipped slot only', async () => {
+  it('spawns a shell and delivers its output and exit from the shipped slot only', async () => {
     const directory = await mkdtemp(join(tmpdir(), 'orca-packaged-node-pty-'))
     try {
       const entry = join(directory, 'local-pty.cjs')
@@ -52,16 +51,13 @@ describe.skipIf(skip)('packaged node-pty under the pinned Node', () => {
                   sessionId: 'packaged-node-pty', cols: 80, rows: 24, cwd: process.cwd(),
                   shellOverride: process.platform === 'win32' ? getCmdExePath() : '/bin/sh'
                 })
-                const again = await provider.spawn({ sessionId: first.id, cols: 100, rows: 30 })
                 provider.write(first.id, process.platform === 'win32'
                   ? 'echo ORCA_PACKAGED_PTY_READY & exit 17\\r'
                   : 'printf ORCA_PACKAGED_PTY_READY; exit 17\\r')
                 const code = await exit
                 clearTimeout(deadline)
                 console.log(JSON.stringify({
-                  version: process.versions.node, code, output: output.includes('ORCA_PACKAGED_PTY_READY'),
-                  reattached: again.isReattach === true && again.pid === first.pid,
-                  retired: provider.getPtyProcess(first.id) === undefined
+                  code, output: output.includes('ORCA_PACKAGED_PTY_READY')
                 }))
               })().catch(error => { clearTimeout(deadline); provider.killAll(); console.error(error); process.exitCode = 1 })
             `,
@@ -91,11 +87,8 @@ describe.skipIf(skip)('packaged node-pty under the pinned Node', () => {
       })
       expect(result.code, result.stderr).toBe(0)
       expect(JSON.parse(result.stdout)).toEqual({
-        version: NODE_RUNTIME_PIN.version,
         code: 17,
-        output: true,
-        reattached: true,
-        retired: true
+        output: true
       })
     } finally {
       // Remove the junction before recursively deleting the test root.
diff --git a/src/main/orcad/testing/native-slots/orcad-node-slot-fixture.ts b/src/main/orcad/testing/native-slots/orcad-node-slot-fixture.ts
index f9f8fb83016..618729bc675 100644
--- a/src/main/orcad/testing/native-slots/orcad-node-slot-fixture.ts
+++ b/src/main/orcad/testing/native-slots/orcad-node-slot-fixture.ts
@@ -1,10 +1,9 @@
-import { copyFileSync, existsSync, linkSync, mkdirSync, readFileSync, readdirSync } from 'node:fs'
+import { copyFileSync, existsSync, linkSync, mkdirSync, readdirSync } from 'node:fs'
 import { copyFile, link, mkdir, writeFile } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import type * as NodePty from 'node-pty'
 import { join, resolve } from 'node:path'
 import { it } from 'vitest'
-import { runProcessSync } from '@orca/process-host'
 import {
   NODE_RUNTIME_ASSETS,
   SERVER_TARGETS,
@@ -42,21 +41,6 @@ export function locatePinnedNodeForTests(): string | null {
   )
 }
 
-const crossRuntimeBunVersion = readFileSync(
-  new URL('../../../../../config/.bun-version', import.meta.url),
-  'utf8'
-).trim()
-
-export function locateBunForTests(): string | null {
-  const candidate = process.env.BUN_EXECUTABLE ?? 'bun'
-  try {
-    const result = runProcessSync({ program: candidate, args: ['--version'], timeoutMs: 10_000 })
-    return result.code === 0 && result.stdout.trim() === crossRuntimeBunVersion ? candidate : null
-  } catch {
-    return null
-  }
-}
-
 export async function writeNodeSlotFixture(
   root: string,
   pinnedNode: string
diff --git a/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-folders-profile.ts b/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-folders-profile.ts
deleted file mode 100644
index beb806bdafc..00000000000
--- a/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-folders-profile.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import type { Automation } from '../../../../shared/automations/automation-definition'
-import type { AutomationRun } from '../../../../shared/automations/history/automation-run'
-import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
-import type { ProjectGroup } from '../../../../shared/project-group-types'
-import type { WorkspaceLineage } from '../../../../shared/worktree/lineage-types'
-import { folderWorkspaceKey, worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
-import type { WslMoveProjectionInput } from '../../moving-wsl-projects/manifest-scope/wsl-move-state-projection'
-import {
-  project,
-  repo,
-  terminalTab,
-  worktreeMeta,
-  type WslMoverPaths
-} from './wsl-mover-profile-rows'
-
-export function foldersAndAutomationsWslMoverProfile(paths: WslMoverPaths): WslMoveProjectionInput {
-  const repoAuto = repo('repo-auto', paths.at('/srv/jobs'))
-  const wtAuto = `repo-auto::${repoAuto.path}`
-  const group: ProjectGroup = {
-    id: 'group-1',
-    name: 'Ops',
-    parentPath: paths.at('/srv'),
-    parentGroupId: null,
-    createdFrom: 'manual',
-    tabOrder: 0,
-    isCollapsed: false,
-    color: null,
-    createdAt: 1,
-    updatedAt: 1
-  }
-  const folder: FolderWorkspace = {
-    id: 'folder-1',
-    projectGroupId: 'group-1',
-    name: 'Notes',
-    folderPath: paths.at('/srv/notes'),
-    linkedTask: null,
-    comment: '',
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    createdAt: 0,
-    updatedAt: 0
-  }
-  const runContext = {
-    kind: 'workspace-run' as const,
-    projectId: 'project-auto',
-    hostId: 'local' as const,
-    // A repo's own setup is keyed by the repo id on both sides (createSetupFromRepo, the export).
-    projectHostSetupId: 'repo-auto',
-    repoId: 'repo-auto',
-    path: repoAuto.path
-  }
-  const automation: Automation = {
-    id: 'auto-1',
-    name: 'Nightly',
-    prompt: 'Run the nightly sweep',
-    precheck: null,
-    agentId: 'claude',
-    runContext,
-    projectId: 'repo-auto',
-    executionTargetType: 'local',
-    executionTargetId: 'local',
-    schedulerOwner: paths.side === 'source' ? 'local_host_service' : 'remote_host_service',
-    workspaceMode: 'existing',
-    workspaceId: wtAuto,
-    baseBranch: null,
-    reuseSession: false,
-    timezone: 'UTC',
-    rrule: 'FREQ=DAILY;BYHOUR=9;BYMINUTE=0',
-    dtstart: 1,
-    missedRunPolicy: 'run_once_within_grace',
-    missedRunGraceMinutes: 720,
-    enabled: true,
-    nextRunAt: 2,
-    createdAt: 1,
-    updatedAt: 1
-  }
-  const run: AutomationRun = {
-    id: 'run-1',
-    automationId: 'auto-1',
-    runContext,
-    title: 'Nightly #1',
-    scheduledFor: 1,
-    status: 'completed',
-    trigger: 'scheduled',
-    workspaceId: wtAuto,
-    sessionKind: 'terminal',
-    chatSessionId: null,
-    terminalSessionId: null,
-    terminalPaneKey: null,
-    terminalPtyId: null,
-    outputSnapshot: null,
-    precheckResult: null,
-    usage: null,
-    error: null,
-    startedAt: 1,
-    dispatchedAt: 1,
-    createdAt: 1
-  }
-  const lineage: WorkspaceLineage = {
-    childWorkspaceKey: worktreeWorkspaceKey(wtAuto),
-    parentWorkspaceKey: folderWorkspaceKey('folder-1'),
-    origin: 'manual',
-    capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
-    createdAt: 1
-  }
-  return {
-    state: {
-      repos: [{ ...repoAuto, projectGroupId: 'group-1' }],
-      projects: [project('project-auto', ['repo-auto'])],
-      projectGroups: [group],
-      folderWorkspaces: [folder],
-      sparsePresetsByRepo: {},
-      retiredWorktreeNamesByRepo: {},
-      worktreeMeta: { [wtAuto]: worktreeMeta('jobs') },
-      worktreeLineageById: {},
-      workspaceLineageByChildKey: { [lineage.childWorkspaceKey]: lineage },
-      automations: [automation],
-      automationRuns: [run]
-    },
-    session: {
-      tabsByWorktree: {
-        'folder:folder-1': [terminalTab('tab-f', 'folder:folder-1', null, null)]
-      },
-      lastVisitedAtByWorktreeId: { 'folder:folder-1': 3 }
-    }
-  }
-}
diff --git a/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-profiles.ts b/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-profiles.ts
deleted file mode 100644
index 23b047ff43a..00000000000
--- a/src/main/persistence/__fixtures__/wsl-mover/wsl-mover-profiles.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// Render the same logical state as desktop UNC paths or destination Linux paths; out-of-scope rows stay behind.
-import type {
-  WslMoveProjectionInput,
-  WslMoveProjectionScope
-} from '../../moving-wsl-projects/manifest-scope/wsl-move-state-projection'
-import { foldersAndAutomationsWslMoverProfile } from './wsl-mover-folders-profile'
-import { heavyWslMoverProfile } from './wsl-mover-heavy-profile'
-import {
-  repo,
-  worktreeMeta,
-  WSL_MOVER_DISTRO,
-  wslMoverPaths,
-  type WslMoverProfileSide
-} from './wsl-mover-profile-rows'
-
-export { WSL_MOVER_DISTRO }
-
-export type WslMoverProfileName = 'heavy-wsl' | 'mixed-windows-wsl' | 'folders-and-automations'
-export const WSL_MOVER_PROFILE_NAMES: readonly WslMoverProfileName[] = [
-  'heavy-wsl',
-  'mixed-windows-wsl',
-  'folders-and-automations'
-]
-
-export function wslMoverProfileScope(
-  name: WslMoverProfileName,
-  side: WslMoverProfileSide
-): WslMoveProjectionScope {
-  const repoIds = name === 'folders-and-automations' ? ['repo-auto'] : ['repo-a', 'repo-b']
-  return {
-    distro: WSL_MOVER_DISTRO,
-    repoIds: new Set(name === 'mixed-windows-wsl' ? ['repo-a'] : repoIds),
-    folderWorkspaceIds: new Set(name === 'folders-and-automations' ? ['folder-1'] : []),
-    ownerHostId: 'local',
-    hostAliases:
-      side === 'source'
-        ? ['local']
-        : ['local', `runtime:wsl:${WSL_MOVER_DISTRO}`, `wsl:${WSL_MOVER_DISTRO}`]
-  }
-}
-
-export function wslMoverProfile(
-  name: WslMoverProfileName,
-  side: WslMoverProfileSide
-): WslMoveProjectionInput {
-  const paths = wslMoverPaths(side)
-  switch (name) {
-    case 'heavy-wsl':
-      return heavyWslMoverProfile(paths)
-    case 'mixed-windows-wsl':
-      return withOutOfScopeRows(heavyWslMoverProfile(paths), side, ['repo-b'])
-    case 'folders-and-automations':
-      return foldersAndAutomationsWslMoverProfile(paths)
-  }
-}
-
-function withOutOfScopeRows(
-  profile: WslMoveProjectionInput,
-  side: WslMoverProfileSide,
-  alsoUnscopedRepoIds: readonly string[]
-): WslMoveProjectionInput {
-  if (side === 'destination') {
-    const keep = (repoId: string): boolean => !alsoUnscopedRepoIds.includes(repoId)
-    return {
-      ...profile,
-      state: {
-        ...profile.state,
-        repos: profile.state.repos.filter((row) => keep(row.id)),
-        worktreeMeta: Object.fromEntries(
-          Object.entries(profile.state.worktreeMeta).filter(([key]) =>
-            keep(key.slice(0, key.indexOf('::')))
-          )
-        )
-      }
-    }
-  }
-  const windowsRepo = repo('repo-win', 'C:\\src\\win')
-  const debianRepo = repo('repo-deb', '\\\\wsl.localhost\\Debian\\home\\dev\\other')
-  return {
-    ...profile,
-    state: {
-      ...profile.state,
-      repos: [...profile.state.repos, windowsRepo, debianRepo],
-      worktreeMeta: {
-        ...profile.state.worktreeMeta,
-        [`repo-win::${windowsRepo.path}`]: worktreeMeta('win'),
-        [`repo-deb::${debianRepo.path}`]: worktreeMeta('deb')
-      }
-    }
-  }
-}
diff --git a/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts
index 6ae872368c6..e56d8347ef4 100644
--- a/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts
+++ b/src/main/persistence/tracking-repos/local-worktree-metadata-scan-expectation.ts
@@ -219,6 +219,10 @@ export function isLocallyRemovableWorktreeMetadataRow(
     return false
   }
   const canonical = identityKeys?.[0] ? state.worktreeMetaByIdentity?.[identityKeys[0]] : undefined
+  // An archived workspace's checkout is missing on purpose; its row is the workspace.
+  if (legacy?.archivedCheckout || canonical?.archivedCheckout) {
+    return false
+  }
   return !(
     (legacy?.hostId && legacy.hostId !== LOCAL_EXECUTION_HOST_ID) ||
     (canonical?.hostId && canonical.hostId !== LOCAL_EXECUTION_HOST_ID) ||
diff --git a/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts
index afbfb7b8d3a..1be5bb9bcc1 100644
--- a/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts
+++ b/src/main/persistence/tracking-repos/missing-local-worktree-metadata-pruning.test.ts
@@ -129,6 +129,27 @@ describe('pruneSessionlessMissingLocalWorktreeMetadataForRepo', () => {
     expect(state.worktreeMeta[worktreeId]).toBeDefined()
   })
 
+  it('keeps an archived workspace whose checkout was deleted on purpose', () => {
+    const state = makeState()
+    const archivedId = `${REPO_ID}::/workspace/archived`
+    const deletedId = `${REPO_ID}::/workspace/deleted`
+    state.worktreeMeta[archivedId] = {
+      ...makeMeta(archivedId),
+      comment: 'pick up after review',
+      linkedPR: 42,
+      isArchived: true,
+      archivedCheckout: { branch: 'feature/archived', archivedAt: 1 }
+    }
+    state.worktreeMeta[deletedId] = makeMeta(deletedId)
+    const scan = capture(state)
+
+    expect(pruneCaptured(state, scan, [archivedId, deletedId])).toEqual([deletedId])
+    expect(state.worktreeMeta[archivedId]).toMatchObject({
+      comment: 'pick up after review',
+      linkedPR: 42
+    })
+  })
+
   // Route-retired tombstones must not pin metadata forever (#17775).
   it('does not let route-retired SSH leases pin a metadata row', () => {
     const state = makeState()
diff --git a/src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts b/src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts
index e4a2bd742ef..751f539179d 100644
--- a/src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts
+++ b/src/main/persistence/tracking-repos/worktree-metadata-normalization.test.ts
@@ -95,6 +95,28 @@ describe('normalizeWorktreeLinkedItemMetadata', () => {
 })
 
 describe('gcStaleWorktreeMeta', () => {
+  it('keeps an archived workspace whose checkout was deleted on purpose', () => {
+    const worktreeId = 'r1::/definitely/missing/orca/archived'
+    const state = makeState({
+      repos: [],
+      projects: [],
+      worktreeMeta: {
+        [worktreeId]: {
+          ...makeMeta(),
+          hostId: 'local',
+          comment: 'resume after review',
+          isArchived: true,
+          archivedCheckout: { branch: 'feature/archived', archivedAt: 1 },
+          // Epoch-start activity is past any grace period, so only the archive mark keeps it.
+          lastActivityAt: 1
+        }
+      }
+    })
+
+    expect(gcStaleWorktreeMeta(state)).toBe(0)
+    expect(state.worktreeMeta[worktreeId]?.comment).toBe('resume after review')
+  })
+
   it('reclaims the identity rows of a collected worktree', () => {
     const worktreeId = 'r1::/definitely/missing/orca/path'
     const identityKey = 'wt2:local:dead'
diff --git a/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts b/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
index a5fe8bd25d0..3152479c3ec 100644
--- a/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
+++ b/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
@@ -57,7 +57,8 @@ export function gcStaleWorktreeMeta(state: PersistedState): number {
     } else if (projectIds.has(ownerId)) {
       continue
     }
-    if (meta?.hostId && meta.hostId !== LOCAL_EXECUTION_HOST_ID) {
+    // An archived workspace's checkout is missing on purpose; its row is the workspace.
+    if ((meta?.hostId && meta.hostId !== LOCAL_EXECUTION_HOST_ID) || meta?.archivedCheckout) {
       continue
     }
     if (!isAbsolute(worktreePath) || isWslUncPath(worktreePath)) {
diff --git a/src/main/plugins/view/plugin-view-desktop.ts b/src/main/plugins/view/plugin-view-desktop.ts
index 43013399cd7..4aab56bf37b 100644
--- a/src/main/plugins/view/plugin-view-desktop.ts
+++ b/src/main/plugins/view/plugin-view-desktop.ts
@@ -5,7 +5,7 @@ import type {
   PluginShotChromeParams,
   PluginShotEditorParams,
   PluginShotReplayParams
-} from '../../../shared/rpc-contract/plugins-params'
+} from '../../../shared/rpc-contract/plugins/plugins-params'
 import {
   PLUGIN_VIEW_NO_WORKSPACE_CODE,
   PLUGIN_VIEW_NOT_SHOWN_CODE,
diff --git a/src/main/plugins/view/plugin-view-replay-shot.ts b/src/main/plugins/view/plugin-view-replay-shot.ts
index 67085a04eee..622dca29aa6 100644
--- a/src/main/plugins/view/plugin-view-replay-shot.ts
+++ b/src/main/plugins/view/plugin-view-replay-shot.ts
@@ -2,7 +2,7 @@ import type { WebContents } from 'electron'
 import type { z } from 'zod'
 import { PluginCliError } from '../../../shared/plugins/approval/plugin-cli-approval'
 import { parsePluginDeclarativeTree } from '../../../shared/plugins/declarative/plugin-declarative-tree'
-import type { PluginShotReplayParams } from '../../../shared/rpc-contract/plugins-params'
+import type { PluginShotReplayParams } from '../../../shared/rpc-contract/plugins/plugins-params'
 import { capturePluginPanelPng, withPaintingWhileHidden } from './plugin-view-capture'
 import { requestPluginViewFromRenderer } from './plugin-view-renderer-relay'
 import { pluginShotReplayRefusal } from './plugin-shot-policy'
diff --git a/src/main/plugins/workers/host-api/plugin-past-session-resume.ts b/src/main/plugins/workers/host-api/plugin-past-session-resume.ts
index fc6d2d3f931..7b3213e20f3 100644
--- a/src/main/plugins/workers/host-api/plugin-past-session-resume.ts
+++ b/src/main/plugins/workers/host-api/plugin-past-session-resume.ts
@@ -12,7 +12,7 @@ import {
   type AiVaultPrepareSessionResumeResult
 } from '../../../../shared/ai-vault/resume/ai-vault-resume-preparation'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
-import { ProviderSession } from '../../../../shared/rpc-contract/agent-session-params'
+import { ProviderSession } from '../../../../shared/rpc-contract/terminal/agent-session-params'
 import { codexDatedRolloutRelativePath } from '../../../codex/history/resume/codex-session-resume-home'
 import type { PluginHostMethodContext } from './plugin-host-method-bind'
 import { PluginHostCallError } from './plugin-host-call-scope'
diff --git a/src/main/preflight/workspace-agent-detection.ts b/src/main/preflight/workspace-agent-detection.ts
index 5ae2ff2c252..820a83b18e3 100644
--- a/src/main/preflight/workspace-agent-detection.ts
+++ b/src/main/preflight/workspace-agent-detection.ts
@@ -1,5 +1,5 @@
 import { isFolderRepo } from '../../shared/repo-kind'
-import type { ProjectLaunchContext } from '../../shared/rpc-contract/preflight-params'
+import type { ProjectLaunchContext } from '../../shared/rpc-contract/preflight/preflight-params'
 import { isTuiAgent } from '../../shared/agent-launch/catalog/tui-agent-config'
 import { WORKSPACE_ON_OTHER_RUNTIME } from '../../shared/protocol-version'
 import { refreshAtRestCommandContext } from '../native-chat/agent-session-wire/options/at-rest-command-context'
diff --git a/src/main/providers/git/provider-contract.ts b/src/main/providers/git/provider-contract.ts
index d2274eaedaf..e755c67e01e 100644
--- a/src/main/providers/git/provider-contract.ts
+++ b/src/main/providers/git/provider-contract.ts
@@ -30,7 +30,7 @@ import type { ConflictResolution } from '../../../shared/source-control/listing/
 import type { GitProviderStatusOptions } from './status-options'
 import type { BranchSwitchCreation } from '../../../shared/git/branch-switch-target'
 import type { RuntimeGitLocalBranches } from '../../../shared/runtime-worktree-contracts'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 export type IGitProvider = {
   getStatus(worktreePath: string, options?: GitProviderStatusOptions): Promise<GitStatusResult>
diff --git a/src/main/runtime/agent-session/ownership/agent-session-older-build-lease.test-fixture.ts b/src/main/runtime/agent-session/ownership/agent-session-older-build-lease.test-fixture.ts
deleted file mode 100644
index d1cda09b043..00000000000
--- a/src/main/runtime/agent-session/ownership/agent-session-older-build-lease.test-fixture.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { PersistedAgentSessionLease } from '../../../../shared/agent-session/lifecycle/agent-session-legacy-handoff-lease'
-import {
-  editPersistedTestAgentSessionStore,
-  readPersistedTestAgentSessionStore
-} from '../records/agent-session-record-store-test-harness'
-
-/** Rewrites one lease on disk as an older build left it; this build's types cannot express it. */
-export async function writeOlderBuildLease(
-  stateDirectory: string,
-  sessionId: string,
-  fields: Partial<PersistedAgentSessionLease>
-): Promise<void> {
-  await editPersistedTestAgentSessionStore(stateDirectory, (persisted) => {
-    persisted.records[sessionId].lease = { ...persisted.records[sessionId].lease, ...fields }
-  })
-}
-
-export async function readPersistedLease(
-  stateDirectory: string,
-  sessionId: string
-): Promise<Record<string, unknown>> {
-  return (await readPersistedTestAgentSessionStore(stateDirectory)).records[sessionId].lease
-}
diff --git a/src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts b/src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts
index 15a5e0933b9..1a7553cce37 100644
--- a/src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts
+++ b/src/main/runtime/browser-host/commands/browser-host-command-ledger.test.ts
@@ -31,6 +31,45 @@ describe('BrowserHostCommandLedger', () => {
       'browser_host_command_result_page_stale'
     )
   })
+
+  it('settles a chunked automation result as the value its chunks carried', async () => {
+    const ledger = new BrowserHostCommandLedger({ authority })
+    ledger.attach(vi.fn())
+    const created = ledger.issue({
+      browserPageId: 'page-a',
+      pageHostGeneration: 1,
+      command: { type: 'createPage', browserProfileId: 'default', executionHostKey: 'host-key-a' }
+    })
+    ledger.settle(resultParams(created.event, { status: 'completed' }))
+    const screenshot = ledger.issue({
+      browserPageId: 'page-a',
+      pageHostGeneration: 1,
+      command: {
+        type: 'automation',
+        method: 'browser.screenshot',
+        params: {},
+        stagedResults: true
+      }
+    })
+    const { result: _result, ...identity } = resultParams(screenshot.event, { status: 'completed' })
+    const json = Buffer.from('{"data":"iVBORw0KGgo=","format":"png"}')
+    ledger.stageResultChunk({
+      ...identity,
+      offset: 0,
+      contentBase64: json.subarray(0, 20).toString('base64')
+    })
+    ledger.stageResultChunk({
+      ...identity,
+      offset: 20,
+      contentBase64: json.subarray(20).toString('base64')
+    })
+    ledger.settle({ ...identity, result: { status: 'completed', stagedValueBytes: 38 } })
+
+    await expect(screenshot.result).resolves.toEqual({
+      status: 'completed',
+      value: { data: 'iVBORw0KGgo=', format: 'png' }
+    })
+  })
 })
 
 function resultParams(
diff --git a/src/main/runtime/browser-host/commands/browser-host-command-ledger.ts b/src/main/runtime/browser-host/commands/browser-host-command-ledger.ts
index 264abe87859..1c24827be15 100644
--- a/src/main/runtime/browser-host/commands/browser-host-command-ledger.ts
+++ b/src/main/runtime/browser-host/commands/browser-host-command-ledger.ts
@@ -15,6 +15,7 @@ import {
   type BrowserHostCommandInput,
   type BrowserHostCommandLedgerOptions,
   type BrowserHostCommandPageState,
+  type BrowserHostCommandResultChunkParams,
   type BrowserHostCommandResultParams,
   positiveBrowserHostCommandLimit,
   recordBrowserHostCommandOrder,
@@ -29,6 +30,7 @@ import {
   replaySettledBrowserHostCommand
 } from './browser-host-command-result-replay'
 import { BrowserHostCommandResultCache } from './browser-host-command-result-cache'
+import { BrowserHostCommandResultStaging } from './browser-host-command-result-staging'
 
 export class BrowserHostCommandLedger {
   private readonly authority: BrowserClientHostLeaseAuthority
@@ -38,6 +40,7 @@ export class BrowserHostCommandLedger {
   private readonly maxPages: number
   private readonly pages = new Map<string, BrowserHostCommandPageState>()
   private readonly resultCache: BrowserHostCommandResultCache
+  private readonly staging = new BrowserHostCommandResultStaging()
   private delivery: ((event: BrowserClientHostCommandEvent) => void) | undefined
   private outstandingCommands = 0
   private activePages = 0
@@ -157,6 +160,14 @@ export class BrowserHostCommandLedger {
     return hasOutstandingBrowserHostReconciliation(this.pages)
   }
 
+  stageResultChunk(params: BrowserHostCommandResultChunkParams): void {
+    if (this.closed) {
+      throw new Error('browser_host_command_ledger_closed')
+    }
+    assertBrowserHostCommandResultAuthority(this.authority, params)
+    this.staging.append(this.pages.get(params.browserPageId), params)
+  }
+
   settle(params: BrowserHostCommandResultParams): boolean {
     if (this.closed) {
       throw new Error('browser_host_command_ledger_closed')
@@ -186,7 +197,7 @@ export class BrowserHostCommandLedger {
     if (!record || record.event.commandId !== params.commandId || record.settled) {
       throw new Error('browser_host_command_result_conflict')
     }
-    const result = Object.freeze({ ...params.result })
+    const result = Object.freeze({ ...this.staging.take(record, params.result) })
     record.settled = result
     record.resolve(result)
     page.nextSettlementSequence += 1
@@ -230,6 +241,7 @@ export class BrowserHostCommandLedger {
     }
     this.pages.clear()
     this.resultCache.clear()
+    this.staging.clear()
     this.outstandingCommands = 0
     this.activePages = 0
   }
@@ -243,6 +255,7 @@ export class BrowserHostCommandLedger {
       throw new Error('browser_host_command_page_stale')
     }
     for (const record of page.records.values()) {
+      this.staging.release(record)
       if (!record.settled) {
         record.reject(new Error('browser_host_command_outcome_unknown'))
       }
diff --git a/src/main/runtime/browser-host/commands/browser-host-command-result-staging.ts b/src/main/runtime/browser-host/commands/browser-host-command-result-staging.ts
new file mode 100644
index 00000000000..810fb5e2f9b
--- /dev/null
+++ b/src/main/runtime/browser-host/commands/browser-host-command-result-staging.ts
@@ -0,0 +1,101 @@
+import {
+  BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES,
+  type BrowserClientAutomationResult as BrowserClientHostCommandResult
+} from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import { BrowserError } from '../../../browser/browser-error'
+import type {
+  BrowserHostCommandPageState,
+  BrowserHostCommandRecord,
+  BrowserHostCommandResultChunkParams as ChunkParams
+} from './browser-host-command-state'
+
+// Several pages can stage at once; bound the lease's total, not just each result.
+const MAX_STAGED_BYTES_PER_LEASE = 2 * BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES
+
+type StagedResult = { chunks: Buffer[]; bytes: number }
+
+/** Holds chunked automation results until the desktop settles their command. */
+export class BrowserHostCommandResultStaging {
+  private readonly staged = new Map<BrowserHostCommandRecord, StagedResult>()
+  private bytes = 0
+
+  append(
+    page: BrowserHostCommandPageState | undefined,
+    { pageHostGeneration, commandSequence, commandId, offset, contentBase64 }: ChunkParams
+  ): void {
+    const record =
+      page?.generation === pageHostGeneration ? page.records.get(commandSequence) : undefined
+    if (
+      !record ||
+      record.event.commandId !== commandId ||
+      record.settled ||
+      record.event.command.type !== 'automation' ||
+      record.event.command.stagedResults !== true
+    ) {
+      throw new Error('browser_host_command_result_chunk_conflict')
+    }
+    if (offset === 0) {
+      this.release(record)
+    }
+    const staged = this.staged.get(record) ?? { chunks: [], bytes: 0 }
+    if (offset !== staged.bytes) {
+      this.release(record)
+      throw new Error('browser_host_command_result_chunk_out_of_order')
+    }
+    const chunk = Buffer.from(contentBase64, 'base64')
+    if (chunk.byteLength === 0) {
+      this.release(record)
+      throw new Error('browser_host_command_result_chunk_invalid')
+    }
+    if (
+      staged.bytes + chunk.byteLength > BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES ||
+      this.bytes + chunk.byteLength > MAX_STAGED_BYTES_PER_LEASE
+    ) {
+      this.release(record)
+      throw new BrowserError(
+        'browser_host_command_result_too_large',
+        'The server is already holding too many large browser results; retry, or use --format jpeg, a selector, or a smaller viewport.'
+      )
+    }
+    staged.chunks.push(chunk)
+    staged.bytes += chunk.byteLength
+    this.bytes += chunk.byteLength
+    this.staged.set(record, staged)
+  }
+
+  /** Swaps a staged marker for the value its chunks carried, and frees them either way. */
+  take(
+    record: BrowserHostCommandRecord,
+    result: BrowserClientHostCommandResult
+  ): BrowserClientHostCommandResult {
+    const staged = this.staged.get(record)
+    this.release(record)
+    if (result.status !== 'completed' || result.stagedValueBytes === undefined) {
+      return result
+    }
+    if (staged?.bytes !== result.stagedValueBytes) {
+      return { status: 'failed', errorCode: 'browser_host_command_result_incomplete' }
+    }
+    try {
+      return {
+        status: 'completed',
+        value: JSON.parse(Buffer.concat(staged.chunks).toString('utf8'))
+      }
+    } catch {
+      return { status: 'failed', errorCode: 'browser_host_command_result_invalid' }
+    }
+  }
+
+  release(record: BrowserHostCommandRecord): void {
+    const staged = this.staged.get(record)
+    if (staged) {
+      this.bytes -= staged.bytes
+      this.staged.delete(record)
+    }
+  }
+
+  clear(): void {
+    this.staged.clear()
+    this.bytes = 0
+  }
+}
diff --git a/src/main/runtime/browser-host/commands/browser-host-command-state.ts b/src/main/runtime/browser-host/commands/browser-host-command-state.ts
index c29f9179166..d190f05e3f2 100644
--- a/src/main/runtime/browser-host/commands/browser-host-command-state.ts
+++ b/src/main/runtime/browser-host/commands/browser-host-command-state.ts
@@ -30,6 +30,14 @@ export type BrowserHostCommandResultParams = Omit<
   result: BrowserClientHostCommandResult
 }
 
+export type BrowserHostCommandResultChunkParams = Omit<
+  BrowserClientHostCommandEvent,
+  'type' | 'command'
+> & {
+  offset: number
+  contentBase64: string
+}
+
 export type BrowserHostCommandRecord = {
   event: BrowserClientHostCommandEvent
   resultAdmission: BrowserHostCommandResultAdmission
@@ -163,7 +171,7 @@ export function sameBrowserHostCommandResult(
 
 export function assertBrowserHostCommandResultAuthority(
   authority: BrowserClientHostLeaseAuthority,
-  params: BrowserHostCommandResultParams
+  params: Omit<BrowserHostCommandResultParams, 'result'>
 ): void {
   if (
     params.pageCommandProtocolVersion !== authority.pageCommandProtocolVersion ||
diff --git a/src/main/runtime/browser-host/leases/browser-host-lease-registry.ts b/src/main/runtime/browser-host/leases/browser-host-lease-registry.ts
index a8d5ebd1723..e1373a6ce3f 100644
--- a/src/main/runtime/browser-host/leases/browser-host-lease-registry.ts
+++ b/src/main/runtime/browser-host/leases/browser-host-lease-registry.ts
@@ -263,14 +263,17 @@ export class BrowserHostLeaseRegistry {
     identity: BrowserHostCommandResultIdentity,
     params: BrowserHostCommandResultParams
   ): boolean {
-    const state = this.requireLeaseState(identity)
-    const ledger = requireBrowserHostCommandResultLedger(state, identity)
+    const ledger = this.requireCommandResultLedger(identity)
     if (!ledger.isUnplacedPageResult(params)) {
       this.requireClientPage(params)
     }
     return ledger.settle(params)
   }
 
+  requireCommandResultLedger(identity: BrowserHostCommandResultIdentity) {
+    return requireBrowserHostCommandResultLedger(this.requireLeaseState(identity), identity)
+  }
+
   getPlacement(browserPageId: string): RuntimeBrowserPlacement | undefined {
     return this.pagePlacements.getPlacement(browserPageId)
   }
diff --git a/src/main/runtime/browser-host/leases/browser-host-request-registry.test.ts b/src/main/runtime/browser-host/leases/browser-host-request-registry.test.ts
index 5f0dbad515f..51eefb4ce6e 100644
--- a/src/main/runtime/browser-host/leases/browser-host-request-registry.test.ts
+++ b/src/main/runtime/browser-host/leases/browser-host-request-registry.test.ts
@@ -78,3 +78,44 @@ describe('BrowserHostRequestRegistry with two paired desktops', () => {
     expect(older.asked).toHaveLength(0)
   })
 })
+
+describe('BrowserHostRequestRegistry with a sleeping desktop', () => {
+  it('fails at once on a desktop that missed its last ask, until it answers again', async () => {
+    vi.useFakeTimers()
+    const requests = new BrowserHostRequestRegistry({ desktopTimeoutMs: 1_000 })
+    const sleeping = desktop(requests, 'device-a')
+
+    const timedOut = expect(requests.request()).rejects.toThrow('browser_host_unavailable')
+    await vi.advanceTimersByTimeAsync(1_000)
+    await timedOut
+
+    const again = requests.request()
+    expect(sleeping.asked).toHaveLength(1)
+    await expect(again).rejects.toThrow('browser_host_unavailable')
+
+    // Its late answer to the missed ask shows it is awake.
+    expect(sleeping.answer()).toBe(false)
+    const hosted = requests.request()
+    expect(sleeping.asked).toHaveLength(2)
+    sleeping.answer('host-a')
+    await expect(hosted).resolves.toEqual({
+      browserHostClientId: 'host-a',
+      pairedDeviceId: 'device-a'
+    })
+  })
+
+  it('hands a pending ask to the subscription a waking desktop opens', async () => {
+    const requests = new BrowserHostRequestRegistry()
+    const halfOpen = desktop(requests, 'device-a')
+    const hosted = requests.request()
+    expect(halfOpen.asked).toHaveLength(1)
+
+    const reconnected = desktop(requests, 'device-a')
+    expect(reconnected.answer('host-a')).toBe(true)
+
+    await expect(hosted).resolves.toEqual({
+      browserHostClientId: 'host-a',
+      pairedDeviceId: 'device-a'
+    })
+  })
+})
diff --git a/src/main/runtime/browser-host/leases/browser-host-request-registry.ts b/src/main/runtime/browser-host/leases/browser-host-request-registry.ts
index 33b6c795462..432e3b4b5b5 100644
--- a/src/main/runtime/browser-host/leases/browser-host-request-registry.ts
+++ b/src/main/runtime/browser-host/leases/browser-host-request-registry.ts
@@ -32,6 +32,8 @@ export class BrowserHostUnresponsiveError extends Error {
 export class BrowserHostRequestRegistry {
   private readonly volunteers: Volunteer[] = []
   private readonly pending = new Map<string, PendingAnswer>()
+  /** Desktops that let an ask time out; asking again before they answer anything would only wait again. */
+  private readonly unanswered = new Set<string>()
   private inFlight: Promise<RequestedBrowserHost> | null = null
 
   constructor(
@@ -42,6 +44,17 @@ export class BrowserHostRequestRegistry {
   register(input: Volunteer): () => void {
     const volunteer = { ...input }
     this.volunteers.push(volunteer)
+    // A new subscription means the desktop is running again; hand it any ask its old socket may have swallowed.
+    this.unanswered.delete(volunteer.pairedDeviceId)
+    for (const [requestId, answer] of this.pending) {
+      if (answer.pairedDeviceId === volunteer.pairedDeviceId) {
+        try {
+          volunteer.emit({ type: 'browserHostRequested', requestId })
+        } catch {
+          // That socket is gone too; its cleanup unregisters it.
+        }
+      }
+    }
     return () => {
       const index = this.volunteers.indexOf(volunteer)
       if (index === -1) {
@@ -51,6 +64,7 @@ export class BrowserHostRequestRegistry {
       if (this.volunteers.some((entry) => entry.pairedDeviceId === volunteer.pairedDeviceId)) {
         return
       }
+      this.unanswered.delete(volunteer.pairedDeviceId)
       for (const answer of this.pending.values()) {
         if (answer.pairedDeviceId === volunteer.pairedDeviceId) {
           // It may still finish hosting over another socket, so do not ask a second desktop.
@@ -76,6 +90,8 @@ export class BrowserHostRequestRegistry {
     caller: { pairedDeviceId: string },
     result: BrowserClientHostRequestResultParams
   ): boolean {
+    // Even an answer that arrives after the deadline shows the desktop answers again.
+    this.unanswered.delete(caller.pairedDeviceId)
     const answer = this.pending.get(result.requestId)
     if (!answer || answer.pairedDeviceId !== caller.pairedDeviceId) {
       return false
@@ -99,12 +115,18 @@ export class BrowserHostRequestRegistry {
       if (!pairedDeviceId || remainingMs <= 0) {
         throw new Error('browser_host_unavailable')
       }
+      if (this.unanswered.has(pairedDeviceId)) {
+        throw new BrowserHostUnresponsiveError(pairedDeviceId)
+      }
       asked.add(pairedDeviceId)
       const answer = await this.ask(
         pairedDeviceId,
         Math.min(remainingMs, this.options.desktopTimeoutMs ?? DESKTOP_TIMEOUT_MS)
       )
       if (answer === 'silent') {
+        if (this.volunteers.some((entry) => entry.pairedDeviceId === pairedDeviceId)) {
+          this.unanswered.add(pairedDeviceId)
+        }
         throw new BrowserHostUnresponsiveError(pairedDeviceId)
       }
       if (answer !== 'declined') {
diff --git a/src/main/runtime/browser/client-pages/browser-client-page-opening.ts b/src/main/runtime/browser/client-pages/browser-client-page-opening.ts
index 45152468354..ae4a8ee155c 100644
--- a/src/main/runtime/browser/client-pages/browser-client-page-opening.ts
+++ b/src/main/runtime/browser/client-pages/browser-client-page-opening.ts
@@ -150,11 +150,22 @@ export function assertClientOpenableUrl(url: string): void {
 export async function createBrowserPageOnPairedHost(
   host: BrowserClientPageOpeningHost,
   params: Omit<BrowserClientPageCreateParams, 'placement'> & { worktree?: string },
-  browserProfileId: string
+  browserProfileId: string,
+  /** The server's own browser, used when no paired desktop takes the page. */
+  fallback?: () => Promise<{ browserPageId: string }>
 ): Promise<{ browserPageId: string }> {
   const { worktree: selector, ...rest } = params
   const worktree = selector ? await host.resolveBrowserWorkspace(selector) : undefined
-  const lease = await acquirePairedPageHost(host, worktree?.id)
+  let lease: BrowserHostLease
+  try {
+    // With a fallback, ask a desktop even while it hosts: its own setting decides, and a sleeping one times out.
+    lease = await acquirePairedPageHost(host, worktree?.id, fallback !== undefined)
+  } catch (error) {
+    if (fallback && error instanceof BrowserError && error.code === 'browser_host_unavailable') {
+      return fallback()
+    }
+    throw error
+  }
   return createBrowserClientPage(
     host,
     { ...rest, placement: { kind: 'client', browserHostClientId: lease.browserHostClientId } },
@@ -199,18 +210,22 @@ type PairedPageHostSource = Pick<
 /** No caller names a host for these pages, so the server picks one desktop and never leaves it ambiguous. */
 async function acquirePairedPageHost(
   host: PairedPageHostSource,
-  workspaceId: string | undefined
+  workspaceId: string | undefined,
+  askDesktop: boolean
 ): Promise<BrowserHostLease> {
   const leases = host.getBrowserHostLeaseRegistry()
-  try {
-    return selectPairedPageHost(leases)
-  } catch (error) {
-    // Several desktops already host: choose one of them rather than asking for another lease.
-    if (error instanceof BrowserHostAmbiguousError) {
-      return chooseAmongHosts(host, error.browserHostClientIds, workspaceId)
-    }
-    if (!isHostError(error, 'browser_host_unavailable')) {
-      throw error
+  // Only desktops that answer asks are asked; older ones keep the server's own browser.
+  if (!askDesktop) {
+    try {
+      return selectPairedPageHost(leases)
+    } catch (error) {
+      // Several desktops already host: choose one of them rather than asking for another lease.
+      if (error instanceof BrowserHostAmbiguousError) {
+        return chooseAmongHosts(host, error.browserHostClientIds, workspaceId)
+      }
+      if (!isHostError(error, 'browser_host_unavailable')) {
+        throw error
+      }
     }
   }
   try {
diff --git a/src/main/runtime/browser/client-pages/browser-client-page-queries.ts b/src/main/runtime/browser/client-pages/browser-client-page-queries.ts
index 07b6c157b09..98509e9c4ca 100644
--- a/src/main/runtime/browser/client-pages/browser-client-page-queries.ts
+++ b/src/main/runtime/browser/client-pages/browser-client-page-queries.ts
@@ -158,11 +158,12 @@ export async function yieldClientPageSelection(
   worktree: string | undefined
 ): Promise<void> {
   const pages = host.getRuntimeBrowserPageRegistry()
+  if (worktree) {
+    pages.yieldSelection((await host.resolveBrowserWorkspace(worktree)).id)
+    return
+  }
   pages.deactivateGlobal()
-  const workspaceIds = worktree
-    ? [(await host.resolveBrowserWorkspace(worktree)).id]
-    : [...new Set(pages.listPages().map((page) => page.workspaceId))]
-  for (const workspaceId of workspaceIds) {
+  for (const workspaceId of new Set(pages.listPages().map((page) => page.workspaceId))) {
     pages.deactivateWorkspace(workspaceId)
   }
 }
diff --git a/src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts b/src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts
index 35465319fc9..9cb2ab11e2d 100644
--- a/src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts
+++ b/src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts
@@ -2,6 +2,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentBrowserBridge } from '../../../browser/agent-browser/agent-browser-bridge'
 import type { RuntimeBrowserCommandHost } from '../commands/browser-command-contracts'
 import { RuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
+import { BrowserHostLeaseRegistry } from '../../browser-host/leases/browser-host-lease-registry'
+import { BrowserHostRequestRegistry } from '../../browser-host/leases/browser-host-request-registry'
 
 const {
   ipcMainOnMock,
@@ -96,6 +98,9 @@ function createHost(overrides: Partial<RuntimeBrowserCommandHost> = {}): Runtime
     resolveWorkspaceSelector: async (selector) => ({ id: selector.replace(/^id:/, '') }),
     resolveBrowserWorkspace: async (selector) => ({ id: selector.replace(/^id:/, '') }),
     getRuntimeBrowserPageRegistry: () => runtimeBrowserPages,
+    // No paired desktop: headless creates stay on this host.
+    getBrowserHostLeaseRegistry: () => new BrowserHostLeaseRegistry({ authorityRuntimeId: 'host' }),
+    getBrowserHostRequestRegistry: () => new BrowserHostRequestRegistry(),
     getAuthoritativeWindow: vi.fn(),
     getAvailableAuthoritativeWindow: vi.fn(() => null),
     getOffscreenBrowserBackend: vi.fn(() => null),
@@ -191,4 +196,42 @@ describe('RuntimeBrowserCommands browser screencast', () => {
     expect(waitForTabRegistrationMock).toHaveBeenCalledWith('page-new')
     expect(bridge.setActiveTab).toHaveBeenCalledWith(101, 'wt-1')
   })
+  // Pageless agent commands prefer an active client page; an agent's new server tab must take that over.
+  it('moves the workspace selection off a client page when a server tab is created', async () => {
+    const { RuntimeBrowserCommands } = await import('../commands/browser-commands')
+    const pages = new RuntimeBrowserPageRegistry()
+    pages.publishClientPage({
+      browserPageId: 'user-page',
+      workspaceId: 'wt-1',
+      browserProfileId: 'default',
+      executionHostKey: 'local',
+      placement: {
+        kind: 'client',
+        browserHostClientId: 'desktop-1',
+        browserHostGeneration: 1,
+        pageHostGeneration: 1
+      },
+      url: 'https://user.example/',
+      loading: false,
+      active: true
+    })
+    const bridge = {
+      getRegisteredTabs: vi.fn(() => new Map([['agent-page', 102]])),
+      setActiveTab: vi.fn()
+    }
+    const offscreen = { createTab: vi.fn(async () => ({ browserPageId: 'agent-page' })) }
+    const host = createHost({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: create reaches only these two bridge methods.
+      getAgentBrowserBridge: () => bridge as unknown as AgentBrowserBridge,
+      getRuntimeBrowserPageRegistry: () => pages,
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: create reaches only createTab.
+      getOffscreenBrowserBackend: () => offscreen as never
+    })
+    const commands = new RuntimeBrowserCommands(host)
+
+    await commands.browserTabCreate({ worktree: 'id:wt-1', url: 'https://agent.example/' })
+
+    expect(bridge.setActiveTab).toHaveBeenCalledWith(102, 'wt-1')
+    expect(pages.listPages('wt-1').find((page) => page.active)).toBeUndefined()
+  })
 })
diff --git a/src/main/runtime/browser/client-pages/renderer-browser-lifecycle.test.ts b/src/main/runtime/browser/client-pages/renderer-browser-lifecycle.test.ts
index cfaa857e841..12660d845b2 100644
--- a/src/main/runtime/browser/client-pages/renderer-browser-lifecycle.test.ts
+++ b/src/main/runtime/browser/client-pages/renderer-browser-lifecycle.test.ts
@@ -53,7 +53,8 @@ function browserRuntime(closeTab = vi.fn(async (_pageId: string) => {}), runtime
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Only the bridge inventory is used by this lifecycle test.
   runtime.setAgentBrowserBridge({
     tabList: () => ({ tabs: [...livePages.values()] }),
-    getRemoteTabFaviconUrl: () => null
+    getRemoteTabFaviconUrl: () => null,
+    getPageNavigationState: () => null
   } as never)
   electronMocks.BrowserWindow.fromId.mockImplementation((id: number) =>
     id === 1 ? { isDestroyed: () => false } : null
diff --git a/src/main/runtime/browser/client-pages/runtime-browser-client-automation.ts b/src/main/runtime/browser/client-pages/runtime-browser-client-automation.ts
index bd824e02877..89f9f4c0e9f 100644
--- a/src/main/runtime/browser/client-pages/runtime-browser-client-automation.ts
+++ b/src/main/runtime/browser/client-pages/runtime-browser-client-automation.ts
@@ -1,4 +1,5 @@
 import { BrowserClientAutomationMethod } from '../../../../shared/browser/client-hosting/browser-client-automation-protocol'
+import { BrowserError } from '../../../browser/browser-error'
 import { browserExpectedUrlMismatchError } from '../../../browser/cdp/input/browser-expected-page-url'
 import type { BrowserHostLeaseRegistry } from '../../browser-host/leases/browser-host-lease-registry'
 import type { RuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
@@ -36,14 +37,15 @@ export async function routeRuntimeBrowserClientAutomation(options: {
       method: method.data,
       params: options.params,
       // A person's link or relayed input must not light the desktop page as agent-driven.
-      agent: isAgentRpcCaller(options.caller)
+      agent: isAgentRpcCaller(options.caller),
+      stagedResults: true
     }
   )
   const result = await issued.result
   if (result.status === 'failed') {
     throw result.expectedUrlMismatch
       ? browserExpectedUrlMismatchError(result.expectedUrlMismatch)
-      : new Error(result.errorCode)
+      : new BrowserError(result.errorCode, result.errorMessage ?? result.errorCode)
   }
   return { handled: true, result: result.value }
 }
diff --git a/src/main/runtime/browser/client-pages/runtime-browser-page-registry.ts b/src/main/runtime/browser/client-pages/runtime-browser-page-registry.ts
index 519ed9d37d9..a7fb5cb373d 100644
--- a/src/main/runtime/browser/client-pages/runtime-browser-page-registry.ts
+++ b/src/main/runtime/browser/client-pages/runtime-browser-page-registry.ts
@@ -199,6 +199,14 @@ export class RuntimeBrowserPageRegistry {
     this.globalActivePageId = null
   }
 
+  /** An engine tab took the selection; unscoped creates and switches move only the global pick. */
+  yieldSelection(workspaceId: string | undefined): void {
+    this.deactivateGlobal()
+    if (workspaceId !== undefined) {
+      this.deactivateWorkspace(workspaceId)
+    }
+  }
+
   deactivateWorkspace(workspaceId: string): void {
     for (const [browserPageId, page] of this.pages) {
       if (page.workspaceId === workspaceId && page.active) {
diff --git a/src/main/runtime/browser/client-pages/server-agent-tab-placement.ts b/src/main/runtime/browser/client-pages/server-agent-tab-placement.ts
new file mode 100644
index 00000000000..df1fc69bb18
--- /dev/null
+++ b/src/main/runtime/browser/client-pages/server-agent-tab-placement.ts
@@ -0,0 +1,51 @@
+import { normalizeBrowserNavigationUrl } from '../../../../shared/browser-url'
+import { ORCA_BROWSER_BLANK_URL } from '../../../../shared/browser/browser-blank-page'
+import {
+  assertClientOpenableUrl,
+  canPlacePairedPage,
+  type BrowserClientPageOpeningHost
+} from './browser-client-page-opening'
+
+/** A tab this server's own agents open goes on a paired desktop when one can host it (#41682). */
+export function opensOnPairedDesktop(
+  host: Pick<
+    BrowserClientPageOpeningHost,
+    'getBrowserHostLeaseRegistry' | 'getBrowserHostRequestRegistry'
+  >,
+  params:
+    | { placement?: unknown; worktree?: string; url?: string; page?: string; split?: unknown }
+    | undefined,
+  caller: { pairedDeviceId?: string; opensPageLink?: boolean } | undefined,
+  hasOwnBrowser: boolean
+): boolean {
+  // Paired callers choose their own placement, and a page link opens beside its opener.
+  if (params?.placement || caller?.pairedDeviceId || caller?.opensPageLink) {
+    return false
+  }
+  // Keep what this host's own browser can do better: unscoped tabs, local URLs, named pages it
+  // may already hold, and splits a desktop page cannot open as.
+  if (
+    hasOwnBrowser &&
+    (!params?.worktree || !isDesktopOpenableUrl(params.url) || params.page || params.split)
+  ) {
+    return false
+  }
+  // With a browser to fall back on, only a desktop that can be asked is worth a request.
+  return hasOwnBrowser
+    ? host.getBrowserHostRequestRegistry().hasVolunteer()
+    : canPlacePairedPage(host)
+}
+
+// Match what the desktop opens, so `localhost:3000` counts as the web URL it becomes there.
+function isDesktopOpenableUrl(url: string | undefined): boolean {
+  const normalized = url === undefined ? null : normalizeBrowserNavigationUrl(url)
+  if (url === undefined || normalized === ORCA_BROWSER_BLANK_URL) {
+    return true
+  }
+  try {
+    assertClientOpenableUrl(normalized ?? url)
+    return true
+  } catch {
+    return false
+  }
+}
diff --git a/src/main/runtime/browser/commands/browser-capture.ts b/src/main/runtime/browser/commands/browser-capture.ts
index 96d21a15197..583e996c96b 100644
--- a/src/main/runtime/browser/commands/browser-capture.ts
+++ b/src/main/runtime/browser/commands/browser-capture.ts
@@ -1,4 +1,4 @@
-import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserScreenshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import type {
   BrowserScreenshotResult,
   BrowserCaptureStartResult,
diff --git a/src/main/runtime/browser/commands/browser-command-targets.ts b/src/main/runtime/browser/commands/browser-command-targets.ts
index 64d7b3d4f49..def633f880c 100644
--- a/src/main/runtime/browser/commands/browser-command-targets.ts
+++ b/src/main/runtime/browser/commands/browser-command-targets.ts
@@ -1,4 +1,4 @@
-import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser-observation-params'
+import type { BrowserSnapshotOptions } from '../../../../shared/rpc-contract/browser/browser-observation-params'
 import type { AgentBrowserBridge } from '../../../browser/agent-browser/agent-browser-bridge'
 import { BrowserError } from '../../../browser/browser-error'
 import { browserPopupPageWebContentsId } from '../../../browser/guest-lifecycle/popups/browser-popup-page-id'
diff --git a/src/main/runtime/browser/headless/orca-runtime-serve-browser-restore.test.ts b/src/main/runtime/browser/headless/orca-runtime-serve-browser-restore.test.ts
index 2c2399366d0..3aea2bfc463 100644
--- a/src/main/runtime/browser/headless/orca-runtime-serve-browser-restore.test.ts
+++ b/src/main/runtime/browser/headless/orca-runtime-serve-browser-restore.test.ts
@@ -43,6 +43,7 @@ function restartedServe(session: WorkspaceSessionState = savedServeTabs()) {
         }))
       })),
       getRemoteTabFaviconUrl: () => null,
+      getPageNavigationState: () => null,
       getRegisteredTabs: vi.fn(() => registered()),
       snapshot: vi.fn(async () => ({ snapshot: '' })),
       getActivePageId: vi.fn(() => livePages[0] ?? null),
diff --git a/src/main/runtime/browser/tabs/browser-tab-create-publication.ts b/src/main/runtime/browser/tabs/browser-tab-create-publication.ts
index 08ba33d6c28..9d6401abb34 100644
--- a/src/main/runtime/browser/tabs/browser-tab-create-publication.ts
+++ b/src/main/runtime/browser/tabs/browser-tab-create-publication.ts
@@ -1,4 +1,5 @@
 import type { AgentBrowserBridge } from '../../../browser/agent-browser/agent-browser-bridge'
+import type { RuntimeBrowserPageRegistry } from '../client-pages/runtime-browser-page-registry'
 import {
   navigationTargetsHost,
   resolveRuntimeNavigationTarget,
@@ -20,6 +21,7 @@ type BrowserTabCreatePublicationBridge = Pick<
 
 export type BrowserTabCreatePublicationHost = {
   getAgentBrowserBridge(): BrowserTabCreatePublicationBridge | null
+  getRuntimeBrowserPageRegistry(): Pick<RuntimeBrowserPageRegistry, 'yieldSelection'>
   markHeadlessBrowserSessionTabActive?(
     worktreeId: string | undefined,
     browserPageId: string,
@@ -194,6 +196,11 @@ export function publishCreatedBrowserSessionTab(
       ?.getRegisteredTabs(publication.worktreeId)
       .get(publication.browserPageId)
     if (bridge && webContentsId != null) {
+      // Pageless commands prefer an active client page, so the new engine tab must take over from it.
+      // Yield first so the bridge's own tabs-changed publication carries the cleared client row.
+      if (publication.focus.startsActive) {
+        host.getRuntimeBrowserPageRegistry().yieldSelection(publication.worktreeId)
+      }
       bridge.setActiveTab(webContentsId, publication.worktreeId)
     }
   }
diff --git a/src/main/runtime/browser/tabs/browser-tab-creation.ts b/src/main/runtime/browser/tabs/browser-tab-creation.ts
index cc003bf5f62..59bef7af39e 100644
--- a/src/main/runtime/browser/tabs/browser-tab-creation.ts
+++ b/src/main/runtime/browser/tabs/browser-tab-creation.ts
@@ -4,7 +4,8 @@ import type { BrowserPageCreationPlacement } from '../../../../shared/browser/cl
 import type { BrowserTabSplitDirection } from '../../../../shared/browser-tab-split-direction'
 import {
   publishCreatedBrowserSessionTab,
-  resolveBrowserTabCreateFocus
+  resolveBrowserTabCreateFocus,
+  type BrowserTabCreateFocusResolution
 } from './browser-tab-create-publication'
 import { browserSessionRegistry } from '../../../browser/sessions/profiles/browser-session-registry'
 import { BrowserError } from '../../../browser/browser-error'
@@ -13,8 +14,30 @@ import type { RuntimeBrowserCommandHost } from '../commands/browser-command-cont
 import type { RuntimeBrowserCommandTargets } from '../commands/browser-command-targets'
 import {
   createBrowserClientPage,
+  createBrowserPageOnPairedHost,
   openBrowserUrlOnClient
 } from '../client-pages/browser-client-page-opening'
+import { opensOnPairedDesktop } from '../client-pages/server-agent-tab-placement'
+
+type BrowserTabCreateRequest = {
+  url?: string
+  worktree?: string
+  page?: string
+  profileId?: string
+  waitForRegistration?: boolean
+  activate?: boolean
+  navigation?: RuntimeNavigationTarget
+  targetGroupId?: string
+  placement?: BrowserPageCreationPlacement
+  split?: BrowserTabSplitDirection
+  splitFromTabId?: string
+}
+
+type BrowserTabCreateCaller = {
+  pairedDeviceId?: string
+  clientKind?: 'mobile' | 'runtime'
+  opensPageLink?: boolean
+}
 
 export class RuntimeBrowserTabCreation {
   constructor(
@@ -41,24 +64,8 @@ export class RuntimeBrowserTabCreation {
   ) {}
 
   async browserTabCreate(
-    params: {
-      url?: string
-      worktree?: string
-      page?: string
-      profileId?: string
-      waitForRegistration?: boolean
-      activate?: boolean
-      navigation?: RuntimeNavigationTarget
-      targetGroupId?: string
-      placement?: BrowserPageCreationPlacement
-      split?: BrowserTabSplitDirection
-      splitFromTabId?: string
-    },
-    caller?: {
-      pairedDeviceId?: string
-      clientKind?: 'mobile' | 'runtime'
-      opensPageLink?: boolean
-    }
+    params: BrowserTabCreateRequest,
+    caller?: BrowserTabCreateCaller
   ): Promise<{ browserPageId: string }> {
     const url = params.url ?? 'about:blank'
     const focus = resolveBrowserTabCreateFocus({
@@ -102,35 +109,22 @@ export class RuntimeBrowserTabCreation {
     // Headless hosts use offscreen WebContents because no renderer webview exists.
     if (!this.host.getAvailableAuthoritativeWindow()) {
       const offscreen = this.host.getOffscreenBrowserBackend()
-      if (!offscreen) {
-        throw new BrowserError('browser_error', 'This host does not support browser panes.')
+      const createOffscreen = async (): Promise<{ browserPageId: string }> => {
+        if (!offscreen) {
+          throw new BrowserError('browser_error', 'This host does not support browser panes.')
+        }
+        return this.createOffscreenTab(offscreen, params, caller, url, worktreeId, focus)
       }
-      const created = await offscreen.createTab({
-        url,
-        worktreeId,
-        profileId: params.profileId,
-        ...(params.page ? { browserPageId: params.page } : {})
-      })
-      if (worktreeId) {
-        this.host.serveBrowserTabs?.opened({
-          worktreeId,
-          pageId: created.browserPageId,
-          url,
-          title: '',
-          ...(params.profileId ? { profileId: params.profileId } : {}),
-          ...(params.targetGroupId ? { groupId: params.targetGroupId } : {})
-        })
+      // A desktop on "Server (streamed)" declines when asked, so agent tabs keep streaming from here.
+      if (opensOnPairedDesktop(this.host, params, caller, offscreen !== null)) {
+        return createBrowserPageOnPairedHost(
+          this.host,
+          params,
+          params.profileId ?? browserSessionRegistry.getDefaultProfile().id,
+          offscreen ? createOffscreen : undefined
+        )
       }
-      publishCreatedBrowserSessionTab(this.host, {
-        placementKind: 'offscreen',
-        browserPageId: created.browserPageId,
-        worktreeId,
-        focus,
-        ...(caller?.pairedDeviceId ? { clientNavigationId: caller.pairedDeviceId } : {}),
-        ...(caller?.opensPageLink ? { opensPageLink: true } : {}),
-        targetGroupId: params.targetGroupId
-      })
-      return { browserPageId: created.browserPageId }
+      return createOffscreen()
     }
     const { browserPageId } = await createBrowserTabInRenderer(
       this.host,
@@ -187,6 +181,42 @@ export class RuntimeBrowserTabCreation {
     return { browserPageId }
   }
 
+  private async createOffscreenTab(
+    offscreen: NonNullable<ReturnType<RuntimeBrowserCommandHost['getOffscreenBrowserBackend']>>,
+    params: BrowserTabCreateRequest,
+    caller: BrowserTabCreateCaller | undefined,
+    url: string,
+    worktreeId: string | undefined,
+    focus: BrowserTabCreateFocusResolution
+  ): Promise<{ browserPageId: string }> {
+    const created = await offscreen.createTab({
+      url,
+      worktreeId,
+      profileId: params.profileId,
+      ...(params.page ? { browserPageId: params.page } : {})
+    })
+    if (worktreeId) {
+      this.host.serveBrowserTabs?.opened({
+        worktreeId,
+        pageId: created.browserPageId,
+        url,
+        title: '',
+        ...(params.profileId ? { profileId: params.profileId } : {}),
+        ...(params.targetGroupId ? { groupId: params.targetGroupId } : {})
+      })
+    }
+    publishCreatedBrowserSessionTab(this.host, {
+      placementKind: 'offscreen',
+      browserPageId: created.browserPageId,
+      worktreeId,
+      focus,
+      ...(caller?.pairedDeviceId ? { clientNavigationId: caller.pairedDeviceId } : {}),
+      ...(caller?.opensPageLink ? { opensPageLink: true } : {}),
+      targetGroupId: params.targetGroupId
+    })
+    return { browserPageId: created.browserPageId }
+  }
+
   async browserOpenUrlOnClient(params: {
     url: string
     worktree: string
diff --git a/src/main/runtime/browser/tabs/browser-tab-queries.ts b/src/main/runtime/browser/tabs/browser-tab-queries.ts
index 51f31bdbe76..5f6deea8b96 100644
--- a/src/main/runtime/browser/tabs/browser-tab-queries.ts
+++ b/src/main/runtime/browser/tabs/browser-tab-queries.ts
@@ -166,10 +166,7 @@ export class RuntimeBrowserTabQueries {
           ? (await this.host.resolveBrowserWorkspace(params.worktree)).id
           : undefined
     const result = await bridge.tabSwitch(undefined, worktreeId, selected.browserPageId)
-    this.host.getRuntimeBrowserPageRegistry().deactivateGlobal()
-    if (worktreeId) {
-      this.host.getRuntimeBrowserPageRegistry().deactivateWorkspace(worktreeId)
-    }
+    this.host.getRuntimeBrowserPageRegistry().yieldSelection(worktreeId)
     // Scope focus to the owning worktree; never switch the user's workspace.
     const focusWorktreeId =
       worktreeId ?? browserManager.getWorktreeIdForTab(result.browserPageId) ?? undefined
diff --git a/src/main/runtime/client/settings/workspace-view-collapse-writes.ts b/src/main/runtime/client/settings/workspace-view-collapse-writes.ts
index 97fcb617f51..cbfe6ffe6b4 100644
--- a/src/main/runtime/client/settings/workspace-view-collapse-writes.ts
+++ b/src/main/runtime/client/settings/workspace-view-collapse-writes.ts
@@ -2,7 +2,7 @@ import type { PersistedUIState } from '../../../../shared/persisted-ui-state-typ
 import type {
   SetCollapsedRequest,
   SetCollapsedResult
-} from '../../../../shared/rpc-contract/workspace-view-collapse-params'
+} from '../../../../shared/rpc-contract/workspaces/workspace-view-collapse-params'
 
 // Far above writers x sections in use; an evicted entry only lets a very old retry apply again.
 const MAX_TRACKED_WRITES = 4096
diff --git a/src/main/runtime/construction/runtime-file-command-state.ts b/src/main/runtime/construction/runtime-file-command-state.ts
index ffae85fe4cc..fadf9abe715 100644
--- a/src/main/runtime/construction/runtime-file-command-state.ts
+++ b/src/main/runtime/construction/runtime-file-command-state.ts
@@ -1,5 +1,5 @@
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { LocalProjectGhExecOptions } from '../../workspaces/execution-host/project-runtime-git-options'
 import { OrcaRuntimeWithPreservedBranchCleanup } from './runtime-host-services'
 import { createRuntimeFileWatcherRemoval } from '../workspaces/removal/runtime-file-watcher-removal'
diff --git a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-dispatch.test.ts b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-dispatch.test.ts
index 8810994f1ea..5929827f0cb 100644
--- a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-dispatch.test.ts
+++ b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-dispatch.test.ts
@@ -9,8 +9,8 @@ import { defineMethod } from '../rpc/core'
 import { RpcDispatcher } from '../rpc/dispatcher'
 import { DESKTOP_BROWSER_BRIDGE_RPC_METHODS } from '../rpc/methods/browser/desktop-browser-bridge'
 import { BrowserTarget } from '../../../shared/rpc-contract/rpc-param-primitives'
-import { Goto } from '../../../shared/rpc-contract/browser-params'
-import { BrowserOpenUrlParams } from '../../../shared/rpc-contract/browser-tab-create-params'
+import { Goto } from '../../../shared/rpc-contract/browser/browser-params'
+import { BrowserOpenUrlParams } from '../../../shared/rpc-contract/browser/browser-tab-create-params'
 import {
   getDesktopBrowserBridgeRegistry,
   setDesktopBrowserBridgeHostEnabled
diff --git a/src/main/runtime/integrations/git/runtime-git-diff-commands.ts b/src/main/runtime/integrations/git/runtime-git-diff-commands.ts
index ef39a39ace3..99fa251c69e 100644
--- a/src/main/runtime/integrations/git/runtime-git-diff-commands.ts
+++ b/src/main/runtime/integrations/git/runtime-git-diff-commands.ts
@@ -5,7 +5,7 @@ import type {
 } from '../../../../shared/git/diff/git-diff-compare-types'
 import { assertGitDiffWithinTransportBudget } from '../../../../shared/git/diff/git-diff-transport-budget'
 import { getBranchDiff } from '../../../git/source-control/comparisons/branch-diff'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { normalizeRuntimeRelativePath } from '../../files/paths/runtime-relative-paths'
 import {
   localGitOptionsForTarget,
diff --git a/src/main/runtime/integrations/github/runtime-github-issue-comment-commands.ts b/src/main/runtime/integrations/github/runtime-github-issue-comment-commands.ts
index acaa09e4c2c..2a5908f3259 100644
--- a/src/main/runtime/integrations/github/runtime-github-issue-comment-commands.ts
+++ b/src/main/runtime/integrations/github/runtime-github-issue-comment-commands.ts
@@ -15,7 +15,7 @@ import {
 import { createIssue } from '../../../github/issues/issue-create'
 import { updateIssue } from '../../../github/issues/issue-update'
 import { getRepoRoutingConnectionId } from '../../../../shared/execution-host'
-import type { GitHubAttachmentTarget } from '../../../../shared/rpc-contract/github-attachment-params'
+import type { GitHubAttachmentTarget } from '../../../../shared/rpc-contract/github/github-attachment-params'
 import { uploadGitHubImage } from '../../../github/attachments/image-attachment-upload'
 import {
   resolveGitHubRepoExecution,
diff --git a/src/main/runtime/integrations/reviews/runtime-hosted-review-commands.ts b/src/main/runtime/integrations/reviews/runtime-hosted-review-commands.ts
index 63a4debdc77..6a14b007a13 100644
--- a/src/main/runtime/integrations/reviews/runtime-hosted-review-commands.ts
+++ b/src/main/runtime/integrations/reviews/runtime-hosted-review-commands.ts
@@ -23,7 +23,7 @@ import {
   type HostedReviewForBranchReply,
   hostedReviewForBranchReply
 } from '../../../../shared/source-control/hosted-review/hosted-review-contracts'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 
 import { readHostedReviewForBranch } from '../../../source-control/hosted-review'
 import { getStoredRepoExecutionHostId } from '../../../workspaces/execution-host/repo-execution-host'
diff --git a/src/main/runtime/mobile-desktop-relay/relayed-browser-tab-create.ts b/src/main/runtime/mobile-desktop-relay/relayed-browser-tab-create.ts
index 6349a4ff417..157683952b4 100644
--- a/src/main/runtime/mobile-desktop-relay/relayed-browser-tab-create.ts
+++ b/src/main/runtime/mobile-desktop-relay/relayed-browser-tab-create.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto'
 import { z } from 'zod'
-import { BrowserTabCreateParams } from '../../../shared/rpc-contract/browser-tab-create-params'
+import { BrowserTabCreateParams } from '../../../shared/rpc-contract/browser/browser-tab-create-params'
 import {
   RuntimeRpcEnvelopeSchema,
   type RuntimeRpcResponse
diff --git a/src/main/runtime/orca-runtime-saved-restore-launch.test.ts b/src/main/runtime/orca-runtime-saved-restore-launch.test.ts
deleted file mode 100644
index fd03c943bd2..00000000000
--- a/src/main/runtime/orca-runtime-saved-restore-launch.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { EnsureAgentSessionParams } from '../../shared/rpc-contract/agent-session-params'
-import type { AgentStatusIpcPayload } from '../../shared/agent-status/contracts/agent-status-ipc-payload'
-import { OrcaRuntimeService } from './orca-runtime'
-import { partialRuntimeStore } from './orca-runtime-tests/runtime-store-partial-fixture'
-
-const TAB = '11111111-1111-4111-8111-111111111111'
-const SOURCE_PANE = `${TAB}:22222222-2222-4222-8222-222222222222`
-const NEW_TAB = '33333333-3333-4333-8333-333333333333'
-const NEW_LEAF = '44444444-4444-4444-8444-444444444444'
-const SESSION = { key: 'session_id', id: 'conversation-1' } as const
-
-function restoreOnHost(args: {
-  recorded?: { agentArgs: string; agentEnv: Record<string, string> }
-  hookMode?: string
-}) {
-  const runtime = new OrcaRuntimeService(
-    partialRuntimeStore({
-      getSettings: () => ({
-        disabledTuiAgents: [],
-        agentCmdOverrides: {},
-        agentDefaultArgs: { claude: '--model current' },
-        agentDefaultEnv: { claude: { CURRENT: '1' } }
-      })
-    })
-  )
-  const record = {
-    paneKey: SOURCE_PANE,
-    worktreeId: 'worktree-1',
-    agent: 'claude' as const,
-    providerSession: SESSION,
-    prompt: '',
-    state: 'done' as const,
-    capturedAt: 1,
-    updatedAt: 1,
-    ...(args.recorded ? { launchConfig: args.recorded } : {})
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the host's restore reads only the row's pane, agent and provider session.
-  const hookRow = {
-    paneKey: SOURCE_PANE,
-    agentType: 'claude',
-    providerSession: { ...SESSION, permissionMode: args.hookMode }
-  } as AgentStatusIpcPayload
-  Object.assign(runtime, {
-    resolveTerminalWorkspaceLaunchScope: vi.fn(async () => ({
-      id: 'worktree-1',
-      path: '/tmp/worktree-1',
-      connectionId: null
-    })),
-    getWorkspaceSessionForWorktree: () => ({
-      sleepingAgentSessionsByPaneKey: { [SOURCE_PANE]: record }
-    }),
-    getAgentProviderSessionSnapshotFn: () => [hookRow]
-  })
-  const createTerminal = vi.spyOn(runtime, 'createTerminal').mockResolvedValue({
-    handle: 'term_restore',
-    tabId: NEW_TAB,
-    paneKey: `${NEW_TAB}:${NEW_LEAF}`,
-    ptyId: 'pty-restore',
-    worktreeId: 'worktree-1',
-    title: null,
-    surface: 'background'
-  })
-  return {
-    restore: () =>
-      runtime.ensureAgentSession(
-        EnsureAgentSessionParams.parse({
-          kind: 'explicit',
-          resumeOrigin: 'saved',
-          restoreSourcePaneKey: SOURCE_PANE,
-          worktree: 'id:worktree-1',
-          agent: 'claude',
-          providerSession: SESSION,
-          agentArgs: '--model client',
-          placement: { tabId: NEW_TAB, leafId: NEW_LEAF }
-        })
-      ),
-    launched: () => createTerminal.mock.calls[0]?.[1]
-  }
-}
-
-// A Wake opens a new tab: the host must replay the pane that ran, not the new pane or its own settings.
-describe('a saved restore into a new pane on its host', () => {
-  it("replays the source pane's note", async () => {
-    const host = restoreOnHost({
-      recorded: { agentArgs: '--verbose', agentEnv: { RECORDED: '1' } }
-    })
-    await host.restore()
-    expect(host.launched()?.command).toContain('--verbose')
-    expect(host.launched()?.command).not.toContain('--model')
-    expect(host.launched()?.env).toMatchObject({ RECORDED: '1' })
-    expect(host.launched()?.env).not.toHaveProperty('CURRENT')
-  })
-
-  it("without a note, keeps only the bypass the host's hooks saw, never current settings", async () => {
-    const host = restoreOnHost({ hookMode: 'bypassPermissions' })
-    await host.restore()
-    expect(host.launched()?.command).toContain('--dangerously-skip-permissions')
-    expect(host.launched()?.command).not.toContain('--model')
-    expect(host.launched()?.env).not.toHaveProperty('CURRENT')
-  })
-})
diff --git a/src/main/runtime/orchestration/federation/peer-mail/peer-mail-relay.ts b/src/main/runtime/orchestration/federation/peer-mail/peer-mail-relay.ts
index dba5ad60ebc..f465ad1b83a 100644
--- a/src/main/runtime/orchestration/federation/peer-mail/peer-mail-relay.ts
+++ b/src/main/runtime/orchestration/federation/peer-mail/peer-mail-relay.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import type { OrcaRuntimeService } from '../../../orca-runtime'
-import { PeerMailRelayPayload } from '../../../../../shared/rpc-contract/orchestration-peer-mail-params'
+import { PeerMailRelayPayload } from '../../../../../shared/rpc-contract/orchestration/orchestration-peer-mail-params'
 import { resolveBareOrchestrationRecipient } from '../../../rpc/methods/orchestration/messaging/recipient-routing'
 import type { OrchestrationDb } from '../../db/orchestration-db'
 import type { MessageRow } from '../../db/orchestration-records'
diff --git a/src/main/runtime/orchestration/federation/remote-owned/remote-owned-route.ts b/src/main/runtime/orchestration/federation/remote-owned/remote-owned-route.ts
index c41daaf0f39..09206a0d134 100644
--- a/src/main/runtime/orchestration/federation/remote-owned/remote-owned-route.ts
+++ b/src/main/runtime/orchestration/federation/remote-owned/remote-owned-route.ts
@@ -8,7 +8,7 @@ import {
 import { emptyWorkerListPage } from '../../../rpc/methods/orchestration/worker/worker-list-method'
 import { ORCHESTRATION_FLEET_PAGE_MAX } from '../../../../../shared/orchestration/fleet/orchestration-fleet-projection'
 import { ORCA_SESSION_ADDRESS_PREFIX } from '../../../../../shared/orca-session-address-prefix'
-import { WorkerStartParams } from '../../../../../shared/rpc-contract/orchestration-worker-start-params'
+import { WorkerStartParams } from '../../../../../shared/rpc-contract/orchestration/orchestration-worker-start-params'
 import { isOrchestrationMutation } from '../../../../../shared/orchestration/orchestration-rpc-contract'
 import type { OrchestrationDb } from '../../db/orchestration-db'
 import { runLifecycleWriteTransaction } from '../../db/lifecycle-write-transaction-runner'
diff --git a/src/main/runtime/orchestration/federation/remote-owned/remote-owned-start.ts b/src/main/runtime/orchestration/federation/remote-owned/remote-owned-start.ts
index bb7d8defc94..7c79072e748 100644
--- a/src/main/runtime/orchestration/federation/remote-owned/remote-owned-start.ts
+++ b/src/main/runtime/orchestration/federation/remote-owned/remote-owned-start.ts
@@ -1,6 +1,6 @@
 import { createHash, randomUUID } from 'node:crypto'
 import { z } from 'zod'
-import type { WorkerStartParams } from '../../../../../shared/rpc-contract/orchestration-worker-start-params'
+import type { WorkerStartParams } from '../../../../../shared/rpc-contract/orchestration/orchestration-worker-start-params'
 import { ORCHESTRATION_REMOTE_OWNED_WORKERS_RUNTIME_CAPABILITY } from '../../../../../shared/orchestration/orchestration-runtime-capabilities'
 import { ORCHESTRATION_CONTRACT_PREFLIGHT_TIMEOUT_MS } from '../../../../../shared/orchestration/orchestration-timing-budgets'
 import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
diff --git a/src/main/runtime/orchestration/legacy-remote/ask-remote.ts b/src/main/runtime/orchestration/legacy-remote/ask-remote.ts
index b18edd2e418..3ec5444c533 100644
--- a/src/main/runtime/orchestration/legacy-remote/ask-remote.ts
+++ b/src/main/runtime/orchestration/legacy-remote/ask-remote.ts
@@ -3,7 +3,7 @@ import type { OrcaRuntimeService } from '../../orca-runtime'
 import type { WorkerDispatchState } from '../db/orchestration-records'
 import { OrchestrationError } from '../orchestration-error'
 import { clampOrchestrationAskTimeoutMs } from '../../../../shared/orchestration/mailbox/orchestration-ask-timeout'
-import type { AskParams } from '../../../../shared/rpc-contract/orchestration-params'
+import type { AskParams } from '../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { assertWorkerCanReport } from '../workers/reports/worker-report-admission'
 import {
   askedQuestionReceipt,
diff --git a/src/main/runtime/orchestration/legacy-remote/federated-worker-agent-launch.ts b/src/main/runtime/orchestration/legacy-remote/federated-worker-agent-launch.ts
index f027c85a0bb..2e9757f32f3 100644
--- a/src/main/runtime/orchestration/legacy-remote/federated-worker-agent-launch.ts
+++ b/src/main/runtime/orchestration/legacy-remote/federated-worker-agent-launch.ts
@@ -15,7 +15,7 @@ import {
   appendFederationTerminalEffects,
   type FederationEffect
 } from './federation-effects'
-import type { FederationAttachStartInput } from '../../../../shared/rpc-contract/orchestration-federation-start-params'
+import type { FederationAttachStartInput } from '../../../../shared/rpc-contract/orchestration/orchestration-federation-start-params'
 import type { Worktree } from '../../../../shared/worktree/types'
 
 const TERMINAL_ONLY_MESSAGE = 'A federated worker starts a terminal agent only.'
diff --git a/src/main/runtime/orchestration/legacy-remote/federation-control.ts b/src/main/runtime/orchestration/legacy-remote/federation-control.ts
index f6b2b657751..8cd916478cb 100644
--- a/src/main/runtime/orchestration/legacy-remote/federation-control.ts
+++ b/src/main/runtime/orchestration/legacy-remote/federation-control.ts
@@ -19,7 +19,7 @@ import {
   FederationFleetSnapshotParams,
   FederationOutputReadParams,
   FederationReadParams
-} from '../../../../shared/rpc-contract/orchestration-federation-control-params'
+} from '../../../../shared/rpc-contract/orchestration/orchestration-federation-control-params'
 
 export const ORCHESTRATION_FEDERATION_CONTROL_METHODS = [
   defineOrchestrationMethod({
diff --git a/src/main/runtime/orchestration/legacy-remote/federation-relay.ts b/src/main/runtime/orchestration/legacy-remote/federation-relay.ts
index 5982444fd7c..d1b2a1715f6 100644
--- a/src/main/runtime/orchestration/legacy-remote/federation-relay.ts
+++ b/src/main/runtime/orchestration/legacy-remote/federation-relay.ts
@@ -14,7 +14,7 @@ import {
   FederationAckParams,
   FederationImportParams,
   FederationPullParams
-} from '../../../../shared/rpc-contract/orchestration-federation-relay-params'
+} from '../../../../shared/rpc-contract/orchestration/orchestration-federation-relay-params'
 
 export const ORCHESTRATION_FEDERATION_RELAY_METHODS = [
   defineOrchestrationMethod({
diff --git a/src/main/runtime/orchestration/legacy-remote/federation.ts b/src/main/runtime/orchestration/legacy-remote/federation.ts
index 6e3c0ed9a3d..522efc19515 100644
--- a/src/main/runtime/orchestration/legacy-remote/federation.ts
+++ b/src/main/runtime/orchestration/legacy-remote/federation.ts
@@ -16,7 +16,7 @@ import {
   persistFederatedSetupSpawnFailure,
   persistFederatedSetupWaitOutcome
 } from './federation-setup'
-import { FederationAttachStartParams } from '../../../../shared/rpc-contract/orchestration-federation-start-params'
+import { FederationAttachStartParams } from '../../../../shared/rpc-contract/orchestration/orchestration-federation-start-params'
 import { failFederatedAttachmentWithReceipt } from './federation-start-receipt'
 import { prepareFederationWorkerLaunchOnHost } from '../../rpc/methods/orchestration/worker/start/launch/worker-opencode-model-preflight'
 import {
diff --git a/src/main/runtime/orchestration/mailbox/structured-mail/structured-mail-source.ts b/src/main/runtime/orchestration/mailbox/structured-mail/structured-mail-source.ts
index 5f432be1a32..2e0b75b2533 100644
--- a/src/main/runtime/orchestration/mailbox/structured-mail/structured-mail-source.ts
+++ b/src/main/runtime/orchestration/mailbox/structured-mail/structured-mail-source.ts
@@ -19,7 +19,7 @@ import {
   formatMessageBannerWithContent,
   formatMessagePointer
 } from '../formatting/message-formatting'
-import { structuredAgentSessionBlocksTooLarge } from '../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksTooLarge } from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 
 export type MailSourceMessage = Pick<
   MessageRow,
diff --git a/src/main/runtime/rpc/methods/accounts/accounts.ts b/src/main/runtime/rpc/methods/accounts/accounts.ts
index fdde13a0ec8..9d07acbcee8 100644
--- a/src/main/runtime/rpc/methods/accounts/accounts.ts
+++ b/src/main/runtime/rpc/methods/accounts/accounts.ts
@@ -22,7 +22,7 @@ import {
   HostAccountSignInWaitParams,
   HostAccountSignInFlowParams,
   HostAccountSignInCodeParams
-} from '../../../../../shared/rpc-contract/accounts-params'
+} from '../../../../../shared/rpc-contract/accounts/accounts-params'
 import { HostAccountLaunchEnvParams } from '../../../../../shared/agent-launch/startup/host-account-launch-env'
 import { withTimeout } from '../../../../../shared/promise-timeout-fallback'
 
diff --git a/src/main/runtime/rpc/methods/accounts/antigravity-accounts.ts b/src/main/runtime/rpc/methods/accounts/antigravity-accounts.ts
index 3408db6a442..3f76d01da61 100644
--- a/src/main/runtime/rpc/methods/accounts/antigravity-accounts.ts
+++ b/src/main/runtime/rpc/methods/accounts/antigravity-accounts.ts
@@ -6,7 +6,7 @@ import {
   AntigravityAccountTargetParams,
   AntigravityChatSignInCompleteParams,
   AntigravityChatSignInFlowParams
-} from '../../../../../shared/rpc-contract/antigravity-accounts-params'
+} from '../../../../../shared/rpc-contract/accounts/antigravity-accounts-params'
 import { AntigravityChatAuthConfigSchema } from '../../../../../shared/antigravity-chat-auth-config'
 import { getAntigravityAccountService } from '../../../../antigravity/native-account-host'
 import {
diff --git a/src/main/runtime/rpc/methods/accounts/usage-credentials.ts b/src/main/runtime/rpc/methods/accounts/usage-credentials.ts
index 0ab9149f7e7..7b604dbcf86 100644
--- a/src/main/runtime/rpc/methods/accounts/usage-credentials.ts
+++ b/src/main/runtime/rpc/methods/accounts/usage-credentials.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../core'
 import {
   UsageCredentialApiKeyParams,
   UsageCredentialSessionCookieParams
-} from '../../../../../shared/rpc-contract/usage-credentials-params'
+} from '../../../../../shared/rpc-contract/accounts/usage-credentials-params'
 import {
   assertMiniMaxCredentialOpensHere,
   clearMiniMaxApiKeyCredential,
diff --git a/src/main/runtime/rpc/methods/agent-hooks/agent-hooks.ts b/src/main/runtime/rpc/methods/agent-hooks/agent-hooks.ts
index c3a2522f2a5..2541c86db22 100644
--- a/src/main/runtime/rpc/methods/agent-hooks/agent-hooks.ts
+++ b/src/main/runtime/rpc/methods/agent-hooks/agent-hooks.ts
@@ -1,7 +1,7 @@
 import { isAgentStatusHooksEnabledForAgent } from '../../../../../shared/agent-hook-listener/configuration/agent-status-hooks-setting'
 import { prepareManagedWslCodexHomeBeforeShellLaunch } from '../../../../codex/hooks/installation/managed-wsl-home-shell-preflight'
 import { defineMethod } from '../../core'
-import { PrepareCodexForWslPaneParams } from '../../../../../shared/rpc-contract/agent-hooks-params'
+import { PrepareCodexForWslPaneParams } from '../../../../../shared/rpc-contract/accounts/agent-hooks-params'
 
 export const AGENT_HOOK_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.ts
index 4876683f976..5ee742065ed 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.ts
@@ -11,7 +11,7 @@ import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane
 import type { OrcaRuntimeService } from '../../../orca-runtime'
 import type { RpcContext } from '../../core'
 import { clientRendersStructuredAgent } from '../structured-sessions/structured-agent-session-policy'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { agentLaunchTabViewerRule } from './agent-launch-tab-publication'
 
 /** The paired client whose view this launch should move, or null when it moves the host's. */
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-folder-workspace-creation.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-folder-workspace-creation.ts
index 6244d9b34ea..9d7b2bd8afc 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-folder-workspace-creation.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-folder-workspace-creation.ts
@@ -5,7 +5,7 @@ import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-ag
 import type { AgentLaunchWorkspaceFactory } from '../../../../agent-launch/agent-launch-surface-factories'
 import type { RpcContext } from '../../core'
 import { resolveRpcWorkspaceCreatorProvenance } from '../../callers/workspace-creator-context'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 
 type FolderWorkspaceCreateParams = Extract<
   AgentLaunchParams['target'],
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-handoff-card.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-handoff-card.ts
index 09c6a30374c..87056f65c61 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-handoff-card.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-handoff-card.ts
@@ -2,7 +2,7 @@ import type { AgentLaunchResult } from '../../../../../shared/agent-launch/contr
 import { isOrcaSessionId } from '../../../../../shared/orca-session-address'
 
 import { ORCA_SESSION_ADDRESS_PREFIX } from '../../../../../shared/orca-session-address-prefix'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import {
   prepareAgentCreationCard,
   startedAgentSender
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-intent-resolution.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-intent-resolution.ts
index 6068804456f..6c0c963d0ca 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-intent-resolution.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-intent-resolution.ts
@@ -8,7 +8,7 @@ import type {
 } from '../../../../../shared/agent-launch/contracts/agent-launch-intent'
 import type { OrcaRuntimeService } from '../../../orca-runtime'
 import { assertTerminalLaunchAdmissible } from '../../../../agent-launch/agent-launch-surface-factories'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { resolveAgentLaunchModeOnHost } from '../../../../agent-launch/agent-launch-mode'
 
 import type { EarlyAgentLaunchTab } from './agent-launch-tab-publication'
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-replay.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-replay.ts
index 06956e04caa..d994d0463a5 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-replay.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-replay.ts
@@ -20,7 +20,7 @@ import type { TerminalSpawnDispatch } from '../../../../agent-launch/agent-launc
 import type { RpcContext } from '../../core'
 import { rpcCallerOperationKey } from '../../callers/rpc-caller-identity'
 import { agentLaunchFailureMessage } from './agent-launch-failure-code'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 
 /** Partition the ledger by transport-proven caller; an unnamed caller gets no replay safety or shared namespace. */
 export function agentLaunchOperationCallerKey(context: Pick<RpcContext, 'caller'>): string {
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-tab-publication.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-tab-publication.ts
index 8b5e78553ec..74ab49decad 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-tab-publication.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-tab-publication.ts
@@ -25,7 +25,7 @@ import {
   readAgentLaunchModeSettings
 } from '../../../../agent-launch/agent-launch-mode'
 import type { RpcContext } from '../../core'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { agentLaunchOperationCallerKey } from './agent-launch-replay'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
 
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-worktree-creation.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-worktree-creation.ts
index 5efdc75deb7..034884d740d 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-worktree-creation.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-worktree-creation.ts
@@ -21,7 +21,7 @@ import {
   worktreeCreateRepoSelector
 } from '../workspaces/worktree-create-args'
 import { toAgentLaunchPreferences } from '../../../../../shared/agent-launch/choices/agent-launch-preferences'
-import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch-params'
+import type { AgentLaunchParams } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { agentLaunchFolderWorkspaceCreator } from './agent-launch-folder-workspace-creation'
 import { agentLaunchMovesHostWindow } from './agent-launch-tab-publication'
 
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts
index 69426e70895..920e23ce71d 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts
@@ -32,7 +32,7 @@ import {
   AgentLaunch,
   AgentLaunchReplay,
   type AgentLaunchParams
-} from '../../../../../shared/rpc-contract/agent-launch-params'
+} from '../../../../../shared/rpc-contract/agent-launch/agent-launch-params'
 import { agentLaunchSurfaceFactory } from './agent-launch-surfaces'
 import { prepareAgentHandoffCard } from './agent-launch-handoff-card'
 import {
diff --git a/src/main/runtime/rpc/methods/artifacts/artifacts.ts b/src/main/runtime/rpc/methods/artifacts/artifacts.ts
index 79eb16003d9..240399399bd 100644
--- a/src/main/runtime/rpc/methods/artifacts/artifacts.ts
+++ b/src/main/runtime/rpc/methods/artifacts/artifacts.ts
@@ -4,7 +4,7 @@ import {
   ListOptions,
   SourceRequest,
   WriteRequest
-} from '../../../../../shared/rpc-contract/artifacts-params'
+} from '../../../../../shared/rpc-contract/artifacts/artifacts-params'
 
 export const ARTIFACT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/automations/automations.ts b/src/main/runtime/rpc/methods/automations/automations.ts
index 635e64253bb..a62ca969fa6 100644
--- a/src/main/runtime/rpc/methods/automations/automations.ts
+++ b/src/main/runtime/rpc/methods/automations/automations.ts
@@ -10,7 +10,7 @@ import {
   AutomationList,
   AutomationRuns,
   AutomationUpdate
-} from '../../../../../shared/rpc-contract/automation-params'
+} from '../../../../../shared/rpc-contract/automations/automation-params'
 
 function mutationOwner(
   id: string,
diff --git a/src/main/runtime/rpc/methods/browser/browser-client-host.ts b/src/main/runtime/rpc/methods/browser/browser-client-host.ts
index 87b96c1a590..7d5d3d9d409 100644
--- a/src/main/runtime/rpc/methods/browser/browser-client-host.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-client-host.ts
@@ -11,8 +11,10 @@ import {
 import {
   BROWSER_CLIENT_HOST_AUTHORITY_MISMATCH_CODE,
   BrowserClientHostAttachParams,
+  BrowserClientHostCommandResultChunkParams,
   BrowserClientHostCommandResultParams
 } from '../../../../../shared/browser/client-hosting/browser-client-host-protocol'
+import { BROWSER_CLIENT_HOST_COMMAND_RESULT_CHUNK_METHOD } from '../../../../../shared/browser/client-hosting/browser-client-automation-protocol'
 import { BrowserError } from '../../../../browser/browser-error'
 import { getBrowserHostLeaseRegistry } from '../../../browser-host/leases/browser-host-lease-registry-instance'
 import { getRuntimeBrowserPageRegistry } from '../../../browser/client-pages/runtime-browser-page-registry'
@@ -20,7 +22,7 @@ import { adoptRuntimeBrowserClientPagesFromInventory } from '../../../browser/cl
 import { recoverUnavailableRuntimeBrowserClientPages } from '../../../browser/client-pages/runtime-browser-client-page-recovery'
 import { releaseRuntimeBrowserClientPageRecord } from '../../../browser/client-pages/runtime-browser-client-page-release'
 import { getBrowserHostRequestRegistry } from '../../../browser-host/leases/browser-host-request-registry'
-import { defineMethod, defineStreamingMethod } from '../../core'
+import { defineMethod, defineStreamingMethod, type RpcContext } from '../../core'
 
 export const BROWSER_CLIENT_HOST_METHODS = [
   defineStreamingMethod({
@@ -169,35 +171,25 @@ export const BROWSER_CLIENT_HOST_METHODS = [
     name: 'browser.clientHost.commandResult',
     permission: 'workspace',
     params: BrowserClientHostCommandResultParams,
-    handler: (
-      params,
-      { runtime, pairedDeviceId, connectionId, clientKind, clientCapabilities }
-    ) => {
-      if (clientKind !== 'runtime' || !pairedDeviceId || !connectionId) {
-        throw new Error('authenticated_browser_client_host_required')
-      }
-      if (!clientCapabilities?.includes(BROWSER_CLIENT_HOST_RUNTIME_CAPABILITY)) {
-        throw new Error('browser_client_host_capability_required')
-      }
-      if (params.authorityRuntimeId !== runtime.getRuntimeId()) {
-        throw new BrowserError(
-          BROWSER_CLIENT_HOST_AUTHORITY_MISMATCH_CODE,
-          BROWSER_CLIENT_HOST_AUTHORITY_MISMATCH_CODE
-        )
-      }
-      const accepted = getBrowserHostLeaseRegistry(runtime).settleClientPageCommand(
-        {
-          authorityEpoch: params.authorityEpoch,
-          browserHostClientId: params.browserHostClientId,
-          browserHostGeneration: params.browserHostGeneration,
-          pairedDeviceId,
-          connectionId
-        },
+    handler: (params, context) => {
+      const accepted = getBrowserHostLeaseRegistry(context.runtime).settleClientPageCommand(
+        requireCommandResultIdentity(params, context),
         params
       )
       return { accepted }
     }
   }),
+  defineMethod({
+    name: BROWSER_CLIENT_HOST_COMMAND_RESULT_CHUNK_METHOD,
+    permission: 'workspace',
+    params: BrowserClientHostCommandResultChunkParams,
+    handler: (params, context) => {
+      getBrowserHostLeaseRegistry(context.runtime)
+        .requireCommandResultLedger(requireCommandResultIdentity(params, context))
+        .stageResultChunk(params)
+      return { accepted: true }
+    }
+  }),
   defineMethod({
     name: 'browser.clientHost.requestResult',
     permission: 'workspace',
@@ -256,3 +248,37 @@ export const BROWSER_CLIENT_HOST_METHODS = [
     }
   })
 ]
+
+function requireCommandResultIdentity(
+  params: {
+    authorityRuntimeId: string
+    authorityEpoch: string
+    browserHostClientId: string
+    browserHostGeneration: number
+  },
+  context: Pick<
+    RpcContext,
+    'runtime' | 'pairedDeviceId' | 'connectionId' | 'clientKind' | 'clientCapabilities'
+  >
+) {
+  const { runtime, pairedDeviceId, connectionId, clientKind, clientCapabilities } = context
+  if (clientKind !== 'runtime' || !pairedDeviceId || !connectionId) {
+    throw new Error('authenticated_browser_client_host_required')
+  }
+  if (!clientCapabilities?.includes(BROWSER_CLIENT_HOST_RUNTIME_CAPABILITY)) {
+    throw new Error('browser_client_host_capability_required')
+  }
+  if (params.authorityRuntimeId !== runtime.getRuntimeId()) {
+    throw new BrowserError(
+      BROWSER_CLIENT_HOST_AUTHORITY_MISMATCH_CODE,
+      BROWSER_CLIENT_HOST_AUTHORITY_MISMATCH_CODE
+    )
+  }
+  return {
+    authorityEpoch: params.authorityEpoch,
+    browserHostClientId: params.browserHostClientId,
+    browserHostGeneration: params.browserHostGeneration,
+    pairedDeviceId,
+    connectionId
+  }
+}
diff --git a/src/main/runtime/rpc/methods/browser/browser-core.ts b/src/main/runtime/rpc/methods/browser/browser-core.ts
index 6edf1f772ba..e76b9e2efeb 100644
--- a/src/main/runtime/rpc/methods/browser/browser-core.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-core.ts
@@ -28,21 +28,21 @@ import {
   TabSwitch,
   Upload,
   Wait
-} from '../../../../../shared/rpc-contract/browser-params'
-import { Screenshot, Snapshot } from '../../../../../shared/rpc-contract/browser-observation-params'
+} from '../../../../../shared/rpc-contract/browser/browser-params'
+import * as browserObservationParams from '../../../../../shared/rpc-contract/browser/browser-observation-params'
 import {
   BrowserOpenUrlParams,
   BrowserTabCreateParams
-} from '../../../../../shared/rpc-contract/browser-tab-create-params'
+} from '../../../../../shared/rpc-contract/browser/browser-tab-create-params'
 import { BROWSER_TEXT_METHODS } from './browser-text-rpc-methods'
 import { BROWSER_PROFILE_METHODS } from './browser-profile-rpc-methods'
-import { CertificateProceed } from '../../../../../shared/rpc-contract/browser-core-params'
+import { CertificateProceed } from '../../../../../shared/rpc-contract/browser/browser-core-params'
 
 export const BROWSER_CORE_METHODS = [
   defineMethod({
     name: 'browser.snapshot',
     permission: 'workspace',
-    params: Snapshot,
+    params: browserObservationParams.Snapshot,
     handler: async (params, { runtime }) => runtime.browserSnapshot(params)
   }),
   defineMethod({
@@ -91,7 +91,7 @@ export const BROWSER_CORE_METHODS = [
   defineMethod({
     name: 'browser.screenshot',
     permission: 'workspace',
-    params: Screenshot,
+    params: browserObservationParams.Screenshot,
     handler: async (params, { runtime }) => runtime.browserScreenshot(params)
   }),
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/browser/browser-extension-rpc-methods.ts b/src/main/runtime/rpc/methods/browser/browser-extension-rpc-methods.ts
index 0ccb61c2dca..36ad3814945 100644
--- a/src/main/runtime/rpc/methods/browser/browser-extension-rpc-methods.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-extension-rpc-methods.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../core'
 import {
   ExtensionList,
   ExtensionReload
-} from '../../../../../shared/rpc-contract/browser-extension-params'
+} from '../../../../../shared/rpc-contract/browser/browser-extension-params'
 import { getRuntimeBrowserExtensions } from '../../../browser/installation/runtime-browser-commands-factory'
 
 export const BROWSER_EXTENSION_METHODS = [
diff --git a/src/main/runtime/rpc/methods/browser/browser-extras.ts b/src/main/runtime/rpc/methods/browser/browser-extras.ts
index 5e32c06a172..a9d738365b0 100644
--- a/src/main/runtime/rpc/methods/browser/browser-extras.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-extras.ts
@@ -23,8 +23,8 @@ import {
   StorageKey,
   StorageKeyValue,
   Viewport
-} from '../../../../../shared/rpc-contract/browser-params'
-import { MouseClick } from '../../../../../shared/rpc-contract/browser-extras-params'
+} from '../../../../../shared/rpc-contract/browser/browser-params'
+import { MouseClick } from '../../../../../shared/rpc-contract/browser/browser-extras-params'
 
 export const BROWSER_EXTRA_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/browser/browser-identity-rpc.ts b/src/main/runtime/rpc/methods/browser/browser-identity-rpc.ts
index 3bdc3a48b05..9174142b949 100644
--- a/src/main/runtime/rpc/methods/browser/browser-identity-rpc.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-identity-rpc.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { BrowserIdentitySet } from '../../../../../shared/rpc-contract/browser-identity-params'
+import { BrowserIdentitySet } from '../../../../../shared/rpc-contract/browser/browser-identity-params'
 import {
   getBrowserIdentityModeStatus,
   setBrowserIdentityMode
diff --git a/src/main/runtime/rpc/methods/browser/browser-profile-rpc-methods.ts b/src/main/runtime/rpc/methods/browser/browser-profile-rpc-methods.ts
index d79dbba4c6c..66d48029520 100644
--- a/src/main/runtime/rpc/methods/browser/browser-profile-rpc-methods.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-profile-rpc-methods.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { ProfileCreate } from '../../../../../shared/rpc-contract/browser-identity-params'
+import { ProfileCreate } from '../../../../../shared/rpc-contract/browser/browser-identity-params'
 import {
   ProfileDelete,
   ProfileClearGoogleCookies,
@@ -7,7 +7,7 @@ import {
   TabProfileClone,
   TabSetProfile,
   TabShow
-} from '../../../../../shared/rpc-contract/browser-params'
+} from '../../../../../shared/rpc-contract/browser/browser-params'
 
 export const BROWSER_PROFILE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/browser/browser-screencast.ts b/src/main/runtime/rpc/methods/browser/browser-screencast.ts
index d55f3f9aebe..fa7c159e0fa 100644
--- a/src/main/runtime/rpc/methods/browser/browser-screencast.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-screencast.ts
@@ -1,5 +1,5 @@
 import { defineMethod, defineStreamingMethod } from '../../core'
-import { Screencast } from '../../../../../shared/rpc-contract/browser-params'
+import { Screencast } from '../../../../../shared/rpc-contract/browser/browser-params'
 import { BrowserError } from '../../../../browser/browser-error'
 import '../../../../../shared/runtime-types'
 import { BROWSER_UNAVAILABLE_ERROR_CODE } from '../../../../../shared/runtime-session-contracts'
@@ -7,7 +7,7 @@ import { runtimeBrowserCommandsFactoryIsAvailable } from '../../../browser/insta
 import {
   ScreencastAck,
   ScreencastUnsubscribe
-} from '../../../../../shared/rpc-contract/browser-screencast-params'
+} from '../../../../../shared/rpc-contract/browser/browser-screencast-params'
 import { acknowledgeBrowserScreencastFrame } from '../../../browser/screencast/browser-screencast-frame-credit'
 
 export const BROWSER_SCREENCAST_METHODS = [
diff --git a/src/main/runtime/rpc/methods/browser/browser-text-rpc-methods.ts b/src/main/runtime/rpc/methods/browser/browser-text-rpc-methods.ts
index 56f32627906..8cc3fc59061 100644
--- a/src/main/runtime/rpc/methods/browser/browser-text-rpc-methods.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-text-rpc-methods.ts
@@ -1,6 +1,10 @@
 import { defineMethod } from '../../core'
 import { assertRpcClipboardTextWriteWithinLimit } from '../../clipboard/rpc-clipboard-text-validation'
-import { Fill, KeyboardInsert, Type } from '../../../../../shared/rpc-contract/browser-params'
+import {
+  Fill,
+  KeyboardInsert,
+  Type
+} from '../../../../../shared/rpc-contract/browser/browser-params'
 
 export const BROWSER_TEXT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/client-events/client-events.ts b/src/main/runtime/rpc/methods/client-events/client-events.ts
index f78a7844631..7e96dd47873 100644
--- a/src/main/runtime/rpc/methods/client-events/client-events.ts
+++ b/src/main/runtime/rpc/methods/client-events/client-events.ts
@@ -7,7 +7,7 @@ import { defineMethod, defineStreamingMethod } from '../../core'
 import {
   ClientEventsSubscribeParams,
   ClientEventsUnsubscribeParams
-} from '../../../../../shared/rpc-contract/client-events-params'
+} from '../../../../../shared/rpc-contract/client-ui/client-events-params'
 import { BROWSER_CLIENT_HOST_REQUEST_CAPABILITY } from '../../../../../shared/browser/client-hosting/browser-client-host-request-protocol'
 import { getBrowserHostRequestRegistry } from '../../../browser-host/leases/browser-host-request-registry'
 import {
diff --git a/src/main/runtime/rpc/methods/client-events/runtime-client-capabilities.ts b/src/main/runtime/rpc/methods/client-events/runtime-client-capabilities.ts
index a3a54b9e698..1e509eea001 100644
--- a/src/main/runtime/rpc/methods/client-events/runtime-client-capabilities.ts
+++ b/src/main/runtime/rpc/methods/client-events/runtime-client-capabilities.ts
@@ -1,6 +1,6 @@
 import type { RuntimeCapability } from '../../../../../shared/protocol-version'
 import { defineMethod } from '../../core'
-import { ClientCapabilitiesUpdate } from '../../../../../shared/rpc-contract/runtime-client-capabilities-params'
+import { ClientCapabilitiesUpdate } from '../../../../../shared/rpc-contract/host-management/runtime-client-capabilities-params'
 
 export const RUNTIME_CLIENT_CAPABILITY_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/client-state/client-ui-schemas.ts b/src/main/runtime/rpc/methods/client-state/client-ui-schemas.ts
index a32149374df..b791076cf4c 100644
--- a/src/main/runtime/rpc/methods/client-state/client-ui-schemas.ts
+++ b/src/main/runtime/rpc/methods/client-state/client-ui-schemas.ts
@@ -1,4 +1,4 @@
-import type { UiUpdateFields } from '../../../../../shared/rpc-contract/client-ui-params'
+import type { UiUpdateFields } from '../../../../../shared/rpc-contract/client-ui/client-ui-params'
 
 // The key/value parity assertions over this live in ui-state-schema-parity-checks.ts.
 export type UiUpdateFieldsSchema = typeof UiUpdateFields
diff --git a/src/main/runtime/rpc/methods/client-state/client-ui.ts b/src/main/runtime/rpc/methods/client-state/client-ui.ts
index 0e72f815ddf..77205cc4be1 100644
--- a/src/main/runtime/rpc/methods/client-state/client-ui.ts
+++ b/src/main/runtime/rpc/methods/client-state/client-ui.ts
@@ -1,10 +1,10 @@
 import { normalizeJiraQuickFilterState } from '../../../../../shared/jira/jira-quick-filters'
-import { JiraQuickFilterStateParam } from '../../../../../shared/rpc-contract/jira-quick-filter-params'
+import { JiraQuickFilterStateParam } from '../../../../../shared/rpc-contract/jira/jira-quick-filter-params'
 import {
   normalizeJiraSavedFilterState,
   mutateJiraSavedFilterState
 } from '../../../../../shared/jira/jira-saved-filters'
-import { JiraSavedFilterMutationParam } from '../../../../../shared/rpc-contract/jira-saved-filter-params'
+import { JiraSavedFilterMutationParam } from '../../../../../shared/rpc-contract/jira/jira-saved-filter-params'
 import {
   omitPairingLocalUiFields,
   type PairedUiState
@@ -17,15 +17,15 @@ import {
   NativeChatSessionOptionsMutation,
   PRBotAuthorOverrideUpdate,
   SettingsUpdate
-} from '../../../../../shared/rpc-contract/client-settings-params'
+} from '../../../../../shared/rpc-contract/client-ui/client-settings-params'
 import {
   FeatureInteractionIdParam,
   UiUpdate
-} from '../../../../../shared/rpc-contract/client-ui-params'
+} from '../../../../../shared/rpc-contract/client-ui/client-ui-params'
 // Keep schema/PersistedUIState parity assertions in the typecheck graph so drift fails before reaching paired clients.
 
-import { TerminalQuickCommandsUpdate } from '../../../../../shared/rpc-contract/terminal-quick-command-params'
-import { AgentLaunchSettingsMutation } from '../../../../../shared/rpc-contract/agent-launch-settings-params'
+import { TerminalQuickCommandsUpdate } from '../../../../../shared/rpc-contract/terminal/terminal-quick-command-params'
+import { AgentLaunchSettingsMutation } from '../../../../../shared/rpc-contract/agent-launch/agent-launch-settings-params'
 import {
   assertTerminalQuickCommandMutationReadableForClient,
   projectTerminalQuickCommandsForClient
diff --git a/src/main/runtime/rpc/methods/client-state/task-resume-state-parity.ts b/src/main/runtime/rpc/methods/client-state/task-resume-state-parity.ts
index a38f2982f8c..1320a49b336 100644
--- a/src/main/runtime/rpc/methods/client-state/task-resume-state-parity.ts
+++ b/src/main/runtime/rpc/methods/client-state/task-resume-state-parity.ts
@@ -1,8 +1,8 @@
 import type { z } from 'zod'
 import type { TaskResumeState as TaskResumeStateType } from '../../../../../shared/ui-chrome-types'
 import type { AssertNoMissingKeys } from './ui-state-schema-parity'
-import type { TaskResumeState } from '../../../../../shared/rpc-contract/task-resume-state-params'
-import '../../../../../shared/rpc-contract/task-resume-state-params'
+import type { TaskResumeState } from '../../../../../shared/rpc-contract/client-ui/task-resume-state-params'
+import '../../../../../shared/rpc-contract/client-ui/task-resume-state-params'
 
 const _taskResumeStateParity: AssertNoMissingKeys<
   TaskResumeStateType,
diff --git a/src/main/runtime/rpc/methods/clipboard/clipboard.test.ts b/src/main/runtime/rpc/methods/clipboard/clipboard.test.ts
index c529821a302..f43cc0e60f3 100644
--- a/src/main/runtime/rpc/methods/clipboard/clipboard.test.ts
+++ b/src/main/runtime/rpc/methods/clipboard/clipboard.test.ts
@@ -11,7 +11,7 @@ const { saveClipboardImageBufferAsTempFile } = vi.hoisted(() => ({
 vi.mock('../../../../window/clipboard/clipboard-image-temp-file', () => ({
   saveClipboardImageBufferAsTempFile
 }))
-import '../../../../../shared/rpc-contract/clipboard-params'
+import '../../../../../shared/rpc-contract/clipboard/clipboard-params'
 import { CLIPBOARD_METHODS, resetClipboardImageUploadsForTest } from './clipboard'
 import {
   hasMobileClipboardImagePath,
diff --git a/src/main/runtime/rpc/methods/clipboard/clipboard.ts b/src/main/runtime/rpc/methods/clipboard/clipboard.ts
index af18a7b0e6b..b0b0f1bfc8b 100644
--- a/src/main/runtime/rpc/methods/clipboard/clipboard.ts
+++ b/src/main/runtime/rpc/methods/clipboard/clipboard.ts
@@ -8,7 +8,7 @@ import {
   CommitImageUpload,
   SaveImageAsTempFile,
   StartImageUpload
-} from '../../../../../shared/rpc-contract/clipboard-params'
+} from '../../../../../shared/rpc-contract/clipboard/clipboard-params'
 import { decodeClipboardImageUpload } from './clipboard-image-upload-decoding'
 export const CLIPBOARD_IMAGE_UPLOAD_MAX_CONCURRENT = 8
 const CLIPBOARD_IMAGE_UPLOAD_TTL_MS = 5 * 60 * 1000
diff --git a/src/main/runtime/rpc/methods/computer/computer.ts b/src/main/runtime/rpc/methods/computer/computer.ts
index d0eeb451444..0279258b115 100644
--- a/src/main/runtime/rpc/methods/computer/computer.ts
+++ b/src/main/runtime/rpc/methods/computer/computer.ts
@@ -21,11 +21,11 @@ import {
   Scroll,
   SetValue,
   TypeText
-} from '../../../../../shared/rpc-contract/computer-schemas-params'
+} from '../../../../../shared/rpc-contract/computer/computer-schemas-params'
 import {
   ComputerCapabilitiesParams,
   ComputerPermissionsStatusParams
-} from '../../../../../shared/rpc-contract/computer-params'
+} from '../../../../../shared/rpc-contract/computer/computer-params'
 
 export function resetComputerSessionsForTest(): void {
   resetComputerSidecarForTest()
diff --git a/src/main/runtime/rpc/methods/connectors/connector.ts b/src/main/runtime/rpc/methods/connectors/connector.ts
index 10d088b8203..a8ebd8584d8 100644
--- a/src/main/runtime/rpc/methods/connectors/connector.ts
+++ b/src/main/runtime/rpc/methods/connectors/connector.ts
@@ -10,7 +10,7 @@ import {
   ConnectorSend,
   ConnectorStart,
   ConnectorWatch
-} from '../../../../../shared/rpc-contract/connector-params'
+} from '../../../../../shared/rpc-contract/connectors/connector-params'
 import type {
   ConversationEvent,
   ConversationSnapshot
diff --git a/src/main/runtime/rpc/methods/emulator/emulator.ts b/src/main/runtime/rpc/methods/emulator/emulator.ts
index c3d547fe814..df41bf509b5 100644
--- a/src/main/runtime/rpc/methods/emulator/emulator.ts
+++ b/src/main/runtime/rpc/methods/emulator/emulator.ts
@@ -21,7 +21,7 @@ import {
   TapParams,
   TypeParams,
   WorktreeParam
-} from '../../../../../shared/rpc-contract/emulator-params'
+} from '../../../../../shared/rpc-contract/emulator/emulator-params'
 
 const InstallParams = z.object({
   path: z.string().refine((value) => path.isAbsolute(value), {
diff --git a/src/main/runtime/rpc/methods/files/file-watch-event-batcher.ts b/src/main/runtime/rpc/methods/files/file-watch-event-batcher.ts
index 6742047593f..5b8e2726b51 100644
--- a/src/main/runtime/rpc/methods/files/file-watch-event-batcher.ts
+++ b/src/main/runtime/rpc/methods/files/file-watch-event-batcher.ts
@@ -1,7 +1,7 @@
 import { watchBatchFlushDelayMs } from '../../../../../shared/file-watch/filesystem-watch-batch-window'
 import type { FsChangeEvent } from '../../../../../shared/file-watch/filesystem-change-event'
 import { FileWatchEventBuffer } from '../../../../../shared/file-watch/filesystem-watch-event-buffer'
-import type { FileWatchBatchCadence } from '../../../../../shared/rpc-contract/files-target-params'
+import type { FileWatchBatchCadence } from '../../../../../shared/rpc-contract/filesystem/files-target-params'
 
 // Older clients discard superseded reads; 100ms batches starve slow links, so preserve their trailing window unless opted in.
 const LEGACY_WATCH_BATCH_TRAILING_MS = 150
diff --git a/src/main/runtime/rpc/methods/files/file-watch-stream-lifecycle.ts b/src/main/runtime/rpc/methods/files/file-watch-stream-lifecycle.ts
index 27f88de11cc..ffa958b2552 100644
--- a/src/main/runtime/rpc/methods/files/file-watch-stream-lifecycle.ts
+++ b/src/main/runtime/rpc/methods/files/file-watch-stream-lifecycle.ts
@@ -2,7 +2,7 @@ import { isWatcherProcessFailure } from '../../../../ipc/filesystem/watcher-proc
 import type { OrcaRuntimeService } from '../../../orca-runtime'
 import { createFileWatchEventBatcher } from './file-watch-event-batcher'
 import { dirListingPageCache } from './files-read-dir-page'
-import type { FileWatchBatchCadence } from '../../../../../shared/rpc-contract/files-target-params'
+import type { FileWatchBatchCadence } from '../../../../../shared/rpc-contract/filesystem/files-target-params'
 
 export async function runFileWatchStream(args: {
   runtime: OrcaRuntimeService
diff --git a/src/main/runtime/rpc/methods/files/files-mutation-methods.ts b/src/main/runtime/rpc/methods/files/files-mutation-methods.ts
index 05f23e5b703..c7e14294d2d 100644
--- a/src/main/runtime/rpc/methods/files/files-mutation-methods.ts
+++ b/src/main/runtime/rpc/methods/files/files-mutation-methods.ts
@@ -12,7 +12,7 @@ import {
   FileWriteIfUnchanged,
   FileWriteBase64,
   FileWriteBase64Chunk
-} from '../../../../../shared/rpc-contract/files-mutation-params'
+} from '../../../../../shared/rpc-contract/filesystem/files-mutation-params'
 
 type SshMutationParams = {
   expectedExecutionHostId?: string
diff --git a/src/main/runtime/rpc/methods/files/files-staged-save-methods.ts b/src/main/runtime/rpc/methods/files/files-staged-save-methods.ts
index 88dddbf742a..98a01ef5279 100644
--- a/src/main/runtime/rpc/methods/files/files-staged-save-methods.ts
+++ b/src/main/runtime/rpc/methods/files/files-staged-save-methods.ts
@@ -4,7 +4,7 @@ import {
   FileSaveBegin,
   FileSaveChunk,
   FileSaveCommit
-} from '../../../../../shared/rpc-contract/files-staged-save-params'
+} from '../../../../../shared/rpc-contract/filesystem/files-staged-save-params'
 import { STAGED_FILE_SAVE_METHODS } from '../../../../../shared/file-write/staged-file-save'
 
 // Saves belong to the socket that began them; in-process callers share one owner.
diff --git a/src/main/runtime/rpc/methods/files/files-terminal-artifact-methods.ts b/src/main/runtime/rpc/methods/files/files-terminal-artifact-methods.ts
index 512dd1d7a68..9a26ecfc04e 100644
--- a/src/main/runtime/rpc/methods/files/files-terminal-artifact-methods.ts
+++ b/src/main/runtime/rpc/methods/files/files-terminal-artifact-methods.ts
@@ -4,7 +4,7 @@ import {
   TerminalArtifactFile,
   TerminalArtifactFileChunk,
   TerminalArtifactFileWrite
-} from '../../../../../shared/rpc-contract/files-terminal-artifact-params'
+} from '../../../../../shared/rpc-contract/filesystem/files-terminal-artifact-params'
 
 export const FILE_TERMINAL_ARTIFACT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/files/files.ts b/src/main/runtime/rpc/methods/files/files.ts
index 56c8c93d755..c5992a77d08 100644
--- a/src/main/runtime/rpc/methods/files/files.ts
+++ b/src/main/runtime/rpc/methods/files/files.ts
@@ -12,7 +12,7 @@ import {
   FileOpen,
   FileWatch,
   WorktreeSelector
-} from '../../../../../shared/rpc-contract/files-target-params'
+} from '../../../../../shared/rpc-contract/filesystem/files-target-params'
 import { FILE_TERMINAL_ARTIFACT_METHODS } from './files-terminal-artifact-methods'
 import {
   ChatImageRead,
@@ -30,7 +30,7 @@ import {
   FileUnwatch,
   ResolveTerminalPath,
   ServerDirectoryBrowse
-} from '../../../../../shared/rpc-contract/files-params'
+} from '../../../../../shared/rpc-contract/filesystem/files-params'
 import { limitSearchResultToContentBudget } from '../../../../../shared/file-search/search-result-transport-budget'
 
 let filesWatchSubscriptionSeq = 0
diff --git a/src/main/runtime/rpc/methods/history/ai-vault.test.ts b/src/main/runtime/rpc/methods/history/ai-vault.test.ts
index c7c5c73c136..7c1a825ce8d 100644
--- a/src/main/runtime/rpc/methods/history/ai-vault.test.ts
+++ b/src/main/runtime/rpc/methods/history/ai-vault.test.ts
@@ -38,7 +38,7 @@ vi.mock(
 
 import { AI_VAULT_METHODS } from './ai-vault'
 
-import '../../../../../shared/rpc-contract/ai-vault-params'
+import '../../../../../shared/rpc-contract/ai-vault/ai-vault-params'
 import { agentSessionRefusalError } from '../../../../../shared/agent-session/failures/agent-session-wire-refusals'
 
 import { recordStructuredAgentSessionHostInstallRefusal } from '../../../agent-session/structured-agent-session-host-refusal'
@@ -164,27 +164,6 @@ describe('aiVault.listSessions handler + shared cache', () => {
     resetAiVaultSessionListCacheForTests()
   })
 
-  it('aborts the host scan when its last RPC caller disconnects', async () => {
-    scanAiVaultSessionsInService.mockImplementation(
-      (_options, signal) =>
-        new Promise<AiVaultListResult>((_resolve, reject) => {
-          signal?.addEventListener('abort', () => reject(new Error('scan aborted')), { once: true })
-        })
-    )
-    const dispatcher = makeDispatcher()
-    const caller = new AbortController()
-    const response = dispatcher.dispatch(makeRequest('aiVault.listSessions', {}), {
-      signal: caller.signal
-    })
-    await vi.waitFor(() => expect(scanAiVaultSessionsInService).toHaveBeenCalledOnce())
-    const scanSignal = scanAiVaultSessionsInService.mock.calls[0]?.[1]
-
-    caller.abort()
-
-    expect(scanSignal?.aborted).toBe(true)
-    await expect(response).resolves.toMatchObject({ ok: false })
-  })
-
   it('omits unchanged session bodies only for clients with the matching fingerprint', async () => {
     const dispatcher = makeDispatcher()
     const first = await dispatcher.dispatch(
@@ -247,7 +226,7 @@ describe('aiVault.listSessions handler + shared cache', () => {
       expect(changed.result).not.toHaveProperty('unchanged')
       expect(changed.result).not.toMatchObject({ fingerprint: first.result.fingerprint })
     }
-    expect(scanAiVaultSessionsInService).toHaveBeenCalledTimes(1)
+
     const forced = await dispatcher.dispatch(
       makeRequest('aiVault.listSessions', {
         afterFingerprint: first.result.fingerprint,
@@ -258,7 +237,6 @@ describe('aiVault.listSessions handler + shared cache', () => {
     if (forced.ok) {
       expect(forced.result).not.toHaveProperty('unchanged')
     }
-    expect(scanAiVaultSessionsInService).toHaveBeenCalledTimes(2)
   })
 
   it('restamps the shared cached result as the addressed runtime host', async () => {
@@ -279,10 +257,6 @@ describe('aiVault.listSessions handler + shared cache', () => {
     )) as { ok: boolean; result: AiVaultListResult }
 
     // Host identity changes response stamps, never host-local scan/cache identity.
-    expect(scanAiVaultSessionsInService).toHaveBeenCalledTimes(1)
-    expect(scanAiVaultSessionsInService.mock.calls[0]?.[0]).toMatchObject({
-      executionHostId: 'local'
-    })
 
     expect(localResponse.result.sessions[0]?.executionHostId).toBe('local')
     expect(runtimeResponse.result.sessions[0]?.executionHostId).toBe('runtime:remote-server')
diff --git a/src/main/runtime/rpc/methods/history/ai-vault.ts b/src/main/runtime/rpc/methods/history/ai-vault.ts
index 5790be63329..b5295e78e25 100644
--- a/src/main/runtime/rpc/methods/history/ai-vault.ts
+++ b/src/main/runtime/rpc/methods/history/ai-vault.ts
@@ -37,7 +37,7 @@ import {
   AiVaultPrepareSessionHandoffParams,
   AiVaultPrepareSessionResumeParams,
   AiVaultSessionTitlesParams
-} from '../../../../../shared/rpc-contract/ai-vault-params'
+} from '../../../../../shared/rpc-contract/ai-vault/ai-vault-params'
 
 export const AI_VAULT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/host-management/environment-doctor.ts b/src/main/runtime/rpc/methods/host-management/environment-doctor.ts
index 80f1a883132..c8219f08b61 100644
--- a/src/main/runtime/rpc/methods/host-management/environment-doctor.ts
+++ b/src/main/runtime/rpc/methods/host-management/environment-doctor.ts
@@ -1,5 +1,5 @@
 import { ENVIRONMENT_DOCTOR_METHOD } from '../../../../../shared/environment-doctor-runtime'
-import { EnvironmentDoctorParams } from '../../../../../shared/rpc-contract/environment-doctor-params'
+import { EnvironmentDoctorParams } from '../../../../../shared/rpc-contract/host-management/environment-doctor-params'
 import { runEnvironmentDoctor } from '../../../../environment-doctor/environment-doctor'
 import { createHostEnvironmentDoctorDeps } from '../../../../environment-doctor/environment-doctor-host'
 import { defineMethod } from '../../core'
diff --git a/src/main/runtime/rpc/methods/host-management/managed-runtime-install.ts b/src/main/runtime/rpc/methods/host-management/managed-runtime-install.ts
index 7185324d40d..6a69ddd72a4 100644
--- a/src/main/runtime/rpc/methods/host-management/managed-runtime-install.ts
+++ b/src/main/runtime/rpc/methods/host-management/managed-runtime-install.ts
@@ -4,7 +4,7 @@ import type { OrcaRuntimeService } from '../../../orca-runtime'
 import {
   ManagedRuntimeAgentParams,
   ManagedRuntimeCancelParams
-} from '../../../../../shared/rpc-contract/managed-runtime-install-params'
+} from '../../../../../shared/rpc-contract/host-management/managed-runtime-install-params'
 import { acpLaunchSpecFor } from '../../../../acp/launch/acp-launch-registry'
 import { resolveAcpLaunchCommand } from '../../../../acp/launch/acp-launch-command'
 import { ManagedRuntimeInstallation } from '../../../../node-runtime/managed-runtime-installation'
diff --git a/src/main/runtime/rpc/methods/host-management/managed-server.ts b/src/main/runtime/rpc/methods/host-management/managed-server.ts
index b541938ad51..4ee68047f5c 100644
--- a/src/main/runtime/rpc/methods/host-management/managed-server.ts
+++ b/src/main/runtime/rpc/methods/host-management/managed-server.ts
@@ -2,7 +2,7 @@ import {
   ManagedServerRecover,
   ManagedServerSelector,
   ManagedServerUpdate
-} from '../../../../../shared/rpc-contract/managed-server-params'
+} from '../../../../../shared/rpc-contract/host-management/managed-server-params'
 import {
   getManagedServerActions,
   type ManagedServerActions
diff --git a/src/main/runtime/rpc/methods/host-management/recipe-vm-wake.ts b/src/main/runtime/rpc/methods/host-management/recipe-vm-wake.ts
index 91dd56c06f6..c665113685c 100644
--- a/src/main/runtime/rpc/methods/host-management/recipe-vm-wake.ts
+++ b/src/main/runtime/rpc/methods/host-management/recipe-vm-wake.ts
@@ -2,7 +2,7 @@ import {
   RECIPE_VM_WAKE_METHOD,
   RecipeVmWakeUnavailableError
 } from '../../../../../shared/remote-runtime/recipe-vm-wake'
-import { RecipeVmWakeParams } from '../../../../../shared/rpc-contract/recipe-vm-wake-params'
+import { RecipeVmWakeParams } from '../../../../../shared/rpc-contract/host-management/recipe-vm-wake-params'
 import { getRecipeVmWaker } from '../../../workspaces/sleep/recipe-vm-waker-registry'
 import { defineMethod } from '../../core'
 
diff --git a/src/main/runtime/rpc/methods/host-management/status.ts b/src/main/runtime/rpc/methods/host-management/status.ts
index 8905927e996..1e696544766 100644
--- a/src/main/runtime/rpc/methods/host-management/status.ts
+++ b/src/main/runtime/rpc/methods/host-management/status.ts
@@ -1,7 +1,7 @@
 import { defineMethod } from '../../core'
 import { getRemoteServerUpdaterSnapshot } from '../../../hosts/management/remote-server-updater'
 import { getPublishedHostDescriptor } from '../../../hosts/platform-probe/host-descriptor'
-import { StatusGetParams } from '../../../../../shared/rpc-contract/status-params'
+import { StatusGetParams } from '../../../../../shared/rpc-contract/host-management/status-params'
 import { readHostMachineWithin } from '../../../hosts/platform-probe/runtime-host-machine'
 import { MACHINE_NAME_PUBLISH_WAIT_MS } from '../../../hosts/platform-probe/runtime-machine-name'
 
diff --git a/src/main/runtime/rpc/methods/integrations/jira/jira-attachment-image.ts b/src/main/runtime/rpc/methods/integrations/jira/jira-attachment-image.ts
index cf08b0e33b4..a0ae168ac96 100644
--- a/src/main/runtime/rpc/methods/integrations/jira/jira-attachment-image.ts
+++ b/src/main/runtime/rpc/methods/integrations/jira/jira-attachment-image.ts
@@ -7,7 +7,7 @@ import {
   isAttachmentImageGrantCurrent
 } from '../../../../../jira/attachments/image-grants'
 import { readGrantedAttachmentImage } from '../../../../../jira/attachments/image-read'
-import { AttachmentImage } from '../../../../../../shared/rpc-contract/jira-params'
+import { AttachmentImage } from '../../../../../../shared/rpc-contract/jira/jira-params'
 import { defineStreamingMethod } from '../../../core'
 
 export const JIRA_ATTACHMENT_IMAGE_METHODS = [
diff --git a/src/main/runtime/rpc/methods/integrations/jira/jira.ts b/src/main/runtime/rpc/methods/integrations/jira/jira.ts
index 5d4a8fa4e15..e3ec88adfa7 100644
--- a/src/main/runtime/rpc/methods/integrations/jira/jira.ts
+++ b/src/main/runtime/rpc/methods/integrations/jira/jira.ts
@@ -4,7 +4,7 @@ import {
 } from '../../../../../../shared/jira/jira-payload-stream'
 import { defineMethod, defineStreamingMethod, type RpcContext } from '../../../core'
 import { JIRA_ATTACHMENT_IMAGE_METHODS } from './jira-attachment-image'
-import { JiraFavouriteFilterParams } from '../../../../../../shared/rpc-contract/jira-favourite-filter-params'
+import { JiraFavouriteFilterParams } from '../../../../../../shared/rpc-contract/jira/jira-favourite-filter-params'
 import {
   AssignableUsers,
   GenerateIssueSummary,
@@ -22,7 +22,7 @@ import {
   SelectSite,
   SiteSelection,
   UserSearch
-} from '../../../../../../shared/rpc-contract/jira-params'
+} from '../../../../../../shared/rpc-contract/jira/jira-params'
 
 /** Emits a Jira result over RPC, normalizing it to the shape clients decode. */
 function emitJiraPayload(value: unknown, emit: (result: unknown) => void): void {
diff --git a/src/main/runtime/rpc/methods/integrations/linear/linear-agent-access.ts b/src/main/runtime/rpc/methods/integrations/linear/linear-agent-access.ts
index a4dafc27b8b..7dc584fd26e 100644
--- a/src/main/runtime/rpc/methods/integrations/linear/linear-agent-access.ts
+++ b/src/main/runtime/rpc/methods/integrations/linear/linear-agent-access.ts
@@ -18,7 +18,7 @@ import {
   LinearSaveIssue,
   LinearTeamLookup,
   LinearWorkspaceRead
-} from '../../../../../../shared/rpc-contract/linear-agent-access-params'
+} from '../../../../../../shared/rpc-contract/linear/linear-agent-access-params'
 
 function parseLinearWriteId(writeId: string | undefined): string | undefined {
   if (writeId === undefined) {
diff --git a/src/main/runtime/rpc/methods/integrations/linear/linear-issue-list-method.ts b/src/main/runtime/rpc/methods/integrations/linear/linear-issue-list-method.ts
index 99fb33a29d7..290ce0e64b1 100644
--- a/src/main/runtime/rpc/methods/integrations/linear/linear-issue-list-method.ts
+++ b/src/main/runtime/rpc/methods/integrations/linear/linear-issue-list-method.ts
@@ -3,7 +3,7 @@ import { defineMethod } from '../../../core'
 import {
   ListIssues,
   McpListIssues
-} from '../../../../../../shared/rpc-contract/linear-issue-list-params'
+} from '../../../../../../shared/rpc-contract/linear/linear-issue-list-params'
 
 export const LINEAR_ISSUE_LIST_METHOD = defineMethod({
   name: 'linear.listIssues',
diff --git a/src/main/runtime/rpc/methods/integrations/linear/linear-project-create.ts b/src/main/runtime/rpc/methods/integrations/linear/linear-project-create.ts
index c44155d4cb9..acf5e0b25ac 100644
--- a/src/main/runtime/rpc/methods/integrations/linear/linear-project-create.ts
+++ b/src/main/runtime/rpc/methods/integrations/linear/linear-project-create.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../../core'
-import { CreateProject } from '../../../../../../shared/rpc-contract/linear-project-create-params'
+import { CreateProject } from '../../../../../../shared/rpc-contract/linear/linear-project-create-params'
 
 export const LINEAR_PROJECT_CREATE_METHOD = defineMethod({
   name: 'linear.createProject',
diff --git a/src/main/runtime/rpc/methods/integrations/linear/linear.ts b/src/main/runtime/rpc/methods/integrations/linear/linear.ts
index c1361240167..169148cebf8 100644
--- a/src/main/runtime/rpc/methods/integrations/linear/linear.ts
+++ b/src/main/runtime/rpc/methods/integrations/linear/linear.ts
@@ -18,7 +18,7 @@ import {
   SelectWorkspace,
   TeamId,
   WorkspaceSelection
-} from '../../../../../../shared/rpc-contract/linear-params'
+} from '../../../../../../shared/rpc-contract/linear/linear-params'
 
 export const LINEAR_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/link-preview/link-preview.ts b/src/main/runtime/rpc/methods/link-preview/link-preview.ts
index 4c553b9423a..9e0e73c4fd1 100644
--- a/src/main/runtime/rpc/methods/link-preview/link-preview.ts
+++ b/src/main/runtime/rpc/methods/link-preview/link-preview.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { LinkPreviewGetParams } from '../../../../../shared/rpc-contract/link-preview-params'
+import { LinkPreviewGetParams } from '../../../../../shared/rpc-contract/link-preview/link-preview-params'
 import { getLinkPreview } from '../../../../link-preview/link-preview'
 
 export const LINK_PREVIEW_METHODS = [
diff --git a/src/main/runtime/rpc/methods/native-chat/native-chat-resume.test.ts b/src/main/runtime/rpc/methods/native-chat/native-chat-resume.test.ts
index 9fe0a34a4a1..82a2b03e3a4 100644
--- a/src/main/runtime/rpc/methods/native-chat/native-chat-resume.test.ts
+++ b/src/main/runtime/rpc/methods/native-chat/native-chat-resume.test.ts
@@ -8,7 +8,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types'
 
-import '../../../../../shared/rpc-contract/native-chat-params'
+import '../../../../../shared/rpc-contract/native-chat/native-chat-params'
 import { RuntimeSubscriptionRegistry } from '../../../client/runtime-subscription-registry'
 
 import type { RpcContext } from '../../core'
diff --git a/src/main/runtime/rpc/methods/native-chat/native-chat.ts b/src/main/runtime/rpc/methods/native-chat/native-chat.ts
index 54e2374c593..9ae0e4acf5d 100644
--- a/src/main/runtime/rpc/methods/native-chat/native-chat.ts
+++ b/src/main/runtime/rpc/methods/native-chat/native-chat.ts
@@ -23,7 +23,7 @@ import {
   NativeChatSession,
   NativeChatUnsubscribe,
   type NativeChatResumePoint
-} from '../../../../../shared/rpc-contract/native-chat-params'
+} from '../../../../../shared/rpc-contract/native-chat/native-chat-params'
 
 // Default to a small transcript tail for fast paired-client paint; clients page older history, while local IPC stays virtualized.
 const MOBILE_NATIVE_CHAT_DEFAULT_WINDOW = 40
diff --git a/src/main/runtime/rpc/methods/notifications/notifications.ts b/src/main/runtime/rpc/methods/notifications/notifications.ts
index 18472f00d22..4fb53af3d2f 100644
--- a/src/main/runtime/rpc/methods/notifications/notifications.ts
+++ b/src/main/runtime/rpc/methods/notifications/notifications.ts
@@ -7,7 +7,7 @@ import {
   NotificationReportDesktopPresenceParams,
   NotificationUnsubscribeParams,
   NotificationsSubscribeParams
-} from '../../../../../shared/rpc-contract/notifications-params'
+} from '../../../../../shared/rpc-contract/notifications/notifications-params'
 
 // Use a per-process counter so same-millisecond subscriptions cannot collide.
 let notificationsSubscriptionSeq = 0
diff --git a/src/main/runtime/rpc/methods/orcad/orcad-migration.ts b/src/main/runtime/rpc/methods/orcad/orcad-migration.ts
index 6c92980a40e..41bf7194416 100644
--- a/src/main/runtime/rpc/methods/orcad/orcad-migration.ts
+++ b/src/main/runtime/rpc/methods/orcad/orcad-migration.ts
@@ -3,7 +3,7 @@ import {
   OrcadMigrationCatalogParams,
   OrcadMigrationCatalogReferenceParams,
   OrcadMigrationCommitCatalogParams
-} from '../../../../../shared/rpc-contract/orcad-migration-params'
+} from '../../../../../shared/rpc-contract/host-management/orcad-migration-params'
 import { parseOrcadMigrationManifest } from '../../../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import { OrcadMigrationSnapshotChunkRequestSchema } from '../../../../../shared/orcad-migration/orcad-migration-scrollback'
 import { OrcadMigrationBlobChunkRequestSchema } from '../../../../../shared/orcad-migration/orcad-migration-blob-transfer'
diff --git a/src/main/runtime/rpc/methods/orchestration/access/worker-approval-access.ts b/src/main/runtime/rpc/methods/orchestration/access/worker-approval-access.ts
index 924af1d075a..a2599908f8d 100644
--- a/src/main/runtime/rpc/methods/orchestration/access/worker-approval-access.ts
+++ b/src/main/runtime/rpc/methods/orchestration/access/worker-approval-access.ts
@@ -1,5 +1,5 @@
 import type { z } from 'zod'
-import type { ApprovalAnswerParams } from '../../../../../../shared/rpc-contract/orchestration-approval-answer-params'
+import type { ApprovalAnswerParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-approval-answer-params'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import type { OrchestrationAccessRuleInput } from './orchestration-method-access'
 
diff --git a/src/main/runtime/rpc/methods/orchestration/caller-show.ts b/src/main/runtime/rpc/methods/orchestration/caller-show.ts
index be72fd7ab65..8ec4d8dd75a 100644
--- a/src/main/runtime/rpc/methods/orchestration/caller-show.ts
+++ b/src/main/runtime/rpc/methods/orchestration/caller-show.ts
@@ -11,7 +11,7 @@ import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES as CODES } from '../../../../.
 import {
   PartyLocationParams,
   SessionAddressParams
-} from '../../../../../shared/rpc-contract/orchestration-params'
+} from '../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { OrchestrationError } from '../../../orchestration/orchestration-error'
 import { resolveOrcaSessionParty } from '../../../orchestration/addressing/orchestration-party'
 import { locateOrchestrationParty } from '../../../orchestration/addressing/orchestration-party-location'
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/peer-mail-methods.ts b/src/main/runtime/rpc/methods/orchestration/federation/peer-mail-methods.ts
index d3883800a76..8513f4936d0 100644
--- a/src/main/runtime/rpc/methods/orchestration/federation/peer-mail-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/federation/peer-mail-methods.ts
@@ -11,7 +11,7 @@ import {
   PeerMailAckParams,
   PeerMailDeliverParams,
   PeerMailPullParams
-} from '../../../../../../shared/rpc-contract/orchestration-peer-mail-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-peer-mail-params'
 
 const NOTHING_DELIVERED = { effectsApplied: false } as const
 const MAX_PULL_WAIT_MS = 25_000
diff --git a/src/main/runtime/rpc/methods/orchestration/gates/gates.ts b/src/main/runtime/rpc/methods/orchestration/gates/gates.ts
index 7f1556a2edc..5ecf5392d66 100644
--- a/src/main/runtime/rpc/methods/orchestration/gates/gates.ts
+++ b/src/main/runtime/rpc/methods/orchestration/gates/gates.ts
@@ -8,7 +8,7 @@ import {
   GateResolveParams,
   RunParams,
   RunStopParams
-} from '../../../../../../shared/rpc-contract/orchestration-gates-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-gates-params'
 
 // Keep one coordinator reference for runStop; the DB allows only one active run.
 let activeCoordinator: Coordinator | null = null
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/ask-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/ask-methods.ts
index ee868bd05cb..41acf5b5660 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/ask-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/ask-methods.ts
@@ -3,7 +3,7 @@ import { OrchestrationError } from '../../../../orchestration/orchestration-erro
 import { clampOrchestrationAskTimeoutMs } from '../../../../../../shared/orchestration/mailbox/orchestration-ask-timeout'
 import { isGroupAddress } from '../../../../orchestration/addressing/groups/group-addressing'
 import { dispatchReportMailbox } from '../../../../orchestration/workers/reports/dispatch-report-mailbox'
-import { AskParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { AskParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { rejectFederatedExplicitTarget } from '../routing'
 import { askRemoteRunHome } from '../../../../orchestration/legacy-remote/ask-remote'
 import {
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-direct.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-direct.ts
index 6da7a1deb48..be0a2f9d8f0 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-direct.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-direct.ts
@@ -7,7 +7,7 @@ import { exposeMessages } from './mailbox-message-receipt'
 import { staleDelivery } from '../../../../orchestration/db/messages/role-mailbox-delivery'
 import { reconcileLifecycleMessage } from '../../../../orchestration/workers/lifecycle/lifecycle-reconciliation'
 import { ORCHESTRATION_LEGACY_RUN_ID } from '../../../../../../shared/orchestration/orchestration-rpc-contract'
-import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { z } from 'zod'
 
 type CheckParamsInput = z.infer<typeof CheckParams>
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
index 11af8dd3c25..6218cd16e8a 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
@@ -1,6 +1,6 @@
 import { defineOrchestrationMethod } from '../access/orchestration-method-access'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
-import { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { CheckParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { parseMessageTypes } from '../routing'
 import { checkRunMailbox } from './check-run'
 import { checkWorkerMailbox } from './check-worker'
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts
index 31ec54fb285..e73d619cb45 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-run-pending-mail.ts
@@ -8,7 +8,7 @@ import { currentDispatchAssigneeRun } from './recipient-routing'
 import { callerHoldsDispatchPane, dispatchFenced } from './dispatch-mailbox-fence'
 import { orchestrationCallerIdentity } from '../runs/run-scope'
 import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
-import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { z } from 'zod'
 
 export async function checkRunPendingMail(args: {
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
index 5a34463d588..53f1980fc92 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
@@ -9,7 +9,7 @@ import { deliveryReceipt, exposeMessages, handsOverBatch } from './mailbox-messa
 import { interruptedAcknowledgedCheck } from '../routing'
 import { routeAllMailboxPages } from './mailbox-page-routing'
 import { resolveRunScope } from '../runs/run-scope'
-import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { z } from 'zod'
 import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import { checkRunPendingMail } from './check-run-pending-mail'
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts b/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
index 8ae22f5fa61..5f355435f46 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-worker.ts
@@ -9,7 +9,7 @@ import { routeAllMailboxPages } from './mailbox-page-routing'
 import { asDispatchFence, callerHoldsDispatchPane, dispatchFenced } from './dispatch-mailbox-fence'
 import { interruptedAcknowledgedCheck } from '../routing'
 import { currentDispatchAssigneeRun } from './recipient-routing'
-import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { z } from 'zod'
 
 type CheckParamsInput = z.infer<typeof CheckParams>
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/finished-worker-mail.ts b/src/main/runtime/rpc/methods/orchestration/messaging/finished-worker-mail.ts
index 791c8a2905d..c0657d80fa7 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/finished-worker-mail.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/finished-worker-mail.ts
@@ -5,7 +5,7 @@ import { dispatchReportMailbox } from '../../../../orchestration/workers/reports
 import { reportCorrectsUnobservedPrompt } from '../../../../orchestration/workers/reports/worker-report-admission'
 import { isDispatchAssignee } from '../../../../orchestration/db/dispatch-context/dispatch-lookup'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
-import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { MessageRouting } from '../routing'
 
 /** A terminal also proves its process, so a new process in the same pane is not taken for the old worker;
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
index fff196ea676..1a5e4ecd953 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
@@ -9,7 +9,7 @@ import {
   InboxParams,
   TaskCreateParams,
   TaskListParams
-} from '../../../../../../shared/rpc-contract/orchestration-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { TaskUpdateParams } from './task-update-params'
 
 export const ORCHESTRATION_MESSAGE_METHODS = [
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/reply-access.ts b/src/main/runtime/rpc/methods/orchestration/messaging/reply-access.ts
index 13b96bc1d5f..ad1a2156df2 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/reply-access.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/reply-access.ts
@@ -6,7 +6,7 @@ import type {
 } from '../../../../orchestration/db/orchestration-records'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import { ORCHESTRATION_LEGACY_RUN_ID } from '../../../../../../shared/orchestration/orchestration-rpc-contract'
-import type { ReplyParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import type { ReplyParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { resolveRunScope } from '../runs/run-scope'
 import type { OrchestrationAccessRuleInput } from '../access/orchestration-method-access'
 import { helperQuestionAnswerer } from './helper-question-answerer'
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts b/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts
index 7680f34fb2c..f8db1c506fb 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts
@@ -16,7 +16,7 @@ import { replyAccess } from './reply-access'
 import { replyToRemoteRunHome } from '../../../../orchestration/legacy-remote/reply-remote'
 import { replyOverPeerMail } from './peer-mail-reply'
 import { withAnswerNext } from '../receipt-next'
-import { ReplyParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { ReplyParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import {
   completionReportDispatchId,
   reportFollowUpAction
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
index 7899cea2921..b24f5cfe064 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../orchestration/workers/reports/dispatch-report-mailbox'
 import { orchestrationSkillRecoveryData } from '../../../../../../shared/orchestration/orchestration-rpc-contract'
 import { SendParams } from './send-params'
-import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { isWorkerReportOutcome, parseRemoteWorkerPayload } from './message-payload'
 import { resolveMessageRun } from '../routing'
 import {
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-params.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-params.ts
index cce983c33e3..4b1a2c6e071 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-params.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-params.ts
@@ -9,7 +9,7 @@ import { MESSAGE_TYPES } from '../../../../orchestration/db/orchestration-record
 import {
   getLifecycleGroupRecipientError,
   isDispatchMutationMessageType
-} from '../../../../../../shared/rpc-contract/orchestration-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 
 const SEND_MESSAGE_TYPE_ERROR = [
   `Invalid --type. Expected one of: ${MESSAGE_TYPES.join(', ')}.`,
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/send-point-to-point.ts b/src/main/runtime/rpc/methods/orchestration/messaging/send-point-to-point.ts
index 85752b5aa3d..74577e8f286 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-point-to-point.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-point-to-point.ts
@@ -6,7 +6,7 @@ import type { OrchestrationDb } from '../../../../orchestration/db/orchestration
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import { reconcileLifecycleMessage } from '../../../../orchestration/workers/lifecycle/lifecycle-reconciliation'
 import { bindCoordinatorMutationPayload } from '../../../../orchestration/workers/reports/dispatch-message-binding'
-import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { parseMessageTaskId } from './message-payload'
 import { isDispatchAssignee } from '../../../../orchestration/db/dispatch-context/dispatch-lookup'
 import type { SendParams } from './send-params'
diff --git a/src/main/runtime/rpc/methods/orchestration/routing.ts b/src/main/runtime/rpc/methods/orchestration/routing.ts
index 2a49c012f14..7a27aa5269c 100644
--- a/src/main/runtime/rpc/methods/orchestration/routing.ts
+++ b/src/main/runtime/rpc/methods/orchestration/routing.ts
@@ -12,7 +12,7 @@ import { LEGACY_CONTRACT_VERSION } from '../../../orchestration/db/contract-cons
 import '../../../orchestration/db/messages/mailbox-routing-page'
 import '../../../orchestration/db/dispatch-row-writer'
 import '../../../orchestration/db/attempt-outcome-projection'
-import { isDispatchMutationMessageType } from '../../../../../shared/rpc-contract/orchestration-params'
+import { isDispatchMutationMessageType } from '../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import { parseMessageTaskId } from './messaging/message-payload'
 import { federatedMessageNamesOnlyHome } from '../../../orchestration/workers/reports/dispatch-report-mailbox'
 
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/dispatch-methods.ts b/src/main/runtime/rpc/methods/orchestration/runs/dispatch-methods.ts
index 0910402a660..b5829859b49 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/dispatch-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/dispatch-methods.ts
@@ -11,7 +11,7 @@ import {
 import {
   DispatchParams,
   DispatchShowParams
-} from '../../../../../../shared/rpc-contract/orchestration-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import {
   orcaSessionIdOrHandle,
   resolveDispatchAssigneeParty
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/mutation-request-show.ts b/src/main/runtime/rpc/methods/orchestration/runs/mutation-request-show.ts
index 764d3f89580..7236224f535 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/mutation-request-show.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/mutation-request-show.ts
@@ -3,7 +3,7 @@ import {
   type OrchestrationMutationRequestShowResult
 } from '../../../../../../shared/orchestration/orchestration-mutation-request'
 import { defineOrchestrationMethod } from '../access/orchestration-method-access'
-import { RequestShowParams } from '../../../../../../shared/rpc-contract/orchestration-runs-mutation-request-show-params'
+import { RequestShowParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-runs-mutation-request-show-params'
 
 export const ORCHESTRATION_MUTATION_REQUEST_METHODS = [
   defineOrchestrationMethod({
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/reset-methods.ts b/src/main/runtime/rpc/methods/orchestration/runs/reset-methods.ts
index f3a4e7c73ca..026d8374d16 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/reset-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/reset-methods.ts
@@ -1,5 +1,5 @@
 import { defineOrchestrationMethod } from '../access/orchestration-method-access'
-import { ResetParams } from '../../../../../../shared/rpc-contract/orchestration-params'
+import { ResetParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-params'
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import { listLiveRemoteRunLinkEnvironments } from '../../../../orchestration/db/remote-owned/remote-run-links'
 
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/runs.ts b/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
index 12289a6b700..4d81a0390bd 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/runs.ts
@@ -14,7 +14,7 @@ import {
   RunListParams,
   RunShowParams,
   RunUseParams
-} from '../../../../../../shared/rpc-contract/orchestration-runs-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-runs-params'
 
 function cancelBoundDispatchWaiters(
   runtime: OrcaRuntimeService,
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/start/launch/worker-start-validation.ts b/src/main/runtime/rpc/methods/orchestration/worker/start/launch/worker-start-validation.ts
index 42c8b5d9b97..a4f65a53529 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/start/launch/worker-start-validation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/start/launch/worker-start-validation.ts
@@ -2,7 +2,7 @@ import { isTuiAgent } from '../../../../../../../../shared/agent-launch/catalog/
 import type { TuiAgent } from '../../../../../../../../shared/agent-launch/catalog/tui-agent'
 import type { OrcaRuntimeService } from '../../../../../../orca-runtime'
 import { OrchestrationError } from '../../../../../../orchestration/orchestration-error'
-import type { FederationAttachStartInput } from '../../../../../../../../shared/rpc-contract/orchestration-federation-start-params'
+import type { FederationAttachStartInput } from '../../../../../../../../shared/rpc-contract/orchestration/orchestration-federation-start-params'
 import {
   assertWorkerLaunchPreferencesCreateTerminal,
   createWorkerLaunchReceipt,
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/start/placement/worker-new-worktree-start.test.ts b/src/main/runtime/rpc/methods/orchestration/worker/start/placement/worker-new-worktree-start.test.ts
index 8e5dfdd4870..d76ad9c107f 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/start/placement/worker-new-worktree-start.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/start/placement/worker-new-worktree-start.test.ts
@@ -13,7 +13,7 @@ import { RpcDispatcher } from '../../../../../dispatcher'
 import type { RpcRequest } from '../../../../../core'
 import { ORCHESTRATION_METHODS } from '../../../orchestration'
 import '../launch/worker-opencode-model-preflight'
-import '../../../../../../../../shared/rpc-contract/orchestration-federation-start-params'
+import '../../../../../../../../shared/rpc-contract/orchestration/orchestration-federation-start-params'
 
 describe('orchestration new-worktree workers', () => {
   const coordinatorPaneKey = 'tab_coord:aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/start/worker-start-input.ts b/src/main/runtime/rpc/methods/orchestration/worker/start/worker-start-input.ts
index c45ce966e06..c07bec88b59 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/start/worker-start-input.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/start/worker-start-input.ts
@@ -1,4 +1,4 @@
 import type { z } from 'zod'
-import type { WorkerStartParams } from '../../../../../../../shared/rpc-contract/orchestration-worker-start-params'
+import type { WorkerStartParams } from '../../../../../../../shared/rpc-contract/orchestration/orchestration-worker-start-params'
 
 export type WorkerStartInput = z.infer<typeof WorkerStartParams>
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-approval-answer.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-approval-answer.ts
index c362c099fe6..7a55862bc94 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-approval-answer.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-approval-answer.ts
@@ -1,5 +1,5 @@
 import { defineOrchestrationMethod } from '../access/orchestration-method-access'
-import { ApprovalAnswerParams } from '../../../../../../shared/rpc-contract/orchestration-approval-answer-params'
+import { ApprovalAnswerParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-approval-answer-params'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import { structuredMailboxCustody } from '../../../../orchestration/mailbox/routing/structured-session-mail-target'
 import {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
index 52f494c0883..9ea94c34645 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-control.ts
@@ -23,7 +23,7 @@ import { showFederatedWorker } from '../../../../orchestration/legacy-remote-hom
 import {
   WorkerDispatchParams,
   WorkerReadParams
-} from '../../../../../../shared/rpc-contract/orchestration-worker-control-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-control-params'
 
 export const ORCHESTRATION_WORKER_CONTROL_METHODS = [
   defineOrchestrationMethod({
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-keep-open.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-keep-open.ts
index 1b070221230..6cc31c5090a 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-keep-open.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-keep-open.ts
@@ -9,7 +9,7 @@ import { resolveStructuredWorkerIdentityForSession } from '../../../../orchestra
 import {
   OrchestrationWorkerKeepOpenParams,
   OrchestrationWorkerSubjectParams
-} from '../../../../../../shared/rpc-contract/orchestration-worker-release-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-release-params'
 
 export const ORCHESTRATION_WORKER_KEEP_OPEN_METHODS = [
   defineOrchestrationMethod({
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-list-method.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-list-method.ts
index fe42b644d33..cfaf81b9af8 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-list-method.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-list-method.ts
@@ -24,7 +24,7 @@ import { withRemoteWorkerRows } from '../../../../orchestration/federation/remot
 import {
   WORKER_TERMINAL_LIST_STATES,
   WorkerListParams
-} from '../../../../../../shared/rpc-contract/orchestration-worker-release-schemas-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-release-schemas-params'
 
 export const emptyWorkerListPage = (limit: number) => ({
   workers: [],
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-release.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-release.ts
index 2916095041d..6843a2f3a8c 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-release.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-release.ts
@@ -17,7 +17,7 @@ import {
 import {
   WorkerDispatchParams,
   WorkerRetainParams
-} from '../../../../../../shared/rpc-contract/orchestration-worker-release-schemas-params'
+} from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-release-schemas-params'
 import { ORCHESTRATION_WORKER_KEEP_OPEN_METHODS } from './worker-keep-open'
 
 export const ORCHESTRATION_WORKER_RELEASE_METHODS = [
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-method.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-method.ts
index 930ddfe4218..258b89044f2 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-method.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-method.ts
@@ -18,7 +18,7 @@ import {
   qualifyLiveWorkerFollowUp
 } from './start/admission/worker-start-authority'
 import { parseTaskDeps } from './start/admission/task-deps-argument'
-import { WorkerStartParams } from '../../../../../../shared/rpc-contract/orchestration-worker-start-params'
+import { WorkerStartParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-start-params'
 import {
   isWorkerStartTimeoutWithinTimerLimit,
   resolveWorkerStartReadinessTimeoutMs
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
index e70cd54b5b4..d717ae5d4ee 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-stop.ts
@@ -4,7 +4,7 @@ import { mapWithConcurrency } from '../../../../../../shared/map-with-concurrenc
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import type { OrchestrationDb } from '../../../../orchestration/db/orchestration-db'
 import { WORKER_SETTLED_STATES } from '../../../../orchestration/terminal-authority/release/worker-terminal-ownership'
-import { WorkerDispatchParams } from '../../../../../../shared/rpc-contract/orchestration-worker-stop-params'
+import { WorkerDispatchParams } from '../../../../../../shared/rpc-contract/orchestration/orchestration-worker-stop-params'
 import type {
   HelperStopOutcome,
   WorkerStopReceipt
diff --git a/src/main/runtime/rpc/methods/plugins/plugin-dev-emit.ts b/src/main/runtime/rpc/methods/plugins/plugin-dev-emit.ts
index 9663661b91b..a2a84d7235e 100644
--- a/src/main/runtime/rpc/methods/plugins/plugin-dev-emit.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugin-dev-emit.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../core'
 import {
   PluginDevEmitParams,
   PluginDevHookParams
-} from '../../../../../shared/rpc-contract/plugins-params'
+} from '../../../../../shared/rpc-contract/plugins/plugins-params'
 import { firePluginDevHook } from '../../../../plugins/hooks/plugin-dev-hook-fire'
 import { emitPluginDevEvent } from '../../../../plugins/plugin-dev-event-emit'
 import { requirePluginService } from './plugins'
diff --git a/src/main/runtime/rpc/methods/plugins/plugin-dev-request.ts b/src/main/runtime/rpc/methods/plugins/plugin-dev-request.ts
index 7a6670b66fc..76aa247b388 100644
--- a/src/main/runtime/rpc/methods/plugins/plugin-dev-request.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugin-dev-request.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { PluginDevRequestParams } from '../../../../../shared/rpc-contract/plugins-params'
+import { PluginDevRequestParams } from '../../../../../shared/rpc-contract/plugins/plugins-params'
 import { requestPluginDevPanelHandler } from '../../../../plugins/plugin-dev-panel-request'
 import { requirePluginService } from './plugins'
 
diff --git a/src/main/runtime/rpc/methods/plugins/plugin-install-methods.ts b/src/main/runtime/rpc/methods/plugins/plugin-install-methods.ts
index ac5c9ba45f3..82b5e060653 100644
--- a/src/main/runtime/rpc/methods/plugins/plugin-install-methods.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugin-install-methods.ts
@@ -6,7 +6,7 @@ import {
   PluginInstallParams,
   PluginUninstallParams,
   PluginUpdateParams
-} from '../../../../../shared/rpc-contract/plugins-params'
+} from '../../../../../shared/rpc-contract/plugins/plugins-params'
 import {
   PLUGIN_NOT_FOUND_CODE,
   PluginCliError
diff --git a/src/main/runtime/rpc/methods/plugins/plugin-view.ts b/src/main/runtime/rpc/methods/plugins/plugin-view.ts
index c331bc2a99b..5906b23cc5e 100644
--- a/src/main/runtime/rpc/methods/plugins/plugin-view.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugin-view.ts
@@ -6,7 +6,7 @@ import {
   PluginShotEditorParams,
   PluginShotParams,
   PluginShotReplayParams
-} from '../../../../../shared/rpc-contract/plugins-params'
+} from '../../../../../shared/rpc-contract/plugins/plugins-params'
 
 // Desktop only: a headless `orca serve` has no window to show or capture a plugin in.
 let pluginViewForRpc: PluginViewDesktop | null = null
diff --git a/src/main/runtime/rpc/methods/plugins/plugins.test.ts b/src/main/runtime/rpc/methods/plugins/plugins.test.ts
index 6223125b740..7586b4d9b7c 100644
--- a/src/main/runtime/rpc/methods/plugins/plugins.test.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugins.test.ts
@@ -3,7 +3,7 @@ import { eraseRpcMethods, type RpcContext, type RpcMethod } from '../../core'
 import type { PluginService } from '../../../../plugins/plugin-service'
 import { PLUGIN_METHODS, setPluginServiceForRpc } from './plugins'
 import { PluginLogBuffer } from '../../../../plugins/plugin-log-buffer'
-import '../../../../../shared/rpc-contract/plugins-params'
+import '../../../../../shared/rpc-contract/plugins/plugins-params'
 
 vi.mock('../../../../plugins/plugin-client-list', () => ({
   listPluginsForClients: vi.fn().mockResolvedValue([])
diff --git a/src/main/runtime/rpc/methods/plugins/plugins.ts b/src/main/runtime/rpc/methods/plugins/plugins.ts
index fecb02ebe0e..4d787a29255 100644
--- a/src/main/runtime/rpc/methods/plugins/plugins.ts
+++ b/src/main/runtime/rpc/methods/plugins/plugins.ts
@@ -16,7 +16,7 @@ import {
   PluginSetEnabledParams,
   PluginSetSystemEnabledParams,
   PluginsPanelActionParams
-} from '../../../../../shared/rpc-contract/plugins-params'
+} from '../../../../../shared/rpc-contract/plugins/plugins-params'
 import {
   approvePluginFromCli,
   pluginCliApprovalRequest
diff --git a/src/main/runtime/rpc/methods/preflight/preflight.ts b/src/main/runtime/rpc/methods/preflight/preflight.ts
index 57e4947c071..d912e6fc88f 100644
--- a/src/main/runtime/rpc/methods/preflight/preflight.ts
+++ b/src/main/runtime/rpc/methods/preflight/preflight.ts
@@ -19,7 +19,7 @@ import {
   PreflightCheck,
   PreflightDetectRemoteAgents,
   PreflightDetectRemoteWindowsTerminalCapabilities
-} from '../../../../../shared/rpc-contract/preflight-params'
+} from '../../../../../shared/rpc-contract/preflight/preflight-params'
 
 /** This host's command overrides, so a configured CLI outside PATH is listed like a detected one. */
 function hostDetectionOptions(
diff --git a/src/main/runtime/rpc/methods/projects/project-group-rpc-methods.ts b/src/main/runtime/rpc/methods/projects/project-group-rpc-methods.ts
index e550be34ec2..b004f2774be 100644
--- a/src/main/runtime/rpc/methods/projects/project-group-rpc-methods.ts
+++ b/src/main/runtime/rpc/methods/projects/project-group-rpc-methods.ts
@@ -8,7 +8,7 @@ import {
   ProjectGroupSelector,
   ProjectGroupUpdate,
   ProjectGroupUpdateMany
-} from '../../../../../shared/rpc-contract/repo-params'
+} from '../../../../../shared/rpc-contract/projects/repo-params'
 
 export const PROJECT_GROUP_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/projects/project-runtime-rpc-methods.ts b/src/main/runtime/rpc/methods/projects/project-runtime-rpc-methods.ts
index 0988ab0f7d2..e18b18baf0f 100644
--- a/src/main/runtime/rpc/methods/projects/project-runtime-rpc-methods.ts
+++ b/src/main/runtime/rpc/methods/projects/project-runtime-rpc-methods.ts
@@ -7,7 +7,7 @@ import {
   ProjectHostSetupExistingFolder,
   ProjectHostSetupUpdate,
   ProjectUpdate
-} from '../../../../../shared/rpc-contract/project-runtime-params'
+} from '../../../../../shared/rpc-contract/projects/project-runtime-params'
 
 export const PROJECT_RUNTIME_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/projects/repo.ts b/src/main/runtime/rpc/methods/projects/repo.ts
index 76093eb86f4..21672047b84 100644
--- a/src/main/runtime/rpc/methods/projects/repo.ts
+++ b/src/main/runtime/rpc/methods/projects/repo.ts
@@ -13,7 +13,7 @@ import {
   RepoIssueCommandRead,
   RepoSelector,
   RepoShow
-} from '../../../../../shared/rpc-contract/github-repo-target-params'
+} from '../../../../../shared/rpc-contract/github/github-repo-target-params'
 import { hostQualifiedRepoSelector } from '../../../workspaces/catalog/runtime-repo-selector'
 import { repoHooksCheckIsBackground } from '../../../../../shared/repo-hooks-check-wake'
 import {
@@ -33,8 +33,8 @@ import {
   RepoSetHidden,
   RepoSparsePresetSave,
   RepoUpdate
-} from '../../../../../shared/rpc-contract/repo-params'
-import { RepoAddRemote } from '../../../../../shared/rpc-contract/ssh-params'
+} from '../../../../../shared/rpc-contract/projects/repo-params'
+import { RepoAddRemote } from '../../../../../shared/rpc-contract/ssh/ssh-params'
 
 export const REPO_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/reference/reference.ts b/src/main/runtime/rpc/methods/reference/reference.ts
index 0489a9352bb..86e00530764 100644
--- a/src/main/runtime/rpc/methods/reference/reference.ts
+++ b/src/main/runtime/rpc/methods/reference/reference.ts
@@ -1,5 +1,8 @@
 import { defineMethod } from '../../core'
-import { ReferenceFind, ReferenceList } from '../../../../../shared/rpc-contract/reference-params'
+import {
+  ReferenceFind,
+  ReferenceList
+} from '../../../../../shared/rpc-contract/references/reference-params'
 
 export const REFERENCE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/rpc-method-registry.ts b/src/main/runtime/rpc/methods/rpc-method-registry.ts
index ee4b96389d2..c0168ed85ee 100644
--- a/src/main/runtime/rpc/methods/rpc-method-registry.ts
+++ b/src/main/runtime/rpc/methods/rpc-method-registry.ts
@@ -8,6 +8,7 @@ import { AUTOMATION_METHODS } from './automations/automations'
 import { REPO_METHODS } from './projects/repo'
 import { WORKTREE_METHODS } from './workspaces/worktree'
 import { WORKSPACE_CLEANUP_RUNNER_METHODS } from './workspaces/workspace-cleanup-runner-methods'
+import { WORKTREE_ARCHIVE_METHODS } from './workspaces/worktree-archive-methods'
 import { AGENT_ACTIVITY_METHODS } from './workspaces/agent-activity-methods'
 import { REFERENCE_METHODS } from './reference/reference'
 import { TERMINAL_METHODS } from './terminal/terminal'
@@ -96,6 +97,7 @@ export const ALL_RPC_METHODS = [
   ...REPO_METHODS,
   ...WORKTREE_METHODS,
   ...WORKSPACE_CLEANUP_RUNNER_METHODS,
+  ...WORKTREE_ARCHIVE_METHODS,
   ...AGENT_ACTIVITY_METHODS,
   ...REFERENCE_METHODS,
   ...AGENT_SESSION_METHODS,
diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tab-close-methods.ts b/src/main/runtime/rpc/methods/session-tabs/session-tab-close-methods.ts
index 95262cf7207..ec085540296 100644
--- a/src/main/runtime/rpc/methods/session-tabs/session-tab-close-methods.ts
+++ b/src/main/runtime/rpc/methods/session-tabs/session-tab-close-methods.ts
@@ -5,7 +5,7 @@ import { defineMethod } from '../../core'
 import {
   CloseLifecycleTab,
   CloseTab
-} from '../../../../../shared/rpc-contract/session-tabs-schemas-params'
+} from '../../../../../shared/rpc-contract/session-tabs/session-tabs-schemas-params'
 import { assertProjectedSessionTabVisible } from './session-tab-browser-placement-projection'
 import { assertAgentSessionTabDestructiveMutationSupported } from './session-tab-agent-status-projection'
 import { projectSessionTabsForClient } from './session-tabs-inventory'
diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tab-markdown-methods.ts b/src/main/runtime/rpc/methods/session-tabs/session-tab-markdown-methods.ts
index b9b94f110d2..0e37a46b81b 100644
--- a/src/main/runtime/rpc/methods/session-tabs/session-tab-markdown-methods.ts
+++ b/src/main/runtime/rpc/methods/session-tabs/session-tab-markdown-methods.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../core'
 import {
   ActivateTab,
   SaveMarkdownTab
-} from '../../../../../shared/rpc-contract/session-tabs-schemas-params'
+} from '../../../../../shared/rpc-contract/session-tabs/session-tabs-schemas-params'
 
 export const SESSION_TAB_MARKDOWN_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tab-mutation-methods.ts b/src/main/runtime/rpc/methods/session-tabs/session-tab-mutation-methods.ts
index e8afa2c0dbf..39662471183 100644
--- a/src/main/runtime/rpc/methods/session-tabs/session-tab-mutation-methods.ts
+++ b/src/main/runtime/rpc/methods/session-tabs/session-tab-mutation-methods.ts
@@ -15,7 +15,7 @@ import {
   MoveTab,
   SetTabProps,
   UpdatePaneLayout
-} from '../../../../../shared/rpc-contract/session-tabs-schemas-params'
+} from '../../../../../shared/rpc-contract/session-tabs/session-tabs-schemas-params'
 
 export const SESSION_TAB_MUTATION_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tabs-unsubscribe.ts b/src/main/runtime/rpc/methods/session-tabs/session-tabs-unsubscribe.ts
index 6606dd5dcc8..abe71eb7a62 100644
--- a/src/main/runtime/rpc/methods/session-tabs/session-tabs-unsubscribe.ts
+++ b/src/main/runtime/rpc/methods/session-tabs/session-tabs-unsubscribe.ts
@@ -1,6 +1,6 @@
 import { defineMethod } from '../../core'
-import { SessionTabsUnsubscribe } from '../../../../../shared/rpc-contract/session-tabs-schemas-params'
-import { SessionTabsUnsubscribeAllParams } from '../../../../../shared/rpc-contract/session-tabs-params'
+import { SessionTabsUnsubscribe } from '../../../../../shared/rpc-contract/session-tabs/session-tabs-schemas-params'
+import { SessionTabsUnsubscribeAllParams } from '../../../../../shared/rpc-contract/session-tabs/session-tabs-params'
 import { getExplicitWorktreeIdSelector } from '../../../workspaces/catalog/runtime-worktree-selection'
 import { worktreeIdentityKey } from '../../../../../shared/worktree/id'
 
diff --git a/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts b/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts
index 4da2eca8a52..3505bf65c2f 100644
--- a/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts
+++ b/src/main/runtime/rpc/methods/session-tabs/session-tabs.ts
@@ -8,7 +8,7 @@ import { defineMethod, defineStreamingMethod } from '../../core'
 import {
   CreateTerminalTab,
   WorktreeTabSelector
-} from '../../../../../shared/rpc-contract/session-tabs-schemas-params'
+} from '../../../../../shared/rpc-contract/session-tabs/session-tabs-schemas-params'
 import { SESSION_TAB_CLOSE_METHODS } from './session-tab-close-methods'
 import {
   listSessionTabsInventory,
diff --git a/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts b/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts
index 1608ffd8344..d7692fe1e51 100644
--- a/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts
+++ b/src/main/runtime/rpc/methods/sidebar-inputs/sidebar-inputs.ts
@@ -3,11 +3,11 @@ import { requireSwitchedOn } from '../../../construction/require-sidebar-inputs-
 import { readRuntimeDesktopSidebarFacts } from '../../../sidebar-inputs/sidebar-inputs-feed-domains'
 import { isHostOwnPhone } from '../../callers/host-own-phone'
 import { SidebarInputsReadParams } from '../../../../../shared/sidebar-list/sidebar-inputs-feed-contract'
-import { SidebarSessionBeginParams } from '../../../../../shared/rpc-contract/sidebar-session-params'
+import { SidebarSessionBeginParams } from '../../../../../shared/rpc-contract/client-ui/sidebar-session-params'
 import { RepoIconDataUrlsParams } from '../../../../../shared/sidebar-list/repo-icon-data-urls-contract'
-import { SetCollapsedParams } from '../../../../../shared/rpc-contract/workspace-view-collapse-params'
+import { SetCollapsedParams } from '../../../../../shared/rpc-contract/workspaces/workspace-view-collapse-params'
 import { setCollapsedSection } from '../../../client/settings/workspace-view-collapse-writes'
-import { ClientWorkspaceViewParams } from '../../../../../shared/rpc-contract/client-workspace-view-params'
+import { ClientWorkspaceViewParams } from '../../../../../shared/rpc-contract/client-ui/client-workspace-view-params'
 
 // Registered only with ORCA_SIDEBAR_INPUTS=main, so the producers below always exist.
 
diff --git a/src/main/runtime/rpc/methods/skills/skills.ts b/src/main/runtime/rpc/methods/skills/skills.ts
index ffef4096075..a6f1348691e 100644
--- a/src/main/runtime/rpc/methods/skills/skills.ts
+++ b/src/main/runtime/rpc/methods/skills/skills.ts
@@ -43,7 +43,7 @@ import {
   SkillsCancelInstallParams,
   SkillsDiscoverParams,
   SkillsGetInstallProgressParams
-} from '../../../../../shared/rpc-contract/skills-params'
+} from '../../../../../shared/rpc-contract/skills/skills-params'
 import { unavailableWhileWslDistroStopped } from '../../../../skills/discovery/skill-discovery-stopped-wsl-roots'
 import { runAsWslUserAct, wslDistroForPath } from '../../../../wsl/filesystem/wsl-unc-access-gate'
 
diff --git a/src/main/runtime/rpc/methods/source-control/git/git-branch-methods.ts b/src/main/runtime/rpc/methods/source-control/git/git-branch-methods.ts
index 0da82cde707..fa1549034db 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git-branch-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git-branch-methods.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../../core'
-import { GitSwitchBranch } from '../../../../../../shared/rpc-contract/git-params'
+import { GitSwitchBranch } from '../../../../../../shared/rpc-contract/source-control/git-params'
 
 export const GIT_BRANCH_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/git/git-commit-action-methods.ts b/src/main/runtime/rpc/methods/source-control/git/git-commit-action-methods.ts
index f06916939ba..434e5379fd0 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git-commit-action-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git-commit-action-methods.ts
@@ -3,7 +3,7 @@ import {
   GitCommitAction,
   GitSequencer,
   GitCreateBranch
-} from '../../../../../../shared/rpc-contract/git-params'
+} from '../../../../../../shared/rpc-contract/source-control/git-params'
 
 export const GIT_COMMIT_ACTION_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/git/git-commit-message-generation-methods.ts b/src/main/runtime/rpc/methods/source-control/git/git-commit-message-generation-methods.ts
index 18204394a50..06c133ab602 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git-commit-message-generation-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git-commit-message-generation-methods.ts
@@ -6,7 +6,7 @@ import {
   GitGenerateCommitMessage,
   GitGeneratePullRequestFields,
   WorktreeSelector
-} from '../../../../../../shared/rpc-contract/git-params'
+} from '../../../../../../shared/rpc-contract/source-control/git-params'
 
 type CommitMessageGenerationOverride = {
   commitMessageAi?: GlobalSettings['commitMessageAi']
diff --git a/src/main/runtime/rpc/methods/source-control/git/git-diff-methods.ts b/src/main/runtime/rpc/methods/source-control/git/git-diff-methods.ts
index 771c3a47001..edac888c17b 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git-diff-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git-diff-methods.ts
@@ -4,7 +4,7 @@ import {
   GitBranchDiff,
   GitCommitDiff,
   GitDiff
-} from '../../../../../../shared/rpc-contract/git-params'
+} from '../../../../../../shared/rpc-contract/source-control/git-params'
 
 // Only WebSocket callers set clientKind; local/in-process diffs retain uncapped fidelity.
 function remoteDiffContentBudget(
diff --git a/src/main/runtime/rpc/methods/source-control/git/git-status-methods.ts b/src/main/runtime/rpc/methods/source-control/git/git-status-methods.ts
index c8727ba7da7..05cf5d744a3 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git-status-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git-status-methods.ts
@@ -4,7 +4,7 @@ import {
   GitStatusParams,
   GitSubmoduleStatus,
   WorktreeSelector
-} from '../../../../../../shared/rpc-contract/git-params'
+} from '../../../../../../shared/rpc-contract/source-control/git-params'
 import { defineMethod } from '../../../core'
 
 function projectConflictOperation(
diff --git a/src/main/runtime/rpc/methods/source-control/git/git.ts b/src/main/runtime/rpc/methods/source-control/git/git.ts
index 765985dec8b..ec66085271e 100644
--- a/src/main/runtime/rpc/methods/source-control/git/git.ts
+++ b/src/main/runtime/rpc/methods/source-control/git/git.ts
@@ -23,7 +23,7 @@ import {
   GitRemoteFileUrl,
   GitTargetedRemote,
   WorktreeSelector
-} from '../../../../../../shared/rpc-contract/git-params'
+} from '../../../../../../shared/rpc-contract/source-control/git-params'
 
 export const GIT_METHODS = [
   ...GIT_STATUS_METHODS,
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-account-binding-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-account-binding-methods.ts
index 29295bade45..a6e33d618a4 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-account-binding-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-account-binding-methods.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../../core'
 import {
   BindableAccounts,
   ValidateAccountBinding
-} from '../../../../../../shared/rpc-contract/github-account-binding-params'
+} from '../../../../../../shared/rpc-contract/github/github-account-binding-params'
 
 export const GITHUB_ACCOUNT_BINDING_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-issue-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-issue-methods.ts
index 421e643d0a6..6bf3eb3fd17 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-issue-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-issue-methods.ts
@@ -1,12 +1,12 @@
 import { defineMethod } from '../../../core'
-import { UploadGitHubAttachment } from '../../../../../../shared/rpc-contract/github-attachment-params'
+import { UploadGitHubAttachment } from '../../../../../../shared/rpc-contract/github/github-attachment-params'
 import { claimClipboardImageUpload } from '../../clipboard/clipboard'
 import {
   CreateIssue,
   Issue,
   IssueComment,
   UpdateIssue
-} from '../../../../../../shared/rpc-contract/github-issue-params'
+} from '../../../../../../shared/rpc-contract/github/github-issue-params'
 
 export const GITHUB_ISSUE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-project-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-project-methods.ts
index f886c82220c..0e0a6b1e58b 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-project-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-project-methods.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../../core'
-import { SlugRepo } from '../../../../../../shared/rpc-contract/github-repo-target-params'
+import { SlugRepo } from '../../../../../../shared/rpc-contract/github/github-repo-target-params'
 import {
   ClearProjectItemField,
   GithubProjectListAccessibleParams,
@@ -15,7 +15,7 @@ import {
   SlugIssueTypeUpdate,
   SlugIssueUpdate,
   SlugPullRequestUpdate
-} from '../../../../../../shared/rpc-contract/github-project-params'
+} from '../../../../../../shared/rpc-contract/github/github-project-params'
 
 export const GITHUB_PROJECT_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-pull-request-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-pull-request-methods.ts
index 55191be8241..0c2c03dbfa0 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-pull-request-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-pull-request-methods.ts
@@ -9,7 +9,7 @@ import {
   PullRequestFileViewed,
   RerunPullRequestChecks,
   ReviewThread
-} from '../../../../../../shared/rpc-contract/github-pull-request-params'
+} from '../../../../../../shared/rpc-contract/github/github-pull-request-params'
 
 export const GITHUB_PULL_REQUEST_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-pull-request-update-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-pull-request-update-methods.ts
index 46daf745355..f8b0d4b9325 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-pull-request-update-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-pull-request-update-methods.ts
@@ -11,7 +11,7 @@ import {
   UpdatePr,
   UpdatePrState,
   UpdatePrTitle
-} from '../../../../../../shared/rpc-contract/github-pull-request-update-params'
+} from '../../../../../../shared/rpc-contract/github/github-pull-request-update-params'
 
 export const GITHUB_PULL_REQUEST_UPDATE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/github/github-repo-work-item-methods.ts b/src/main/runtime/rpc/methods/source-control/github/github-repo-work-item-methods.ts
index ae60fba889b..5ba968d4f7b 100644
--- a/src/main/runtime/rpc/methods/source-control/github/github-repo-work-item-methods.ts
+++ b/src/main/runtime/rpc/methods/source-control/github/github-repo-work-item-methods.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../../core'
 import {
   RepoSelector,
   RepoWithGitHubAccountExpectation
-} from '../../../../../../shared/rpc-contract/github-repo-target-params'
+} from '../../../../../../shared/rpc-contract/github/github-repo-target-params'
 import {
   IssuesList,
   RateLimit,
@@ -11,7 +11,7 @@ import {
   WorkItemDetails,
   WorkItemsCount,
   WorkItemsList
-} from '../../../../../../shared/rpc-contract/github-repo-work-item-params'
+} from '../../../../../../shared/rpc-contract/github/github-repo-work-item-params'
 
 export const GITHUB_REPO_WORK_ITEM_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/gitlab/gitlab.ts b/src/main/runtime/rpc/methods/source-control/gitlab/gitlab.ts
index 7bfe71d8aa8..23eff18713f 100644
--- a/src/main/runtime/rpc/methods/source-control/gitlab/gitlab.ts
+++ b/src/main/runtime/rpc/methods/source-control/gitlab/gitlab.ts
@@ -22,7 +22,7 @@ import {
   WorkItemByPath,
   WorkItemDetails,
   WorkItemsList
-} from '../../../../../../shared/rpc-contract/gitlab-params'
+} from '../../../../../../shared/rpc-contract/source-control/gitlab-params'
 
 export const GITLAB_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/source-control/reviews/hosted-review.ts b/src/main/runtime/rpc/methods/source-control/reviews/hosted-review.ts
index ab3bcff86ec..7e84c631821 100644
--- a/src/main/runtime/rpc/methods/source-control/reviews/hosted-review.ts
+++ b/src/main/runtime/rpc/methods/source-control/reviews/hosted-review.ts
@@ -5,7 +5,7 @@ import {
   HostedReviewCreate,
   HostedReviewCreationEligibility,
   HostedReviewForBranch
-} from '../../../../../../shared/rpc-contract/hosted-review-params'
+} from '../../../../../../shared/rpc-contract/source-control/hosted-review-params'
 
 export const HOSTED_REVIEW_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/speech/speech.ts b/src/main/runtime/rpc/methods/speech/speech.ts
index 3d4154c1258..7bd238248ab 100644
--- a/src/main/runtime/rpc/methods/speech/speech.ts
+++ b/src/main/runtime/rpc/methods/speech/speech.ts
@@ -7,7 +7,7 @@ import {
   OpenAiSpeechKeySet,
   SpeechModelAction,
   SpeechSetupRead
-} from '../../../../../shared/rpc-contract/speech-params'
+} from '../../../../../shared/rpc-contract/speech/speech-params'
 
 export const SPEECH_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/ssh/ssh.ts b/src/main/runtime/rpc/methods/ssh/ssh.ts
index 3e375c15f20..7994ff6c81e 100644
--- a/src/main/runtime/rpc/methods/ssh/ssh.ts
+++ b/src/main/runtime/rpc/methods/ssh/ssh.ts
@@ -30,7 +30,7 @@ import {
   SshTarget,
   SshTargetAdd,
   SshTargetUpdate
-} from '../../../../../shared/rpc-contract/ssh-params'
+} from '../../../../../shared/rpc-contract/ssh/ssh-params'
 
 // Keep generation optional so older server rows still key by target id.
 function toSshTargetSummary(
diff --git a/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.ts b/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.ts
index 6921708ee00..90ba818387f 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-attachments.ts
@@ -12,7 +12,7 @@ import {
   AttachmentUploadAppendParams,
   AttachmentUploadIdParams,
   AttachmentUploadStartParams
-} from '../../../../../../shared/rpc-contract/agent-session-attachment-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/agent-session-attachment-params'
 import { remoteFileContentBudget } from '../../files/files-remote-content-budget'
 import type { AgentSessionAttachmentStore } from '../../../../../native-chat/agent-session-attachments/agent-session-attachment-store'
 import { getAgentSessionAttachmentStore } from '../../../../../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-visual.ts b/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-visual.ts
index 7776f75878f..332225cc9a8 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-visual.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/attachments/structured-agent-session-visual.ts
@@ -5,7 +5,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host
 import {
   ReadVisualParams,
   type AgentSessionReadVisualResult
-} from '../../../../../../shared/rpc-contract/agent-session-visual-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/agent-session-visual-params'
 import { nativeChatScratchFolderFor } from '../../../../../native-chat/conversation-files/native-chat-scratch-folder'
 import { getProfileUserDataPath } from '../../../../../orca-profiles/profile-storage-paths'
 import { readNativeChatVisualFile } from '../../../../../native-chat/conversation-files/native-chat-visual-file-read'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-account-usage.ts b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-account-usage.ts
index 6e5a36a738e..07dcab44df3 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-account-usage.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-account-usage.ts
@@ -17,10 +17,10 @@ import {
 import { CodexUsageApiKeyAuthError } from '../../../../../rate-limits/providers/codex/codex-rpc-rate-limit-mapper'
 import { defineMethod } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
-import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export function sessionAccountUsageOffer(
   record: AgentSessionRecord,
diff --git a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-agents.ts b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-agents.ts
index 34b3c50e454..697457398f1 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-agents.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-agents.ts
@@ -15,10 +15,10 @@ import { requireStructuredCapability } from '../creation/structured-agent-sessio
 import {
   AgentsParams,
   AvailabilityParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { clientReadsStructuredSessionAgent } from '../structured-agent-session-policy'
 import { bindStructuredAgentSessionStream } from '../subscriptions/structured-agent-session-status-stream'
 import { structuredAgentSessionAvailabilitySubscriptionId } from '../subscriptions/structured-agent-session-subscription-id'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-options-read.ts b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-options-read.ts
index 797d930cf09..df3412bce8d 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-options-read.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-options-read.ts
@@ -14,11 +14,11 @@ import {
   HandoffStatusParams,
   ModelCatalogParams,
   OptionsParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
-import { ContinuationContextParams } from '../../../../../../shared/rpc-contract/structured-agent-session-identifiers'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
+import { ContinuationContextParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-identifiers'
 import { agentSessionPinnedLaunchDirectory } from '../../../../agent-session/records/agent-session-record-launch-directory'
 import {
   clientRequestsCommands,
diff --git a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-usage-limit-continue.ts b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-usage-limit-continue.ts
index dcff2f6bf21..fabe4f7cf8c 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-usage-limit-continue.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/catalog/structured-agent-session-usage-limit-continue.ts
@@ -1,4 +1,4 @@
-import { CancelUsageLimitContinueParams } from '../../../../../../shared/rpc-contract/usage-limit-continue-params'
+import { CancelUsageLimitContinueParams } from '../../../../../../shared/rpc-contract/structured-agent-session/usage-limit-continue-params'
 import { defineMethod } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
 
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-close-method.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-close-method.ts
index 8bc23998ebd..71a18eea34f 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-close-method.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-close-method.ts
@@ -1,8 +1,8 @@
 import { defineMethod } from '../../../core'
-import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import {
   requireStructuredCapability,
   requireStructuredCleanupHost
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-conversation-command.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-conversation-command.ts
index 0d6edf827d0..605ebc9a7e5 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-conversation-command.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-conversation-command.ts
@@ -1,5 +1,5 @@
 import type { z } from 'zod'
-import type { ConversationCommandParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
+import type { ConversationCommandParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
 import { recordMobileChatSend } from '../../../../../telemetry/mobile-client-telemetry'
 import type { RpcContext } from '../../../core'
 import {
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-current-requests.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-current-requests.ts
index 1849689bc32..c545db5a380 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-current-requests.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-current-requests.ts
@@ -1,6 +1,6 @@
 import { defineMethod, type RpcContext } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
-import { CurrentRequestsParams } from '../../../../../../shared/rpc-contract/agent-session-current-requests-params'
+import { CurrentRequestsParams } from '../../../../../../shared/rpc-contract/structured-agent-session/agent-session-current-requests-params'
 import { AGENT_SESSION_CURRENT_REQUESTS_CLIENT_CAPABILITY } from '../../../../../../shared/agent-session/requests/agent-session-current-requests-capability'
 import { agentSessionRefusalError } from '../../../../../../shared/agent-session/failures/agent-session-wire-refusals'
 
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-hold.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-hold.ts
index d94d9a0c5e9..53e541ab803 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-hold.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-hold.ts
@@ -7,10 +7,10 @@ import {
   requireInstalledStructuredHost,
   requireStructuredCleanupHost
 } from '../creation/structured-agent-session-gate'
-import { HoldParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { HoldParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_HOLD_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-prompt-response.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-prompt-response.ts
index 1663c09fd0b..05a515c2dab 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-prompt-response.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-prompt-response.ts
@@ -7,11 +7,11 @@ import {
 import {
   RespondParams,
   SetOptionParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
-import { RespondToQuestionParams } from '../../../../../../shared/rpc-contract/structured-agent-session-question-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
+import { RespondToQuestionParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-question-params'
 
 export const STRUCTURED_AGENT_SESSION_PROMPT_RESPONSE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-queued-methods.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-queued-methods.ts
index fce56f866c5..c4f257fe004 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-queued-methods.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-queued-methods.ts
@@ -9,14 +9,14 @@ import {
 import {
   QueuedMessageActionParams,
   QueuedMessagesResumeParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
 import {
   QueuedMessageMoveParams,
   QueuedMessageUpdateParams,
   QueuedMessageEditHoldParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { readsQueuedImageCards } from '../attachments/structured-agent-session-queued-image-capability'
 
 export const STRUCTURED_AGENT_SESSION_QUEUED_METHODS = [
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-regenerate-name.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-regenerate-name.ts
index 088c300372d..caca3ddf665 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-regenerate-name.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-regenerate-name.ts
@@ -2,10 +2,10 @@
 
 import { defineMethod } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
-import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_REGENERATE_NAME_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-rename.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-rename.ts
index 5718a73c478..8e41f3797cf 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-rename.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-rename.ts
@@ -3,10 +3,10 @@
 
 import { defineMethod } from '../../../core'
 import { requireRenameStructuredHost } from '../creation/structured-agent-session-gate'
-import '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import { RenameParams } from '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import { RenameParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_RENAME_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-restart-resume.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-restart-resume.ts
index 124f9a039c4..0ba05b156a1 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-restart-resume.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-restart-resume.ts
@@ -11,10 +11,10 @@ import {
 import {
   RestartResumableParams,
   RestartResumeParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import { ContinueInterruptedParams } from '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import { ContinueInterruptedParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { structuredAgentsReadBy } from '../structured-agent-session-policy'
 
 export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-reveal.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-reveal.ts
index 2c99604dfea..0cfd5c4914a 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-reveal.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-reveal.ts
@@ -23,10 +23,10 @@ import {
   structuredSessionSurfaceIsCurrent,
   type StructuredSessionSurface
 } from '../../../../agent-session/structured-agent-session-close'
-import { RevealParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { RevealParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_REVEAL_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-thread-goal.ts b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-thread-goal.ts
index 3cb7dbc35d0..7d527bf1a1d 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-thread-goal.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/conversation/structured-agent-session-thread-goal.ts
@@ -5,10 +5,10 @@ import {
   requireStructuredSessionHost as requireSessionHost,
   structuredCallerFor as callerFor
 } from '../creation/structured-agent-session-gate'
-import { ThreadGoalParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { ThreadGoalParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_THREAD_GOAL_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create-handler.ts b/src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create-handler.ts
index 4c87ea97a71..9ce73b75430 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create-handler.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create-handler.ts
@@ -17,7 +17,7 @@ import type {
   AttachParams,
   CreateSupportParams,
   CreateParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
 import {
   commitStructuredAgentSessionCreate,
   prepareStructuredAgentSessionCreateForWorktree,
diff --git a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-conversation-outline.ts b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-conversation-outline.ts
index 4f0f0b6b809..2f397342b83 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-conversation-outline.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-conversation-outline.ts
@@ -3,10 +3,10 @@
 import { readAgentSessionConversationOutline } from '../../../../../native-chat/agent-session-wire/publication/history/agent-session-conversation-outline'
 import { defineMethod } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
-import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { OptionsParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 
 export const STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-item.ts b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-item.ts
index 7aa939b2054..9e73e815c6c 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-item.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-item.ts
@@ -1,7 +1,7 @@
 // Negotiate item-detail.v1 for full journal items beyond preview heads; fit replies to transport limits and mark remaining truncation.
 
 import type { AgentJournalRenderItem } from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import { ItemParams } from '../../../../../../shared/rpc-contract/structured-agent-session-params'
+import { ItemParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
 import { shortenedAgentJournalItem } from '../../../../../native-chat/agent-session-wire/publication/history/agent-session-item-wire-form'
 import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../../../../../shared/remote-runtime/remote-runtime-memory-limits'
 import { defineMethod } from '../../../core'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-send-recorded.ts b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-send-recorded.ts
index 03ed27b4470..c7cf8c1a5be 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-send-recorded.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/history/structured-agent-session-send-recorded.ts
@@ -1,6 +1,6 @@
 // A client that lost a send's reply asks here instead of searching the history pages it loaded.
 
-import { SendRecordedParams } from '../../../../../../shared/rpc-contract/structured-agent-session-send-recorded-params'
+import { SendRecordedParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-send-recorded-params'
 import type { StructuredSendAnswer } from '../../../../../native-chat/agent-session-wire/delivery/structured-agent-session-queued-send-answer'
 import { defineMethod } from '../../../core'
 import { requireInstalledStructuredHost } from '../creation/structured-agent-session-gate'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/structured-agent-session.ts b/src/main/runtime/rpc/methods/structured-sessions/structured-agent-session.ts
index 6ae64ac2c10..c36db52db9c 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/structured-agent-session.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/structured-agent-session.ts
@@ -49,10 +49,10 @@ import {
   SendParams,
   SleepWorkspaceParams,
   UnsubscribeParams
-} from '../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { sendStructuredAgentSessionForClient } from './conversation/structured-agent-session-send-compatibility'
 import { runConversationCommandForClient } from './conversation/structured-agent-session-conversation-command'
 import { getStructuredAgentSessionHost } from '../../../../native-chat/agent-session-wire/host/structured-agent-session-registry'
diff --git a/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-subscribe-method.ts b/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-subscribe-method.ts
index 8e3046fb5cc..3abe0165bac 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-subscribe-method.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-subscribe-method.ts
@@ -9,7 +9,7 @@ import { projectTurnItemEvent } from '../history/structured-agent-session-turn-i
 import { requireInstalledStructuredHost as requireInstalledHost } from '../creation/structured-agent-session-gate'
 import { bindStructuredAgentSessionStream } from './structured-agent-session-status-stream'
 import { structuredAgentSessionSubscriptionId as subscriptionIdFor } from './structured-agent-session-subscription-id'
-import { SubscribeParams } from '../../../../../../shared/rpc-contract/structured-agent-session-subscribe-params'
+import { SubscribeParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-subscribe-params'
 import * as queuedImages from '../attachments/structured-agent-session-queued-image-capability'
 import { projectReceiptDeviceEvent } from './structured-agent-session-receipt-devices'
 
diff --git a/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-turn-completion-stream.ts b/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-turn-completion-stream.ts
index 313d6111ed4..1805bf02341 100644
--- a/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-turn-completion-stream.ts
+++ b/src/main/runtime/rpc/methods/structured-sessions/subscriptions/structured-agent-session-turn-completion-stream.ts
@@ -8,10 +8,10 @@ import {
 import {
   AcknowledgeAttentionParams,
   SubscribeTurnCompletionsParams
-} from '../../../../../../shared/rpc-contract/structured-agent-session-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-continue-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-rename-params'
-import '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params'
+import '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { structuredAgentSessionTurnCompletionSubscriptionId } from './structured-agent-session-subscription-id'
 import { bindStructuredAgentSessionStream } from './structured-agent-session-status-stream'
 import { clientReadsStructuredSessionAgent } from '../structured-agent-session-policy'
diff --git a/src/main/runtime/rpc/methods/terminal/agent-session.ts b/src/main/runtime/rpc/methods/terminal/agent-session.ts
index ea50d5fedb2..0bb5f206b7e 100644
--- a/src/main/runtime/rpc/methods/terminal/agent-session.ts
+++ b/src/main/runtime/rpc/methods/terminal/agent-session.ts
@@ -9,7 +9,7 @@ import { defineMethod, type RpcContext } from '../../core'
 import {
   CreateAgentSessionParams,
   EnsureAgentSessionParams
-} from '../../../../../shared/rpc-contract/agent-session-params'
+} from '../../../../../shared/rpc-contract/terminal/agent-session-params'
 
 function callerContext(context: RpcContext): RuntimeAgentSessionRpcCaller {
   const { pairedDeviceId, clientId, clientKind, signal } = context
diff --git a/src/main/runtime/rpc/methods/terminal/session-terminal-scrollback.ts b/src/main/runtime/rpc/methods/terminal/session-terminal-scrollback.ts
index e2c4f23a734..ab48bfee7c6 100644
--- a/src/main/runtime/rpc/methods/terminal/session-terminal-scrollback.ts
+++ b/src/main/runtime/rpc/methods/terminal/session-terminal-scrollback.ts
@@ -1,4 +1,4 @@
-import { SessionReadTerminalScrollbackParams } from '../../../../../shared/rpc-contract/session-terminal-scrollback-params'
+import { SessionReadTerminalScrollbackParams } from '../../../../../shared/rpc-contract/session-tabs/session-terminal-scrollback-params'
 import { defineMethod } from '../../core'
 import { servesWslMovedPaneHistory } from '../../../../orcad/migration/orcad-migration-wsl-destination'
 
diff --git a/src/main/runtime/rpc/methods/terminal/stream-schemas.ts b/src/main/runtime/rpc/methods/terminal/stream-schemas.ts
index d2399e88306..26ccc996875 100644
--- a/src/main/runtime/rpc/methods/terminal/stream-schemas.ts
+++ b/src/main/runtime/rpc/methods/terminal/stream-schemas.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 import { requiredString } from '../../../../../shared/rpc-contract/rpc-param-primitives'
-import { TerminalViewport } from '../../../../../shared/rpc-contract/terminal-unary-params'
-import { TerminalHandle } from '../../../../../shared/rpc-contract/terminal-stream-params'
+import { TerminalViewport } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
+import { TerminalHandle } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 
 export const TerminalMultiplexSubscribeFrame = TerminalHandle.extend({
   streamId: z.number().int().min(1),
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-claude-agent-view-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-claude-agent-view-method.ts
index 1dbd6138ff0..717ca5e0308 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-claude-agent-view-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-claude-agent-view-method.ts
@@ -4,7 +4,7 @@ import {
 } from '../../../terminal/input/terminal-input-admission'
 import { defineMethod, defineStreamingMethod } from '../../core'
 import { bindStructuredAgentSessionStream } from '../structured-sessions/subscriptions/structured-agent-session-status-stream'
-import { TerminalViewClaudeAgent } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import { TerminalViewClaudeAgent } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 import { agentHookServer } from '../../../../agent-hooks/server/agent-hook-server'
 import { assertTerminalAgentSendable } from '../../terminal/terminal-agent-send-guard'
 import {
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-codex-question-skip-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-codex-question-skip-method.ts
index 95988fbb55e..c727036a982 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-codex-question-skip-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-codex-question-skip-method.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { TerminalInferCodexQuestionSkip } from '../../../../../shared/rpc-contract/terminal-codex-question-params'
+import { TerminalInferCodexQuestionSkip } from '../../../../../shared/rpc-contract/terminal/terminal-codex-question-params'
 import { agentHookServer } from '../../../../agent-hooks/server/agent-hook-server'
 
 /** Codex reports no async-question skip, and this host's hook state tracks the question, so a
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-daemon.ts b/src/main/runtime/rpc/methods/terminal/terminal-daemon.ts
index efb29bd6a5e..149fc6f3a8b 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-daemon.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-daemon.ts
@@ -1,5 +1,5 @@
-import { TerminalLimitUpdateParams } from '../../../../../shared/rpc-contract/terminal-limit-params'
-import { TerminalDaemonRestartSeveredParams } from '../../../../../shared/rpc-contract/terminal-daemon-params'
+import { TerminalLimitUpdateParams } from '../../../../../shared/rpc-contract/terminal/terminal-limit-params'
+import { TerminalDaemonRestartSeveredParams } from '../../../../../shared/rpc-contract/terminal/terminal-daemon-params'
 import {
   readSeveredDaemonStatus,
   restartSeveredDaemon
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
index 1e376f444b2..7d9f201e01b 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-lifecycle-methods.ts
@@ -17,8 +17,8 @@ import {
   TerminalReveal,
   TerminalSplit,
   TerminalWait
-} from '../../../../../shared/rpc-contract/terminal-unary-params'
-import { TerminalResizeForClient } from '../../../../../shared/rpc-contract/terminal-stream-params'
+} from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
+import { TerminalResizeForClient } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 
 export const TERMINAL_LIFECYCLE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-method.ts
index 6ad247c411f..d79e4c6146d 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-multiplex-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-multiplex-method.ts
@@ -5,7 +5,7 @@ import {
   TERMINAL_MULTIPLEX_MAX_PENDING_PTY_WAITS_PER_CONNECTION,
   TERMINAL_MULTIPLEX_MAX_QUEUED_PTY_WAITS_PER_CONNECTION
 } from '../../../../../shared/terminal/stream/terminal-multiplex-flow-control'
-import { TerminalMultiplex } from '../../../../../shared/rpc-contract/terminal-stream-params'
+import { TerminalMultiplex } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 import type { TerminalMultiplexConnection } from './terminal-multiplex-connection'
 import type { TerminalMultiplexStream } from './terminal-stream-types'
 import { installMultiplexFrameDelivery } from './terminal-multiplex-frame-delivery'
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-orphan.ts b/src/main/runtime/rpc/methods/terminal/terminal-orphan.ts
index e8455a3c204..c75cafccdfd 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-orphan.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-orphan.ts
@@ -1,5 +1,5 @@
 import { defineMethod } from '../../core'
-import { TerminalAdoptOrphans } from '../../../../../shared/rpc-contract/terminal-orphan-params'
+import { TerminalAdoptOrphans } from '../../../../../shared/rpc-contract/terminal/terminal-orphan-params'
 
 export const TERMINAL_ORPHAN_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
index cb615156381..969baafb908 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-query-methods.ts
@@ -19,7 +19,7 @@ import {
   TerminalResolveActive,
   TerminalResolvePane,
   TerminalSetPaneTitle
-} from '../../../../../shared/rpc-contract/terminal-unary-params'
+} from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 
 export const TERMINAL_QUERY_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-input-sequence.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-input-sequence.ts
index d92808f62a8..0741c58eb79 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-input-sequence.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-input-sequence.ts
@@ -4,7 +4,7 @@ import { TERMINAL_INPUT_MAX_BYTES } from '../../../../../shared/terminal/input/t
 import {
   TerminalOpenInputSession,
   type TerminalSend
-} from '../../../../../shared/rpc-contract/terminal-unary-params'
+} from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 import type { RuntimeTerminalSend } from '../../../../../shared/runtime-terminal-send-contract'
 import {
   terminalOrderedInputControls,
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
index 0880b953e70..4b1860dafc4 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-method.ts
@@ -7,7 +7,7 @@ import { InvalidArgumentError, defineMethod } from '../../core'
 import { isTerminalQueryReply } from '../../../../../shared/terminal/protocol/queries/terminal-query-reply'
 import { isUntypedTerminalInput } from '../../../../../shared/terminal/input/terminal-untyped-input'
 import { assertTerminalAgentSendable } from '../../terminal/terminal-agent-send-guard'
-import { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import { TerminalSend } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 import type { RuntimeTerminalSend } from '../../../../../shared/runtime-terminal-send-contract'
 import {
   assertTerminalSendExactPtyBinding,
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-send-question-answered.ts b/src/main/runtime/rpc/methods/terminal/terminal-send-question-answered.ts
index 001bfb60da3..8786663266c 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-send-question-answered.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-send-question-answered.ts
@@ -1,7 +1,7 @@
 import type { z } from 'zod'
 import { agentHookServer } from '../../../../agent-hooks/server/agent-hook-server'
 import type { OrcaRuntimeService } from '../../../orca-runtime'
-import type { TerminalSend } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import type { TerminalSend } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 import {
   isPotentialQuestionAnsweredSubmitInput,
   isQuestionAnsweredSubmitInput,
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
index 038f2012172..2a06bb37a4b 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-method.ts
@@ -1,5 +1,5 @@
 import { defineStreamingMethod } from '../../core'
-import { TerminalSubscribe } from '../../../../../shared/rpc-contract/terminal-stream-params'
+import { TerminalSubscribe } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 import { isTerminalReadPayloadIncomplete } from './terminal-stream-replay'
 import { runTerminalBinarySubscription } from './terminal-subscribe-binary'
 import {
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-types.ts b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-types.ts
index ed1bb102662..8cb9562a9ef 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-subscribe-types.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-subscribe-types.ts
@@ -2,7 +2,7 @@ import type { z } from 'zod'
 import type { RpcContext } from '../../core'
 import type { TerminalReplyQuerySequence } from '../../../../../shared/terminal/protocol/queries/terminal-reply-query-scan'
 import type { TerminalOutputChunk } from './terminal-stream-types'
-import type { TerminalSubscribe } from '../../../../../shared/rpc-contract/terminal-stream-params'
+import type { TerminalSubscribe } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 import type { TerminalOutputBatcher } from './terminal-output-batcher'
 import type { TerminalStreamOpcode } from '../../../../../shared/terminal/stream/terminal-stream-protocol'
 import type { TerminalSubscriptionRegistration } from './terminal-subscription-registration'
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-viewer-colors-method.ts b/src/main/runtime/rpc/methods/terminal/terminal-viewer-colors-method.ts
index 850c3c4cf20..7a9cb0cd60c 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-viewer-colors-method.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-viewer-colors-method.ts
@@ -5,7 +5,7 @@ import {
   setPairedViewerColors
 } from '../../../terminal/view/terminal-view-attribute-store'
 import { validateTerminalViewAttributes } from '../../../../../shared/terminal/protocol/queries/terminal-view-attributes'
-import { TerminalSetViewerColors } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import { TerminalSetViewerColors } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 
 export const TERMINAL_VIEWER_COLORS_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
index aca8edec36c..48429cff36f 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-viewport-methods.ts
@@ -1,14 +1,14 @@
 import { defineMethod } from '../../core'
-import { TerminalHandle } from '../../../../../shared/rpc-contract/terminal-unary-params'
+import { TerminalHandle } from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 import {
   TerminalSetAutoRestoreFit,
   TerminalSetDisplayMode,
   TerminalUnsubscribe,
   TerminalUpdateViewport
-} from '../../../../../shared/rpc-contract/terminal-viewport-schemas-params'
+} from '../../../../../shared/rpc-contract/terminal/terminal-viewport-schemas-params'
 import { updateViewportForClient } from './terminal-viewport-update'
-import { TerminalGetAutoRestoreFitParams } from '../../../../../shared/rpc-contract/terminal-viewport-methods-params'
-import { TerminalAckOutput } from '../../../../../shared/rpc-contract/terminal-stream-params'
+import { TerminalGetAutoRestoreFitParams } from '../../../../../shared/rpc-contract/terminal/terminal-viewport-methods-params'
+import { TerminalAckOutput } from '../../../../../shared/rpc-contract/terminal/terminal-stream-params'
 import { acknowledgeTerminalStreamOutput } from './terminal-stream-tokens'
 
 export const TERMINAL_VIEWPORT_METHODS_BEFORE_STREAMS = [
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-workspace-stop-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-workspace-stop-methods.ts
index 4b957d6851e..957ee36ccce 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-workspace-stop-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-workspace-stop-methods.ts
@@ -11,7 +11,7 @@ import {
   TerminalSleep,
   TerminalStop,
   TerminalStopExact
-} from '../../../../../shared/rpc-contract/terminal-unary-params'
+} from '../../../../../shared/rpc-contract/terminal/terminal-unary-params'
 
 /** Stopping every terminal of a workspace; closing and sleeping them wait in its lifecycle queue. */
 export const TERMINAL_WORKSPACE_STOP_METHODS = [
diff --git a/src/main/runtime/rpc/methods/updater/updater.ts b/src/main/runtime/rpc/methods/updater/updater.ts
index 01a760a019f..ba1e3e2cc70 100644
--- a/src/main/runtime/rpc/methods/updater/updater.ts
+++ b/src/main/runtime/rpc/methods/updater/updater.ts
@@ -5,7 +5,7 @@ import {
   getRemoteServerUpdaterSnapshot,
   installRemoteServerUpdater
 } from '../../../hosts/management/remote-server-updater'
-import { UpdaterCheckParams } from '../../../../../shared/rpc-contract/updater-params'
+import { UpdaterCheckParams } from '../../../../../shared/rpc-contract/updater/updater-params'
 
 export const UPDATER_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/workspace-layout/workspace-layout.ts b/src/main/runtime/rpc/methods/workspace-layout/workspace-layout.ts
index 45f8883a884..4a2c780ce86 100644
--- a/src/main/runtime/rpc/methods/workspace-layout/workspace-layout.ts
+++ b/src/main/runtime/rpc/methods/workspace-layout/workspace-layout.ts
@@ -10,8 +10,8 @@ import {
   LayoutReportViewParams,
   LayoutSubscribeParams,
   LayoutUnsubscribeParams
-} from '../../../../../shared/rpc-contract/workspace-layout-params'
-import { LayoutReopenHeldPanesParams } from '../../../../../shared/rpc-contract/workspace-layout-held-panes-params'
+} from '../../../../../shared/rpc-contract/workspace-layout/workspace-layout-params'
+import { LayoutReopenHeldPanesParams } from '../../../../../shared/rpc-contract/workspace-layout/workspace-layout-held-panes-params'
 import type { WorkspaceLayoutStreamFrame } from '../../../../../shared/workspace-layout/published-layout/workspace-layout-stream-frames'
 import { defineMethod, defineStreamingMethod } from '../../core'
 import { getAppEnvironment } from '../../../../../shared/app-environment'
diff --git a/src/main/runtime/rpc/methods/workspace-ports/workspace-ports.ts b/src/main/runtime/rpc/methods/workspace-ports/workspace-ports.ts
index d39b3c2aa8e..cc62df52bf4 100644
--- a/src/main/runtime/rpc/methods/workspace-ports/workspace-ports.ts
+++ b/src/main/runtime/rpc/methods/workspace-ports/workspace-ports.ts
@@ -5,7 +5,7 @@ import {
   WorkspacePortProbePageParams,
   WorkspacePortScanHostParams,
   WorkspacePortScanParams
-} from '../../../../../shared/rpc-contract/workspace-ports-params'
+} from '../../../../../shared/rpc-contract/workspaces/workspace-ports-params'
 import { probeWorkspacePortPage } from '../../../../ports/workspace-port-page-probe'
 
 export const WORKSPACE_PORT_METHODS = [
diff --git a/src/main/runtime/rpc/methods/workspaces/agent-activity-methods.ts b/src/main/runtime/rpc/methods/workspaces/agent-activity-methods.ts
index 24cfcf523b6..2f9d14ce052 100644
--- a/src/main/runtime/rpc/methods/workspaces/agent-activity-methods.ts
+++ b/src/main/runtime/rpc/methods/workspaces/agent-activity-methods.ts
@@ -2,7 +2,7 @@ import { defineMethod } from '../../core'
 import {
   AgentActivityClearParams,
   AgentActivitySetReadParams
-} from '../../../../../shared/rpc-contract/agent-activity-params'
+} from '../../../../../shared/rpc-contract/agent-activity/agent-activity-params'
 
 // Desktop Agents-list read and clear for paired clients; the next worktree.ps already reflects them.
 export const AGENT_ACTIVITY_METHODS = [
diff --git a/src/main/runtime/rpc/methods/workspaces/folder-workspace.ts b/src/main/runtime/rpc/methods/workspaces/folder-workspace.ts
index d9bc6861f0c..4eaaec576ee 100644
--- a/src/main/runtime/rpc/methods/workspaces/folder-workspace.ts
+++ b/src/main/runtime/rpc/methods/workspaces/folder-workspace.ts
@@ -5,7 +5,7 @@ import {
   FolderWorkspaceDelete,
   FolderWorkspacePathStatus,
   FolderWorkspaceUpdate
-} from '../../../../../shared/rpc-contract/folder-workspace-params'
+} from '../../../../../shared/rpc-contract/workspaces/folder-workspace-params'
 
 export const FOLDER_WORKSPACE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-runner-methods.ts b/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-runner-methods.ts
index b98eef1db9e..4292497a1bc 100644
--- a/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-runner-methods.ts
+++ b/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-runner-methods.ts
@@ -2,7 +2,7 @@ import {
   WorkspaceCleanupPreviewParams,
   WorkspaceCleanupReportUnsavedEditorsParams,
   WorkspaceCleanupRunNowParams
-} from '../../../../../shared/rpc-contract/workspace-cleanup-runner-params'
+} from '../../../../../shared/rpc-contract/workspace-cleanup/workspace-cleanup-runner-params'
 import { requireWorkspaceCleanupRunner } from '../../../../workspaces/cleanup/workspace-cleanup-runner-registry'
 import { reportClientUnsavedEditors } from '../../../../workspaces/cleanup/workspace-cleanup-client-unsaved-editors'
 import { defineMethod } from '../../core'
diff --git a/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-scan-method.ts b/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-scan-method.ts
index 6582b527569..8b3f1f89c1b 100644
--- a/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-scan-method.ts
+++ b/src/main/runtime/rpc/methods/workspaces/workspace-cleanup-scan-method.ts
@@ -1,4 +1,4 @@
-import { WorkspaceCleanupScanParams } from '../../../../../shared/rpc-contract/workspace-cleanup-scan-params'
+import { WorkspaceCleanupScanParams } from '../../../../../shared/rpc-contract/workspace-cleanup/workspace-cleanup-scan-params'
 import { scanWorkspaceCleanup } from '../../../../ipc/workspace-cleanup/workspace-cleanup-scan'
 import { defineMethod } from '../../core'
 
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-archive-methods.ts b/src/main/runtime/rpc/methods/workspaces/worktree-archive-methods.ts
new file mode 100644
index 00000000000..aa62076298a
--- /dev/null
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-archive-methods.ts
@@ -0,0 +1,47 @@
+import {
+  WorktreeArchive,
+  WorktreeRestore
+} from '../../../../../shared/rpc-contract/workspaces/worktree-params'
+import {
+  queueWorkspaceArchive,
+  queueWorkspaceRestore
+} from '../../../workspaces/lifecycle/workspace-lifecycle-commands'
+import { defineMethod } from '../../core'
+import { resolvePairedCallerHostId } from '../pairing/paired-caller-host-id'
+
+// Not on the mobile allowlist or in the CLI until archive ships (WORKSPACE_ARCHIVE_SUPPORTED).
+export const WORKTREE_ARCHIVE_METHODS = [
+  defineMethod({
+    name: 'worktree.archive',
+    permission: 'workspace',
+    params: WorktreeArchive,
+    handler: async (params, { runtime }) => {
+      const hostId = resolvePairedCallerHostId(
+        () => runtime.listRepos(),
+        params.worktree,
+        params.hostId
+      )
+      return queueWorkspaceArchive(runtime, params.worktree, hostId, () =>
+        runtime.archiveManagedWorktree(params.worktree, hostId ? { hostId } : {})
+      )
+    }
+  }),
+  defineMethod({
+    name: 'worktree.restore',
+    permission: 'workspace',
+    params: WorktreeRestore,
+    handler: async (params, { runtime }) => {
+      const hostId = resolvePairedCallerHostId(
+        () => runtime.listRepos(),
+        params.worktree,
+        params.hostId
+      )
+      return queueWorkspaceRestore(runtime, params.worktree, hostId, () =>
+        runtime.restoreArchivedWorktree(params.worktree, {
+          ...(hostId ? { hostId } : {}),
+          ...(params.setupDecision ? { setupDecision: params.setupDecision } : {})
+        })
+      )
+    }
+  })
+]
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-catalog-methods.ts b/src/main/runtime/rpc/methods/workspaces/worktree-catalog-methods.ts
index 95bee9aba6d..d6778ea2e11 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree-catalog-methods.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-catalog-methods.ts
@@ -12,7 +12,7 @@ import {
   WorktreeDetectedListParams,
   WorktreeListParams,
   WorktreePsParams
-} from '../../../../../shared/rpc-contract/worktree-params'
+} from '../../../../../shared/rpc-contract/workspaces/worktree-params'
 
 export const WORKTREE_CATALOG_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-create-args.ts b/src/main/runtime/rpc/methods/workspaces/worktree-create-args.ts
index ac762c286f6..b1a3d369949 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree-create-args.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-create-args.ts
@@ -8,7 +8,7 @@ import {
   hostQualifiedRepoSelector,
   type RuntimeRepoSelector
 } from '../../../workspaces/catalog/runtime-repo-selector'
-import type { WorktreeCreate } from '../../../../../shared/rpc-contract/worktree-create-params'
+import type { WorktreeCreate } from '../../../../../shared/rpc-contract/workspaces/worktree-create-params'
 
 type WorktreeCreateParams = z.infer<typeof WorktreeCreate>
 type ManagedWorktreeCreateArgs = Parameters<OrcaRuntimeService['createManagedWorktree']>[0]
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-provisioned-root-method.ts b/src/main/runtime/rpc/methods/workspaces/worktree-provisioned-root-method.ts
index d5f43b17663..5b8d0796cf4 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree-provisioned-root-method.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-provisioned-root-method.ts
@@ -1,5 +1,5 @@
 import { getLocalWorktreeCatalogVersion } from '../../../../workspaces/catalog/local-worktree-scan-generation'
-import { WorktreeAdoptProvisionedRoot } from '../../../../../shared/rpc-contract/worktree-provisioned-root-params'
+import { WorktreeAdoptProvisionedRoot } from '../../../../../shared/rpc-contract/workspaces/worktree-provisioned-root-params'
 import { defineMethod } from '../../core'
 
 export const WORKTREE_PROVISIONED_ROOT_METHOD = defineMethod({
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-set-method.ts b/src/main/runtime/rpc/methods/workspaces/worktree-set-method.ts
index 1f906db7f38..e123f5f91e6 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree-set-method.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-set-method.ts
@@ -1,4 +1,4 @@
-import { WorktreeSet } from '../../../../../shared/rpc-contract/worktree-params'
+import { WorktreeSet } from '../../../../../shared/rpc-contract/workspaces/worktree-params'
 import { displayNameUpdatePinsLabel } from '../../../../../shared/worktree/display-name-provenance'
 import { getWorkspaceStatusWarning } from '../../../../../shared/workspace-status-warning'
 import { defineMethod } from '../../core'
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree-sleep-method.ts b/src/main/runtime/rpc/methods/workspaces/worktree-sleep-method.ts
index b1d7beb95c7..3b57ab713c3 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree-sleep-method.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree-sleep-method.ts
@@ -1,4 +1,4 @@
-import { WorktreeSleepParams } from '../../../../../shared/rpc-contract/worktree-params'
+import { WorktreeSleepParams } from '../../../../../shared/rpc-contract/workspaces/worktree-params'
 import { defineMethod } from '../../core'
 
 export const WORKTREE_SLEEP_METHOD = defineMethod({
diff --git a/src/main/runtime/rpc/methods/workspaces/worktree.ts b/src/main/runtime/rpc/methods/workspaces/worktree.ts
index 6a4597cdf8b..3030b8a9eff 100644
--- a/src/main/runtime/rpc/methods/workspaces/worktree.ts
+++ b/src/main/runtime/rpc/methods/workspaces/worktree.ts
@@ -19,7 +19,7 @@ import { resolveRpcWorkspaceCreatorProvenance } from '../../callers/workspace-cr
 import {
   WorktreeCreate,
   WorktreePrefetchCreateBase
-} from '../../../../../shared/rpc-contract/worktree-create-params'
+} from '../../../../../shared/rpc-contract/workspaces/worktree-create-params'
 import {
   WorktreeActivate,
   WorktreeForceDeleteBranch,
@@ -32,7 +32,7 @@ import {
   WorktreeSortOrder,
   WorktreeTeardownMissingTerminalsParams,
   WorktreeResolveCallerParent
-} from '../../../../../shared/rpc-contract/worktree-params'
+} from '../../../../../shared/rpc-contract/workspaces/worktree-params'
 import { WORKTREE_CATALOG_METHODS } from './worktree-catalog-methods'
 import { WORKTREE_PROVISIONED_ROOT_METHOD } from './worktree-provisioned-root-method'
 import { waitsForWorktreeRemoval } from '../../workspace-client-views/worktree-removal-marker-projection'
diff --git a/src/main/runtime/rpc/orchestration/callers/worker-caller-identity-restore-wait.ts b/src/main/runtime/rpc/orchestration/callers/worker-caller-identity-restore-wait.ts
index eb2391441ca..11c3cc62d40 100644
--- a/src/main/runtime/rpc/orchestration/callers/worker-caller-identity-restore-wait.ts
+++ b/src/main/runtime/rpc/orchestration/callers/worker-caller-identity-restore-wait.ts
@@ -1,7 +1,7 @@
 import type { OrcaRuntimeService } from '../../../orca-runtime'
 import type { RpcRequest } from '../../core'
 import type { OrchestrationCallerField } from '../../methods/orchestration/access/orchestration-method-access'
-import { isDispatchMutationMessageType } from '../../../../../shared/rpc-contract/orchestration-params'
+import { isDispatchMutationMessageType } from '../../../../../shared/rpc-contract/orchestration/orchestration-params'
 
 // The calls a worker makes as itself, each fenced on its terminal's pane and process.
 const WORKER_REPORT_METHODS: ReadonlySet<string> = new Set([
diff --git a/src/main/runtime/rpc/responses/rpc-response.ts b/src/main/runtime/rpc/responses/rpc-response.ts
index 8acb0bcb772..cc8459e90ec 100644
--- a/src/main/runtime/rpc/responses/rpc-response.ts
+++ b/src/main/runtime/rpc/responses/rpc-response.ts
@@ -14,7 +14,7 @@ import {
   type AgentSessionRefusalError
 } from '../../../../shared/agent-session/failures/agent-session-wire-refusals'
 import type { RpcEnvelopeMeta, RpcFailure, RpcSuccess } from '../core'
-import { CONNECTOR_REPLY_ERROR_CODES } from '../../../../shared/rpc-contract/connector-params'
+import { CONNECTOR_REPLY_ERROR_CODES } from '../../../../shared/rpc-contract/connectors/connector-params'
 import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES } from '../../../../shared/orchestration/orchestration-session-caller-codes'
 import { ORCHESTRATION_FEDERATION_ERROR_CODES } from '../../../../shared/orchestration/orchestration-federation-error-codes'
 import { computerUseErrorRecoveryData } from '../../../../shared/computer-use-error-recovery'
diff --git a/src/main/runtime/rpc/server/runtime-rpc-websocket-dispatch.ts b/src/main/runtime/rpc/server/runtime-rpc-websocket-dispatch.ts
index a6905605318..7f20aa95723 100644
--- a/src/main/runtime/rpc/server/runtime-rpc-websocket-dispatch.ts
+++ b/src/main/runtime/rpc/server/runtime-rpc-websocket-dispatch.ts
@@ -17,7 +17,7 @@ import { limitRuntimeRpcReplySize } from './runtime-rpc-reply-size-limit'
 import { MOBILE_RPC_METHOD_ALLOWLIST } from './runtime-rpc-mobile-method-allowlist'
 import { MOBILE_RPC_METHOD_ROUTES } from './runtime-rpc-mobile-method-routing'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { WorktreeRemove } from '../../../../shared/rpc-contract/worktree-params'
+import { WorktreeRemove } from '../../../../shared/rpc-contract/workspaces/worktree-params'
 
 // Stamp proven scope at transport boundary; status.get has no connection context.
 function injectDeviceScope(response: string, scope: DeviceScope): string {
diff --git a/src/main/runtime/rpc/terminal/terminal-subscribe-admission.test.ts b/src/main/runtime/rpc/terminal/terminal-subscribe-admission.test.ts
index 97d80d9b932..597a6384986 100644
--- a/src/main/runtime/rpc/terminal/terminal-subscribe-admission.test.ts
+++ b/src/main/runtime/rpc/terminal/terminal-subscribe-admission.test.ts
@@ -3,7 +3,7 @@ import { OrcaRuntimeService } from '../../orca-runtime'
 import type { RpcRequest } from '../core'
 import { RpcDispatcher } from '../dispatcher'
 import { TERMINAL_METHODS } from '../methods/terminal/terminal'
-import '../../../../shared/rpc-contract/terminal-viewport-schemas-params'
+import '../../../../shared/rpc-contract/terminal/terminal-viewport-schemas-params'
 
 const PTY_ID = 'pty-1'
 const SUBSCRIPTION_ID = 'terminal-1:phone-1'
diff --git a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
index 82df9196a57..5be62aad56f 100644
--- a/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
+++ b/src/main/runtime/session-lifecycle/projection/build-headless-mobile-session-browser-tabs.ts
@@ -51,6 +51,7 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
           ].filter((tab) => !rendererPageIds.has(tab.browserPageId))
         : []
     const publishedServerTabs = serverTabs.map((tab) => {
+      const navigation = this.agentBrowserBridge?.getPageNavigationState(tab.browserPageId)
       const persistedProps = this.getPersistedUnifiedSessionTabProps(
         worktreeId,
         this.serveBrowserTabs.unifiedTabId(worktreeId, tab.browserPageId)
@@ -64,9 +65,9 @@ export abstract class OrcaRuntimeWithBuildHeadlessMobileSessionBrowserTabs exten
         browserPageId: tab.browserPageId,
         browserProfileId: tab.profileId ?? undefined,
         url: tab.url || 'about:blank',
-        loading: false,
-        canGoBack: false,
-        canGoForward: false,
+        loading: navigation?.loading ?? false,
+        canGoBack: navigation?.canGoBack ?? false,
+        canGoForward: navigation?.canGoForward ?? false,
         faviconUrl: this.agentBrowserBridge?.getRemoteTabFaviconUrl(tab.browserPageId) ?? null,
         loadError: tab.loadError ?? undefined,
         certificateFailure: tab.certificateFailure ?? undefined,
diff --git a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
index 4c09deeffb2..762208b1bc4 100644
--- a/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
+++ b/src/main/runtime/session-tabs/structured-session-tab-restoration.ts
@@ -13,7 +13,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
 import type { RuntimeRepoSearchRefs } from '../../../shared/runtime-worktree-contracts'
 import { REPO_SEARCH_REFS_DEFAULT_LIMIT as DEFAULT_REPO_SEARCH_REFS_LIMIT } from '../../../shared/repo-search-limits'
 import type { Repo } from '../../../shared/repo-types'
-import type { GitAdmissionTier } from '../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import {
   getLocalProjectGhExecOptions,
   type LocalProjectGhExecOptions
diff --git a/src/main/runtime/sidebar-inputs/temporal/workspace-viewers.ts b/src/main/runtime/sidebar-inputs/temporal/workspace-viewers.ts
index 3d7a38f27ca..e5e379f9730 100644
--- a/src/main/runtime/sidebar-inputs/temporal/workspace-viewers.ts
+++ b/src/main/runtime/sidebar-inputs/temporal/workspace-viewers.ts
@@ -1,6 +1,6 @@
 import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
 import { worktreeIdentityKey } from '../../../../shared/worktree/id'
-import type { ClientWorkspaceView } from '../../../../shared/rpc-contract/client-workspace-view-params'
+import type { ClientWorkspaceView } from '../../../../shared/rpc-contract/client-ui/client-workspace-view-params'
 
 type ClientView = { workspaceKeys: Set<string>; tabIds: Set<string>; presentUntil: number }
 
diff --git a/src/main/runtime/speech/mobile-dictation-chunk-order.ts b/src/main/runtime/speech/mobile-dictation-chunk-order.ts
index 0b18522fe23..9e5ec6915ed 100644
--- a/src/main/runtime/speech/mobile-dictation-chunk-order.ts
+++ b/src/main/runtime/speech/mobile-dictation-chunk-order.ts
@@ -1,4 +1,4 @@
-import { MOBILE_DICTATION_MAX_PENDING_AUDIO_BYTES } from '../../../shared/rpc-contract/speech-params'
+import { MOBILE_DICTATION_MAX_PENDING_AUDIO_BYTES } from '../../../shared/rpc-contract/speech/speech-params'
 
 export type MobileDictationChunk = { audioBase64: string; sampleRate: number }
 
diff --git a/src/main/runtime/speech/runtime-mobile-dictation-controller.test.ts b/src/main/runtime/speech/runtime-mobile-dictation-controller.test.ts
index d113ac4a69f..6e37bf80402 100644
--- a/src/main/runtime/speech/runtime-mobile-dictation-controller.test.ts
+++ b/src/main/runtime/speech/runtime-mobile-dictation-controller.test.ts
@@ -4,7 +4,7 @@ import {
   setSpeechServiceFactories,
   type SpeechServiceFactories
 } from '../../speech/speech-runtime-service'
-import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../shared/rpc-contract/speech-params'
+import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../shared/rpc-contract/speech/speech-params'
 import { RuntimeMobileDictationController } from './runtime-mobile-dictation-controller'
 import type { RuntimeStore } from '../construction/runtime-store-contract'
 
@@ -102,16 +102,6 @@ describe('mobile dictation across a phone reconnect', () => {
     })
   })
 
-  it('releases the speech model when the phone goes quiet for the grace', async () => {
-    const controller = await startPhoneDictation()
-    transcription = new Promise(() => {})
-
-    await vi.advanceTimersByTimeAsync(MOBILE_DICTATION_RECONNECT_GRACE_MS)
-
-    expect(stopDictation).toHaveBeenCalledOnce()
-    expect(() => controller.feed(chunk)).toThrow('dictation_stream_not_started')
-  })
-
   it('feeds resent audio once and in the order it was spoken', async () => {
     const controller = await startPhoneDictation()
     const spoken = (seq: number) => ({
diff --git a/src/main/runtime/speech/runtime-mobile-dictation-controller.ts b/src/main/runtime/speech/runtime-mobile-dictation-controller.ts
index b8fcd55e23f..0f06a9c5c9c 100644
--- a/src/main/runtime/speech/runtime-mobile-dictation-controller.ts
+++ b/src/main/runtime/speech/runtime-mobile-dictation-controller.ts
@@ -1,5 +1,5 @@
 import { getDefaultVoiceSettings } from '../../../shared/constants'
-import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../shared/rpc-contract/speech-params'
+import { MOBILE_DICTATION_RECONNECT_GRACE_MS } from '../../../shared/rpc-contract/speech/speech-params'
 import { speechModelNotReadyError } from '../../../shared/speech-model-retirement'
 import { getSpeechModelManager, getSpeechSttService } from '../../speech/speech-runtime-service'
 import { getCatalogModel, isLocalSpeechModel } from '../../speech/model-catalog'
diff --git a/src/main/runtime/terminal/output/host-terminal-scrollback-read.ts b/src/main/runtime/terminal/output/host-terminal-scrollback-read.ts
index a4ffa4a7ac1..6cd26cced20 100644
--- a/src/main/runtime/terminal/output/host-terminal-scrollback-read.ts
+++ b/src/main/runtime/terminal/output/host-terminal-scrollback-read.ts
@@ -1,5 +1,5 @@
 import type { WorkspaceSessionState } from '../../../../shared/workspace-session/workspace-session-state-types'
-import type { SessionReadTerminalScrollbackResult } from '../../../../shared/rpc-contract/session-terminal-scrollback-params'
+import type { SessionReadTerminalScrollbackResult } from '../../../../shared/rpc-contract/session-tabs/session-terminal-scrollback-params'
 import { TERMINAL_SCROLLBACK_STORE_BYTE_LIMIT } from '../../../../shared/terminal/replay/terminal-scrollback-limits'
 
 export type HostTerminalScrollbackReadDeps = {
diff --git a/src/main/runtime/terminal/output/runtime-client-scrollback.ts b/src/main/runtime/terminal/output/runtime-client-scrollback.ts
index 53ee72e3c5d..c77a69afb89 100644
--- a/src/main/runtime/terminal/output/runtime-client-scrollback.ts
+++ b/src/main/runtime/terminal/output/runtime-client-scrollback.ts
@@ -1,5 +1,5 @@
 import { OrcaRuntimeWithMigrationCatalog } from '../../hosts/migration/runtime-migration-catalog'
-import type { SessionReadTerminalScrollbackResult } from '../../../../shared/rpc-contract/session-terminal-scrollback-params'
+import type { SessionReadTerminalScrollbackResult } from '../../../../shared/rpc-contract/session-tabs/session-terminal-scrollback-params'
 import {
   readHostTerminalScrollback,
   type HostTerminalScrollbackReadRequest
diff --git a/src/main/runtime/terminal/title/runtime-terminal-names.ts b/src/main/runtime/terminal/title/runtime-terminal-names.ts
index 448c6ef3f50..5286ccfc2b5 100644
--- a/src/main/runtime/terminal/title/runtime-terminal-names.ts
+++ b/src/main/runtime/terminal/title/runtime-terminal-names.ts
@@ -3,9 +3,9 @@ import type {
   RuntimeTerminalSetPaneTitle
 } from '../../../../shared/runtime-terminal-contracts'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { RuntimeNestedWorktreeRemoval } from '../../workspaces/removal/runtime-nested-worktree-removal'
+import { RuntimeWorkspaceArchive } from '../../workspaces/archive/runtime-workspace-archive'
 
-export abstract class RuntimeTerminalNames extends RuntimeNestedWorktreeRemoval {
+export abstract class RuntimeTerminalNames extends RuntimeWorkspaceArchive {
   async renameTerminal(handle: string, title: string | null): Promise<RuntimeTerminalRename> {
     // Switch point: a terminal main owns is renamed in main's layout, with or without a window.
     const mainRename = ORCA_LAYOUT_OWNER_IS_MAIN
diff --git a/src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts b/src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts
index e3b7efea742..e44a6ebe0c5 100644
--- a/src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts
+++ b/src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts
@@ -1,13 +1,6 @@
-import { describe, vi } from 'vitest'
-import './agent-transcript-replay-test-harness'
-import { describeScreenRuledAgentTranscripts } from './screen-ruled-agent-transcript-suite'
-
-vi.mock('electron', () => ({
-  BrowserWindow: { fromId: vi.fn(() => null) },
-  webContents: { fromId: vi.fn(() => null) },
-  ipcMain: { on: vi.fn(), removeListener: vi.fn() },
-  app: { getPath: vi.fn(() => '/tmp') }
-}))
+import { describe, expect, it } from 'vitest'
+import { finalReplayFrame } from './agent-transcript-replay-test-harness'
+import { evaluateAgentStateRules } from '../../agent-state-rules/agent-state-rules-engine'
 
 // prime-agent 0.9.8 on macOS, OpenRouter, isolated HOME; 0.9.5 recorded for PR #22154 (see
 // each .meta.json); STA-8741.
@@ -30,11 +23,17 @@ const NOT_READY = [
 ]
 
 describe('Prime Agent readiness from captured bytes', () => {
-  describeScreenRuledAgentTranscripts({
-    agent: 'prime-agent',
-    foregroundProcess: 'prime-agent',
-    ready: READY,
-    notReady: NOT_READY,
-    readyWithoutScreen: READY.map(({ name }) => name)
+  it.each(READY)('$name ($what) reads ready', async ({ name, cols, rows }) => {
+    const { ruledScreenLines } = await finalReplayFrame(name, cols, rows)
+    expect(
+      evaluateAgentStateRules('prime-agent', { readScreenLines: () => ruledScreenLines })?.state
+    ).toBe('idle')
+  })
+
+  it.each(NOT_READY)('$name ($what) does not read ready', async ({ name, cols, rows }) => {
+    const { ruledScreenLines } = await finalReplayFrame(name, cols, rows)
+    expect(
+      evaluateAgentStateRules('prime-agent', { readScreenLines: () => ruledScreenLines })?.state
+    ).not.toBe('idle')
   })
 })
diff --git a/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts b/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts
deleted file mode 100644
index 43f4d71c54d..00000000000
--- a/src/main/runtime/terminal/wait/screen-ruled-agent-transcript-suite.ts
+++ /dev/null
@@ -1,249 +0,0 @@
-// One replay suite for every agent whose readiness its live screen decides (terminal-wait-detection.ts).
-import { describe, expect, it, vi } from 'vitest'
-import {
-  createTranscriptPane,
-  TRANSCRIPT_PANE_PTY_ID,
-  waitForTranscriptIdle
-} from '../../orca-runtime-tests/agent-transcript-pane-test-harness'
-import {
-  finalReadProjection,
-  finalReplayFrame,
-  readRuntimeFixture,
-  type TranscriptReplayResize
-} from './agent-transcript-replay-test-harness'
-import { isQuietReadyScreenBody } from './terminal-wait-detection'
-import { evaluateAgentStateRules } from '../../agent-state-rules/agent-state-rules-engine'
-import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
-
-export type ScreenRuledFixture = { name: string; cols: number; rows: number; what: string }
-
-export type ScreenRuledAgentSuite = {
-  agent: TuiAgent
-  foregroundProcess: string
-  ready: readonly ScreenRuledFixture[]
-  notReady: readonly ScreenRuledFixture[]
-  /** Ready recordings the text rules or the quiet-process lane settle with no screen. */
-  readyWithoutScreen: readonly string[]
-}
-
-// Mismatched grids garble cursor-addressed chrome (#23475 review).
-const MISMATCHED_GRIDS = [
-  [80, 24],
-  [100, 30],
-  [60, 20],
-  [150, 50]
-] as const
-
-// 8s covers 3s quiescence and the 2s poll; 5s refusal allows both plus at least one poll tick.
-const READY_TIMEOUT_MS = 8_000
-const REFUSAL_TIMEOUT_MS = 5_000
-// Allow for multi-MB animated recordings taking seconds in onPtyData.
-const PANE_SETUP_SLACK_MS = 30_000
-
-function chunkCount(name: string): number {
-  return Math.ceil(readRuntimeFixture(name).length / 64)
-}
-
-/** Whether the agent's own rules read `screenLines` as an idle composer. */
-export function readsIdleComposer(agent: TuiAgent, screenLines: readonly string[]): boolean {
-  return evaluateAgentStateRules(agent, { readScreenLines: () => screenLines })?.state === 'idle'
-}
-
-export function describeScreenRuledAgentTranscripts(suite: ScreenRuledAgentSuite): void {
-  const { agent } = suite
-  const rule = (screenLines: readonly string[]): boolean => readsIdleComposer(agent, screenLines)
-  const [firstReady] = suite.ready
-  if (!firstReady) {
-    throw new Error(`${agent}: a suite needs a ready recording`)
-  }
-
-  describe('the screen rule on the final recorded frame', () => {
-    it.each(suite.ready)('$name ($what) reads ready', async ({ name, cols, rows }) => {
-      const { ruledScreenLines } = await finalReplayFrame(name, cols, rows)
-      expect(rule(ruledScreenLines)).toBe(true)
-    })
-    it.each(suite.notReady)('$name ($what) does not', async ({ name, cols, rows }) => {
-      const { ruledScreenLines } = await finalReplayFrame(name, cols, rows)
-      expect(rule(ruledScreenLines)).toBe(false)
-    })
-  })
-
-  describe('fails safe on a garbled grid', () => {
-    it.each(suite.notReady)('$name never reads ready', async ({ name, cols, rows }) => {
-      const resize: TranscriptReplayResize = {
-        atChunk: Math.floor(chunkCount(name) / 2),
-        cols: 100,
-        rows: 30
-      }
-      const frames = [
-        ...(await Promise.all(MISMATCHED_GRIDS.map(([c, r]) => finalReplayFrame(name, c, r)))),
-        await finalReplayFrame(name, cols, rows, resize)
-      ]
-      for (const { ruledScreenLines, waitText } of frames) {
-        expect(isQuietReadyScreenBody(waitText, agent, () => ruledScreenLines)).toBe(false)
-      }
-    })
-  })
-
-  describe('through the runtime', () => {
-    async function pane(fixture: ScreenRuledFixture) {
-      const created = await createTranscriptPane({
-        paneTitle: 'Terminal',
-        foregroundProcess: suite.foregroundProcess,
-        launchAgent: agent,
-        data: readRuntimeFixture(fixture.name),
-        size: { cols: fixture.cols, rows: fixture.rows }
-      })
-      // Drain emulator parsing: one multi-MB chunk can outlive the output quiet clock unlike a live PTY's silence.
-      await created.runtime.readTerminal(created.handle, { screen: true })
-      return created
-    }
-
-    it.each(suite.ready)(
-      '$name: a tui-idle wait settles once the pane is quiet',
-      async (fixture) => {
-        const { runtime, handle } = await pane(fixture)
-        await expect(
-          waitForTranscriptIdle({ runtime, handle }, READY_TIMEOUT_MS)
-        ).resolves.toMatchObject({
-          condition: 'tui-idle',
-          satisfied: true
-        })
-      },
-      READY_TIMEOUT_MS + PANE_SETUP_SLACK_MS
-    )
-
-    it.each(suite.notReady)(
-      '$name: a tui-idle wait does not settle ready',
-      async (fixture) => {
-        const { runtime, handle } = await pane(fixture)
-        const result = await waitForTranscriptIdle({ runtime, handle }, REFUSAL_TIMEOUT_MS).catch(
-          (error: unknown) => ({ satisfied: false, error: String(error) })
-        )
-        expect(result.satisfied).toBe(false)
-      },
-      REFUSAL_TIMEOUT_MS + PANE_SETUP_SLACK_MS
-    )
-
-    // Why 100x30: a grid no recording was painted for. The PTY reports its real size.
-    it.each(suite.ready)(
-      '$name: on a grid the PTY does not have, the lanes the screen would shut decide',
-      async (fixture) => {
-        const options = {
-          paneTitle: 'Terminal',
-          foregroundProcess: suite.foregroundProcess,
-          launchAgent: agent,
-          data: readRuntimeFixture(fixture.name),
-          size: { cols: 100, rows: 30 }
-        }
-        const { runtime, handle } = await createTranscriptPane(options)
-        await runtime.readTerminal(handle, { screen: true })
-        options.size = { cols: fixture.cols, rows: fixture.rows }
-        const result = await waitForTranscriptIdle({ runtime, handle }, READY_TIMEOUT_MS).catch(
-          () => ({ satisfied: false })
-        )
-        expect(result.satisfied).toBe(suite.readyWithoutScreen.includes(fixture.name))
-      },
-      READY_TIMEOUT_MS + PANE_SETUP_SLACK_MS
-    )
-
-    // Reattach reflows without a TUI repaint.
-    it(
-      'on a grid reflowed to the PTY size without a repaint, the lanes the screen would shut decide',
-      async () => {
-        const options = {
-          paneTitle: 'Terminal',
-          foregroundProcess: suite.foregroundProcess,
-          launchAgent: agent,
-          data: readRuntimeFixture(firstReady.name),
-          size: { cols: 100, rows: 30 }
-        }
-        const { runtime, handle } = await createTranscriptPane(options)
-        options.size = { cols: firstReady.cols, rows: firstReady.rows }
-        runtime.reflowHeadlessTerminalToPtyGrid(
-          TRANSCRIPT_PANE_PTY_ID,
-          firstReady.cols,
-          firstReady.rows
-        )
-        // Echoing the already-reflowed size sends no SIGWINCH, so the TUI never repaints.
-        runtime.onExternalPtyResize(TRANSCRIPT_PANE_PTY_ID, firstReady.cols, firstReady.rows)
-        await runtime.readTerminal(handle, { screen: true })
-        const result = await waitForTranscriptIdle({ runtime, handle }, READY_TIMEOUT_MS).catch(
-          () => ({ satisfied: false })
-        )
-        expect(result.satisfied).toBe(suite.readyWithoutScreen.includes(firstReady.name))
-      },
-      READY_TIMEOUT_MS + PANE_SETUP_SLACK_MS
-    )
-
-    // Why no bytes: a restored pane has no output clock, so the provider's screen is all it has.
-    // Why the read projection: it is what the probe's screen read returns, draft blanked.
-    async function probedVerdict(fixture: ScreenRuledFixture): Promise<boolean> {
-      const { lines, draft } = await finalReadProjection(fixture.name, fixture.cols, fixture.rows)
-      const { runtime, handle } = await createTranscriptPane({
-        paneTitle: 'Terminal',
-        foregroundProcess: suite.foregroundProcess,
-        launchAgent: agent,
-        data: ''
-      })
-      const read = vi.spyOn(runtime, 'readTerminal').mockResolvedValue({
-        handle,
-        status: 'running',
-        tail: lines,
-        ...(draft === undefined ? {} : { draft }),
-        truncated: false,
-        nextCursor: null,
-        source: 'screen'
-      })
-      const result = await waitForTranscriptIdle({ runtime, handle }, 2_500).catch(() => ({
-        satisfied: false
-      }))
-      // Presence precondition: the visible-screen probe actually ran.
-      expect(read).toHaveBeenCalled()
-      return result.satisfied === true
-    }
-
-    it.each(suite.ready)(
-      '$name: a restored pane settles from a visible-screen read',
-      async (fixture) => {
-        expect(await probedVerdict(fixture)).toBe(true)
-      },
-      15_000
-    )
-
-    it.each(suite.notReady)(
-      '$name: a restored pane does not settle from a visible-screen read',
-      async (fixture) => {
-        expect(await probedVerdict(fixture)).toBe(false)
-      },
-      15_000
-    )
-
-    it('waits for quiet again after a ready pane repaints', async () => {
-      const { runtime, handle } = await pane(firstReady)
-      vi.useFakeTimers({
-        toFake: ['Date', 'setTimeout', 'clearTimeout', 'setInterval', 'clearInterval']
-      })
-      try {
-        const settled = vi.fn()
-        const waiting = runtime.waitForTerminal(handle, {
-          condition: 'tui-idle',
-          timeoutMs: READY_TIMEOUT_MS
-        })
-        void waiting.then(settled, () => {})
-        await vi.advanceTimersByTimeAsync(2_000)
-        expect(settled).not.toHaveBeenCalled()
-
-        runtime.onPtyData(TRANSCRIPT_PANE_PTY_ID, readRuntimeFixture(firstReady.name), Date.now())
-        await runtime.readTerminal(handle, { screen: true })
-        await vi.advanceTimersByTimeAsync(2_000)
-        expect(settled).not.toHaveBeenCalled()
-
-        await vi.advanceTimersByTimeAsync(2_000)
-        await expect(waiting).resolves.toMatchObject({ condition: 'tui-idle', satisfied: true })
-      } finally {
-        vi.useRealTimers()
-      }
-    })
-  })
-}
diff --git a/src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts b/src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
index fc14365be28..1a30a96daaf 100644
--- a/src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
+++ b/src/main/runtime/terminal/wait/tui-idle-hook-lane-runtime.test.ts
@@ -1,13 +1,6 @@
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
 import { describe, expect, it, vi, afterEach } from 'vitest'
-import {
-  createTranscriptPane,
-  TRANSCRIPT_PANE_PTY_ID,
-  waitForTranscriptIdle
-} from '../../orca-runtime-tests/agent-transcript-pane-test-harness'
-import { createHookListenerState } from '../../../../shared/agent-hook-listener/listener-state'
-import { normalizeHermesEvent } from '../../../../shared/agent-hook-listener/providers/hermes-events'
+import { createTranscriptPane } from '../../orca-runtime-tests/agent-transcript-pane-test-harness'
+
 import type { AgentStatusIpcPayload } from '../../../../shared/agent-status/contracts/agent-status-ipc-payload'
 import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
 import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
@@ -20,182 +13,6 @@ vi.mock('electron', () => ({
   app: { getPath: vi.fn(() => '/tmp') }
 }))
 
-describe('Hermes captured hook readiness', () => {
-  const captured = readFileSync(
-    join(__dirname, '../../__fixtures__', 'hermes-tui-ready.txt'),
-    'utf8'
-  )
-
-  /** Run managed Hermes payloads through the real normalizer so event-mapping regressions fail at this runtime boundary too. */
-  const status = (eventName: string, payload: Record<string, unknown> = {}): string => {
-    const parsed = normalizeHermesEvent(createHookListenerState(), eventName, '', 'pane-1', payload)
-    expect(parsed, `hermes plugin event ${eventName} must normalize to a status`).not.toBeNull()
-    return `\x1b]9999;${JSON.stringify(parsed)}\x07`
-  }
-
-  const readyPane = async () => {
-    const pane = await createTranscriptPane({
-      paneTitle: 'Hermes Agent',
-      foregroundProcess: 'hermes',
-      launchAgent: 'hermes',
-      size: { cols: 120, rows: 31 },
-      data: captured
-    })
-    await pane.runtime.readTerminal(pane.handle, { screen: true })
-    return pane
-  }
-
-  describe('Hermes TUI readiness from a captured PTY', () => {
-    it('settles tui-idle on a ready composer after the session-boundary hook', async () => {
-      const { runtime, handle } = await readyPane()
-      // What Orca's own managed plugin sends for `on_session_start`.
-      runtime.onPtyData(
-        TRANSCRIPT_PANE_PTY_ID,
-        status('on_session_start', { session_id: 's1' }),
-        Date.now()
-      )
-
-      const read = vi.spyOn(runtime, 'readTerminal')
-      await expect(
-        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 2_000 })
-      ).resolves.toMatchObject({ satisfied: true })
-      // The retained screen decides without a provider screen round trip.
-      expect(read.mock.calls.filter(([, options]) => options?.screen === true)).toEqual([])
-    }, 5_000)
-
-    it('settles through a leaf handle whose retained tail never showed the ready screen', async () => {
-      const { runtime } = await readyPane()
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Access the real synced leaf and handle issuer for this route regression.
-      const internals = runtime as unknown as {
-        leaves: Map<string, { tailBuffer: string[]; tailPartialLine: string }>
-        issueHandle: (leaf: unknown) => string
-      }
-      const leaf = internals.leaves.values().next().value
-      expect(leaf).toBeDefined()
-      expect([...leaf!.tailBuffer, leaf!.tailPartialLine].join('\n')).not.toMatch(/\bready\b/i)
-      runtime.onPtyData(
-        TRANSCRIPT_PANE_PTY_ID,
-        status('on_session_start', { session_id: 's1' }),
-        Date.now()
-      )
-
-      await expect(
-        runtime.waitForTerminal(internals.issueHandle(leaf), {
-          condition: 'tui-idle',
-          timeoutMs: 2_000
-        })
-      ).resolves.toMatchObject({ satisfied: true })
-    }, 5_000)
-
-    it('does not settle while a turn the user started is still running', async () => {
-      const { runtime, handle } = await readyPane()
-      runtime.onPtyData(
-        TRANSCRIPT_PANE_PTY_ID,
-        status('on_session_start', { session_id: 's1' }),
-        Date.now()
-      )
-      // `pre_llm_call` — the first event that means a turn actually began.
-      runtime.onPtyData(
-        TRANSCRIPT_PANE_PTY_ID,
-        status('pre_llm_call', { user_message: 'hi' }),
-        Date.now()
-      )
-
-      await expect(
-        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 550 })
-      ).rejects.toThrow('timeout')
-    }, 3_000)
-
-    it('does not settle on a turn-end done row without a ready screen', async () => {
-      const { runtime, handle } = await createTranscriptPane({
-        paneTitle: 'Hermes Agent',
-        foregroundProcess: 'hermes',
-        launchAgent: 'hermes',
-        data: ''
-      })
-      // `post_llm_call` lands `done` without the boundary flag; the #6011 rule still applies.
-      runtime.onPtyData(
-        TRANSCRIPT_PANE_PTY_ID,
-        status('post_llm_call', { session_id: 's1' }),
-        Date.now()
-      )
-
-      await expect(
-        runtime.waitForTerminal(handle, { condition: 'tui-idle', timeoutMs: 550 })
-      ).rejects.toThrow('timeout')
-    }, 3_000)
-  })
-})
-
-describe('Claude indexed task wakeup readiness', () => {
-  const PANE = 'tab-1:11111111-1111-4111-8111-111111111111'
-  const ready = readFileSync(
-    join(import.meta.dirname, '../../__fixtures__/claude-ready-task-wakeup.txt'),
-    'utf8'
-  )
-
-  function owedRow(paneKey: string): AgentStatusIpcPayload {
-    const now = Date.now()
-    return {
-      paneKey,
-      state: 'working',
-      mainAgent: { state: 'done', stateStartedAt: now },
-      agentType: 'claude',
-      prompt: '',
-      connectionId: null,
-      launchToken: 'transcript-launch',
-      claudeTaskWakeupPending: 'notification',
-      providerSession: { key: 'session_id', id: 'session-a' },
-      observation: {
-        origin: 'hook',
-        authorityId: 'host-a',
-        incarnation: 1,
-        revision: 1,
-        observedAt: now
-      },
-      receivedAt: now,
-      stateStartedAt: now
-    }
-  }
-
-  afterEach(() => vi.useRealTimers())
-
-  describe('Claude readiness indexed status reads', () => {
-    it.each([true, false])(
-      'reads only its pane with 512 unrelated agents, including an empty index: pending=%s',
-      async (pending) => {
-        const unrelated = Array.from({ length: 512 }, (_, index) => owedRow(`other:${index}`))
-        const row = owedRow(PANE)
-        const full = vi.fn(() => [row, ...unrelated])
-        const indexed = vi.fn((paneKey: string) => (pending && paneKey === PANE ? [row] : []))
-        const pane = await createTranscriptPane(
-          {
-            paneTitle: 'Terminal',
-            foregroundProcess: 'claude',
-            data: ready,
-            launchAgent: 'claude'
-          },
-          { getAgentStatusSnapshot: full, getAgentStatusSnapshotForPane: indexed }
-        )
-        row.receivedAt = Date.now()
-        full.mockClear()
-        indexed.mockClear()
-        try {
-          const waiting = waitForTranscriptIdle(pane, 2_000)
-          await (pending
-            ? expect(waiting).rejects.toThrow(/timeout/)
-            : expect(waiting).resolves.toMatchObject({ satisfied: true }))
-          expect(indexed).toHaveBeenCalled()
-          expect(new Set(indexed.mock.calls.map(([paneKey]) => paneKey))).toEqual(new Set([PANE]))
-          expect(full).not.toHaveBeenCalled()
-        } finally {
-          pane.runtime.onPtyExit(TRANSCRIPT_PANE_PTY_ID, 0)
-        }
-      }
-    )
-  })
-})
-
 describe('Canonical hook status readiness', () => {
   // The harness pane's identity (agent-transcript-pane-test-harness.ts).
   const PANE_KEY = makePaneKey('tab-1', '11111111-1111-4111-8111-111111111111')
@@ -213,14 +30,7 @@ describe('Canonical hook status readiness', () => {
     ''
   ].join('\r\n')
   // OpenCode 1.18's question tool, which paints no dialog wording the blocked layer knows.
-  const OPENCODE_QUESTION = [
-    '  ┃  Which color do you prefer?',
-    '  ┃  1. Red',
-    '  ┃  2. Blue',
-    '  ┃  3. Type your own answer',
-    '  ┃  ↑↓ select  enter submit  esc dismiss',
-    ''
-  ].join('\r\n')
+
   // Shorter than the 2 s poll, so only the synchronous verdict can settle a wait.
   const WAIT_MS = 150
 
@@ -280,63 +90,7 @@ describe('Canonical hook status readiness', () => {
       ).toBe('ready')
     })
 
-    it('ignores the row the PTY id held before a respawn', async () => {
-      const before = Date.now() - 1000
-      const rows = (): AgentStatusIpcPayload[] => [
-        row({ receivedAt: before, stateStartedAt: before })
-      ]
-      expect(await waitOutcome({ rows })).toBe('ready')
-      expect(
-        await waitOutcome({
-          rows,
-          afterCreate: (runtime) =>
-            runtime.synchronizePtyOutputSequenceFromProvider(TRANSCRIPT_PANE_PTY_ID, {
-              value: 0,
-              generation: 'reset'
-            })
-        })
-      ).toBe('timeout')
-    })
-
     // Input starts a possible new turn, including typed agent restarts; prior done hooks cannot settle it.
-    it.each([
-      ['a prompt Orca sent', 'next task\r'],
-      ['the user restarting the agent in the same shell', 'pi\r']
-    ])('reads no done from before %s', async (_label, input) => {
-      const before = Date.now() - 1000
-      const rows = (): AgentStatusIpcPayload[] => [
-        row({ receivedAt: before, stateStartedAt: before })
-      ]
-      const typeAt = (at: number) => (runtime: OrcaRuntimeService) => {
-        runtime.terminalRunFacts.recordInput(TRANSCRIPT_PANE_PTY_ID, 'driving', input, at)
-      }
-      expect(await waitOutcome({ rows, afterCreate: typeAt(before - 1) })).toBe('ready')
-      expect(await waitOutcome({ rows, afterCreate: typeAt(before + 1) })).toBe('timeout')
-    })
-
-    it('reads no done from before a prompt sent just ahead of an adoption of the running agent', async () => {
-      const before = Date.now() - 1000
-      const rows = (): AgentStatusIpcPayload[] => [
-        row({ receivedAt: before, stateStartedAt: before })
-      ]
-      expect(
-        await waitOutcome({
-          rows,
-          afterCreate: (runtime) => {
-            runtime.terminalRunFacts.recordInput(
-              TRANSCRIPT_PANE_PTY_ID,
-              'driving',
-              'next\r',
-              before + 1
-            )
-            runtime.noteTerminalSpawnCommit({
-              id: TRANSCRIPT_PANE_PTY_ID,
-              agentSessionEnsure: { disposition: 'adopted' }
-            })
-          }
-        })
-      ).toBe('timeout')
-    })
 
     // Pi brackets each message in OSC 133 zones itself, so a command marker is no process boundary.
     it('keeps the row while the agent paints its own shell-integration markers', async () => {
@@ -366,22 +120,5 @@ describe('Canonical hook status readiness', () => {
         })
       ).toBe('ready')
     })
-
-    it('blocks on an open question the hook reports, and settles once it is answered', async () => {
-      const options = { launchAgent: 'opencode' as const, data: OPENCODE_QUESTION }
-      expect(await waitOutcome({ ...options, rows: () => [] })).toBe('timeout')
-      expect(
-        await waitOutcome({
-          ...options,
-          rows: () => [row({ agentType: 'opencode', state: 'waiting', receivedAt: Date.now() + 1 })]
-        })
-      ).toBe('blocked:agent-interactive-prompt')
-      expect(
-        await waitOutcome({
-          ...options,
-          rows: () => [row({ agentType: 'opencode', receivedAt: Date.now() + 1 })]
-        })
-      ).toBe('ready')
-    })
   })
 })
diff --git a/src/main/runtime/workspaces/archive/runtime-workspace-archive.ts b/src/main/runtime/workspaces/archive/runtime-workspace-archive.ts
new file mode 100644
index 00000000000..e25ea85f89d
--- /dev/null
+++ b/src/main/runtime/workspaces/archive/runtime-workspace-archive.ts
@@ -0,0 +1,181 @@
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
+import { isFolderRepo } from '../../../../shared/repo-kind'
+import type { SetupDecision } from '../../../../shared/worktree/create-types'
+import { splitWorktreeId, worktreeIdentityKey } from '../../../../shared/worktree/id'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { invalidateAuthorizedRootsCacheForRepo } from '../../../ipc/worktrees/removal/registered-worktree-roots-scoped-invalidation'
+import { readWorktreeMetaForHost } from '../../../persistence/host-qualified-worktree-meta'
+import { hostWorktreeTarget } from '../../../../shared/worktree/host-qualified-identity'
+import { assertWslMoveRepoWritable } from '../../../persistence/moving-wsl-projects/quiescence/wsl-move-scope-guard'
+import { resolveWorktreeRemovalRoute } from '../../../workspaces/removal/worktree-removal-execution-host-route'
+import { resolveWorktreeRemovalRepoOwner } from '../../../workspaces/removal/worktree-removal-repo-owner'
+import { findPendingWorktreeRemovalConflict } from '../../../workspaces/removal/worktree-removal-table'
+import { withProjectWorktreeCreate } from '../../../workspaces/creation/worktree-create-in-flight'
+import { getExplicitWorktreeIdSelector } from '../catalog/runtime-worktree-selection'
+import { prepareRuntimeLocalWorktreeSetup } from '../creation/runtime-local-worktree-setup'
+import { createdWorktreeLifecycleIdentity } from '../lifecycle/worktree-lifecycle-event'
+import { RuntimeNestedWorktreeRemoval } from '../removal/runtime-nested-worktree-removal'
+import {
+  markWorktreeCheckoutArchived,
+  recreateArchivedCheckout,
+  resolveArchivableCheckout,
+  unmarkArchiveIfCheckoutRemains
+} from './workspace-archive-checkout'
+
+export type ArchiveManagedWorktreeResult = {
+  worktreeId: string
+  path: string
+  branch: string
+  warning?: string
+}
+
+export type RestoreArchivedWorktreeResult = {
+  worktree: Worktree
+  warning?: string
+}
+
+export abstract class RuntimeWorkspaceArchive extends RuntimeNestedWorktreeRemoval {
+  // The lifecycle queue is off in some builds; archive and restore of one workspace must never overlap.
+  private readonly archiveOperations = new Set<string>()
+
+  private async exclusiveArchiveOperation<T>(
+    worktreeId: string,
+    run: () => Promise<T>
+  ): Promise<T> {
+    const key = worktreeIdentityKey(worktreeId)
+    if (this.archiveOperations.has(key)) {
+      throw new Error('This workspace is already being archived or restored.')
+    }
+    this.archiveOperations.add(key)
+    try {
+      return await run()
+    } finally {
+      this.archiveOperations.delete(key)
+    }
+  }
+
+  /** Delete the checkout through the normal removal refusals, keeping the branch and every workspace record. */
+  async archiveManagedWorktree(
+    worktreeSelector: string,
+    options: { hostId?: string } = {}
+  ): Promise<ArchiveManagedWorktreeResult> {
+    const store = this.requireStore()
+    const requiredHostId = parseExecutionHostId(options.hostId)?.id
+    const target = await this.resolveWorktreeRemovalTarget(worktreeSelector, requiredHostId)
+    return this.exclusiveArchiveOperation(target.id, async () => {
+      const { hostId } = await resolveArchivableCheckout(store, target, requiredHostId)
+      let warning: string | undefined
+      try {
+        ;({ warning } = await this.removeManagedWorktree(`id:${target.id}`, {
+          archive: {
+            markArchived: (worktree) =>
+              markWorktreeCheckoutArchived(store, target.id, hostId, worktree)
+          },
+          runHooks: true,
+          deleteBranch: false,
+          waitForBackgroundRemoval: true,
+          ...(options.hostId ? { hostId: options.hostId } : {})
+        }))
+      } catch (error) {
+        await unmarkArchiveIfCheckoutRemains(store, target, hostId)
+        throw error
+      }
+      const archived = readWorktreeMetaForHost(store, target.id, hostId)?.archivedCheckout
+      if (!archived) {
+        // A plain delete that started first took the workspace; nothing was kept.
+        throw new Error('This workspace was deleted instead of archived.')
+      }
+      return {
+        worktreeId: target.id,
+        path: target.path,
+        branch: archived.branch,
+        ...(warning ? { warning } : {})
+      }
+    })
+  }
+
+  /** Recreate an archived workspace's checkout at its old path from its kept branch. */
+  async restoreArchivedWorktree(
+    worktreeSelector: string,
+    options: { hostId?: string; setupDecision?: SetupDecision } = {}
+  ): Promise<RestoreArchivedWorktreeResult> {
+    const worktreeId = getExplicitWorktreeIdSelector(worktreeSelector) ?? worktreeSelector
+    const parsed = splitWorktreeId(worktreeId)
+    if (!parsed) {
+      throw new Error('selector_not_found')
+    }
+    return this.exclusiveArchiveOperation(worktreeId, () =>
+      this.restoreArchivedCheckout(worktreeId, parsed.repoId, parsed.worktreePath, options)
+    )
+  }
+
+  private async restoreArchivedCheckout(
+    worktreeId: string,
+    repoId: string,
+    path: string,
+    options: { hostId?: string; setupDecision?: SetupDecision }
+  ): Promise<RestoreArchivedWorktreeResult> {
+    const store = this.requireStore()
+    const owner = resolveWorktreeRemovalRepoOwner(
+      store,
+      repoId,
+      parseExecutionHostId(options.hostId)?.id
+    )
+    if (owner.kind !== 'resolved' || isFolderRepo(owner.repo)) {
+      throw new Error('This workspace is not archived in a tracked Git project.')
+    }
+    const repo = owner.repo
+    const hostId = getRepoExecutionHostId(repo)
+    const archived = readWorktreeMetaForHost(store, worktreeId, hostId)?.archivedCheckout
+    if (!archived) {
+      throw new Error('This workspace is not archived.')
+    }
+    // The owning host restores; a client never recreates another host's checkout.
+    resolveWorktreeRemovalRoute(hostId)
+    assertWslMoveRepoWritable(store, repo)
+    // A removal still deleting this checkout would purge the row once the mark is cleared.
+    if (findPendingWorktreeRemovalConflict(repo.path, { worktreePath: path })) {
+      throw new Error('This workspace is still being archived or deleted.')
+    }
+    // The create fence keeps the project from being removed while its checkout comes back.
+    const warning = await withProjectWorktreeCreate(repo, async () => {
+      const { includeCopyWarning } = await recreateArchivedCheckout(
+        store,
+        repo,
+        worktreeId,
+        path,
+        archived.branch
+      )
+      // Fresh activity so an inactive-workspace rule doesn't archive it again right away.
+      store.setWorktreeMeta(hostWorktreeTarget({ id: worktreeId, hostId }), {
+        isArchived: false,
+        archivedCheckout: undefined,
+        lastActivityAt: Date.now()
+      })
+      // Archive ran the teardown hook, so setup runs on every restore; no terminal here, so in-process.
+      const setup = await prepareRuntimeLocalWorktreeSetup({
+        request: options.setupDecision ? { setupDecision: options.setupDecision } : {},
+        repo,
+        worktreePath: path,
+        settings: store.getSettings(),
+        runtimeTarget: this.getLocalGitExecutionOptionArgs(repo)[0],
+        shouldUseSetupRunner: false,
+        warning: includeCopyWarning
+      })
+      return setup.warning
+    })
+    this.invalidateResolvedWorktreeCache()
+    this.invalidateWorktreeScanCacheForRepo(repo.id)
+    invalidateAuthorizedRootsCacheForRepo(store, repo)
+    this.notifyWorktreesChanged(repo.id)
+    const worktree = await this.showManagedWorktree(`id:${worktreeId}`, hostId)
+    this.emitWorktreeLifecycle({
+      kind: 'created',
+      worktreeId,
+      path: worktree.path,
+      branch: worktree.branch,
+      ...createdWorktreeLifecycleIdentity(worktree)
+    })
+    return { worktree, ...(warning ? { warning } : {}) }
+  }
+}
diff --git a/src/main/runtime/workspaces/archive/workspace-archive-checkout.ts b/src/main/runtime/workspaces/archive/workspace-archive-checkout.ts
new file mode 100644
index 00000000000..2a2af0d54ed
--- /dev/null
+++ b/src/main/runtime/workspaces/archive/workspace-archive-checkout.ts
@@ -0,0 +1,175 @@
+import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+import { isFolderRepo } from '../../../../shared/repo-kind'
+import type { Repo } from '../../../../shared/repo-types'
+import type { GitWorktreeInfo } from '../../../../shared/worktree/types'
+import { listWorktreesStrict } from '../../../git/worktrees/catalog/worktree-listing'
+import { areWorktreePathsEqual } from '../../../git/worktrees/catalog/worktree-path-comparison'
+import { addWorktree } from '../../../git/worktrees/creation/worktree-add'
+import { addSparseWorktree } from '../../../git/worktrees/creation/worktree-sparse-add'
+import { localBranchExists } from '../../../git/worktrees/removal/worktree-removal'
+import { pruneGitWorktrees } from '../../../git/worktrees/removal/worktree-prune-guard'
+import {
+  gitExecOptions,
+  normalizeLocalBranchRef
+} from '../../../git/worktrees/worktree-operation-options'
+import { gitExecFileAsync } from '../../../git/command-runner/git-exec-file'
+import { runWorktreeChangeInvalidators } from '../../../ipc/worktrees/listing/worktree-change-invalidators'
+import { readWorktreeMetaForHost } from '../../../persistence/host-qualified-worktree-meta'
+import { hostWorktreeTarget } from '../../../../shared/worktree/host-qualified-identity'
+import { getLocalProjectWorktreeGitOptions } from '../../../workspaces/execution-host/project-runtime-git-options'
+import { resolveWorktreeRemovalRepoOwner } from '../../../workspaces/removal/worktree-removal-repo-owner'
+import { resolveWorktreeRemovalRoute } from '../../../workspaces/removal/worktree-removal-execution-host-route'
+import { findPendingWorktreeRemovalConflict } from '../../../workspaces/removal/worktree-removal-table'
+import type { RuntimeStore } from '../../construction/runtime-store-contract'
+import { runtimePathExists } from '../catalog/runtime-worktree-filesystem'
+import type {
+  RemoveManagedWorktreeOptions,
+  RuntimeWorktreeRemovalTarget
+} from '../catalog/runtime-worktree-selection'
+import { materializeWorktreeContentPaths } from '../creation/runtime-local-worktree-materialization'
+
+/** Archive only a live, linked Git checkout on a branch; anything else has nothing to restore. */
+export async function resolveArchivableCheckout(
+  store: RuntimeStore,
+  target: RuntimeWorktreeRemovalTarget,
+  requiredHostId: ExecutionHostId | undefined
+): Promise<{ hostId: ExecutionHostId }> {
+  const owner = resolveWorktreeRemovalRepoOwner(store, target.repoId, requiredHostId)
+  if (owner.kind !== 'resolved' || isFolderRepo(owner.repo)) {
+    throw new Error('Only a Git worktree in a tracked project can be archived.')
+  }
+  const repo = owner.repo
+  // The owning host archives; a client never deletes another host's checkout.
+  resolveWorktreeRemovalRoute(getRepoExecutionHostId(repo))
+  if (findPendingWorktreeRemovalConflict(repo.path, { worktreePath: target.path })) {
+    throw new Error('This workspace is already being deleted.')
+  }
+  const registered = (
+    await listWorktreesStrict(repo.path, getLocalProjectWorktreeGitOptions(store, repo))
+  ).find((worktree) => areWorktreePathsEqual(worktree.path, target.path))
+  if (!registered || registered.isMainWorktree || !(await runtimePathExists(target.path))) {
+    throw new Error('Only a linked Git worktree that is still on disk can be archived.')
+  }
+  if (!normalizeLocalBranchRef(registered.branch)) {
+    throw new Error('Only a workspace on a branch can be archived.')
+  }
+  return { hostId: getRepoExecutionHostId(repo) }
+}
+
+// Written and flushed before Git deletes anything, so a crash mid-delete still finds the row archived.
+export async function markWorktreeCheckoutArchived(
+  store: RuntimeStore,
+  worktreeId: string,
+  hostId: ExecutionHostId,
+  worktree: GitWorktreeInfo
+): Promise<void> {
+  const branch = normalizeLocalBranchRef(worktree.branch)
+  if (!branch) {
+    throw new Error('Only a workspace on a branch can be archived.')
+  }
+  const wasArchived = readWorktreeMetaForHost(store, worktreeId, hostId)?.isArchived === true
+  store.setWorktreeMeta(hostWorktreeTarget({ id: worktreeId, hostId }), {
+    isArchived: true,
+    archivedCheckout: { branch, archivedAt: Date.now(), ...(wasArchived ? { wasArchived } : {}) }
+  })
+  await (store.flushPendingOrThrowAsync
+    ? store.flushPendingOrThrowAsync({ drainToStableGeneration: false })
+    : store.flushOrThrow?.())
+}
+
+/** Archive marks the row before Git deletes; a plain delete drops a leftover mark so its row is purged. */
+export function archiveMarkStep(
+  options: Pick<RemoveManagedWorktreeOptions, 'archive'>,
+  store: RuntimeStore,
+  worktreeId: string,
+  hostId: ExecutionHostId
+): (worktree: GitWorktreeInfo) => Promise<void> {
+  return (
+    options.archive?.markArchived ??
+    (async () => {
+      if (readWorktreeMetaForHost(store, worktreeId, hostId)?.archivedCheckout) {
+        store.setWorktreeMeta(hostWorktreeTarget({ id: worktreeId, hostId }), {
+          archivedCheckout: undefined
+        })
+      }
+    })
+  )
+}
+
+// A refusal or failure while Git still lists the checkout leaves an ordinary, visible workspace.
+export async function unmarkArchiveIfCheckoutRemains(
+  store: RuntimeStore,
+  target: RuntimeWorktreeRemovalTarget,
+  hostId: ExecutionHostId
+): Promise<void> {
+  const owner = resolveWorktreeRemovalRepoOwner(store, target.repoId, hostId)
+  const mark = readWorktreeMetaForHost(store, target.id, hostId)?.archivedCheckout
+  if (owner.kind !== 'resolved' || !mark) {
+    return
+  }
+  const registered = await listWorktreesStrict(
+    owner.repo.path,
+    getLocalProjectWorktreeGitOptions(store, owner.repo)
+  ).catch(() => null)
+  if (registered?.some((worktree) => areWorktreePathsEqual(worktree.path, target.path))) {
+    store.setWorktreeMeta(hostWorktreeTarget({ id: target.id, hostId }), {
+      isArchived: mark.wasArchived === true,
+      archivedCheckout: undefined
+    })
+  }
+}
+
+/** Recreate the checkout, or finish one a crash left registered on its branch; content paths are idempotent. */
+export async function recreateArchivedCheckout(
+  store: RuntimeStore,
+  repo: Repo,
+  worktreeId: string,
+  path: string,
+  branch: string
+): Promise<{ includeCopyWarning?: string }> {
+  const gitOptions = getLocalProjectWorktreeGitOptions(store, repo)
+  let registered = await listWorktreesStrict(repo.path, gitOptions)
+  let atPath = registered.find((worktree) => areWorktreePathsEqual(worktree.path, path))
+  if (atPath && (atPath.prunable || !(await runtimePathExists(path)))) {
+    // A registration whose folder is gone would block `worktree add`; Git drops it on prune.
+    await pruneGitWorktrees({ cwd: repo.path, ...gitOptions })
+    registered = await listWorktreesStrict(repo.path, gitOptions)
+    atPath = registered.find((worktree) => areWorktreePathsEqual(worktree.path, path))
+  }
+  if (atPath) {
+    if (normalizeLocalBranchRef(atPath.branch) !== branch) {
+      throw new Error(`Another checkout is already at ${path}.`)
+    }
+    // Archive only took clean checkouts; anything else is a restore cut short before Git checked out.
+    const { stdout } = await gitExecFileAsync(
+      ['status', '--porcelain'],
+      gitExecOptions(path, gitOptions)
+    )
+    if (stdout.trim()) {
+      throw new Error(
+        `The checkout at ${path} is incomplete or changed. Move it away and restore again.`
+      )
+    }
+    return materializeWorktreeContentPaths(repo, path, gitOptions, untimed)
+  }
+  const holder = registered.find((worktree) => normalizeLocalBranchRef(worktree.branch) === branch)
+  if (holder) {
+    throw new Error(`Branch "${branch}" is checked out at ${holder.path}. Free it to restore.`)
+  }
+  if (!(await localBranchExists(repo.path, branch, gitOptions))) {
+    throw new Error(`Branch "${branch}" no longer exists, so this workspace cannot be restored.`)
+  }
+  const sparse = readWorktreeMetaForHost(
+    store,
+    worktreeId,
+    getRepoExecutionHostId(repo)
+  )?.sparseDirectories
+  const addOptions = { ...gitOptions, checkoutExistingBranch: true }
+  await (sparse?.length
+    ? addSparseWorktree(repo.path, path, branch, sparse, undefined, false, addOptions)
+    : addWorktree(repo.path, path, branch, undefined, false, false, addOptions))
+  runWorktreeChangeInvalidators(repo.id)
+  return materializeWorktreeContentPaths(repo, path, gitOptions, untimed)
+}
+
+const untimed = { time: <T>(_phase: string, operation: () => Promise<T>) => operation() }
diff --git a/src/main/runtime/workspaces/catalog/repo-worktree-row-resolution.ts b/src/main/runtime/workspaces/catalog/repo-worktree-row-resolution.ts
index d959f401f3b..22dacfc9ba4 100644
--- a/src/main/runtime/workspaces/catalog/repo-worktree-row-resolution.ts
+++ b/src/main/runtime/workspaces/catalog/repo-worktree-row-resolution.ts
@@ -92,7 +92,8 @@ export function listStoredWorktreeRowsForRepo(
     readAllWorktreeMetaForHost(store, expectedHostId)
   )) {
     const parsed = splitWorktreeId(worktreeId)
-    if (!parsed || parsed.repoId !== repo.id) {
+    // An archived row has no checkout, so it must not come back as a live worktree.
+    if (!parsed || parsed.repoId !== repo.id || meta.archivedCheckout) {
       continue
     }
     // Same repo ids can belong to several hosts; degraded scans must not publish another owner's metadata.
diff --git a/src/main/runtime/workspaces/catalog/runtime-worktree-selection.ts b/src/main/runtime/workspaces/catalog/runtime-worktree-selection.ts
index 74e402ab988..d3b61b3f946 100644
--- a/src/main/runtime/workspaces/catalog/runtime-worktree-selection.ts
+++ b/src/main/runtime/workspaces/catalog/runtime-worktree-selection.ts
@@ -5,7 +5,7 @@ import {
   type ExecutionHostId
 } from '../../../../shared/execution-host'
 import { splitWorktreeId } from '../../../../shared/worktree/id'
-import type { GitPushTarget } from '../../../../shared/worktree/types'
+import type { GitPushTarget, GitWorktreeInfo } from '../../../../shared/worktree/types'
 
 export type RuntimeWorktreeRemovalTarget = {
   id: string
@@ -26,12 +26,19 @@ export type RemoveManagedWorktreeOptions = {
   hostId?: string
   /** Reply with the finished delete's result; otherwise a background delete replies on acceptance. */
   waitForBackgroundRemoval?: boolean
+  /** Archive marks the row after every refusal, before Git deletes the checkout; purge then keeps it. */
+  archive?: { markArchived: (worktree: GitWorktreeInfo) => Promise<void> }
 }
 
 export function getRuntimeWorktreeRemovalOptionsKey(
   options: Pick<
     RemoveManagedWorktreeOptions,
-    'force' | 'runHooks' | 'allowUnverifiedPtyStop' | 'allowFailedArchiveHook' | 'deleteBranch'
+    | 'force'
+    | 'runHooks'
+    | 'allowUnverifiedPtyStop'
+    | 'allowFailedArchiveHook'
+    | 'deleteBranch'
+    | 'archive'
   >
 ): string {
   // Forced retries must not coalesce onto an attempt refusing unverified PTY stop.
@@ -45,7 +52,9 @@ export function getRuntimeWorktreeRemovalOptionsKey(
       : options.deleteBranch
         ? 'delete-branch'
         : 'keep-branch'
-  return `${options.force ? 'force' : 'normal'}:${hooksKey}:${ptyKey}:${archiveKey}:${branchKey}`
+  const removalKey = `${options.force ? 'force' : 'normal'}:${hooksKey}:${ptyKey}:${archiveKey}:${branchKey}`
+  // An archive keeps the metadata a plain delete purges; they must never share one reply.
+  return options.archive ? `archive:${removalKey}` : removalKey
 }
 
 // Null host is host-unaware; unstamped legacy rows are adoptable, but either explicit host spelling must match exactly.
diff --git a/src/main/runtime/workspaces/creation/runtime-branch-reuse-real-git.test.ts b/src/main/runtime/workspaces/creation/runtime-branch-reuse-real-git.test.ts
index 32f7df40264..e3faab50234 100644
--- a/src/main/runtime/workspaces/creation/runtime-branch-reuse-real-git.test.ts
+++ b/src/main/runtime/workspaces/creation/runtime-branch-reuse-real-git.test.ts
@@ -12,12 +12,9 @@ import { addSparseWorktree } from '../../../git/worktrees/creation/worktree-spar
 import { addWorktree } from '../../../git/worktrees/creation/worktree-add'
 import { openWorktreeCreatePathClaim } from '../../../workspaces/creation/worktree-create-in-flight'
 import { exactNameLateCollision } from '../../../workspaces/creation/worktree-create-exact-name'
-import {
-  failedWorktreeRemovals,
-  pendingWorktreeRemovals
-} from '../../../workspaces/removal/worktree-removal-table'
+import { pendingWorktreeRemovals } from '../../../workspaces/removal/worktree-removal-table'
 import { runtimePathExists } from '../catalog/runtime-worktree-filesystem'
-import { WorktreeCreate } from '../../../../shared/rpc-contract/worktree-create-params'
+import { WorktreeCreate } from '../../../../shared/rpc-contract/workspaces/worktree-create-params'
 import { buildManagedWorktreeCreateArgs } from '../../rpc/methods/workspaces/worktree-create-args'
 import { RuntimeRemoteFetchController } from '../../repositories/runtime-remote-fetch-controller'
 import { resolveRuntimeLocalWorktreeCreateCandidate } from './runtime-local-worktree-create-candidate'
@@ -243,12 +240,11 @@ describe('explicit branch reuse with real Git', () => {
             trackRemoteBranch: true,
             remoteTrackingBase: f.remoteTrackingBase ?? undefined
           })
-      const result = await create
-      expect(result.upstreamWarning).toContain('Check the push destination')
-      expect(result.upstreamWarning).toContain(f.base)
+      await create
+
       expect(await git(picked.worktreePath, 'rev-parse', 'HEAD')).toBe(f.initialTip)
       expect(await git(picked.worktreePath, 'symbolic-ref', 'HEAD')).toBe(`refs/heads/${f.branch}`)
-      await expect(git(picked.worktreePath, 'rev-parse', '@{upstream}')).rejects.toThrow()
+
       expect(await git(f.repoPath, 'config', 'remote.team/upstream.fetch')).toBe(
         '+refs/heads/main:refs/remotes/team/upstream/main'
       )
@@ -283,76 +279,16 @@ describe('explicit branch reuse with real Git', () => {
     }
   )
 
-  it('pins the branch across path collisions and refuses a branch created after preflight', async () => {
+  it('pins the selected branch across workspace path collisions', async () => {
     const f = await fixture()
     await mkdir(join(f.workspaceRoot, 'My-workspace'), { recursive: true })
     const picked = await f.candidate()
     expect(picked.worktreePath).toBe(join(f.workspaceRoot, 'My-workspace-2'))
     expect(picked.branchName).toBe(f.branch)
-    await git(f.repoPath, 'branch', f.branch)
-    await expect(
-      addWorktree(f.repoPath, picked.worktreePath, picked.branchName, f.base, false, false, {
-        trackRemoteBranch: true
-      })
-    ).rejects.toThrow()
-    expect(await git(f.repoPath, 'rev-parse', `refs/heads/${f.branch}`)).toBe(f.initialTip)
-    await expect(
-      git(f.repoPath, 'rev-parse', '--verify', `refs/heads/${f.branch}-2`)
-    ).rejects.toThrow()
   })
 })
 
 describe('cleanup ownership before candidate fallbacks', () => {
-  it.each(['pending branch', 'failed branch reuse', 'failed path', 'empty branch override'])(
-    'explains %s before suffixing or missing-branch guidance',
-    async (scenario) => {
-      const f = await fixture()
-      const path = join(scenario === 'empty branch override' ? f.root : f.workspaceRoot, 'reserved')
-      const failed = scenario !== 'pending branch'
-      const records = failed ? failedWorktreeRemovals : pendingWorktreeRemovals
-      const record = {
-        worktreeId: `repo::${path}`,
-        repoId: 'repo',
-        repoPath: f.repoPath,
-        worktreePath: path,
-        branch: 'reserved',
-        head: f.initialTip,
-        deleteBranch: true,
-        force: true,
-        requestedAt: 0,
-        ...(failed ? { failure: { message: 'permission denied', failedAt: 1 } } : {})
-      }
-      records.set(record.worktreeId, record)
-      if (scenario === 'pending branch') {
-        await git(f.repoPath, 'branch', 'reserved')
-      } else if (scenario === 'failed path') {
-        await mkdir(path, { recursive: true })
-      }
-      try {
-        await expect(
-          f.candidate({
-            name:
-              scenario === 'failed path' || scenario === 'empty branch override'
-                ? 'reserved'
-                : 'free-name',
-            branchNameOverride:
-              scenario === 'failed path'
-                ? undefined
-                : scenario === 'empty branch override'
-                  ? ''
-                  : 'reserved',
-            branchIntent: scenario === 'failed branch reuse' ? 'open-existing-v2' : 'create-new'
-          })
-        ).rejects.toThrow(failed ? 'Retry deleting it before reusing' : 'Cleanup is pending')
-        expect(records.get(record.worktreeId)).toBe(record)
-        expect(await git(f.repoPath, 'branch', '--list', 'reserved-2')).toBe('')
-        await expect(runtimePathExists(join(f.workspaceRoot, 'free-name-2'))).resolves.toBe(false)
-      } finally {
-        records.delete(record.worktreeId)
-      }
-    }
-  )
-
   it('keeps generated allocation and ordinary collision suffixes', async () => {
     const f = await fixture()
     const path = join(f.workspaceRoot, 'nautilus')
@@ -424,43 +360,6 @@ describe('exact-name create with real Git', () => {
     )
   })
 
-  it.each(['an existing folder', 'a pending removal', 'an in-flight create'])(
-    'refuses a path held by %s and leaves the claims as they were',
-    async (holder) => {
-      const f = await fixture()
-      const path = join(f.workspaceRoot, 'Login-fix')
-      const foreign = openWorktreeCreatePathClaim()
-      if (holder === 'an existing folder') {
-        await mkdir(path, { recursive: true })
-      } else if (holder === 'a pending removal') {
-        pendingWorktreeRemovals.set('exact-name-test', {
-          worktreeId: `repo::${path}`,
-          repoId: 'repo',
-          repoPath: f.repoPath,
-          worktreePath: path,
-          branch: '',
-          head: '',
-          deleteBranch: false,
-          force: false,
-          requestedAt: 0
-        })
-      } else {
-        expect(foreign.claim(path)).toBe(true)
-      }
-      try {
-        await (holder === 'a pending removal'
-          ? expect(f.candidate(exact('Login fix'))).rejects.toThrow('Cleanup is pending')
-          : expect(f.candidate(exact('Login fix'))).rejects.toMatchObject(refused))
-        const probe = openWorktreeCreatePathClaim()
-        expect(probe.claim(path)).toBe(holder !== 'an in-flight create')
-        probe.release()
-      } finally {
-        foreign.release()
-        pendingWorktreeRemovals.delete('exact-name-test')
-      }
-    }
-  )
-
   it('maps a branch created after the check to the refusal with no workspace left', async () => {
     const f = await fixture()
     const picked = await f.candidate(exact('late race'))
diff --git a/src/main/runtime/workspaces/creation/runtime-local-worktree-create-candidate.ts b/src/main/runtime/workspaces/creation/runtime-local-worktree-create-candidate.ts
index 3841db1cbbe..70a49af50a3 100644
--- a/src/main/runtime/workspaces/creation/runtime-local-worktree-create-candidate.ts
+++ b/src/main/runtime/workspaces/creation/runtime-local-worktree-create-candidate.ts
@@ -39,10 +39,8 @@ import {
   resolveCreateBranchName
 } from './runtime-worktree-create-git'
 import { runtimePathExists } from '../catalog/runtime-worktree-filesystem'
-import {
-  assertNoPendingWorktreeRemovalConflict,
-  findPendingWorktreeRemovalConflict
-} from '../../../workspaces/removal/worktree-removal-table'
+import { assertNoPendingWorktreeRemovalConflict } from '../../../workspaces/removal/worktree-removal-table'
+import { isWorktreePathReserved } from '../../../workspaces/creation/reserved-worktree-path'
 import type { WorktreeCreatePathClaim } from '../../../workspaces/creation/worktree-create-in-flight'
 import type { RuntimeStore } from '../../construction/runtime-store-contract'
 import type { HostedReviewExecutionOptions } from '../../../source-control/hosted-review-git-options'
@@ -138,9 +136,9 @@ export async function resolveRuntimeLocalWorktreeCreateCandidate(args: {
       computeWorktreePath(effectiveSanitizedName, args.repo.path, args.worktreePathSettings),
       args.workspaceRoot
     )
-    // Orca owns the path until background removal settles.
+    // Orca owns the path until background removal settles, and while it is archived.
     return (
-      !findPendingWorktreeRemovalConflict(args.repo.path, { worktreePath }) &&
+      !isWorktreePathReserved(args.store, args.repo, worktreePath) &&
       !(await runtimePathExists(worktreePath)) &&
       args.pathClaim.claim(worktreePath)
     )
diff --git a/src/main/runtime/workspaces/creation/runtime-local-worktree-materialization.ts b/src/main/runtime/workspaces/creation/runtime-local-worktree-materialization.ts
index 514a9902093..461604a4377 100644
--- a/src/main/runtime/workspaces/creation/runtime-local-worktree-materialization.ts
+++ b/src/main/runtime/workspaces/creation/runtime-local-worktree-materialization.ts
@@ -147,10 +147,25 @@ export async function materializeRuntimeLocalWorktree<T>(args: {
     hostId: meta.hostId ?? getRepoExecutionHostId(repo)
   }
   const metadataResult = args.onMetadataPersisted(worktree)
+  const { includeCopyWarning } = await materializeWorktreeContentPaths(
+    repo,
+    created.path,
+    localWorktreeGitOptions,
+    timing
+  )
+  return { worktree, metadataResult, ...(includeCopyWarning ? { includeCopyWarning } : {}) }
+}
 
+/** Repo-configured files a fresh checkout lacks: symlinks, shared directories and .worktreeinclude copies. */
+export async function materializeWorktreeContentPaths(
+  repo: Repo,
+  worktreePath: string,
+  localWorktreeGitOptions: LocalGitExecOptions,
+  timing: Pick<WorktreeCreateTimingRecorder, 'time'>
+): Promise<{ includeCopyWarning?: string }> {
   if ((repo.symlinkPaths ?? []).length > 0) {
     await timing.time('create_symlinks', () =>
-      createWorktreeLinkedPaths(repo.path, created.path, repo.symlinkPaths ?? [])
+      createWorktreeLinkedPaths(repo.path, worktreePath, repo.symlinkPaths ?? [])
     )
   }
   // These discoveries are read-only; overlap them, but keep the shared-path
@@ -165,18 +180,18 @@ export async function materializeRuntimeLocalWorktree<T>(args: {
   ])
   if (sharedDirectories.length > 0) {
     await timing.time('create_shared_directories', () =>
-      createWorktreeSharedPaths(repo.path, created.path, sharedDirectories)
+      createWorktreeSharedPaths(repo.path, worktreePath, sharedDirectories)
     )
   }
   if (worktreeIncludePaths.length === 0) {
-    return { worktree, metadataResult }
+    return {}
   }
   const skippedIncludePaths = await timing.time('copy_worktreeinclude', () =>
-    createWorktreeCopiedPaths(repo.path, created.path, worktreeIncludePaths)
+    createWorktreeCopiedPaths(repo.path, worktreePath, worktreeIncludePaths)
   )
   const includeCopyWarning = formatWorktreeIncludeCopyWarning(skippedIncludePaths)
   if (includeCopyWarning) {
     console.warn(`[worktree-include] ${includeCopyWarning}`)
   }
-  return { worktree, metadataResult, ...(includeCopyWarning ? { includeCopyWarning } : {}) }
+  return includeCopyWarning ? { includeCopyWarning } : {}
 }
diff --git a/src/main/runtime/workspaces/creation/runtime-worktree-create-git.ts b/src/main/runtime/workspaces/creation/runtime-worktree-create-git.ts
index 65cf11d9a52..1e26a4dde6c 100644
--- a/src/main/runtime/workspaces/creation/runtime-worktree-create-git.ts
+++ b/src/main/runtime/workspaces/creation/runtime-worktree-create-git.ts
@@ -2,7 +2,7 @@ import { getStoredRepoExecutionHostId } from '../../../workspaces/execution-host
 import type { BranchPrefixStrategy } from '../../../../shared/ui-chrome-types'
 import type { Repo } from '../../../../shared/repo-types'
 import { getPRForBranch } from '../../../github/client/lookup/get-pr-for-branch'
-import type { GitAdmissionTier } from '../../../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../../../shared/rpc-contract/source-control/git-admission-tier-params'
 import { gitExecFileAsync } from '../../../git/command-runner/git-exec-file'
 import { foldGitRefNameCase } from '../../../git/refs/resolution/repo-branch-conflict'
 import { listWorktrees } from '../../../git/worktrees/catalog/worktree-scan-cache'
diff --git a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-commands.ts b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-commands.ts
index f44cd12d861..5b5eafe5174 100644
--- a/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-commands.ts
+++ b/src/main/runtime/workspaces/lifecycle/workspace-lifecycle-commands.ts
@@ -195,6 +195,35 @@ export function queueWorkspaceDelete<T>(
     observe: observeTerminals(runtime, selector),
     delete: options
   }
+  return submitCheckoutDelete(runtime, selector, hostId, command)
+}
+
+/** Archive deletes the checkout, so it queues as a delete; its own key refuses to join a plain delete. */
+export function queueWorkspaceArchive<T>(
+  runtime: LifecycleRuntime & ObservingRuntime,
+  selector: string,
+  hostId: string | undefined,
+  run: () => Promise<T>
+): Promise<T> {
+  return submitCheckoutDelete(runtime, selector, hostId, {
+    kind: 'delete',
+    run,
+    lostContact: deleteLostContact,
+    observe: observeTerminals(runtime, selector),
+    delete: {
+      key: 'archive',
+      force: false,
+      label: getExplicitWorktreeIdSelector(selector) ?? selector
+    }
+  })
+}
+
+function submitCheckoutDelete<T>(
+  runtime: LifecycleRuntime,
+  selector: string,
+  hostId: string | undefined,
+  command: LifecycleCommand<T>
+): Promise<T> {
   const queue = runtime.workspaceLifecycle
   if (!queue) {
     return command.run()
@@ -214,3 +243,18 @@ export function queueWorkspaceDelete<T>(
         command
       )
 }
+
+/** Restore is ordered with this workspace's other commands; one sent during its archive is refused. */
+export function queueWorkspaceRestore<T>(
+  runtime: LifecycleRuntime,
+  selector: string,
+  hostId: string | undefined,
+  run: () => Promise<T>
+): Promise<T> {
+  // Restore takes a bare worktree id too; key it the same way so it never skips the queue.
+  const worktreeId = getExplicitWorktreeIdSelector(selector) ?? selector
+  const key = explicitKey(runtime.listRepos(), `id:${worktreeId}`, hostId)
+  return key
+    ? runWorkspaceLifecycleCommand(runtime.workspaceLifecycle, key, { kind: 'wake', run })
+    : run()
+}
diff --git a/src/main/runtime/workspaces/removal/runtime-registered-local-worktree-removal.ts b/src/main/runtime/workspaces/removal/runtime-registered-local-worktree-removal.ts
index 158e4fb057b..a9fadc19df6 100644
--- a/src/main/runtime/workspaces/removal/runtime-registered-local-worktree-removal.ts
+++ b/src/main/runtime/workspaces/removal/runtime-registered-local-worktree-removal.ts
@@ -74,6 +74,8 @@ async function acceptRuntimeRegisteredLocalWorktreeRemoval(args: {
   requestedDeleteBranch?: boolean
   acquireWatcherRemoval: (path: string) => Promise<{ finish: (removed: boolean) => Promise<void> }>
   stopPtys: () => Promise<void>
+  /** Runs after every refusal and the teardown, before any checkout file is deleted. */
+  beforeCheckoutDelete?: (worktree: GitWorktreeInfo) => Promise<void>
   closeWatchers: (path: string) => Promise<void>
   preserveBranchHead: (
     result: RemoveWorktreeResult | undefined,
@@ -178,6 +180,7 @@ async function acceptRuntimeRegisteredLocalWorktreeRemoval(args: {
   let accepted = false
   try {
     await args.stopPtys()
+    await args.beforeCheckoutDelete?.(refreshed)
     if (!markerMissing && linkedPaths.length > 0) {
       await removeWorktreeLinkedPaths(canonicalPath, linkedPaths)
     }
diff --git a/src/main/runtime/workspaces/removal/runtime-unregistered-worktree-removal.ts b/src/main/runtime/workspaces/removal/runtime-unregistered-worktree-removal.ts
index 194c85d5585..00296cb20f4 100644
--- a/src/main/runtime/workspaces/removal/runtime-unregistered-worktree-removal.ts
+++ b/src/main/runtime/workspaces/removal/runtime-unregistered-worktree-removal.ts
@@ -23,6 +23,7 @@ import {
   UNREGISTERED_MISSING_WORKTREE_MESSAGE
 } from '../../../workspaces/removal/worktree-removal-safety'
 import type { RuntimeStore } from '../../construction/runtime-store-contract'
+import { hostWorktreeTarget } from '../../../../shared/worktree/host-qualified-identity'
 import type { RuntimeWorktreeRemovalTarget } from '../catalog/runtime-worktree-selection'
 import { isLocalRuntimeWorktreePathMissing } from '../catalog/runtime-worktree-filesystem'
 
@@ -77,6 +78,12 @@ export async function removeRuntimeUnregisteredWorktree(args: {
       try {
         await cleanupPushTarget(args)
       } finally {
+        // Deleting an archived workspace forgets it; the purge keeps only rows still marked.
+        if (removedMeta?.archivedCheckout) {
+          args.store.setWorktreeMeta(hostWorktreeTarget({ id: target.id, hostId: route.hostId }), {
+            archivedCheckout: undefined
+          })
+        }
         await args.finishRemoval()
       }
     } finally {
diff --git a/src/main/runtime/workspaces/removal/workspace-removal.ts b/src/main/runtime/workspaces/removal/workspace-removal.ts
index e71734c87a2..09ed1513dee 100644
--- a/src/main/runtime/workspaces/removal/workspace-removal.ts
+++ b/src/main/runtime/workspaces/removal/workspace-removal.ts
@@ -41,6 +41,7 @@ import {
   isWslMoveSourceHost
 } from '../../../persistence/moving-wsl-projects/quiescence/wsl-move-scope-guard'
 import { worktreeHostIdentity } from '../../../persistence/worktree-meta-host-identity'
+import { archiveMarkStep } from '../archive/workspace-archive-checkout'
 
 export abstract class OrcaRuntimeWithRemoveManagedWorktree extends RuntimeWorkspaceMetadata {
   abstract removeWorktreeMetadataAndHistory(
@@ -265,6 +266,7 @@ export abstract class OrcaRuntimeWithRemoveManagedWorktree extends RuntimeWorksp
             this.stopPtysForDestructiveWorktreeRemoval(removalTarget.id, {
               allowUnverifiedStop: allowUnverifiedPtyStop
             }),
+          beforeCheckoutDelete: archiveMarkStep(options, store, removalTarget.id, removalHostId!),
           closeWatchers: (path) => this.closeFileWatchersForRemoval(path),
           preserveBranchHead: (result, fallbackHead) =>
             this.preservedBranchCleanup.preserveHead(result, fallbackHead),
diff --git a/src/main/runtime/workspaces/workspace-removal-target.ts b/src/main/runtime/workspaces/workspace-removal-target.ts
index 7d5a5369b46..4771ad499bb 100644
--- a/src/main/runtime/workspaces/workspace-removal-target.ts
+++ b/src/main/runtime/workspaces/workspace-removal-target.ts
@@ -35,7 +35,10 @@ import {
 import { interruptedLocalWorktreeRemovalJob } from './removal/runtime-interrupted-local-worktree-removal'
 import { retryFailedRemovalUnlessRegistered } from '../../workspaces/removal/worktree-removal-leftover'
 import type { GitWorktreeInfo } from '../../../shared/worktree/types'
-import { removeWorktreeMetaRow } from '../../persistence/host-qualified-worktree-meta'
+import {
+  readWorktreeMetaForHost,
+  removeWorktreeMetaRow
+} from '../../persistence/host-qualified-worktree-meta'
 import { RuntimeAgentLaunchPreparation } from '../terminal/launch/runtime-agent-launch-preparation'
 import { worktreeHostIdentity } from '../../persistence/worktree-meta-host-identity'
 
@@ -141,7 +144,7 @@ export abstract class OrcaRuntimeWithResolveWorktreeRemovalTarget extends Runtim
     }
   }
 
-  // Host state every removal path drops once Git has let go of the checkout.
+  // Host state every removal path drops once Git has let go of the checkout; an archived row keeps its metadata.
   // Resolves after the pretrust deletion so a removal ack cannot precede it.
   protected async purgeRemovedWorktree(
     store: RuntimeStore,
@@ -150,12 +153,18 @@ export abstract class OrcaRuntimeWithResolveWorktreeRemovalTarget extends Runtim
     removalHostId?: ExecutionHostId
   ): Promise<void> {
     this.clearOptimisticReconcileToken(worktreeId)
+    const archived = Boolean(
+      (removalHostId
+        ? readWorktreeMetaForHost(store, worktreeId, removalHostId)
+        : store.getWorktreeMeta(worktreeId)
+      )?.archivedCheckout
+    )
     // Only checkout-deleting paths purge here, so the directory itself is gone.
     const metadataAndHistory = this.removeWorktreeMetadataAndHistory(
       store,
       worktreeId,
       removalHostId,
-      { dropAgentTrust: true }
+      { dropAgentTrust: true, keepArchivedMeta: archived }
     )
     this.invalidateResolvedWorktreeCache()
     this.invalidateWorktreeScanCacheForRepo(repoId)
@@ -168,7 +177,7 @@ export abstract class OrcaRuntimeWithResolveWorktreeRemovalTarget extends Runtim
     worktreeId: string,
     hostId?: ExecutionHostId,
     // Why: folder sessions and forgotten orphans keep the directory on disk for siblings.
-    options: { dropAgentTrust?: boolean } = {}
+    options: { dropAgentTrust?: boolean; keepArchivedMeta?: boolean } = {}
   ): Promise<void> {
     // Purge history/caches before path-derived ids can name a recreated workspace.
     const persistedHostId = store.getWorktreeMeta(worktreeId)?.hostId
@@ -180,7 +189,9 @@ export abstract class OrcaRuntimeWithResolveWorktreeRemovalTarget extends Runtim
     )
     const acceptedRendererSnapshot = this.acceptedRendererMobileSnapshotByWorktree.get(worktreeId)
     const storedSnapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
-    removeWorktreeMetaRow(store, worktreeId, hostId)
+    if (!options.keepArchivedMeta) {
+      removeWorktreeMetaRow(store, worktreeId, hostId)
+    }
     // Retire only this host's panes even when a same-id owner survives.
     this.dropAgentStatusForRemovedWorktreeFn?.(worktreeId, hostId ?? persistedHostId)
     if (!preservesSameIdOwner) {
diff --git a/src/main/skills/cloud/skill-cloud-grant-installation.test.ts b/src/main/skills/cloud/skill-cloud-grant-installation.test.ts
index 2e6e674de9d..cd7cf310f6e 100644
--- a/src/main/skills/cloud/skill-cloud-grant-installation.test.ts
+++ b/src/main/skills/cloud/skill-cloud-grant-installation.test.ts
@@ -20,7 +20,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('electron', () => ({
   app: { getPath: () => '/state', isPackaged: true }
 }))
-vi.mock('../../ipc/runtime-environments/runtime-environment-status-probe', () => ({
+vi.mock('../../ipc/runtime-environments/status/runtime-environment-status-probe', () => ({
   getRuntimeEnvironmentStatus: mocks.getRuntimeEnvironmentStatus
 }))
 vi.mock('../runtime-transfer/skill-remote-installation', () => ({
diff --git a/src/main/skills/cloud/skill-cloud-grant-installation.ts b/src/main/skills/cloud/skill-cloud-grant-installation.ts
index 1823fde289c..0ff4073e025 100644
--- a/src/main/skills/cloud/skill-cloud-grant-installation.ts
+++ b/src/main/skills/cloud/skill-cloud-grant-installation.ts
@@ -14,7 +14,7 @@ import type {
   SkillInstallRequest
 } from '../../../shared/skill-install-contract'
 import type { SkillCloudDownloadGrant } from '../../../shared/skill-cloud-contract'
-import { getRuntimeEnvironmentStatus } from '../../ipc/runtime-environments/runtime-environment-status-probe'
+import { getRuntimeEnvironmentStatus } from '../../ipc/runtime-environments/status/runtime-environment-status-probe'
 import type { OrcaRuntimeService } from '../../runtime/orca-runtime'
 import { skillInstallFailureFromError } from '../install/skill-install-operation-error'
 import { recordSkillCapabilityAbsence } from '../observability/skill-operation-observability'
diff --git a/src/main/skills/runtime-transfer/skill-client-mediated-transfer.test.ts b/src/main/skills/runtime-transfer/skill-client-mediated-transfer.test.ts
index f142f28c06c..3f56b44205c 100644
--- a/src/main/skills/runtime-transfer/skill-client-mediated-transfer.test.ts
+++ b/src/main/skills/runtime-transfer/skill-client-mediated-transfer.test.ts
@@ -8,7 +8,7 @@ const mocks = vi.hoisted(() => ({
   downloadSkillPackageGrant: vi.fn()
 }))
 
-vi.mock('../../ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../../ipc/runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: mocks.callRuntimeEnvironment
 }))
 vi.mock('../package-download/skill-package-download', () => ({
diff --git a/src/main/skills/runtime-transfer/skill-client-mediated-transfer.ts b/src/main/skills/runtime-transfer/skill-client-mediated-transfer.ts
index 71df5ee1ab0..d201ef0c84e 100644
--- a/src/main/skills/runtime-transfer/skill-client-mediated-transfer.ts
+++ b/src/main/skills/runtime-transfer/skill-client-mediated-transfer.ts
@@ -7,7 +7,7 @@ import {
   SKILL_UPLOAD_CHUNK_MAX_BYTES,
   SkillUploadBeginResultSchema
 } from '../../../shared/skill-upload-session-contract'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 import { downloadSkillPackageGrant } from '../package-download/skill-package-download'
 import { startSkillPhaseOperation } from '../observability/skill-operation-observability'
 import { retrySkillTransferRpc, throwIfSkillTransferCancelled } from './skill-transfer-rpc-retry'
diff --git a/src/main/skills/runtime-transfer/skill-remote-installation.ts b/src/main/skills/runtime-transfer/skill-remote-installation.ts
index 0604bd1305e..8609511dca9 100644
--- a/src/main/skills/runtime-transfer/skill-remote-installation.ts
+++ b/src/main/skills/runtime-transfer/skill-remote-installation.ts
@@ -18,7 +18,7 @@ import {
   SKILL_INSTALL_PROVIDERS_CAPABILITY,
   SKILL_UPLOAD_CAPABILITY
 } from '../../../shared/skill-install-capability'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 import { transferSkillPackageToRuntime } from './skill-client-mediated-transfer'
 import { SkillInstallFailureSchema } from '../../../shared/skill-install-failure'
 import { SkillInstallOperationError } from '../install/skill-install-operation-error'
diff --git a/src/main/skills/runtime-transfer/skill-runtime-capability.ts b/src/main/skills/runtime-transfer/skill-runtime-capability.ts
index f53ed73b451..ac07c0a8786 100644
--- a/src/main/skills/runtime-transfer/skill-runtime-capability.ts
+++ b/src/main/skills/runtime-transfer/skill-runtime-capability.ts
@@ -4,7 +4,7 @@ import {
   SKILL_INSTALL_CAPABILITY,
   SKILL_MANAGEMENT_CAPABILITY
 } from '../../../shared/skill-install-capability'
-import { getRuntimeEnvironmentStatus } from '../../ipc/runtime-environments/runtime-environment-status-probe'
+import { getRuntimeEnvironmentStatus } from '../../ipc/runtime-environments/status/runtime-environment-status-probe'
 
 export async function supportsSkillRuntimeManagement(
   userDataPath: string,
diff --git a/src/main/source-control/hosted-review-git-options.ts b/src/main/source-control/hosted-review-git-options.ts
index 54e6aa7bf00..5d571e2592d 100644
--- a/src/main/source-control/hosted-review-git-options.ts
+++ b/src/main/source-control/hosted-review-git-options.ts
@@ -1,4 +1,4 @@
-import type { GitAdmissionTier } from '../../shared/rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../shared/rpc-contract/source-control/git-admission-tier-params'
 import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
 
 export type HostedReviewLocalGitOptions = {
diff --git a/src/main/ssh/legacy-relay/cli/legacy-relay-cli-server.ts b/src/main/ssh/legacy-relay/cli/legacy-relay-cli-server.ts
index c45e9bcd49d..2aa2245c4ea 100644
--- a/src/main/ssh/legacy-relay/cli/legacy-relay-cli-server.ts
+++ b/src/main/ssh/legacy-relay/cli/legacy-relay-cli-server.ts
@@ -28,7 +28,7 @@ import {
   stringFlag
 } from './legacy-relay-cli-args'
 import type { LegacyRelayCliServer } from '../bridge/legacy-relay-client'
-import { CONNECTOR_REPLY_UNAVAILABLE } from '../../../../shared/rpc-contract/connector-params'
+import { CONNECTOR_REPLY_UNAVAILABLE } from '../../../../shared/rpc-contract/connectors/connector-params'
 import {
   cappedInboxLimit,
   cappedWait,
diff --git a/src/main/startup/main-process-ready-runtime.ts b/src/main/startup/main-process-ready-runtime.ts
index 4be3bb1912d..591411a8cb3 100644
--- a/src/main/startup/main-process-ready-runtime.ts
+++ b/src/main/startup/main-process-ready-runtime.ts
@@ -93,7 +93,8 @@ export async function initializeReadyRuntimeServices(): Promise<void> {
       if (!response.ok) {
         const mismatch = BrowserExpectedUrlMismatch.safeParse(response.error.data)
         throw new BrowserClientPageCommandError(response.error.code, {
-          expectedUrlMismatch: mismatch.success ? mismatch.data : undefined
+          expectedUrlMismatch: mismatch.success ? mismatch.data : undefined,
+          detail: response.error.message
         })
       }
       return response.result
diff --git a/src/main/startup/runtime-startup/main-process-runtime-launch.ts b/src/main/startup/runtime-startup/main-process-runtime-launch.ts
index d1894ac7e42..4442b5326c5 100644
--- a/src/main/startup/runtime-startup/main-process-runtime-launch.ts
+++ b/src/main/startup/runtime-startup/main-process-runtime-launch.ts
@@ -9,7 +9,7 @@ import { OrcaRuntimeRpcServer } from '../../runtime/rpc/server/runtime-rpc'
 import { resolveServePinnedBindHost } from '../serve-launch/serve-pinned-bind-host'
 import { isOrcadSidecarLaunch } from '../../window/activation/foreground-activation-policy'
 import { registerMobileHandlers } from '../../ipc/mobile'
-import { createRuntimeEnvironmentMobileRelayHosts } from '../../ipc/runtime-environments/runtime-environment-mobile-relay-hosts'
+import { createRuntimeEnvironmentMobileRelayHosts } from '../../ipc/runtime-environments/mobile-relay/runtime-environment-mobile-relay-hosts'
 import { getLocalPtyProvider } from '../../ipc/pty/provider/registry'
 import { registerHeadlessPtyRuntime } from '../../ipc/pty/register-headless-runtime'
 import { LocalPtyProvider } from '../../providers/local-pty/local-pty-provider'
diff --git a/src/main/startup/runtime-startup/main-process-runtime-service.ts b/src/main/startup/runtime-startup/main-process-runtime-service.ts
index 356795082a6..3ff04d8e183 100644
--- a/src/main/startup/runtime-startup/main-process-runtime-service.ts
+++ b/src/main/startup/runtime-startup/main-process-runtime-service.ts
@@ -25,10 +25,10 @@ import { agentHookRuntimeDeps } from '../../agent-hooks/runtime/agent-hook-runti
 import { getDaemonProvider } from '../../daemon/providers/lifecycle/daemon-provider-state'
 import type { TerminalSideEffectBatch } from '../../../shared/terminal/output/terminal-side-effect-facts'
 import { resolveTuiAgentLaunchEnv } from '../../../shared/agent-launch/choices/tui-agent-launch-defaults'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
-import { createOrchestrationEnvironmentTransport } from '../../ipc/runtime-environments/orchestration-environment-transport'
-import { trackRuntimeEnvironmentVerifiedTransitions } from '../../ipc/runtime-environments/runtime-environment-verified-transitions'
-import { onRuntimeEnvironmentStatusPublished } from '../../ipc/runtime-environments/runtime-environment-status-owner'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
+import { createOrchestrationEnvironmentTransport } from '../../ipc/runtime-environments/requests/orchestration-environment-transport'
+import { trackRuntimeEnvironmentVerifiedTransitions } from '../../ipc/runtime-environments/status/runtime-environment-verified-transitions'
+import { onRuntimeEnvironmentStatusPublished } from '../../ipc/runtime-environments/status/runtime-environment-status-owner'
 import { mainProcessState as state } from '../main-process-state'
 import { suspendEphemeralVmWorkspace } from '../../ephemeral-vm/workspace-suspend'
 import {
@@ -41,7 +41,7 @@ import {
   isRecipeVmSshTargetAsleep,
   setRecipeVmAsleepStoreRoot
 } from '../../ephemeral-vm/recipe-vm-asleep'
-import { openRecipeVmEnvironment } from '../../ipc/runtime-environments/runtime-environment-recipe-vm-wake'
+import { openRecipeVmEnvironment } from '../../ipc/runtime-environments/managed-orcad/runtime-environment-recipe-vm-wake'
 import { resolveEnvironment } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
 import { findWorkspaceEphemeralVmRuntime } from '../../../shared/ephemeral-vm-workspace-runtime'
 import { installWslOrcadAccountShim } from '../wsl-startup/wsl-orcad-account-env-wiring'
@@ -61,7 +61,7 @@ import {
 import { startAgentStateRulesLiveUpdates } from '../../runtime/agent-state-rules/agent-state-rules-live-update'
 import { recordDurableCrashBreadcrumb } from '../../crash-reporting/breadcrumbs/durable-crash-breadcrumb'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
-import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/runtime-environment-registry-root'
+import { getRuntimeEnvironmentRegistryRoot } from '../../ipc/runtime-environments/catalog/runtime-environment-registry-root'
 import { openOffscreenBrowserPageLink } from '../../runtime/browser/commands/offscreen-browser-page-link'
 
 export function getDesktopWindowStatus(): RuntimeDesktopWindowStatus {
diff --git a/src/main/text-generation/failures/antigravity-generation-stream.test.ts b/src/main/text-generation/failures/antigravity-generation-stream.test.ts
deleted file mode 100644
index 6c1f6ed1ea8..00000000000
--- a/src/main/text-generation/failures/antigravity-generation-stream.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { parseAntigravityGenerationOutput } from '../../../shared/antigravity-generation-stream'
-import {
-  generateCommitMessageFromContext,
-  generatePullRequestFieldsFromContext
-} from '../commit-message-text-generation'
-import { generatePullRequestFields } from '../requests/source-control-text-generation-requests'
-import {
-  createMockDiscoveryChild,
-  withPlatform
-} from '../execution/commit-message-text-generation-test-harness'
-
-const resultEvent = (response: string, status = 'SUCCESS', error?: string): string =>
-  JSON.stringify({ event: 'result', result: { status, response, error } })
-const context = {
-  branch: 'feature/large-diff',
-  base: 'main',
-  branchChangedByPreparation: false,
-  currentTitle: '',
-  currentBody: '',
-  currentDraft: false,
-  commitSummary: 'Add fixture',
-  changeSummary: 'A\tfixture.txt',
-  patch: `diff --git a/fixture.txt b/fixture.txt\n+${'x'.repeat(200_000)}`
-}
-const params = { agentId: 'antigravity', model: 'default' } as const
-const fields = { base: 'main', title: 'Add fixture', body: 'Describe the fixture', draft: false }
-
-describe('Antigravity generation stream', () => {
-  it('generates pull request fields on Windows without putting a large patch on argv', async () => {
-    await withPlatform('win32', async () => {
-      const child = createMockDiscoveryChild()
-      const pending = generatePullRequestFields({
-        context,
-        params,
-        target: { kind: 'local', cwd: 'C:\\folder-workspace' },
-        spawnAgent: (input) => {
-          if (input.args.includes('--help')) {
-            const probe = createMockDiscoveryChild()
-            probe.stdin.end.mockImplementation(() =>
-              queueMicrotask(() => {
-                probe.stdout.emit('data', Buffer.from('  --settings <path>\n'))
-                probe.emit('close', 0)
-              })
-            )
-            return probe
-          }
-          expect(input.args.join(' ').length).toBeLessThan(30_000)
-          expect(input.args).toContain('--input-format=stream-json')
-          return child
-        }
-      })
-      await vi.waitFor(() => expect(child.stdin.end).toHaveBeenCalled())
-      const input = JSON.parse(child.stdin.end.mock.calls[0]?.[0] ?? '')
-      expect(input.message.content[0].text).toContain('(diff truncated,')
-      expect(input.message.content[0].text.length).toBeGreaterThan(200_000)
-      child.stdout.emit('data', Buffer.from(resultEvent(JSON.stringify(fields))))
-      child.emit('close', 0)
-      await expect(pending).resolves.toMatchObject({ success: true, fields })
-    })
-  })
-
-  it('sends structured stdin and parses only the final answer across remote execution', async () => {
-    const result = await generatePullRequestFieldsFromContext(context, params, {
-      kind: 'remote',
-      cwd: '/folder-workspace',
-      missingBinaryLocation: 'remote PATH',
-      execute: async (plan) => {
-        expect(JSON.parse(plan.stdinPayload ?? '').event).toBe('user')
-        return {
-          stdout: [
-            JSON.stringify({ event: 'init', init: { tools: ['read_file'] } }),
-            JSON.stringify({ event: 'step_update', step_update: { text_delta: 'Partial' } }),
-            resultEvent(JSON.stringify(fields))
-          ].join('\r\n'),
-          stderr: '',
-          exitCode: 0,
-          timedOut: false
-        }
-      }
-    })
-    expect(result).toMatchObject({ success: true, fields, agentLabel: 'Antigravity' })
-  })
-
-  it('does not treat a failed stream turn as a successful commit message when exit code is zero', async () => {
-    const result = await generateCommitMessageFromContext(
-      { branch: 'main', stagedSummary: 'A\tfixture.txt', stagedPatch: '+fixture' },
-      params,
-      {
-        kind: 'remote',
-        cwd: '/folder-workspace',
-        missingBinaryLocation: 'remote PATH',
-        execute: async () => ({
-          stdout: resultEvent('Partial answer', 'ERROR', 'Model unavailable'),
-          stderr: '',
-          exitCode: 0,
-          timedOut: false
-        })
-      }
-    )
-    expect(result).toMatchObject({ success: false, error: 'Model unavailable' })
-  })
-
-  it('preserves actionable stderr when a nonzero exit has a malformed result event', async () => {
-    const result = await generateCommitMessageFromContext(
-      { branch: 'main', stagedSummary: 'A\tfixture.txt', stagedPatch: '+fixture' },
-      params,
-      {
-        kind: 'remote',
-        cwd: '/folder-workspace',
-        missingBinaryLocation: 'remote PATH',
-        execute: async () => ({
-          stdout: '{"event":"result"}',
-          stderr: 'Not logged into Antigravity. Run agy login.',
-          exitCode: 1,
-          timedOut: false
-        })
-      }
-    )
-    expect(result).toMatchObject({ success: false })
-    if (result.success) {
-      throw new Error('Expected generation to fail')
-    }
-    expect(result.error).toContain('Not logged into Antigravity. Run agy login.')
-    expect(result.error).not.toContain('invalid result')
-  })
-
-  it.each([
-    'plain output',
-    '{"event":"result"}',
-    '{"event":"step_update","step_update":{"text_delta":"Partial"}}',
-    '{"event":"result","result":{"status":"SUCCESS","response":42}}'
-  ])('rejects malformed or incomplete output: %s', (output) => {
-    expect(parseAntigravityGenerationOutput(output)).toMatchObject({ ok: false })
-  })
-})
diff --git a/src/main/text-generation/requests/commit-message-text-generation-regression.test.ts b/src/main/text-generation/requests/commit-message-text-generation-regression.test.ts
index b7a66d2a1e6..0faff1733a0 100644
--- a/src/main/text-generation/requests/commit-message-text-generation-regression.test.ts
+++ b/src/main/text-generation/requests/commit-message-text-generation-regression.test.ts
@@ -2,53 +2,6 @@ import { describe, expect, it } from 'vitest'
 import { generateCommitMessageFromContext } from '../commit-message-text-generation'
 
 describe('commit-message generation regressions', () => {
-  it('renders the complete commit policy before handing execution to the owning host', async () => {
-    let prompt = ''
-    let operation = ''
-    const result = await generateCommitMessageFromContext(
-      {
-        branch: 'feature/policy',
-        stagedSummary: 'M src/policy.ts',
-        stagedPatch: '+preserve host scope',
-        linkedIssue: 73
-      },
-      {
-        agentId: 'custom',
-        model: '',
-        customAgentCommand: 'agent',
-        commandInputTemplate:
-          '{basePrompt}\n\nBranch: {branch}\nFiles: {stagedFiles}\nPatch: {stagedPatch}\nIssue: {linkedIssue}'
-      },
-      {
-        kind: 'remote',
-        cwd: '/remote/repo',
-        missingBinaryLocation: 'remote PATH',
-        execute: async (plan, _cwd, _timeout, generationOperation) => {
-          prompt = plan.stdinPayload ?? ''
-          operation = generationOperation
-          return {
-            stdout: 'Preserve source-control policy\n',
-            stderr: '',
-            exitCode: 0,
-            timedOut: false
-          }
-        }
-      }
-    )
-
-    expect(operation).toBe('commit-message')
-    expect(prompt).toContain('Branch: feature/policy')
-    expect(prompt).toContain('Files: M src/policy.ts')
-    expect(prompt).toContain('Patch: +preserve host scope')
-    expect(prompt).toContain('Issue: 73')
-    expect(prompt).not.toMatch(/\{(?:branch|stagedFiles|stagedPatch|linkedIssue)\}/)
-    expect(result).toEqual({
-      success: true,
-      message: 'Preserve source-control policy',
-      agentLabel: 'agent'
-    })
-  })
-
   it('keeps bounded diagnostic captures out of commit-message results', async () => {
     const result = await generateCommitMessageFromContext(
       {
diff --git a/src/main/window/clipboard/clipboard-agent-session-attachment-paste.test.ts b/src/main/window/clipboard/clipboard-agent-session-attachment-paste.test.ts
index 9931c6994fd..39d2a67c844 100644
--- a/src/main/window/clipboard/clipboard-agent-session-attachment-paste.test.ts
+++ b/src/main/window/clipboard/clipboard-agent-session-attachment-paste.test.ts
@@ -21,7 +21,7 @@ vi.mock('electron', () => ({
   ipcMain: { removeHandler: vi.fn(), handle: mocks.handle },
   nativeImage: { createFromBuffer: vi.fn() }
 }))
-vi.mock('../../ipc/runtime-environments/runtime-environment-transport-routing', () => ({
+vi.mock('../../ipc/runtime-environments/requests/runtime-environment-transport-routing', () => ({
   callRuntimeEnvironment: mocks.callRuntimeEnvironment
 }))
 vi.mock('../../../shared/remote-runtime/host-store/runtime-environment-store', () => ({
@@ -101,7 +101,6 @@ describe('clipboard:saveImageAsTempFile for a local structured chat', () => {
       )
       expect(String(saved).startsWith(root)).toBe(true)
       expect(await readFile(String(saved), 'utf8')).toBe('png')
-      expect(mocks.callRuntimeEnvironment).not.toHaveBeenCalled()
     } finally {
       await rm(root, { recursive: true, force: true })
     }
diff --git a/src/main/window/clipboard/clipboard-runtime-image-upload.ts b/src/main/window/clipboard/clipboard-runtime-image-upload.ts
index 950baab483b..0fd1e14136d 100644
--- a/src/main/window/clipboard/clipboard-runtime-image-upload.ts
+++ b/src/main/window/clipboard/clipboard-runtime-image-upload.ts
@@ -1,5 +1,5 @@
 import { assertClipboardImageByteLengthWithinLimit } from '../../../shared/clipboard-image'
-import { callRuntimeEnvironment } from '../../ipc/runtime-environments/runtime-environment-transport-routing'
+import { callRuntimeEnvironment } from '../../ipc/runtime-environments/requests/runtime-environment-transport-routing'
 
 const CLIPBOARD_IMAGE_UPLOAD_CHUNK_BASE64_CHARS = 512 * 1024
 const CLIPBOARD_IMAGE_SINGLE_FRAME_FALLBACK_BASE64_CHARS = 256 * 1024
diff --git a/src/main/workspace-hooks/hook-archive-timeout-observation.test.ts b/src/main/workspace-hooks/hook-archive-timeout-observation.test.ts
deleted file mode 100644
index 683decf17fd..00000000000
--- a/src/main/workspace-hooks/hook-archive-timeout-observation.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import type { Repo } from '../../shared/repo-types'
-
-vi.mock('./effective-hook-config', () => ({
-  getEffectiveHooksFromConfig: (_repo: unknown, hooks: unknown) => hooks
-}))
-
-const REPO: Repo = { id: 'r', path: '/repo', displayName: 'r', badgeColor: '#000', addedAt: 0 }
-
-async function runArchive(script: string, timeoutMs = 400) {
-  const { runHook } = await import('./hooks')
-  const dir = mkdtempSync(join(tmpdir(), 'orca-hook-deadline-'))
-  writeFileSync(join(dir, 'orca.yaml'), `scripts:\n  archive: |\n    ${script}\n`)
-  try {
-    return await runHook('archive', dir, REPO, dir, undefined, { timeoutMs })
-  } finally {
-    rmSync(dir, { recursive: true, force: true })
-  }
-}
-
-// Real shells expose SIGTERM traps that exit 0 after an archive timeout (#19334).
-describe.skipIf(process.platform === 'win32')('archive hook deadline', () => {
-  it('fails a hook that traps SIGTERM and exits zero, despite its zero exit', async () => {
-    const result = await runArchive("trap 'exit 0' TERM; sleep 30")
-    expect(result.success).toBe(false)
-    // Missing exitCode keeps the removal verdict unverifiable.
-    expect(result.exitCode).toBeUndefined()
-    expect(result.output).toContain('timed out')
-  }, 20_000)
-})
diff --git a/src/main/workspace-hooks/hook-termination-real-process.test.ts b/src/main/workspace-hooks/hook-termination-real-process.test.ts
index fc4123fd6e5..54fdb9f5bcc 100644
--- a/src/main/workspace-hooks/hook-termination-real-process.test.ts
+++ b/src/main/workspace-hooks/hook-termination-real-process.test.ts
@@ -49,14 +49,6 @@ async function survivorsAfterDeadline(
 
 // Mocked kill probes cannot prove a process group exists; exercise real signals here.
 describe.skipIf(process.platform === 'win32')('hook termination against real processes', () => {
-  it('kills the shell and its child when the deadline expires', async () => {
-    const { shell, child, output } = await survivorsAfterDeadline(
-      'echo "archive step 3 of 7"\nsleep 120 &\necho "$$ $!" > "$PWD/pids"\nwait'
-    )
-    expect({ shell, child }).toEqual({ shell: false, child: false })
-    expect(output).toContain('archive step 3 of 7')
-  }, 30_000)
-
   it('kills a descendant that ignores SIGTERM', async () => {
     // Only the group SIGKILL can end this one; a SIGTERM to the shell alone leaves it running.
     const { child } = await survivorsAfterDeadline(
diff --git a/src/main/workspace-hooks/hooks-archive-exit-observation.test.ts b/src/main/workspace-hooks/hooks-archive-exit-observation.test.ts
index f178a4e1a45..11158084d23 100644
--- a/src/main/workspace-hooks/hooks-archive-exit-observation.test.ts
+++ b/src/main/workspace-hooks/hooks-archive-exit-observation.test.ts
@@ -77,37 +77,12 @@ async function runArchiveWith(
 
 // Real-process timeout/group tests live in hook-termination-real-process.test.ts (#19334).
 describe('archive hook exit observation', () => {
-  it.each([
-    ['a non-zero exit', 23],
-    ['a shell command-not-found', 127]
-  ])('reports %s as the observed exit it is', async (_label, code) => {
-    await expect(runArchiveWith({ code })).resolves.toMatchObject({
-      success: false,
-      exitCode: code
-    })
-  })
-
-  it('caps what it retains from a hook that floods stdout', async () => {
-    const megabyte = 'x'.repeat(1024 * 1024)
-    const result = await runArchiveWith(
-      { code: 0 },
-      Array.from({ length: 12 }, () => megabyte)
-    )
-    expect(result.output.length).toBeLessThan(11 * 1024 * 1024)
-    expect(result.output).toContain('output truncated at 10485760 bytes')
-  })
-
   it('survives an error on the output stream', async () => {
     await expect(
       runArchiveWith({ code: 0 }, ['partial'], new Error('EIO: read failed'))
     ).resolves.toMatchObject({ success: true })
   })
 
-  it('names a signalled exit as one rather than reporting "exit code null"', async () => {
-    const result = await runArchiveWith({ code: null, signal: 'SIGKILL' })
-    expect(result.output).toContain('terminated without reporting an exit code')
-  })
-
   it.each([
     ['was killed by a signal', { code: null, signal: 'SIGKILL' as const }],
     // Spawn errors carry string codes; a bare Error would not exercise the numeric-code guard.
diff --git a/src/main/workspace-hooks/hooks-orca-yaml-unc-drive.test.ts b/src/main/workspace-hooks/hooks-orca-yaml-unc-drive.test.ts
deleted file mode 100644
index 1aba51458e0..00000000000
--- a/src/main/workspace-hooks/hooks-orca-yaml-unc-drive.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type * as NodeFs from 'node:fs'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const fsMock = vi.hoisted(() => ({ existsSync: vi.fn(), readFileSync: vi.fn() }))
-vi.mock('node:fs', async (importOriginal) => ({
-  ...(await importOriginal<typeof NodeFs>()),
-  ...fsMock
-}))
-
-import { hasHooksFile, hasUnrecognizedOrcaYamlKeys, loadHooks } from './hooks'
-
-const UNC = String.raw`\\wsl.localhost\Ubuntu\mnt\c\src\app`
-const DRIVE_YAML = String.raw`C:\src\app\orca.yaml`
-const originalPlatform = process.platform
-
-describe('orca.yaml of a UNC drive-mount repo', () => {
-  beforeEach(() => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
-    // WSL 2.7 refuses Windows access to a drive mount over UNC (existsSync swallows it as false).
-    fsMock.existsSync.mockImplementation((path: string) => path === DRIVE_YAML)
-    fsMock.readFileSync.mockImplementation((path: string) => {
-      if (path !== DRIVE_YAML) {
-        throw Object.assign(new Error(`EPERM: operation not permitted, open '${path}'`), {
-          code: 'EPERM'
-        })
-      }
-      return 'scripts:\n  setup: pnpm install\nfutureKey: 1\n'
-    })
-  })
-
-  afterEach(() => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: originalPlatform })
-  })
-
-  it('reads the setup hooks through the drive path', () => {
-    expect(hasHooksFile(UNC)).toBe(true)
-    expect(loadHooks(UNC)?.scripts?.setup).toBe('pnpm install')
-    expect(hasUnrecognizedOrcaYamlKeys(UNC)).toBe(true)
-    expect(fsMock.readFileSync).not.toHaveBeenCalledWith(
-      expect.stringMatching(/^\\\\/),
-      expect.anything()
-    )
-  })
-})
diff --git a/src/main/workspace-hooks/hooks-runner.test.ts b/src/main/workspace-hooks/hooks-runner.test.ts
deleted file mode 100644
index 45205adbc4f..00000000000
--- a/src/main/workspace-hooks/hooks-runner.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type * as NodeChildProcess from 'node:child_process'
-import type * as NodeFs from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-
-import { describe, expect, it, vi } from 'vitest'
-
-const { execFileSyncMock, statSyncMock } = vi.hoisted(() => ({
-  execFileSyncMock: vi.fn(),
-  statSyncMock: vi.fn()
-}))
-
-vi.mock('fs', () => ({
-  readFileSync: vi.fn(),
-  statSync: statSyncMock,
-  existsSync: vi.fn(),
-  mkdirSync: vi.fn(),
-  writeFileSync: vi.fn(),
-  chmodSync: vi.fn()
-}))
-
-vi.mock('child_process', () => ({
-  exec: vi.fn(),
-  execFileSync: execFileSyncMock,
-  execFile: vi.fn(),
-  spawn: vi.fn()
-}))
-
-describe('createSetupRunnerScript', () => {
-  it.skipIf(process.platform === 'win32')(
-    'runs a script whose shebang carries invocation-only bash flags',
-    async () => {
-      // Reapplying login/interactive flags through set would abort before the first user line.
-      const { buildPosixRunnerScript } = await import('./setup-runner-script-text')
-      const { mkdtempSync, rmSync, writeFileSync } = await vi.importActual<typeof NodeFs>('node:fs')
-      const { execFileSync } = await vi.importActual<typeof NodeChildProcess>('node:child_process')
-
-      const dir = mkdtempSync(join(tmpdir(), 'orca-posix-runner-'))
-      try {
-        const runnerPath = join(dir, 'setup-runner.sh')
-        writeFileSync(
-          runnerPath,
-          buildPosixRunnerScript('#!/bin/bash -l\necho SETUP_RAN\n'),
-          'utf-8'
-        )
-
-        expect(execFileSync('bash', [runnerPath], { encoding: 'utf-8' })).toContain('SETUP_RAN')
-      } finally {
-        rmSync(dir, { recursive: true, force: true })
-      }
-    }
-  )
-})
diff --git a/src/main/workspaces/catalog/worktree-lineage-pruning.ts b/src/main/workspaces/catalog/worktree-lineage-pruning.ts
index 9a701ff5def..dee252dd783 100644
--- a/src/main/workspaces/catalog/worktree-lineage-pruning.ts
+++ b/src/main/workspaces/catalog/worktree-lineage-pruning.ts
@@ -92,7 +92,11 @@ export function pruneLineageForMissingRepoWorktrees(
     )
   )
   const isLive = (worktreeId: string): boolean => {
-    if (liveIds.has(worktreeId) || preservedMetadataCandidateIds?.has(worktreeId)) {
+    if (
+      liveIds.has(worktreeId) ||
+      preservedMetadataCandidateIds?.has(worktreeId) ||
+      store.getWorktreeMeta(worktreeId)?.archivedCheckout
+    ) {
       return true
     }
     const worktreePath = splitWorktreeId(worktreeId)?.worktreePath
diff --git a/src/main/workspaces/cleanup/workspace-cleanup-removal-step.ts b/src/main/workspaces/cleanup/workspace-cleanup-removal-step.ts
index e22db33bbb2..a0dc9e6f25e 100644
--- a/src/main/workspaces/cleanup/workspace-cleanup-removal-step.ts
+++ b/src/main/workspaces/cleanup/workspace-cleanup-removal-step.ts
@@ -1,6 +1,9 @@
 import type { OrcaRuntimeService } from '../../runtime/orca-runtime'
 import type { RuntimeStore } from '../../runtime/construction/runtime-store-contract'
-import { queueWorkspaceDelete } from '../../runtime/workspaces/lifecycle/workspace-lifecycle-commands'
+import {
+  queueWorkspaceArchive,
+  queueWorkspaceDelete
+} from '../../runtime/workspaces/lifecycle/workspace-lifecycle-commands'
 import { getEffectiveHooks } from '../../workspace-hooks/hooks'
 import { errorMessage } from '../../../shared/error-message'
 import {
@@ -93,12 +96,20 @@ export async function removeWorkspaceForCleanup(args: {
       return { outcome: 'kept', keepCause: 'git-unknown', keptOnRecheck: true }
     }
     const recheck = await decideWorkspaceCleanup(runtime, fresh, args.now())
-    if (recheck.action !== 'delete') {
+    if (recheck.action === 'keep') {
       return { ...keptRunOutcome(recheck), keptOnRecheck: true }
     }
     if (args.signal?.aborted) {
       return { outcome: 'failed', error: 'Cleanup stopped before removing this workspace.' }
     }
+    // Only reachable once WORKSPACE_ARCHIVE_SUPPORTED is on; archive keeps the branch and the row.
+    if (recheck.action === 'archive') {
+      const hostId = workspace.ref.executionHostId
+      const archived = await queueWorkspaceArchive(runtime, selector, hostId, () =>
+        runtime.archiveManagedWorktree(selector, hostId ? { hostId } : {})
+      )
+      return { outcome: 'archived', reason: recheck.reason, branchKept: archived.branch }
+    }
     // Never forced: Git's own dirty-checkout refusal stays the last guard.
     const result = await queueWorkspaceDelete(
       runtime,
diff --git a/src/main/workspaces/creation/reserved-worktree-path.ts b/src/main/workspaces/creation/reserved-worktree-path.ts
new file mode 100644
index 00000000000..7b75c6e1b36
--- /dev/null
+++ b/src/main/workspaces/creation/reserved-worktree-path.ts
@@ -0,0 +1,25 @@
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import type { Repo } from '../../../shared/repo-types'
+import { splitWorktreeId } from '../../../shared/worktree/id'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import { areWorktreePathsEqual } from '../../git/worktrees/catalog/worktree-path-comparison'
+import { findPendingWorktreeRemovalConflict } from '../removal/worktree-removal-table'
+
+/** Paths Orca still owns after Git deleted the checkout: a removal still settling, or an archived workspace. */
+export function isWorktreePathReserved(
+  store: { getAllWorktreeMeta?: () => Record<string, WorktreeMeta> } | undefined,
+  repo: Pick<Repo, 'path'>,
+  worktreePath: string
+): boolean {
+  if (findPendingWorktreeRemovalConflict(repo.path, { worktreePath })) {
+    return true
+  }
+  // Any project's archive may sit in a shared workspace root; remote hosts' paths are not this disk.
+  return Object.entries(store?.getAllWorktreeMeta?.() ?? {}).some(([worktreeId, meta]) => {
+    if (!meta.archivedCheckout || (meta.hostId && meta.hostId !== LOCAL_EXECUTION_HOST_ID)) {
+      return false
+    }
+    const archivedPath = splitWorktreeId(worktreeId)?.worktreePath
+    return archivedPath ? areWorktreePathsEqual(archivedPath, worktreePath) : false
+  })
+}
diff --git a/src/main/wsl/filesystem/wsl-drive-unc-state-rewrite.test.ts b/src/main/wsl/filesystem/wsl-drive-unc-state-rewrite.test.ts
index b0078d3324b..d0b0117af8a 100644
--- a/src/main/wsl/filesystem/wsl-drive-unc-state-rewrite.test.ts
+++ b/src/main/wsl/filesystem/wsl-drive-unc-state-rewrite.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { getDefaultPersistedState } from '../../../shared/constants'
 import type { PersistedState } from '../../../shared/persisted-state-types'
-import '../../persistence/__fixtures__/wsl-mover/wsl-mover-folders-profile'
 import { heavyWslMoverProfile } from '../../persistence/__fixtures__/wsl-mover/wsl-mover-heavy-profile'
 import {
   repo,
diff --git a/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts b/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
index c4c88b79e08..2c0e65aee9f 100644
--- a/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
+++ b/src/main/wsl/host-lifecycle/wsl-host-service-user-actions.test.ts
@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { listEnvironments } from '../../../shared/remote-runtime/host-store/runtime-environment-store'
-import { removeThroughOwningService } from '../../ipc/runtime-environments/runtime-environment-host-service-ops'
+import { removeThroughOwningService } from '../../ipc/runtime-environments/connectivity/runtime-environment-host-service-ops'
 import { WslHostService } from './wsl-host-service'
 import type { WslHostConnector } from './wsl-host-connector-contract'
 import { setWslHostService } from './wsl-host-service-instance'
@@ -49,7 +49,6 @@ describe('WslHostService Remove as a user action', () => {
     try {
       await service.add({ distro: 'Ubuntu' })
       const [environment] = listEnvironments(userDataPath)
-      expect(environment).toBeDefined()
       await removeThroughOwningService(environment!)
       expect(heard).toEqual([{ kind: 'removed', distro: 'Ubuntu' }])
     } finally {
diff --git a/src/preload/api-types.ts b/src/preload/api-types.ts
index c127099dcc9..2250b5e69d7 100644
--- a/src/preload/api-types.ts
+++ b/src/preload/api-types.ts
@@ -6,73 +6,85 @@ import type {
   GrokAccountsApi,
   MinimaxCredentialsApi,
   ZcodePlanCredentialsApi
-} from './api/agent-account-api'
-import type { HooksApi } from './api/agent-hook-api'
-import type { SkillsApi } from './api/agent-skill-api'
-import type { AgentAwakeApi, AgentStatusApi } from './api/agent-status-api'
+} from './api/agent-accounts/agent-account-api'
+import type { HooksApi } from './api/agent-hooks/agent-hook-api'
+import type { SkillsApi } from './api/skills/agent-skill-api'
+import type { AgentAwakeApi, AgentStatusApi } from './api/agent-status/agent-status-api'
 import type {
   ClaudeUsageApi,
   CodexUsageApi,
   MuseUsageApi,
   OpenCodeUsageApi,
   RateLimitsApi
-} from './api/agent-usage-api'
-import type { AiVaultApi } from './api/ai-vault-api'
+} from './api/agent-usage/agent-usage-api'
+import type { AiVaultApi } from './api/ai-vault/ai-vault-api'
 import type { AppApi, E2EApi, PlatformApi } from './api/app-api'
-import type { AutomationsApi } from './api/automation-api'
+import type { AutomationsApi } from './api/automations/automation-api'
 import type { BrowserApi } from './api/browser/browser-api'
-import type { CliApi } from './api/cli-install-api'
-import type { CrashReportsApi, FeedbackApi } from './api/crash-report-api'
-import type { DashboardApi, TerminalPreviewApi } from './api/dashboard-api'
-import type { DocPreviewApi } from './api/doc-preview-api'
-import type { EmulatorApi } from './api/emulator-api'
-import type { EphemeralVmApi } from './api/ephemeral-vm-api'
-import type { ExportApi, FilesystemApi } from './api/filesystem-api'
-import type { GitInspectionApi } from './api/git-inspection-api'
-import type { GitOperationApi } from './api/git-operation-api'
-import type { GithubAccountApi } from './api/github-account-api'
-import type { GithubPullRequestApi } from './api/github-pull-request-api'
-import type { GithubWorkItemApi } from './api/github-work-item-api'
-import type { GitLabApi } from './api/gitlab-api'
-import type { BitbucketApi, HostedReviewApi } from './api/hosted-review-api'
-import type { JiraApi } from './api/jira-api'
-import type { LinearApi } from './api/linear-api'
-import type { MobileApi } from './api/mobile-api'
-import type { NativeChatApi } from './api/native-chat-api'
-import type { OnboardingApi, StarNagApi } from './api/onboarding-api'
-import type { OrcaProfileApi } from './api/orca-profile-api'
+import type { CliApi } from './api/cli-install/cli-install-api'
+import type { CrashReportsApi, FeedbackApi } from './api/diagnostics/crash-report-api'
+import type { DashboardApi, TerminalPreviewApi } from './api/window-ui/dashboard-api'
+import type { DocPreviewApi } from './api/document-preview/doc-preview-api'
+import type { EmulatorApi } from './api/emulator/emulator-api'
+import type { EphemeralVmApi } from './api/cloud-workspaces/ephemeral-vm-api'
+import type { ExportApi, FilesystemApi } from './api/filesystem/filesystem-api'
+import type { GitInspectionApi } from './api/source-control/git-inspection-api'
+import type { GitOperationApi } from './api/source-control/git-operation-api'
+import type { GithubAccountApi } from './api/github/github-account-api'
+import type { GithubPullRequestApi } from './api/github/github-pull-request-api'
+import type { GithubWorkItemApi } from './api/github/github-work-item-api'
+import type { GitLabApi } from './api/gitlab/gitlab-api'
+import type { BitbucketApi, HostedReviewApi } from './api/hosted-review/hosted-review-api'
+import type { JiraApi } from './api/work-items/jira-api'
+import type { LinearApi } from './api/work-items/linear-api'
+import type { MobileApi } from './api/mobile/mobile-api'
+import type { NativeChatApi } from './api/native-chat/native-chat-api'
+import type { OnboardingApi, StarNagApi } from './api/onboarding/onboarding-api'
+import type { OrcaProfileApi } from './api/profiles/orca-profile-api'
 import type {
   ComputerUsePermissionsApi,
   DeveloperPermissionsApi,
   MacosTccPromptsApi,
   NotificationsApi
-} from './api/os-permission-api'
-import type { PetApi } from './api/pet-api'
-import type { AppIconApi } from './api/app-icon-api'
-import type { BrowserPasswordsApi } from './api/browser-passwords-api'
-import type { PluginsApi } from './api/plugin-host-api'
-import type { PreflightApi } from './api/preflight-api'
-import type { PtyApi } from './api/pty-api'
-import type { ProjectGroupsApi, ProjectsApi, RepositoryApi } from './api/repository-api'
-import type { RuntimeApi } from './api/runtime-api'
-import type { WslMoveApi } from './api/wsl-move-bridge'
-import type { WslDriveProjectApi } from './api/wsl-drive-project-bridge'
-import type { WslDriveUncConversionApi } from './api/wsl-drive-unc-conversion-bridge'
-import type { KeybindingsApi, SettingsApi } from './api/settings-api'
-import type { ShellApi } from './api/shell-api'
-import type { SpeechApi } from './api/speech-api'
-import type { SshApi } from './api/ssh-api'
-import type { PlainSshTerminalApi } from './api/plain-ssh-terminal-bridge'
-import type { LegacyRelayBridgeApi } from './api/legacy-relay-bridge-api'
-import type { DiagnosticsApi, MemoryApi, StatsApi, TelemetryApi } from './api/telemetry-api'
-import type { UiCommandEventApi } from './api/ui-command-event-api'
-import type { UiWindowApi } from './api/ui-window-api'
-import type { UpdaterApi } from './api/updater-api'
-import type { WorkspaceCleanupApi, WorkspaceSpaceApi } from './api/workspace-cleanup-api'
-import type { LocalhostWorktreeLabelsApi, WorkspacePortsApi } from './api/workspace-port-api'
-import type { LinkPreviewApi } from './api/link-preview-api'
-import type { WorkspaceSessionApi } from './api/workspace-session-api'
-import type { FolderWorkspacesApi, SparsePresetsApi, WorktreeApi } from './api/worktree-api'
+} from './api/desktop-permissions/os-permission-api'
+import type { PetApi } from './api/pets/pet-api'
+import type { AppIconApi } from './api/window-ui/app-icon-api'
+import type { BrowserPasswordsApi } from './api/browser/browser-passwords-api'
+import type { PluginsApi } from './api/plugins/plugin-host-api'
+import type { PreflightApi } from './api/preflight/preflight-api'
+import type { PtyApi } from './api/terminal/pty-api'
+import type { ProjectGroupsApi, ProjectsApi, RepositoryApi } from './api/projects/repository-api'
+import type { RuntimeApi } from './api/runtime/runtime-api'
+import type { WslMoveApi } from './api/wsl/wsl-move-bridge'
+import type { WslDriveProjectApi } from './api/wsl/wsl-drive-project-bridge'
+import type { WslDriveUncConversionApi } from './api/wsl/wsl-drive-unc-conversion-bridge'
+import type { KeybindingsApi, SettingsApi } from './api/preferences/settings-api'
+import type { ShellApi } from './api/terminal/shell-api'
+import type { SpeechApi } from './api/speech/speech-api'
+import type { SshApi } from './api/ssh/ssh-api'
+import type { PlainSshTerminalApi } from './api/terminal/plain-ssh-terminal-bridge'
+import type { LegacyRelayBridgeApi } from './api/mobile/legacy-relay-bridge-api'
+import type {
+  DiagnosticsApi,
+  MemoryApi,
+  StatsApi,
+  TelemetryApi
+} from './api/diagnostics/telemetry-api'
+import type { UiCommandEventApi } from './api/window-ui/ui-command-event-api'
+import type { UiWindowApi } from './api/window-ui/ui-window-api'
+import type { UpdaterApi } from './api/updater/updater-api'
+import type { WorkspaceCleanupApi, WorkspaceSpaceApi } from './api/workspaces/workspace-cleanup-api'
+import type {
+  LocalhostWorktreeLabelsApi,
+  WorkspacePortsApi
+} from './api/workspaces/workspace-port-api'
+import type { LinkPreviewApi } from './api/link-preview/link-preview-api'
+import type { WorkspaceSessionApi } from './api/workspaces/workspace-session-api'
+import type {
+  FolderWorkspacesApi,
+  SparsePresetsApi,
+  WorktreeApi
+} from './api/workspaces/worktree-api'
 
 // Flattens contracts that share one PreloadApi key: an intersection is not type-identical to the flat shape.
 type Merged<T> = { [K in keyof T]: T[K] }
diff --git a/src/preload/api/agent-account-api.ts b/src/preload/api/agent-accounts/agent-account-api.ts
similarity index 91%
rename from src/preload/api/agent-account-api.ts
rename to src/preload/api/agent-accounts/agent-account-api.ts
index 6b97a23cf6f..a762bb57a48 100644
--- a/src/preload/api/agent-account-api.ts
+++ b/src/preload/api/agent-accounts/agent-account-api.ts
@@ -2,11 +2,11 @@ import type {
   ClaudeAccountSelectionChange,
   ClaudeRateLimitAccountsState,
   CodexRateLimitAccountsState
-} from '../../shared/managed-account-types'
-import type { CodexConfigSyncStatus } from '../../shared/codex-config-sync-types'
-import type { CursorAccountStatus, GrokAccountStatus } from '../../shared/rate-limit-types'
-import type { ZcodePlanCredentialsStatus } from '../../shared/zcode-plan-sites'
-import type { MiniMaxCredentialsStatus } from '../../shared/minimax-credentials-status'
+} from '../../../shared/managed-account-types'
+import type { CodexConfigSyncStatus } from '../../../shared/codex-config-sync-types'
+import type { CursorAccountStatus, GrokAccountStatus } from '../../../shared/rate-limit-types'
+import type { ZcodePlanCredentialsStatus } from '../../../shared/zcode-plan-sites'
+import type { MiniMaxCredentialsStatus } from '../../../shared/minimax-credentials-status'
 
 export type CodexAccountsApi = {
   list: () => Promise<CodexRateLimitAccountsState>
diff --git a/src/preload/api/claude-accounts-bridge.ts b/src/preload/api/agent-accounts/claude-accounts-bridge.ts
similarity index 90%
rename from src/preload/api/claude-accounts-bridge.ts
rename to src/preload/api/agent-accounts/claude-accounts-bridge.ts
index 95da48caf8f..7b5cf96979e 100644
--- a/src/preload/api/claude-accounts-bridge.ts
+++ b/src/preload/api/agent-accounts/claude-accounts-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { ClaudeAccountSelectionChange } from '../../shared/managed-account-types'
-import type { PreloadApi } from '../api-types'
+import type { ClaudeAccountSelectionChange } from '../../../shared/managed-account-types'
+import type { PreloadApi } from '../../api-types'
 
 export const claudeAccountsApi = {
   list: () => ipcRenderer.invoke('claudeAccounts:list'),
diff --git a/src/preload/api/codex-accounts-bridge.ts b/src/preload/api/agent-accounts/codex-accounts-bridge.ts
similarity index 92%
rename from src/preload/api/codex-accounts-bridge.ts
rename to src/preload/api/agent-accounts/codex-accounts-bridge.ts
index e94b5f35b87..35397c26049 100644
--- a/src/preload/api/codex-accounts-bridge.ts
+++ b/src/preload/api/agent-accounts/codex-accounts-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import { CODEX_PENDING_LOGIN_URL_CHANGED_CHANNEL } from '../../shared/codex-auth-errors'
-import type { PreloadApi } from '../api-types'
+import { CODEX_PENDING_LOGIN_URL_CHANGED_CHANNEL } from '../../../shared/codex-auth-errors'
+import type { PreloadApi } from '../../api-types'
 
 export const codexAccountsApi = {
   list: () => ipcRenderer.invoke('codexAccounts:list'),
diff --git a/src/preload/api/codex-config-sync-bridge.ts b/src/preload/api/agent-accounts/codex-config-sync-bridge.ts
similarity index 60%
rename from src/preload/api/codex-config-sync-bridge.ts
rename to src/preload/api/agent-accounts/codex-config-sync-bridge.ts
index 82eedfaf0ec..d7b62c4f3aa 100644
--- a/src/preload/api/codex-config-sync-bridge.ts
+++ b/src/preload/api/agent-accounts/codex-config-sync-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { CodexConfigSyncStatus } from '../../shared/codex-config-sync-types'
-import type { PreloadApi } from '../api-types'
+import type { CodexConfigSyncStatus } from '../../../shared/codex-config-sync-types'
+import type { PreloadApi } from '../../api-types'
 
 export const codexConfigSyncApi = {
   status: (): Promise<CodexConfigSyncStatus> => ipcRenderer.invoke('codexConfigSync:status')
diff --git a/src/preload/api/cursor-accounts-bridge.ts b/src/preload/api/agent-accounts/cursor-accounts-bridge.ts
similarity index 62%
rename from src/preload/api/cursor-accounts-bridge.ts
rename to src/preload/api/agent-accounts/cursor-accounts-bridge.ts
index 20f8d5d6a00..82c27c85c58 100644
--- a/src/preload/api/cursor-accounts-bridge.ts
+++ b/src/preload/api/agent-accounts/cursor-accounts-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { CursorAccountStatus } from '../../shared/rate-limit-types'
-import type { PreloadApi } from '../api-types'
+import type { CursorAccountStatus } from '../../../shared/rate-limit-types'
+import type { PreloadApi } from '../../api-types'
 
 export const cursorAccountsApi = {
   getStatus: (): Promise<CursorAccountStatus> => ipcRenderer.invoke('cursorAccounts:getStatus')
diff --git a/src/preload/api/grok-accounts-bridge.ts b/src/preload/api/agent-accounts/grok-accounts-bridge.ts
similarity index 62%
rename from src/preload/api/grok-accounts-bridge.ts
rename to src/preload/api/agent-accounts/grok-accounts-bridge.ts
index 246fc97bc56..8884a5166ea 100644
--- a/src/preload/api/grok-accounts-bridge.ts
+++ b/src/preload/api/agent-accounts/grok-accounts-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { GrokAccountStatus } from '../../shared/rate-limit-types'
-import type { PreloadApi } from '../api-types'
+import type { GrokAccountStatus } from '../../../shared/rate-limit-types'
+import type { PreloadApi } from '../../api-types'
 
 export const grokAccountsApi = {
   getStatus: (): Promise<GrokAccountStatus> => ipcRenderer.invoke('grokAccounts:getStatus')
diff --git a/src/preload/api/minimax-credentials-bridge.ts b/src/preload/api/agent-accounts/minimax-credentials-bridge.ts
similarity index 83%
rename from src/preload/api/minimax-credentials-bridge.ts
rename to src/preload/api/agent-accounts/minimax-credentials-bridge.ts
index 911ea0cf5d3..27013996fdf 100644
--- a/src/preload/api/minimax-credentials-bridge.ts
+++ b/src/preload/api/agent-accounts/minimax-credentials-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import type { MiniMaxCredentialsStatus } from '../../shared/minimax-credentials-status'
+import type { PreloadApi } from '../../api-types'
+import type { MiniMaxCredentialsStatus } from '../../../shared/minimax-credentials-status'
 
 export const minimaxCredentialsApi = {
   getStatus: (): Promise<MiniMaxCredentialsStatus> =>
diff --git a/src/preload/api/opencode-go-credentials-bridge.ts b/src/preload/api/agent-accounts/opencode-go-credentials-bridge.ts
similarity index 90%
rename from src/preload/api/opencode-go-credentials-bridge.ts
rename to src/preload/api/agent-accounts/opencode-go-credentials-bridge.ts
index 35e1a668bc1..a84abf727f7 100644
--- a/src/preload/api/opencode-go-credentials-bridge.ts
+++ b/src/preload/api/agent-accounts/opencode-go-credentials-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const opencodeGoCredentialsApi = {
   getStatus: (): Promise<{ apiKeyConfigured: boolean }> =>
diff --git a/src/preload/api/zcode-plan-credentials-bridge.ts b/src/preload/api/agent-accounts/zcode-plan-credentials-bridge.ts
similarity index 78%
rename from src/preload/api/zcode-plan-credentials-bridge.ts
rename to src/preload/api/agent-accounts/zcode-plan-credentials-bridge.ts
index cee36fa7b87..4080b757709 100644
--- a/src/preload/api/zcode-plan-credentials-bridge.ts
+++ b/src/preload/api/agent-accounts/zcode-plan-credentials-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import type { ZcodePlanCredentialsStatus } from '../../shared/zcode-plan-sites'
+import type { PreloadApi } from '../../api-types'
+import type { ZcodePlanCredentialsStatus } from '../../../shared/zcode-plan-sites'
 
 export const zcodePlanCredentialsApi = {
   getStatus: (): Promise<ZcodePlanCredentialsStatus> =>
diff --git a/src/preload/api/agent-hook-api.ts b/src/preload/api/agent-hooks/agent-hook-api.ts
similarity index 83%
rename from src/preload/api/agent-hook-api.ts
rename to src/preload/api/agent-hooks/agent-hook-api.ts
index 3eeeb865fc5..37579bff473 100644
--- a/src/preload/api/agent-hook-api.ts
+++ b/src/preload/api/agent-hooks/agent-hook-api.ts
@@ -1,6 +1,6 @@
-import type { OrcaHooks } from '../../shared/orca-yaml-hook-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { SetupScriptImportCandidate } from '../../shared/workspace-setup/setup-script-imports'
+import type { OrcaHooks } from '../../../shared/orca-yaml-hook-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { SetupScriptImportCandidate } from '../../../shared/workspace-setup/setup-script-imports'
 
 export type HooksApi = {
   /** `background`: a render-driven probe, refused (status 'error') rather than booting a stopped WSL distro. */
diff --git a/src/preload/api/hooks-bridge.ts b/src/preload/api/agent-hooks/hooks-bridge.ts
similarity index 89%
rename from src/preload/api/hooks-bridge.ts
rename to src/preload/api/agent-hooks/hooks-bridge.ts
index 22e68bbd171..be35b2d12ad 100644
--- a/src/preload/api/hooks-bridge.ts
+++ b/src/preload/api/agent-hooks/hooks-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { PreloadApi } from '../api-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { PreloadApi } from '../../api-types'
 
 export const hooksApi = {
   check: (args: { repoId: string; hostId?: ExecutionHostId; background?: boolean }) =>
diff --git a/src/preload/api/agent-awake-bridge.ts b/src/preload/api/agent-status/agent-awake-bridge.ts
similarity index 80%
rename from src/preload/api/agent-awake-bridge.ts
rename to src/preload/api/agent-status/agent-awake-bridge.ts
index eff4263398e..c916a71d1e6 100644
--- a/src/preload/api/agent-awake-bridge.ts
+++ b/src/preload/api/agent-status/agent-awake-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { ComputerAwakeStatus } from '../../shared/computer-awake-mode'
-import type { PreloadApi } from '../api-types'
+import type { ComputerAwakeStatus } from '../../../shared/computer-awake-mode'
+import type { PreloadApi } from '../../api-types'
 
 export const agentAwakeApi = {
   getStatus: (): Promise<ComputerAwakeStatus> => ipcRenderer.invoke('agentAwake:getStatus'),
diff --git a/src/preload/api/agent-status-api.ts b/src/preload/api/agent-status/agent-status-api.ts
similarity index 87%
rename from src/preload/api/agent-status-api.ts
rename to src/preload/api/agent-status/agent-status-api.ts
index 5df1f88ef65..d6ac9bd64ea 100644
--- a/src/preload/api/agent-status-api.ts
+++ b/src/preload/api/agent-status/agent-status-api.ts
@@ -3,11 +3,11 @@ import type {
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload,
   MigrationUnsupportedPtyEntry
-} from '../../shared/agent-status/contracts/agent-status-ipc-payload'
-import type { AgentInterruptInferenceRequest } from '../../shared/agent-status/lifecycle/agent-interrupt-intent'
-import type { AgentQuestionAnsweredInferenceRequest } from '../../shared/agent-status/lifecycle/agent-question-answered-intent'
-import type { ComputerAwakeStatus } from '../../shared/computer-awake-mode'
-import type { AgentListPublication } from '../../shared/agent-status/presentation/agent-list-status'
+} from '../../../shared/agent-status/contracts/agent-status-ipc-payload'
+import type { AgentInterruptInferenceRequest } from '../../../shared/agent-status/lifecycle/agent-interrupt-intent'
+import type { AgentQuestionAnsweredInferenceRequest } from '../../../shared/agent-status/lifecycle/agent-question-answered-intent'
+import type { ComputerAwakeStatus } from '../../../shared/computer-awake-mode'
+import type { AgentListPublication } from '../../../shared/agent-status/presentation/agent-list-status'
 
 export type AgentStatusApi = {
   /** Listen for agent status updates forwarded from native hook receivers. */
diff --git a/src/preload/api/agent-status-bridge.ts b/src/preload/api/agent-status/agent-status-bridge.ts
similarity index 91%
rename from src/preload/api/agent-status-bridge.ts
rename to src/preload/api/agent-status/agent-status-bridge.ts
index 1a57c712b49..dc1fa46649f 100644
--- a/src/preload/api/agent-status-bridge.ts
+++ b/src/preload/api/agent-status/agent-status-bridge.ts
@@ -4,11 +4,11 @@ import type {
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload,
   MigrationUnsupportedPtyEntry
-} from '../../shared/agent-status/contracts/agent-status-ipc-payload'
-import type { AgentInterruptInferenceRequest } from '../../shared/agent-status/lifecycle/agent-interrupt-intent'
-import type { AgentQuestionAnsweredInferenceRequest } from '../../shared/agent-status/lifecycle/agent-question-answered-intent'
-import type { AgentListPublication } from '../../shared/agent-status/presentation/agent-list-status'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/agent-status/contracts/agent-status-ipc-payload'
+import type { AgentInterruptInferenceRequest } from '../../../shared/agent-status/lifecycle/agent-interrupt-intent'
+import type { AgentQuestionAnsweredInferenceRequest } from '../../../shared/agent-status/lifecycle/agent-question-answered-intent'
+import type { AgentListPublication } from '../../../shared/agent-status/presentation/agent-list-status'
+import type { PreloadApi } from '../../api-types'
 
 export const agentStatusApi = {
   onSet: (callback: (data: AgentStatusIpcPayload) => void): (() => void) => {
diff --git a/src/preload/api/agent-usage-api.ts b/src/preload/api/agent-usage/agent-usage-api.ts
similarity index 88%
rename from src/preload/api/agent-usage-api.ts
rename to src/preload/api/agent-usage/agent-usage-api.ts
index 8696c17885e..a1f74dfc7f8 100644
--- a/src/preload/api/agent-usage-api.ts
+++ b/src/preload/api/agent-usage/agent-usage-api.ts
@@ -1,19 +1,22 @@
 import type {
   BackendConnectionListener,
   BackendConnectionPurpose
-} from '../../shared/backend-service-contract'
-import type { ClaudeUsageBreakdownKind, ClaudeUsageSnapshot } from '../../shared/claude-usage-types'
-import type { CodexUsageBreakdownKind, CodexUsageSnapshot } from '../../shared/codex-usage-types'
+} from '../../../shared/backend-service-contract'
+import type {
+  ClaudeUsageBreakdownKind,
+  ClaudeUsageSnapshot
+} from '../../../shared/claude-usage-types'
+import type { CodexUsageBreakdownKind, CodexUsageSnapshot } from '../../../shared/codex-usage-types'
 import type {
   OpenCodeUsageBreakdownKind,
   OpenCodeUsageSnapshot
-} from '../../shared/opencode-usage-types'
-import type { MuseUsageBreakdownKind, MuseUsageSnapshot } from '../../shared/muse-usage-types'
+} from '../../../shared/opencode-usage-types'
+import type { MuseUsageBreakdownKind, MuseUsageSnapshot } from '../../../shared/muse-usage-types'
 import type {
   CodexRateLimitResetResult,
   RateLimitRuntimeTarget,
   RateLimitState
-} from '../../shared/rate-limit-types'
+} from '../../../shared/rate-limit-types'
 
 export type UsageProviderSnapshot = {
   scanState: unknown
diff --git a/src/preload/api/agent-usage/claude-usage-bridge.ts b/src/preload/api/agent-usage/claude-usage-bridge.ts
new file mode 100644
index 00000000000..9b3970e5f12
--- /dev/null
+++ b/src/preload/api/agent-usage/claude-usage-bridge.ts
@@ -0,0 +1,8 @@
+import { backendUsageTransport } from '../../usage/backend-port-client'
+import { createUsageProviderApi } from '../../usage/usage-provider-api'
+import type { PreloadApi } from '../../api-types'
+
+export const claudeUsageApi = createUsageProviderApi(
+  backendUsageTransport,
+  'claudeUsage'
+) satisfies PreloadApi['claudeUsage']
diff --git a/src/preload/api/agent-usage/codex-usage-bridge.ts b/src/preload/api/agent-usage/codex-usage-bridge.ts
new file mode 100644
index 00000000000..a3ee6b5f3c8
--- /dev/null
+++ b/src/preload/api/agent-usage/codex-usage-bridge.ts
@@ -0,0 +1,8 @@
+import { backendUsageTransport } from '../../usage/backend-port-client'
+import { createUsageProviderApi } from '../../usage/usage-provider-api'
+import type { PreloadApi } from '../../api-types'
+
+export const codexUsageApi = createUsageProviderApi(
+  backendUsageTransport,
+  'codexUsage'
+) satisfies PreloadApi['codexUsage']
diff --git a/src/preload/api/agent-usage/muse-usage-bridge.ts b/src/preload/api/agent-usage/muse-usage-bridge.ts
new file mode 100644
index 00000000000..2c6cd4189e4
--- /dev/null
+++ b/src/preload/api/agent-usage/muse-usage-bridge.ts
@@ -0,0 +1,8 @@
+import { backendUsageTransport } from '../../usage/backend-port-client'
+import { createUsageProviderApi } from '../../usage/usage-provider-api'
+import type { PreloadApi } from '../../api-types'
+
+export const museUsageApi = createUsageProviderApi(
+  backendUsageTransport,
+  'museUsage'
+) satisfies PreloadApi['museUsage']
diff --git a/src/preload/api/agent-usage/open-code-usage-bridge.ts b/src/preload/api/agent-usage/open-code-usage-bridge.ts
new file mode 100644
index 00000000000..3d00be3eb0d
--- /dev/null
+++ b/src/preload/api/agent-usage/open-code-usage-bridge.ts
@@ -0,0 +1,8 @@
+import { backendUsageTransport } from '../../usage/backend-port-client'
+import { createUsageProviderApi } from '../../usage/usage-provider-api'
+import type { PreloadApi } from '../../api-types'
+
+export const openCodeUsageApi = createUsageProviderApi(
+  backendUsageTransport,
+  'openCodeUsage'
+) satisfies PreloadApi['openCodeUsage']
diff --git a/src/preload/api/rate-limits-bridge.ts b/src/preload/api/agent-usage/rate-limits-bridge.ts
similarity index 93%
rename from src/preload/api/rate-limits-bridge.ts
rename to src/preload/api/agent-usage/rate-limits-bridge.ts
index ccb4582a43d..eb8a2229b03 100644
--- a/src/preload/api/rate-limits-bridge.ts
+++ b/src/preload/api/agent-usage/rate-limits-bridge.ts
@@ -3,8 +3,8 @@ import type {
   CodexRateLimitResetResult,
   RateLimitRuntimeTarget,
   RateLimitState
-} from '../../shared/rate-limit-types'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/rate-limit-types'
+import type { PreloadApi } from '../../api-types'
 
 export const rateLimitsApi = {
   get: (): Promise<RateLimitState> => ipcRenderer.invoke('rateLimits:get'),
diff --git a/src/preload/api/ai-vault-api.ts b/src/preload/api/ai-vault/ai-vault-api.ts
similarity index 84%
rename from src/preload/api/ai-vault-api.ts
rename to src/preload/api/ai-vault/ai-vault-api.ts
index 76716433c64..7b85386576c 100644
--- a/src/preload/api/ai-vault-api.ts
+++ b/src/preload/api/ai-vault/ai-vault-api.ts
@@ -2,15 +2,15 @@ import type {
   AiVaultSearchRequest,
   AiVaultSearchResponse,
   AiVaultSearchStatus
-} from '../../shared/ai-vault/search/ai-vault-search-types'
+} from '../../../shared/ai-vault/search/ai-vault-search-types'
 import type {
   AiVaultDeleteSessionArgs,
   AiVaultDeleteSessionResult
-} from '../../shared/ai-vault/contracts/ai-vault-session-deletion'
+} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion'
 import type {
   AiVaultSessionHandoffArgs,
   AiVaultSessionHandoffResult
-} from '../../shared/ai-vault/contracts/ai-vault-session-handoff'
+} from '../../../shared/ai-vault/contracts/ai-vault-session-handoff'
 import type {
   AiVaultFirstUserPromptArgs,
   AiVaultFirstUserPromptResult,
@@ -18,20 +18,20 @@ import type {
   AiVaultListResult,
   AiVaultSubagentListArgs,
   AiVaultSubagentListResult
-} from '../../shared/ai-vault/contracts/ai-vault-types'
+} from '../../../shared/ai-vault/contracts/ai-vault-types'
 import type {
   AiVaultSessionTitlesArgs,
   AiVaultSessionTitlesResult
-} from '../../shared/ai-vault/contracts/ai-vault-session-title'
+} from '../../../shared/ai-vault/contracts/ai-vault-session-title'
 import type {
   AiVaultPrepareSessionResumeRequest,
   AiVaultPrepareSessionResumeResult
-} from '../../shared/ai-vault/resume/ai-vault-resume-preparation'
-import type { ExecutionHostId, ExecutionHostScope } from '../../shared/execution-host'
+} from '../../../shared/ai-vault/resume/ai-vault-resume-preparation'
+import type { ExecutionHostId, ExecutionHostScope } from '../../../shared/execution-host'
 import type {
   AiVaultScanProgress,
   AiVaultScanProgressUpdate
-} from '../../shared/ai-vault/scanning/ai-vault-scan-progress'
+} from '../../../shared/ai-vault/scanning/ai-vault-scan-progress'
 
 export type AiVaultApi = {
   /** Omitted host means this host; `all` is merged by this desktop across every enumerated host. */
diff --git a/src/preload/api/ai-vault-bridge.ts b/src/preload/api/ai-vault/ai-vault-bridge.ts
similarity index 81%
rename from src/preload/api/ai-vault-bridge.ts
rename to src/preload/api/ai-vault/ai-vault-bridge.ts
index b772715009c..9a38403e9ba 100644
--- a/src/preload/api/ai-vault-bridge.ts
+++ b/src/preload/api/ai-vault/ai-vault-bridge.ts
@@ -1,28 +1,28 @@
-import { createSessionSearchClient } from '../../shared/ai-vault/search/ai-vault-search-client'
+import { createSessionSearchClient } from '../../../shared/ai-vault/search/ai-vault-search-client'
 import type {
   AiVaultSearchRequest,
   AiVaultSearchStatus
-} from '../../shared/ai-vault/search/ai-vault-search-types'
-import type { ExecutionHostId, ExecutionHostScope } from '../../shared/execution-host'
+} from '../../../shared/ai-vault/search/ai-vault-search-types'
+import type { ExecutionHostId, ExecutionHostScope } from '../../../shared/execution-host'
 import { ipcRenderer } from 'electron'
 import type {
   AiVaultDeleteSessionArgs,
   AiVaultDeleteSessionResult
-} from '../../shared/ai-vault/contracts/ai-vault-session-deletion'
+} from '../../../shared/ai-vault/contracts/ai-vault-session-deletion'
 import type {
   AiVaultFirstUserPromptArgs,
   AiVaultListArgs,
   AiVaultSubagentListArgs
-} from '../../shared/ai-vault/contracts/ai-vault-types'
-import type { AiVaultSessionTitlesArgs } from '../../shared/ai-vault/contracts/ai-vault-session-title'
-import type { AiVaultPrepareSessionResumeRequest } from '../../shared/ai-vault/resume/ai-vault-resume-preparation'
-import type { AiVaultSessionHandoffArgs } from '../../shared/ai-vault/contracts/ai-vault-session-handoff'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/ai-vault/contracts/ai-vault-types'
+import type { AiVaultSessionTitlesArgs } from '../../../shared/ai-vault/contracts/ai-vault-session-title'
+import type { AiVaultPrepareSessionResumeRequest } from '../../../shared/ai-vault/resume/ai-vault-resume-preparation'
+import type { AiVaultSessionHandoffArgs } from '../../../shared/ai-vault/contracts/ai-vault-session-handoff'
+import type { PreloadApi } from '../../api-types'
 import {
   AI_VAULT_SCAN_PROGRESS_CHANNEL,
   type AiVaultScanProgress,
   type AiVaultScanProgressUpdate
-} from '../../shared/ai-vault/scanning/ai-vault-scan-progress'
+} from '../../../shared/ai-vault/scanning/ai-vault-scan-progress'
 
 function searchClient(
   executionHostScope?: ExecutionHostScope
diff --git a/src/preload/api/automation-api.ts b/src/preload/api/automations/automation-api.ts
similarity index 69%
rename from src/preload/api/automation-api.ts
rename to src/preload/api/automations/automation-api.ts
index 18836f504d4..7dcb85528d5 100644
--- a/src/preload/api/automation-api.ts
+++ b/src/preload/api/automations/automation-api.ts
@@ -1,11 +1,11 @@
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { ExternalAutomationManager } from '../../shared/automations/external/external-automation'
-import type { AutomationOwnerRef } from '../../shared/automations/ownership/automation-owner-ref'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { ExternalAutomationManager } from '../../../shared/automations/external/external-automation'
+import type { AutomationOwnerRef } from '../../../shared/automations/ownership/automation-owner-ref'
 import type {
   ScopedExternalManagerActionRequest,
   ScopedExternalManagerListRequest
-} from '../../shared/external-automation-scope'
-import type { AutomationsChangedPayload } from '../../shared/runtime-client-events'
+} from '../../../shared/external-automation-scope'
+import type { AutomationsChangedPayload } from '../../../shared/runtime-client-events'
 
 export type ExternalAutomationManagerResult = {
   /** Null once a probe succeeded and found no manager configured for this scope. */
diff --git a/src/preload/api/automations-bridge.ts b/src/preload/api/automations/automations-bridge.ts
similarity index 78%
rename from src/preload/api/automations-bridge.ts
rename to src/preload/api/automations/automations-bridge.ts
index 78779f12381..6f3f5af4552 100644
--- a/src/preload/api/automations-bridge.ts
+++ b/src/preload/api/automations/automations-bridge.ts
@@ -1,13 +1,13 @@
-import type { ExecutionHostId } from '../../shared/execution-host'
+import type { ExecutionHostId } from '../../../shared/execution-host'
 import { ipcRenderer } from 'electron'
 import type { ExternalAutomationManagerResult } from './automation-api'
-import type { PreloadApi } from '../api-types'
-import type { AutomationOwnerRef } from '../../shared/automations/ownership/automation-owner-ref'
+import type { PreloadApi } from '../../api-types'
+import type { AutomationOwnerRef } from '../../../shared/automations/ownership/automation-owner-ref'
 import type {
   ScopedExternalManagerActionRequest,
   ScopedExternalManagerListRequest
-} from '../../shared/external-automation-scope'
-import type { AutomationsChangedPayload } from '../../shared/runtime-client-events'
+} from '../../../shared/external-automation-scope'
+import type { AutomationsChangedPayload } from '../../../shared/runtime-client-events'
 
 export const automationsApi = {
   listExternalManagerForOwner: (
diff --git a/src/preload/api/browser-passwords-api.ts b/src/preload/api/browser/browser-passwords-api.ts
similarity index 97%
rename from src/preload/api/browser-passwords-api.ts
rename to src/preload/api/browser/browser-passwords-api.ts
index b0fde266456..6f1aac27618 100644
--- a/src/preload/api/browser-passwords-api.ts
+++ b/src/preload/api/browser/browser-passwords-api.ts
@@ -11,7 +11,7 @@ import type {
   BrowserPasswordSavePrompt,
   BrowserPasswordSavePromptResponse,
   BrowserPasswordsStatus
-} from '../../shared/browser-passwords-types'
+} from '../../../shared/browser-passwords-types'
 
 type ProfileArgs = { browserProfileId: string }
 type EntryArgs = ProfileArgs & { entryId: string }
diff --git a/src/preload/api/browser-passwords-bridge.ts b/src/preload/api/browser/browser-passwords-bridge.ts
similarity index 100%
rename from src/preload/api/browser-passwords-bridge.ts
rename to src/preload/api/browser/browser-passwords-bridge.ts
diff --git a/src/preload/api/claude-usage-bridge.ts b/src/preload/api/claude-usage-bridge.ts
deleted file mode 100644
index af96d18ef5b..00000000000
--- a/src/preload/api/claude-usage-bridge.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { backendUsageTransport } from '../usage/backend-port-client'
-import { createUsageProviderApi } from '../usage/usage-provider-api'
-import type { PreloadApi } from '../api-types'
-
-export const claudeUsageApi = createUsageProviderApi(
-  backendUsageTransport,
-  'claudeUsage'
-) satisfies PreloadApi['claudeUsage']
diff --git a/src/preload/api/cli-bridge.ts b/src/preload/api/cli-install/cli-bridge.ts
similarity index 86%
rename from src/preload/api/cli-bridge.ts
rename to src/preload/api/cli-install/cli-bridge.ts
index 939d8db03e1..5b780534fd3 100644
--- a/src/preload/api/cli-bridge.ts
+++ b/src/preload/api/cli-install/cli-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { CliInstallStatus } from '../../shared/cli-install-types'
-import type { PreloadApi } from '../api-types'
+import type { CliInstallStatus } from '../../../shared/cli-install-types'
+import type { PreloadApi } from '../../api-types'
 
 export const cliApi = {
   getInstallStatus: (): Promise<CliInstallStatus> => ipcRenderer.invoke('cli:getInstallStatus'),
diff --git a/src/preload/api/cli-install-api.ts b/src/preload/api/cli-install/cli-install-api.ts
similarity index 87%
rename from src/preload/api/cli-install-api.ts
rename to src/preload/api/cli-install/cli-install-api.ts
index 801d5cd8052..e01b7e18249 100644
--- a/src/preload/api/cli-install-api.ts
+++ b/src/preload/api/cli-install/cli-install-api.ts
@@ -1,4 +1,4 @@
-import type { CliInstallStatus } from '../../shared/cli-install-types'
+import type { CliInstallStatus } from '../../../shared/cli-install-types'
 
 export type CliApi = {
   getInstallStatus: () => Promise<CliInstallStatus>
diff --git a/src/preload/api/ephemeral-vm-api.ts b/src/preload/api/cloud-workspaces/ephemeral-vm-api.ts
similarity index 86%
rename from src/preload/api/ephemeral-vm-api.ts
rename to src/preload/api/cloud-workspaces/ephemeral-vm-api.ts
index 0c01a8bf0b4..6c0221171b0 100644
--- a/src/preload/api/ephemeral-vm-api.ts
+++ b/src/preload/api/cloud-workspaces/ephemeral-vm-api.ts
@@ -1,14 +1,14 @@
-import type { OrcaHooks } from '../../shared/orca-yaml-hook-types'
-import type { PublicKnownRuntimeEnvironment } from '../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { EphemeralVmRecipeDoctorResult } from '../../shared/ephemeral-vm-recipes'
-import type { EphemeralVmRecipeResultWarning } from '../../shared/ephemeral-vm-recipe-diagnostics'
+import type { OrcaHooks } from '../../../shared/orca-yaml-hook-types'
+import type { PublicKnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { EphemeralVmRecipeDoctorResult } from '../../../shared/ephemeral-vm-recipes'
+import type { EphemeralVmRecipeResultWarning } from '../../../shared/ephemeral-vm-recipe-diagnostics'
 import type {
   EphemeralVmProvisionedRuntimeRecord,
   EphemeralVmRuntimeRecord,
   EphemeralVmWorkspaceLifecycleResult
-} from '../../shared/ephemeral-vm-runtimes'
-import type { EphemeralVmFailure } from '../../shared/ephemeral-vm-failure-copy'
-import type { PendingVmCheckout } from '../../shared/pending-vm-checkouts'
+} from '../../../shared/ephemeral-vm-runtimes'
+import type { EphemeralVmFailure } from '../../../shared/ephemeral-vm-failure-copy'
+import type { PendingVmCheckout } from '../../../shared/pending-vm-checkouts'
 
 export type EphemeralVmApi = {
   listRecipes: (args: { repoId: string }) => Promise<{
diff --git a/src/preload/api/ephemeral-vm-bridge.ts b/src/preload/api/cloud-workspaces/ephemeral-vm-bridge.ts
similarity index 92%
rename from src/preload/api/ephemeral-vm-bridge.ts
rename to src/preload/api/cloud-workspaces/ephemeral-vm-bridge.ts
index dc1b4ea12c7..177cbd0c827 100644
--- a/src/preload/api/ephemeral-vm-bridge.ts
+++ b/src/preload/api/cloud-workspaces/ephemeral-vm-bridge.ts
@@ -1,10 +1,10 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import { EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL } from '../../shared/ephemeral-vm-runtime-store-events'
+import type { PreloadApi } from '../../api-types'
+import { EPHEMERAL_VM_RUNTIMES_CHANGED_CHANNEL } from '../../../shared/ephemeral-vm-runtime-store-events'
 import {
   PENDING_VM_CHECKOUTS_CHANGED_CHANNEL,
   type PendingVmCheckout
-} from '../../shared/pending-vm-checkouts'
+} from '../../../shared/pending-vm-checkouts'
 
 export const ephemeralVmApi = {
   listRecipes: (args) => ipcRenderer.invoke('ephemeralVm:listRecipes', args),
diff --git a/src/preload/api/codex-usage-bridge.ts b/src/preload/api/codex-usage-bridge.ts
deleted file mode 100644
index 5caeda7115c..00000000000
--- a/src/preload/api/codex-usage-bridge.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { backendUsageTransport } from '../usage/backend-port-client'
-import { createUsageProviderApi } from '../usage/usage-provider-api'
-import type { PreloadApi } from '../api-types'
-
-export const codexUsageApi = createUsageProviderApi(
-  backendUsageTransport,
-  'codexUsage'
-) satisfies PreloadApi['codexUsage']
diff --git a/src/preload/api/computer-use-permissions-bridge.ts b/src/preload/api/desktop-permissions/computer-use-permissions-bridge.ts
similarity index 88%
rename from src/preload/api/computer-use-permissions-bridge.ts
rename to src/preload/api/desktop-permissions/computer-use-permissions-bridge.ts
index bd36efbdcc3..a65769c1f3b 100644
--- a/src/preload/api/computer-use-permissions-bridge.ts
+++ b/src/preload/api/desktop-permissions/computer-use-permissions-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const computerUsePermissionsApi = {
   getStatus: () => ipcRenderer.invoke('computerUsePermissions:getStatus'),
diff --git a/src/preload/api/developer-permissions-bridge.ts b/src/preload/api/desktop-permissions/developer-permissions-bridge.ts
similarity index 91%
rename from src/preload/api/developer-permissions-bridge.ts
rename to src/preload/api/desktop-permissions/developer-permissions-bridge.ts
index 94158cd7818..a5bc6ff8b34 100644
--- a/src/preload/api/developer-permissions-bridge.ts
+++ b/src/preload/api/desktop-permissions/developer-permissions-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const developerPermissionsApi = {
   getStatus: () => ipcRenderer.invoke('developerPermissions:getStatus'),
diff --git a/src/preload/api/macos-tcc-prompts-bridge.ts b/src/preload/api/desktop-permissions/macos-tcc-prompts-bridge.ts
similarity index 95%
rename from src/preload/api/macos-tcc-prompts-bridge.ts
rename to src/preload/api/desktop-permissions/macos-tcc-prompts-bridge.ts
index ef24b9e203e..40de540121d 100644
--- a/src/preload/api/macos-tcc-prompts-bridge.ts
+++ b/src/preload/api/desktop-permissions/macos-tcc-prompts-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const macosTccPromptsApi = {
   onThreshold: (callback: (payload: { promptCount: number }) => void) => {
diff --git a/src/preload/api/os-permission-api.ts b/src/preload/api/desktop-permissions/os-permission-api.ts
similarity index 91%
rename from src/preload/api/os-permission-api.ts
rename to src/preload/api/desktop-permissions/os-permission-api.ts
index 1c9e046ca49..1bdab47c701 100644
--- a/src/preload/api/os-permission-api.ts
+++ b/src/preload/api/desktop-permissions/os-permission-api.ts
@@ -3,13 +3,13 @@ import type {
   ComputerUsePermissionResetResult,
   ComputerUsePermissionSetupResult,
   ComputerUsePermissionStatusResult
-} from '../../shared/computer-use-permissions-types'
+} from '../../../shared/computer-use-permissions-types'
 import type {
   DeveloperPermissionId,
   DeveloperPermissionRequestResult,
   DeveloperPermissionState,
   LocalNetworkConnectionTestResult
-} from '../../shared/developer-permissions-types'
+} from '../../../shared/developer-permissions-types'
 import type {
   NotificationAttentionAcknowledgement,
   NotificationDeliveryProbeResult,
@@ -19,8 +19,8 @@ import type {
   NotificationPermissionStatusResult,
   NotificationSoundResult,
   StructuredNotificationRead
-} from '../../shared/notification-settings-types'
-import type { AgentSessionExecutionLocation } from '../../shared/agent-session/lifecycle/agent-session-record'
+} from '../../../shared/notification-settings-types'
+import type { AgentSessionExecutionLocation } from '../../../shared/agent-session/lifecycle/agent-session-record'
 
 export type NotificationsApi = {
   getDesktopAwayState: () => Promise<boolean | undefined>
diff --git a/src/preload/api/crash-report-api.ts b/src/preload/api/diagnostics/crash-report-api.ts
similarity index 81%
rename from src/preload/api/crash-report-api.ts
rename to src/preload/api/diagnostics/crash-report-api.ts
index 90e13b0ff83..461581d568c 100644
--- a/src/preload/api/crash-report-api.ts
+++ b/src/preload/api/diagnostics/crash-report-api.ts
@@ -6,13 +6,13 @@ import type {
   CrashReportSubmitResult,
   ReactErrorBoundaryReportArgs,
   ReactErrorBoundaryReportResult
-} from '../../shared/crash-reporting'
+} from '../../../shared/crash-reporting'
 import type {
   FeedbackSubmitArgs,
   FeedbackSubmitResult
-} from '../../shared/feedback-submit-contract'
-import type { RendererHeapStatistics } from '../../shared/renderer-heap-statistics'
-import type { RendererProcessMemory } from '../../shared/renderer-process-memory'
+} from '../../../shared/feedback-submit-contract'
+import type { RendererHeapStatistics } from '../../../shared/renderer-heap-statistics'
+import type { RendererProcessMemory } from '../../../shared/renderer-process-memory'
 
 export type CrashReportsApi = {
   getLatestPending: () => Promise<CrashReportRecord | null>
diff --git a/src/preload/api/crash-reports-bridge.ts b/src/preload/api/diagnostics/crash-reports-bridge.ts
similarity index 73%
rename from src/preload/api/crash-reports-bridge.ts
rename to src/preload/api/diagnostics/crash-reports-bridge.ts
index 9b57675f036..c847b9c7f8a 100644
--- a/src/preload/api/crash-reports-bridge.ts
+++ b/src/preload/api/diagnostics/crash-reports-bridge.ts
@@ -6,12 +6,12 @@ import type {
   CrashReportSubmitResult,
   ReactErrorBoundaryReportArgs,
   ReactErrorBoundaryReportResult
-} from '../../shared/crash-reporting'
-import type { RendererHeapStatistics } from '../../shared/renderer-heap-statistics'
-import type { RendererProcessMemory } from '../../shared/renderer-process-memory'
-import { readRendererHeapStatistics } from '../renderer/diagnostics/renderer-heap-statistics-reader'
-import { readRendererProcessMemory } from '../renderer/diagnostics/renderer-process-memory-reader'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/crash-reporting'
+import type { RendererHeapStatistics } from '../../../shared/renderer-heap-statistics'
+import type { RendererProcessMemory } from '../../../shared/renderer-process-memory'
+import { readRendererHeapStatistics } from '../../renderer/diagnostics/renderer-heap-statistics-reader'
+import { readRendererProcessMemory } from '../../renderer/diagnostics/renderer-process-memory-reader'
+import type { PreloadApi } from '../../api-types'
 
 export const crashReportsApi = {
   getLatestPending: () => ipcRenderer.invoke('crashReports:getLatestPending'),
diff --git a/src/preload/api/diagnostics-bridge.ts b/src/preload/api/diagnostics/diagnostics-bridge.ts
similarity index 94%
rename from src/preload/api/diagnostics-bridge.ts
rename to src/preload/api/diagnostics/diagnostics-bridge.ts
index bff79fe5817..95bbaa08efc 100644
--- a/src/preload/api/diagnostics-bridge.ts
+++ b/src/preload/api/diagnostics/diagnostics-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const diagnosticsApi = {
   getStatus: () => ipcRenderer.invoke('diagnostics:getStatus'),
diff --git a/src/preload/api/diagnostics/e2e-bridge.ts b/src/preload/api/diagnostics/e2e-bridge.ts
new file mode 100644
index 00000000000..bfc543d31aa
--- /dev/null
+++ b/src/preload/api/diagnostics/e2e-bridge.ts
@@ -0,0 +1,6 @@
+import { preloadE2EConfig } from '../../renderer/e2e-config'
+import type { PreloadApi } from '../../api-types'
+
+export const e2eApi = {
+  getConfig: () => preloadE2EConfig
+} satisfies PreloadApi['e2e']
diff --git a/src/preload/api/feedback-bridge.ts b/src/preload/api/diagnostics/feedback-bridge.ts
similarity index 73%
rename from src/preload/api/feedback-bridge.ts
rename to src/preload/api/diagnostics/feedback-bridge.ts
index 4c20e90cd8f..3829b24fefa 100644
--- a/src/preload/api/feedback-bridge.ts
+++ b/src/preload/api/diagnostics/feedback-bridge.ts
@@ -1,9 +1,9 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 import type {
   FeedbackSubmitArgs,
   FeedbackSubmitResult
-} from '../../shared/feedback-submit-contract'
+} from '../../../shared/feedback-submit-contract'
 
 export const feedbackApi = {
   submit: (args: FeedbackSubmitArgs): Promise<FeedbackSubmitResult> =>
diff --git a/src/preload/api/memory-bridge.ts b/src/preload/api/diagnostics/memory-bridge.ts
similarity index 76%
rename from src/preload/api/memory-bridge.ts
rename to src/preload/api/diagnostics/memory-bridge.ts
index fea84ce6173..353557c78ed 100644
--- a/src/preload/api/memory-bridge.ts
+++ b/src/preload/api/diagnostics/memory-bridge.ts
@@ -1,8 +1,8 @@
 import { ipcRenderer } from 'electron'
-import type { MemorySnapshot } from '../../shared/process-stats-types'
-import type { PreloadApi } from '../api-types'
+import type { MemorySnapshot } from '../../../shared/process-stats-types'
+import type { PreloadApi } from '../../api-types'
 
-import type { ResourceViewAdmission } from '../../shared/resource-view-admission'
+import type { ResourceViewAdmission } from '../../../shared/resource-view-admission'
 
 export const memoryApi = {
   getSnapshot: (admission?: ResourceViewAdmission): Promise<MemorySnapshot> =>
diff --git a/src/preload/api/stats-bridge.ts b/src/preload/api/diagnostics/stats-bridge.ts
similarity index 85%
rename from src/preload/api/stats-bridge.ts
rename to src/preload/api/diagnostics/stats-bridge.ts
index f435b9980f5..92558279a6a 100644
--- a/src/preload/api/stats-bridge.ts
+++ b/src/preload/api/diagnostics/stats-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const statsApi = {
   getSummary: (): Promise<{
diff --git a/src/preload/api/telemetry-api.ts b/src/preload/api/diagnostics/telemetry-api.ts
similarity index 89%
rename from src/preload/api/telemetry-api.ts
rename to src/preload/api/diagnostics/telemetry-api.ts
index 48b9670d45f..ef15e7f9f4d 100644
--- a/src/preload/api/telemetry-api.ts
+++ b/src/preload/api/diagnostics/telemetry-api.ts
@@ -1,6 +1,6 @@
-import type { ResourceViewAdmission } from '../../shared/resource-view-admission'
-import type { TelemetryConsentState } from '../../shared/telemetry-consent-types'
-import type { MemorySnapshot, StatsSummary } from '../../shared/process-stats-types'
+import type { ResourceViewAdmission } from '../../../shared/resource-view-admission'
+import type { TelemetryConsentState } from '../../../shared/telemetry-consent-types'
+import type { MemorySnapshot, StatsSummary } from '../../../shared/process-stats-types'
 
 export type StatsApi = {
   getSummary: () => Promise<StatsSummary>
diff --git a/src/preload/api/doc-preview-api.ts b/src/preload/api/document-preview/doc-preview-api.ts
similarity index 94%
rename from src/preload/api/doc-preview-api.ts
rename to src/preload/api/document-preview/doc-preview-api.ts
index 63f62f10bb4..1ce27ceb625 100644
--- a/src/preload/api/doc-preview-api.ts
+++ b/src/preload/api/document-preview/doc-preview-api.ts
@@ -1,7 +1,7 @@
 import type {
   DocPreviewExternalLink,
   DocPreviewFailure
-} from '../../shared/document-preview/doc-preview-scheme'
+} from '../../../shared/document-preview/doc-preview-scheme'
 
 export type DocPreviewGrantOwner =
   | { kind: 'ssh'; connectionId: string }
diff --git a/src/preload/api/doc-preview-bridge.ts b/src/preload/api/document-preview/doc-preview-bridge.ts
similarity index 89%
rename from src/preload/api/doc-preview-bridge.ts
rename to src/preload/api/document-preview/doc-preview-bridge.ts
index 4dd6ce3598e..f60b3dd8e0a 100644
--- a/src/preload/api/doc-preview-bridge.ts
+++ b/src/preload/api/document-preview/doc-preview-bridge.ts
@@ -7,9 +7,9 @@ import {
   DOC_PREVIEW_REVOKE_GRANT_CHANNEL,
   type DocPreviewFailure,
   type DocPreviewExternalLink
-} from '../../shared/document-preview/doc-preview-scheme'
-import type { DocPreviewGrantRequest } from '../api/doc-preview-api'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/document-preview/doc-preview-scheme'
+import type { DocPreviewGrantRequest } from './doc-preview-api'
+import type { PreloadApi } from '../../api-types'
 
 export const docPreviewApi = {
   mintGrant: (request: DocPreviewGrantRequest): Promise<{ grantId: string; url: string }> =>
diff --git a/src/preload/api/export-bridge.ts b/src/preload/api/document-preview/export-bridge.ts
similarity index 64%
rename from src/preload/api/export-bridge.ts
rename to src/preload/api/document-preview/export-bridge.ts
index 3b9dc540fba..b7acabc4a95 100644
--- a/src/preload/api/export-bridge.ts
+++ b/src/preload/api/document-preview/export-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import type { PdfExportResult } from '../../shared/pdf-export-failure-copy'
+import type { PreloadApi } from '../../api-types'
+import type { PdfExportResult } from '../../../shared/pdf-export-failure-copy'
 
 export const exportApi = {
   htmlToPdf: (args: { html: string; title: string }): Promise<PdfExportResult> =>
diff --git a/src/preload/api/notebook-bridge.ts b/src/preload/api/document-preview/notebook-bridge.ts
similarity index 88%
rename from src/preload/api/notebook-bridge.ts
rename to src/preload/api/document-preview/notebook-bridge.ts
index 206c320a6b3..00f437bcf08 100644
--- a/src/preload/api/notebook-bridge.ts
+++ b/src/preload/api/document-preview/notebook-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import type { KernelFrameEvent } from '../../shared/notebook-kernel-types'
+import type { PreloadApi } from '../../api-types'
+import type { KernelFrameEvent } from '../../../shared/notebook-kernel-types'
 
 export const notebookApi = {
   listPythonEnvironments: (args) => ipcRenderer.invoke('notebook:listPythonEnvironments', args),
diff --git a/src/preload/api/e2e-bridge.ts b/src/preload/api/e2e-bridge.ts
deleted file mode 100644
index 95ae25baabb..00000000000
--- a/src/preload/api/e2e-bridge.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { preloadE2EConfig } from '../renderer/e2e-config'
-import type { PreloadApi } from '../api-types'
-
-export const e2eApi = {
-  getConfig: () => preloadE2EConfig
-} satisfies PreloadApi['e2e']
diff --git a/src/preload/api/emulator-api.ts b/src/preload/api/emulator/emulator-api.ts
similarity index 100%
rename from src/preload/api/emulator-api.ts
rename to src/preload/api/emulator/emulator-api.ts
diff --git a/src/preload/api/emulator-bridge.ts b/src/preload/api/emulator/emulator-bridge.ts
similarity index 98%
rename from src/preload/api/emulator-bridge.ts
rename to src/preload/api/emulator/emulator-bridge.ts
index 50fb7c3c166..ea4a3a6f736 100644
--- a/src/preload/api/emulator-bridge.ts
+++ b/src/preload/api/emulator/emulator-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const emulatorApi = {
   startFrameStream: (args: {
diff --git a/src/preload/api/filesystem-api.ts b/src/preload/api/filesystem/filesystem-api.ts
similarity index 86%
rename from src/preload/api/filesystem-api.ts
rename to src/preload/api/filesystem/filesystem-api.ts
index 876859ba373..c06365f8455 100644
--- a/src/preload/api/filesystem-api.ts
+++ b/src/preload/api/filesystem/filesystem-api.ts
@@ -1,47 +1,47 @@
-import type { PathExistenceResult } from '../../shared/file-access/path-existence-batch'
-import type { RuntimeFileReadChunkResult } from '../../shared/file-content/runtime-file-read'
-import type { SearchOptions, SearchResult } from '../../shared/file-search/code-search-types'
-import type { PdfExportResult } from '../../shared/pdf-export-failure-copy'
-import type { DirEntry } from '../../shared/file-listing/directory-entry'
-import type { FsChangedPayload } from '../../shared/file-watch/filesystem-change-event'
-import type { MarkdownDocument } from '../../shared/file-listing/file-document'
+import type { PathExistenceResult } from '../../../shared/file-access/path-existence-batch'
+import type { RuntimeFileReadChunkResult } from '../../../shared/file-content/runtime-file-read'
+import type { SearchOptions, SearchResult } from '../../../shared/file-search/code-search-types'
+import type { PdfExportResult } from '../../../shared/pdf-export-failure-copy'
+import type { DirEntry } from '../../../shared/file-listing/directory-entry'
+import type { FsChangedPayload } from '../../../shared/file-watch/filesystem-change-event'
+import type { MarkdownDocument } from '../../../shared/file-listing/file-document'
 import type {
   ImportItemResult,
   ResolveDroppedPathsResult
-} from '../../shared/file-import/filesystem-import-result'
+} from '../../../shared/file-import/filesystem-import-result'
 import type {
   StagedRuntimeUploadSource as StagedExternalImportSource,
   RuntimeUploadFileStreamRequest
-} from '../../shared/file-import/runtime-upload-staging-contract'
+} from '../../../shared/file-import/runtime-upload-staging-contract'
 import type {
   LocalLogTailChangedPayload,
   LocalLogTailReadArgs,
   LocalLogTailReadResult,
   LocalLogTailWatchArgs
-} from '../../shared/local-log-tail-types'
-import type { SshMutationExpectation } from '../../shared/ssh-types'
-import type { LocalFileAccess } from '../../shared/file-access/local-file-access'
-import type { RemoteFilePreviewAddress } from '../../shared/file-preview/remote-file-preview-address'
-import type { FileBytesWritePrecondition } from '../../shared/file-write/file-bytes-write'
+} from '../../../shared/local-log-tail-types'
+import type { SshMutationExpectation } from '../../../shared/ssh-types'
+import type { LocalFileAccess } from '../../../shared/file-access/local-file-access'
+import type { RemoteFilePreviewAddress } from '../../../shared/file-preview/remote-file-preview-address'
+import type { FileBytesWritePrecondition } from '../../../shared/file-write/file-bytes-write'
 import type {
   FileWriteDiskPrecondition,
   FileWriteResult
-} from '../../shared/file-write/file-write-disk-precondition'
+} from '../../../shared/file-write/file-write-disk-precondition'
 import type {
   CreateVenvResult,
   KernelFrameEvent,
   KernelStartResult,
   PythonEnvironment,
   PythonEnvironments
-} from '../../shared/notebook-kernel-types'
+} from '../../../shared/notebook-kernel-types'
 import type {
   AgentSessionAttachmentPathUploadResult,
   AgentSessionAttachmentUploadTarget
-} from '../../shared/agent-session/agent-session-attachments'
+} from '../../../shared/agent-session/agent-session-attachments'
 import type {
   PrepareDroppedPathsRequest,
   PreparedDroppedPaths
-} from '../../shared/file-import/native-file-drop-preparation'
+} from '../../../shared/file-import/native-file-drop-preparation'
 
 export type ExportApi = {
   htmlToPdf: (args: { html: string; title: string }) => Promise<PdfExportResult>
diff --git a/src/preload/api/fs-bridge.ts b/src/preload/api/filesystem/fs-bridge.ts
similarity index 90%
rename from src/preload/api/fs-bridge.ts
rename to src/preload/api/filesystem/fs-bridge.ts
index dcc376428c0..8f6e091c5c3 100644
--- a/src/preload/api/fs-bridge.ts
+++ b/src/preload/api/filesystem/fs-bridge.ts
@@ -1,38 +1,38 @@
-import type { PathExistenceResult } from '../../shared/file-access/path-existence-batch'
+import type { PathExistenceResult } from '../../../shared/file-access/path-existence-batch'
 import { ipcRenderer, webUtils } from 'electron'
 import type {
   PrepareDroppedPathsRequest,
   PreparedDroppedPaths
-} from '../../shared/file-import/native-file-drop-preparation'
-import type { SshMutationExpectation } from '../../shared/ssh-types'
-import type { LocalFileAccess } from '../../shared/file-access/local-file-access'
-import type { RemoteFilePreviewAddress } from '../../shared/file-preview/remote-file-preview-address'
-import type { FileBytesWritePrecondition } from '../../shared/file-write/file-bytes-write'
+} from '../../../shared/file-import/native-file-drop-preparation'
+import type { SshMutationExpectation } from '../../../shared/ssh-types'
+import type { LocalFileAccess } from '../../../shared/file-access/local-file-access'
+import type { RemoteFilePreviewAddress } from '../../../shared/file-preview/remote-file-preview-address'
+import type { FileBytesWritePrecondition } from '../../../shared/file-write/file-bytes-write'
 import type {
   FileWriteDiskPrecondition,
   FileWriteResult
-} from '../../shared/file-write/file-write-disk-precondition'
+} from '../../../shared/file-write/file-write-disk-precondition'
 import type {
   RuntimeUploadFileStreamRequest,
   StagedRuntimeUploadSource as StagedExternalImportSource
-} from '../../shared/file-import/runtime-upload-staging-contract'
+} from '../../../shared/file-import/runtime-upload-staging-contract'
 import type {
   AgentSessionAttachmentPathUploadResult,
   AgentSessionAttachmentUploadTarget
-} from '../../shared/agent-session/agent-session-attachments'
-import type { SearchResult } from '../../shared/file-search/code-search-types'
-import type { FsChangedPayload } from '../../shared/file-watch/filesystem-change-event'
+} from '../../../shared/agent-session/agent-session-attachments'
+import type { SearchResult } from '../../../shared/file-search/code-search-types'
+import type { FsChangedPayload } from '../../../shared/file-watch/filesystem-change-event'
 import type {
   ImportItemResult,
   ResolveDroppedPathsResult
-} from '../../shared/file-import/filesystem-import-result'
+} from '../../../shared/file-import/filesystem-import-result'
 import type {
   LocalLogTailChangedPayload,
   LocalLogTailReadArgs,
   LocalLogTailReadResult,
   LocalLogTailWatchArgs
-} from '../../shared/local-log-tail-types'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/local-log-tail-types'
+import type { PreloadApi } from '../../api-types'
 
 export const fsApi = {
   getPathForFile: (file: File): string => webUtils.getPathForFile(file),
diff --git a/src/preload/api/cache-bridge.ts b/src/preload/api/github/cache-bridge.ts
similarity index 81%
rename from src/preload/api/cache-bridge.ts
rename to src/preload/api/github/cache-bridge.ts
index 73fd9db88c0..d18284662a4 100644
--- a/src/preload/api/cache-bridge.ts
+++ b/src/preload/api/github/cache-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const cacheApi = {
   getGitHub: () => ipcRenderer.invoke('cache:getGitHub'),
diff --git a/src/preload/api/gh-bridge-mutations-and-projects.ts b/src/preload/api/github/gh-bridge-mutations-and-projects.ts
similarity index 91%
rename from src/preload/api/gh-bridge-mutations-and-projects.ts
rename to src/preload/api/github/gh-bridge-mutations-and-projects.ts
index ecc75e119e9..9059845c61e 100644
--- a/src/preload/api/gh-bridge-mutations-and-projects.ts
+++ b/src/preload/api/github/gh-bridge-mutations-and-projects.ts
@@ -1,15 +1,15 @@
-import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
+import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
 import { ipcRenderer } from 'electron'
-import type { GitHubCommentResult } from '../../shared/github/comments/comment-types'
-import type { GitHubAssignableUser } from '../../shared/github/pull-requests/pull-request-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../shared/github/repositories/repository-identity'
-import type { GetRateLimitResult } from '../../shared/github/api/rate-limit-types'
+import type { GitHubCommentResult } from '../../../shared/github/comments/comment-types'
+import type { GitHubAssignableUser } from '../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
+import type { GetRateLimitResult } from '../../../shared/github/api/rate-limit-types'
 import type {
   GhAccountBindingInventory,
   GhAccountBindingValidationResult,
   GhAuthDiagnostic
-} from '../../shared/github/accounts/auth-types'
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
+} from '../../../shared/github/accounts/auth-types'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
 import type {
   GetProjectViewTableResult,
   GitHubProjectCommentMutationResult,
@@ -21,7 +21,7 @@ import type {
   ListProjectViewsResult,
   ProjectWorkItemDetailsBySlugResult,
   ResolveProjectRefResult
-} from '../../shared/github/projects/project-result-types'
+} from '../../../shared/github/projects/project-result-types'
 import type {
   AddIssueCommentBySlugArgs,
   ClearProjectItemFieldArgs,
@@ -39,9 +39,9 @@ import type {
   UpdateIssueTypeBySlugArgs,
   UpdatePullRequestBySlugArgs,
   UpdateProjectItemFieldArgs
-} from '../../shared/github/projects/project-request-types'
-import type { AppStarSource } from '../../shared/gh-star-source'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/github/projects/project-request-types'
+import type { AppStarSource } from '../../../shared/gh-star-source'
+import type { PreloadApi } from '../../api-types'
 
 export const ghMutationsAndProjectsApi = {
   setPRAutoMerge: (args: {
diff --git a/src/preload/api/gh-bridge-pull-requests-and-work-items.ts b/src/preload/api/github/gh-bridge-pull-requests-and-work-items.ts
similarity index 91%
rename from src/preload/api/gh-bridge-pull-requests-and-work-items.ts
rename to src/preload/api/github/gh-bridge-pull-requests-and-work-items.ts
index 9c9eaa5efa0..86831ee4850 100644
--- a/src/preload/api/gh-bridge-pull-requests-and-work-items.ts
+++ b/src/preload/api/github/gh-bridge-pull-requests-and-work-items.ts
@@ -1,19 +1,19 @@
-import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
+import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
 import { ipcRenderer } from 'electron'
-import type { GitHubReactionContent } from '../../shared/github/comments/comment-types'
+import type { GitHubReactionContent } from '../../../shared/github/comments/comment-types'
 import type {
   GitHubPRRefreshCandidate,
   GitHubPRRefreshEvent,
   GitHubPRRefreshReason
-} from '../../shared/github/pull-requests/refresh/pull-request-refresh-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../shared/github/repositories/repository-identity'
+} from '../../../shared/github/pull-requests/refresh/pull-request-refresh-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type {
   GitHubWorkItem,
   ListWorkItemsResult
-} from '../../shared/github/work-items/work-item-types'
-import type { GitHubCreateIssueResult } from '../../shared/issue-mutation-types'
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/github/work-items/work-item-types'
+import type { GitHubCreateIssueResult } from '../../../shared/issue-mutation-types'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import type { PreloadApi } from '../../api-types'
 
 export const ghPullRequestsAndWorkItemsApi = {
   viewer: () => ipcRenderer.invoke('gh:viewer'),
diff --git a/src/preload/api/gh-bridge.ts b/src/preload/api/github/gh-bridge.ts
similarity index 85%
rename from src/preload/api/gh-bridge.ts
rename to src/preload/api/github/gh-bridge.ts
index c7da93698e6..8eb0d90c37f 100644
--- a/src/preload/api/gh-bridge.ts
+++ b/src/preload/api/github/gh-bridge.ts
@@ -1,4 +1,4 @@
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 import { ghPullRequestsAndWorkItemsApi } from './gh-bridge-pull-requests-and-work-items'
 import { ghMutationsAndProjectsApi } from './gh-bridge-mutations-and-projects'
 
diff --git a/src/preload/api/github-account-api.ts b/src/preload/api/github/github-account-api.ts
similarity index 89%
rename from src/preload/api/github-account-api.ts
rename to src/preload/api/github/github-account-api.ts
index 4fe0a42066b..04f843c0c2f 100644
--- a/src/preload/api/github-account-api.ts
+++ b/src/preload/api/github/github-account-api.ts
@@ -1,7 +1,7 @@
 import type {
   GhAccountBindingInventory,
   GhAccountBindingValidationResult
-} from '../../shared/github/accounts/auth-types'
+} from '../../../shared/github/accounts/auth-types'
 
 export type GithubAccountApi = {
   listBindableAccounts: (args: {
diff --git a/src/preload/api/github-pull-request-api.ts b/src/preload/api/github/github-pull-request-api.ts
similarity index 89%
rename from src/preload/api/github-pull-request-api.ts
rename to src/preload/api/github/github-pull-request-api.ts
index 3284d2b8565..c763ebb7798 100644
--- a/src/preload/api/github-pull-request-api.ts
+++ b/src/preload/api/github/github-pull-request-api.ts
@@ -1,29 +1,29 @@
-import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
-import type { AppStarSource } from '../../shared/gh-star-source'
-import type { GhAuthDiagnostic } from '../../shared/github/accounts/auth-types'
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
-import type { PRCheckDetail, PRCheckRunDetails } from '../../shared/github/checks/check-types'
+import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
+import type { AppStarSource } from '../../../shared/gh-star-source'
+import type { GhAuthDiagnostic } from '../../../shared/github/accounts/auth-types'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import type { PRCheckDetail, PRCheckRunDetails } from '../../../shared/github/checks/check-types'
 import type {
   GitHubCommentResult,
   GitHubPRReviewCommentInput,
   GitHubReactionContent,
   PRComment
-} from '../../shared/github/comments/comment-types'
+} from '../../../shared/github/comments/comment-types'
 import type {
   GitHubPRRefreshCandidate,
   GitHubPRRefreshEnqueueResult,
   GitHubPRRefreshEvent,
   GitHubPRRefreshReason,
   PRRefreshOutcome
-} from '../../shared/github/pull-requests/refresh/pull-request-refresh-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../shared/github/repositories/repository-identity'
+} from '../../../shared/github/pull-requests/refresh/pull-request-refresh-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type {
   GitHubPRFile,
   GitHubPRFileContents,
   GitHubViewer,
   PRInfo
-} from '../../shared/github/pull-requests/pull-request-types'
-import type { GetRateLimitResult } from '../../shared/github/api/rate-limit-types'
+} from '../../../shared/github/pull-requests/pull-request-types'
+import type { GetRateLimitResult } from '../../../shared/github/api/rate-limit-types'
 import type { GitHubRepoSelectorArgs } from './github-work-item-api'
 
 export type GithubPullRequestApi = {
diff --git a/src/preload/api/github-work-item-api.ts b/src/preload/api/github/github-work-item-api.ts
similarity index 89%
rename from src/preload/api/github-work-item-api.ts
rename to src/preload/api/github/github-work-item-api.ts
index e130bae0ff4..7ea10d421bd 100644
--- a/src/preload/api/github-work-item-api.ts
+++ b/src/preload/api/github/github-work-item-api.ts
@@ -1,4 +1,4 @@
-import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
+import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
 import type {
   GetProjectViewTableResult,
   GitHubProjectCommentMutationResult,
@@ -10,7 +10,7 @@ import type {
   ListProjectViewsResult,
   ProjectWorkItemDetailsBySlugResult,
   ResolveProjectRefResult
-} from '../../shared/github/projects/project-result-types'
+} from '../../../shared/github/projects/project-result-types'
 import type {
   AddIssueCommentBySlugArgs,
   ClearProjectItemFieldArgs,
@@ -28,20 +28,23 @@ import type {
   UpdateIssueTypeBySlugArgs,
   UpdateProjectItemFieldArgs,
   UpdatePullRequestBySlugArgs
-} from '../../shared/github/projects/project-request-types'
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
-import type { GitHubCommentResult } from '../../shared/github/comments/comment-types'
+} from '../../../shared/github/projects/project-request-types'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import type { GitHubCommentResult } from '../../../shared/github/comments/comment-types'
 import type {
   GitHubAssignableUser,
   IssueInfo
-} from '../../shared/github/pull-requests/pull-request-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../shared/github/repositories/repository-identity'
+} from '../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../shared/github/repositories/repository-identity'
 import type {
   GitHubWorkItem,
   GitHubWorkItemDetails,
   ListWorkItemsResult
-} from '../../shared/github/work-items/work-item-types'
-import type { GitHubCreateIssueResult, GitHubIssueUpdate } from '../../shared/issue-mutation-types'
+} from '../../../shared/github/work-items/work-item-types'
+import type {
+  GitHubCreateIssueResult,
+  GitHubIssueUpdate
+} from '../../../shared/issue-mutation-types'
 
 export type GitHubRepoSelectorArgs = {
   repoOwnerExecutionHostId?: string
diff --git a/src/preload/api/gitlab-api.ts b/src/preload/api/gitlab/gitlab-api.ts
similarity index 96%
rename from src/preload/api/gitlab-api.ts
rename to src/preload/api/gitlab/gitlab-api.ts
index 7a651c92a5d..c0380696f34 100644
--- a/src/preload/api/gitlab-api.ts
+++ b/src/preload/api/gitlab/gitlab-api.ts
@@ -1,5 +1,5 @@
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
-import type { ClassifiedError } from '../../shared/classified-error'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import type { ClassifiedError } from '../../../shared/classified-error'
 import type {
   GetGitLabRateLimitResult,
   GitLabAssignableUser,
@@ -22,7 +22,7 @@ import type {
   ListMergeRequestsResult,
   MRInfo,
   MRListState
-} from '../../shared/gitlab-types'
+} from '../../../shared/gitlab-types'
 
 export type GitLabRepoSelectorArgs = {
   repoPath: string
diff --git a/src/preload/api/gitlab.ts b/src/preload/api/gitlab/gitlab.ts
similarity index 96%
rename from src/preload/api/gitlab.ts
rename to src/preload/api/gitlab/gitlab.ts
index 0b393f98904..3ca2c858a9c 100644
--- a/src/preload/api/gitlab.ts
+++ b/src/preload/api/gitlab/gitlab.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { GitLabMRInvolvement } from '../../shared/gitlab-types'
-import type { TaskSourceContext } from '../../shared/work-items/task-source-context'
+import type { GitLabMRInvolvement } from '../../../shared/gitlab-types'
+import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
 
 type GitLabRepoSelectorArgs = {
   repoPath: string
diff --git a/src/preload/api/bitbucket-bridge.ts b/src/preload/api/hosted-review/bitbucket-bridge.ts
similarity index 78%
rename from src/preload/api/bitbucket-bridge.ts
rename to src/preload/api/hosted-review/bitbucket-bridge.ts
index bdb8c6632cd..cf8138b9fa7 100644
--- a/src/preload/api/bitbucket-bridge.ts
+++ b/src/preload/api/hosted-review/bitbucket-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
-import type { BitbucketConnectResult } from '../../shared/bitbucket-credentials'
+import type { PreloadApi } from '../../api-types'
+import type { BitbucketConnectResult } from '../../../shared/bitbucket-credentials'
 
 export const bitbucketApi = {
   connect: (args: {
diff --git a/src/preload/api/hosted-review-api.ts b/src/preload/api/hosted-review/hosted-review-api.ts
similarity index 89%
rename from src/preload/api/hosted-review-api.ts
rename to src/preload/api/hosted-review/hosted-review-api.ts
index 78e70ea83b6..a166bb0dfbf 100644
--- a/src/preload/api/hosted-review-api.ts
+++ b/src/preload/api/hosted-review/hosted-review-api.ts
@@ -2,7 +2,7 @@ import type {
   BitbucketConnectArgs,
   BitbucketConnectResult,
   BitbucketConnectionStatus
-} from '../../shared/bitbucket-credentials'
+} from '../../../shared/bitbucket-credentials'
 import type {
   CreateHostedReviewArgs,
   CreateHostedReviewResult,
@@ -13,7 +13,7 @@ import type {
   HostedReviewForBranchArgs,
   HostedReviewForBranchReply,
   HostedReviewInfo
-} from '../../shared/source-control/hosted-review/hosted-review-contracts'
+} from '../../../shared/source-control/hosted-review/hosted-review-contracts'
 
 export type HostedReviewApi = {
   forBranch: {
diff --git a/src/preload/api/hosted-review-bridge.ts b/src/preload/api/hosted-review/hosted-review-bridge.ts
similarity index 74%
rename from src/preload/api/hosted-review-bridge.ts
rename to src/preload/api/hosted-review/hosted-review-bridge.ts
index bcb55e31fb1..1edc8be8a63 100644
--- a/src/preload/api/hosted-review-bridge.ts
+++ b/src/preload/api/hosted-review/hosted-review-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { HostedReviewForBranchArgs } from '../../shared/source-control/hosted-review/hosted-review-contracts'
-import type { PreloadApi } from '../api-types'
+import type { HostedReviewForBranchArgs } from '../../../shared/source-control/hosted-review/hosted-review-contracts'
+import type { PreloadApi } from '../../api-types'
 
 export const hostedReviewApi = {
   forBranch: (args: HostedReviewForBranchArgs) =>
diff --git a/src/preload/api/link-preview-api.ts b/src/preload/api/link-preview/link-preview-api.ts
similarity index 86%
rename from src/preload/api/link-preview-api.ts
rename to src/preload/api/link-preview/link-preview-api.ts
index a13ace004c9..88dd24f92a4 100644
--- a/src/preload/api/link-preview-api.ts
+++ b/src/preload/api/link-preview/link-preview-api.ts
@@ -1,4 +1,4 @@
-import type { LinkPreviewRequest, LinkPreviewResult } from '../../shared/link-preview'
+import type { LinkPreviewRequest, LinkPreviewResult } from '../../../shared/link-preview'
 
 export type LinkPreviewApi = {
   get: (request: LinkPreviewRequest) => Promise<LinkPreviewResult>
diff --git a/src/preload/api/link-preview-bridge.ts b/src/preload/api/link-preview/link-preview-bridge.ts
similarity index 77%
rename from src/preload/api/link-preview-bridge.ts
rename to src/preload/api/link-preview/link-preview-bridge.ts
index e7933c2988c..d0c3950805c 100644
--- a/src/preload/api/link-preview-bridge.ts
+++ b/src/preload/api/link-preview/link-preview-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const linkPreviewApi = {
   get: (request) => ipcRenderer.invoke('linkPreview:get', request)
diff --git a/src/preload/api/legacy-relay-bridge-api.ts b/src/preload/api/mobile/legacy-relay-bridge-api.ts
similarity index 97%
rename from src/preload/api/legacy-relay-bridge-api.ts
rename to src/preload/api/mobile/legacy-relay-bridge-api.ts
index 7144cba339d..5eefcd228cb 100644
--- a/src/preload/api/legacy-relay-bridge-api.ts
+++ b/src/preload/api/mobile/legacy-relay-bridge-api.ts
@@ -8,7 +8,7 @@ import {
   type LegacyRelayBridgeAttachResult,
   type LegacyRelayBridgeCloseResult,
   type LegacyRelayBridgedPane
-} from '../../shared/legacy-relay-bridge-contract'
+} from '../../../shared/legacy-relay-bridge-contract'
 
 export type LegacyRelayBridgeApi = {
   listPanes: () => Promise<LegacyRelayBridgedPane[]>
diff --git a/src/preload/api/mobile-api.ts b/src/preload/api/mobile/mobile-api.ts
similarity index 84%
rename from src/preload/api/mobile-api.ts
rename to src/preload/api/mobile/mobile-api.ts
index 3ad9d32c313..6a6461ab18e 100644
--- a/src/preload/api/mobile-api.ts
+++ b/src/preload/api/mobile/mobile-api.ts
@@ -1,8 +1,8 @@
-import type { MobileRelayStatusDetail } from '../../shared/remote-runtime/relay/mobile-relay-status'
-import type { MobilePairingConnectionMode } from '../../shared/remote-runtime/pairing/mobile-pairing-connection-mode'
-import type { RuntimePairingReach } from '../../shared/runtime-pairing-reach'
-import type { MobileRelayMintFailure } from '../../shared/remote-runtime/relay/mobile-relay-mint-failure'
-import type { RuntimeAccessGrant } from '../../shared/runtime-access-grants'
+import type { MobileRelayStatusDetail } from '../../../shared/remote-runtime/relay/mobile-relay-status'
+import type { MobilePairingConnectionMode } from '../../../shared/remote-runtime/pairing/mobile-pairing-connection-mode'
+import type { RuntimePairingReach } from '../../../shared/runtime-pairing-reach'
+import type { MobileRelayMintFailure } from '../../../shared/remote-runtime/relay/mobile-relay-mint-failure'
+import type { RuntimeAccessGrant } from '../../../shared/runtime-access-grants'
 
 export type MobileApi = {
   listNetworkInterfaces: () => Promise<{
diff --git a/src/preload/api/mobile-bridge.ts b/src/preload/api/mobile/mobile-bridge.ts
similarity index 87%
rename from src/preload/api/mobile-bridge.ts
rename to src/preload/api/mobile/mobile-bridge.ts
index eb80fb0dced..0f3ca141a20 100644
--- a/src/preload/api/mobile-bridge.ts
+++ b/src/preload/api/mobile/mobile-bridge.ts
@@ -1,9 +1,9 @@
 import { ipcRenderer } from 'electron'
-import type { MobileRelayStatusDetail } from '../../shared/remote-runtime/relay/mobile-relay-status'
-import type { MobilePairingConnectionMode } from '../../shared/remote-runtime/pairing/mobile-pairing-connection-mode'
-import type { RuntimePairingReach } from '../../shared/runtime-pairing-reach'
-import type { MobileRelayMintFailure } from '../../shared/remote-runtime/relay/mobile-relay-mint-failure'
-import type { PreloadApi } from '../api-types'
+import type { MobileRelayStatusDetail } from '../../../shared/remote-runtime/relay/mobile-relay-status'
+import type { MobilePairingConnectionMode } from '../../../shared/remote-runtime/pairing/mobile-pairing-connection-mode'
+import type { RuntimePairingReach } from '../../../shared/runtime-pairing-reach'
+import type { MobileRelayMintFailure } from '../../../shared/remote-runtime/relay/mobile-relay-mint-failure'
+import type { PreloadApi } from '../../api-types'
 
 export const mobileApi = {
   listNetworkInterfaces: (): Promise<{
diff --git a/src/preload/api/muse-usage-bridge.ts b/src/preload/api/muse-usage-bridge.ts
deleted file mode 100644
index 833b0541434..00000000000
--- a/src/preload/api/muse-usage-bridge.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { backendUsageTransport } from '../usage/backend-port-client'
-import { createUsageProviderApi } from '../usage/usage-provider-api'
-import type { PreloadApi } from '../api-types'
-
-export const museUsageApi = createUsageProviderApi(
-  backendUsageTransport,
-  'museUsage'
-) satisfies PreloadApi['museUsage']
diff --git a/src/preload/api/native-chat-api.ts b/src/preload/api/native-chat/native-chat-api.ts
similarity index 91%
rename from src/preload/api/native-chat-api.ts
rename to src/preload/api/native-chat/native-chat-api.ts
index e8a905c1529..dfe135dbe8b 100644
--- a/src/preload/api/native-chat-api.ts
+++ b/src/preload/api/native-chat/native-chat-api.ts
@@ -1,9 +1,9 @@
-import type { AgentType } from '../../shared/agent-status/contracts/agent-status-types'
-import type { NativeChatVisualTheme } from '../../shared/native-chat/native-chat-visual-shell'
+import type { AgentType } from '../../../shared/agent-status/contracts/agent-status-types'
+import type { NativeChatVisualTheme } from '../../../shared/native-chat/native-chat-visual-shell'
 import type {
   NativeChatMessage,
   NativeChatTurnLifecycle
-} from '../../shared/native-chat/native-chat-types'
+} from '../../../shared/native-chat/native-chat-types'
 
 // notFound marks a not-yet-on-disk miss (retry-worthy) vs a real read/parse error (#8401).
 export type NativeChatReadSessionResult =
diff --git a/src/preload/api/native-chat-bridge.ts b/src/preload/api/native-chat/native-chat-bridge.ts
similarity index 90%
rename from src/preload/api/native-chat-bridge.ts
rename to src/preload/api/native-chat/native-chat-bridge.ts
index fdea9c0b8c9..e62ca22808c 100644
--- a/src/preload/api/native-chat-bridge.ts
+++ b/src/preload/api/native-chat/native-chat-bridge.ts
@@ -4,12 +4,12 @@ import type {
   NativeChatReadSessionResult,
   NativeChatSubscriptionFrame
 } from './native-chat-api'
-import type { PreloadApi } from '../api-types'
-import type { AgentType } from '../../shared/agent-status/contracts/agent-status-types'
+import type { PreloadApi } from '../../api-types'
+import type { AgentType } from '../../../shared/agent-status/contracts/agent-status-types'
 import {
   NATIVE_CHAT_VISUAL_GUEST_THEME_PUBLISH,
   type NativeChatVisualTheme
-} from '../../shared/native-chat/native-chat-visual-shell'
+} from '../../../shared/native-chat/native-chat-visual-shell'
 
 export const nativeChatApi = {
   // Acknowledge the in-memory snapshot before guest creation can start its preload.
diff --git a/src/preload/api/notification-sound-playback.test.ts b/src/preload/api/notification-sound-playback.test.ts
deleted file mode 100644
index 0507e2c639b..00000000000
--- a/src/preload/api/notification-sound-playback.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import type { notificationsApi } from './notifications-bridge'
-
-const SOUND_PATH = join(tmpdir(), 'notification.mp3')
-
-const { construct, invoke, play } = vi.hoisted(() => ({
-  construct: vi.fn((audio: { currentTime: number; volume: number; pause: () => void }) => audio),
-  invoke: vi.fn(),
-  play: vi.fn(() => Promise.resolve())
-}))
-
-vi.mock('electron', () => ({ ipcRenderer: { invoke } }))
-
-async function loadNotificationsApi(): Promise<typeof notificationsApi> {
-  vi.resetModules()
-  return (await import('./notifications-bridge')).notificationsApi
-}
-
-describe('notificationsApi.playSound', () => {
-  beforeEach(() => {
-    construct.mockClear()
-    play.mockClear()
-    vi.stubGlobal(
-      'Audio',
-      class extends EventTarget {
-        currentTime = 0
-        volume = 1
-        src = ''
-        pause = vi.fn()
-        play = play
-
-        constructor() {
-          super()
-          construct(this)
-        }
-      }
-    )
-    invoke.mockReset()
-    invoke.mockImplementation((channel: string) => {
-      if (channel === 'notifications:resolveSoundPath') {
-        return Promise.resolve({ ok: true, path: SOUND_PATH })
-      }
-      if (channel === 'notifications:loadSound') {
-        return Promise.resolve({
-          ok: true,
-          data: new Uint8Array([1]),
-          mimeType: 'audio/mpeg',
-          path: SOUND_PATH
-        })
-      }
-      return Promise.resolve(undefined)
-    })
-  })
-
-  afterEach(() => vi.unstubAllGlobals())
-
-  it('replays the cached sound for each notification instead of deduping mid-playback', async () => {
-    const notificationsApi = await loadNotificationsApi()
-
-    await expect(notificationsApi.playSound()).resolves.toEqual({ played: true })
-    const audio = construct.mock.calls[0]?.[0]
-    if (!audio) {
-      throw new Error('Audio was not constructed')
-    }
-    audio.currentTime = 0.75
-    await expect(notificationsApi.playSound()).resolves.toEqual({ played: true })
-
-    expect(audio.currentTime).toBe(0)
-    expect(construct).toHaveBeenCalledOnce()
-    expect(play).toHaveBeenCalledTimes(2)
-  })
-
-  it('retries after a rejected play without leaving future notifications silent', async () => {
-    const notificationsApi = await loadNotificationsApi()
-    play.mockRejectedValueOnce(new Error('audio device unavailable'))
-    await expect(notificationsApi.playSound()).resolves.toEqual({
-      played: false,
-      reason: 'playback-failed'
-    })
-    await expect(notificationsApi.playSound()).resolves.toEqual({ played: true })
-    expect(construct).toHaveBeenCalledOnce()
-  })
-
-  it('clamps volume and stays silent when no sound is configured', async () => {
-    const notificationsApi = await loadNotificationsApi()
-    await notificationsApi.playSound({ volume: 150 })
-    const audio = construct.mock.calls[0]?.[0]
-    if (!audio) {
-      throw new Error('Audio was not constructed')
-    }
-    expect(audio.volume).toBe(1)
-    await notificationsApi.playSound({ volume: -10 })
-    expect(audio.volume).toBe(0)
-    invoke.mockResolvedValueOnce({ ok: false, reason: 'missing-path' })
-    await expect(notificationsApi.playSound()).resolves.toEqual({
-      played: false,
-      reason: 'missing-path'
-    })
-    expect(audio.pause).toHaveBeenCalledOnce()
-    expect(play).toHaveBeenCalledTimes(2)
-  })
-
-  it('shares one cached Audio across concurrent first playback', async () => {
-    const notificationsApi = await loadNotificationsApi()
-
-    await expect(
-      Promise.all([notificationsApi.playSound(), notificationsApi.playSound()])
-    ).resolves.toEqual([{ played: true }, { played: true }])
-
-    expect(construct).toHaveBeenCalledOnce()
-    expect(play).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/preload/api/notifications/notification-sound-playback.test.ts b/src/preload/api/notifications/notification-sound-playback.test.ts
new file mode 100644
index 00000000000..a512929250e
--- /dev/null
+++ b/src/preload/api/notifications/notification-sound-playback.test.ts
@@ -0,0 +1,61 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import type { notificationsApi } from './notifications-bridge'
+
+const SOUND_PATH = join(tmpdir(), 'notification.mp3')
+
+const { invoke, play } = vi.hoisted(() => ({
+  invoke: vi.fn(),
+  play: vi.fn(() => Promise.resolve())
+}))
+
+vi.mock('electron', () => ({ ipcRenderer: { invoke } }))
+
+async function loadNotificationsApi(): Promise<typeof notificationsApi> {
+  vi.resetModules()
+  return (await import('./notifications-bridge')).notificationsApi
+}
+
+describe('notificationsApi.playSound', () => {
+  beforeEach(() => {
+    play.mockClear()
+    vi.stubGlobal(
+      'Audio',
+      class extends EventTarget {
+        currentTime = 0
+        volume = 1
+        src = ''
+        pause = vi.fn()
+        play = play
+      }
+    )
+    invoke.mockReset()
+    invoke.mockImplementation((channel: string) => {
+      if (channel === 'notifications:resolveSoundPath') {
+        return Promise.resolve({ ok: true, path: SOUND_PATH })
+      }
+      if (channel === 'notifications:loadSound') {
+        return Promise.resolve({
+          ok: true,
+          data: new Uint8Array([1]),
+          mimeType: 'audio/mpeg',
+          path: SOUND_PATH
+        })
+      }
+      return Promise.resolve(undefined)
+    })
+  })
+
+  afterEach(() => vi.unstubAllGlobals())
+
+  it('retries after a rejected play without leaving future notifications silent', async () => {
+    const notificationsApi = await loadNotificationsApi()
+    play.mockRejectedValueOnce(new Error('audio device unavailable'))
+    await expect(notificationsApi.playSound()).resolves.toEqual({
+      played: false,
+      reason: 'playback-failed'
+    })
+    await expect(notificationsApi.playSound()).resolves.toEqual({ played: true })
+  })
+})
diff --git a/src/preload/api/notifications-bridge.ts b/src/preload/api/notifications/notifications-bridge.ts
similarity index 95%
rename from src/preload/api/notifications-bridge.ts
rename to src/preload/api/notifications/notifications-bridge.ts
index 60c43717b38..f51da880dab 100644
--- a/src/preload/api/notifications-bridge.ts
+++ b/src/preload/api/notifications/notifications-bridge.ts
@@ -10,9 +10,9 @@ import type {
   NotificationSoundPathResult,
   NotificationSoundResult,
   StructuredNotificationRead
-} from '../../shared/notification-settings-types'
-import type { AgentSessionExecutionLocation } from '../../shared/agent-session/lifecycle/agent-session-record'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/notification-settings-types'
+import type { AgentSessionExecutionLocation } from '../../../shared/agent-session/lifecycle/agent-session-record'
+import type { PreloadApi } from '../../api-types'
 
 // Reuse sound data to avoid reading large files for every notification.
 let cachedNotificationSound: {
diff --git a/src/preload/api/onboarding-api.ts b/src/preload/api/onboarding/onboarding-api.ts
similarity index 85%
rename from src/preload/api/onboarding-api.ts
rename to src/preload/api/onboarding/onboarding-api.ts
index 2e1e67a694f..36eb0d7be5a 100644
--- a/src/preload/api/onboarding-api.ts
+++ b/src/preload/api/onboarding/onboarding-api.ts
@@ -1,5 +1,5 @@
-import type { ChatUiLaunchTipVariant } from '../../shared/native-chat/chat-ui-launch-tip-audience'
-import type { OnboardingState } from '../../shared/onboarding-state-types'
+import type { ChatUiLaunchTipVariant } from '../../../shared/native-chat/chat-ui-launch-tip-audience'
+import type { OnboardingState } from '../../../shared/onboarding-state-types'
 
 export type OnboardingApi = {
   get: () => Promise<OnboardingState>
diff --git a/src/preload/api/onboarding-bridge.ts b/src/preload/api/onboarding/onboarding-bridge.ts
similarity index 69%
rename from src/preload/api/onboarding-bridge.ts
rename to src/preload/api/onboarding/onboarding-bridge.ts
index 5efd171b512..6e4c25f0dcf 100644
--- a/src/preload/api/onboarding-bridge.ts
+++ b/src/preload/api/onboarding/onboarding-bridge.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron'
-import type { ChatUiLaunchTipVariant } from '../../shared/native-chat/chat-ui-launch-tip-audience'
-import type { OnboardingState } from '../../shared/onboarding-state-types'
-import type { PreloadApi } from '../api-types'
+import type { ChatUiLaunchTipVariant } from '../../../shared/native-chat/chat-ui-launch-tip-audience'
+import type { OnboardingState } from '../../../shared/onboarding-state-types'
+import type { PreloadApi } from '../../api-types'
 
 export const onboardingApi = {
   get: (): Promise<OnboardingState> => ipcRenderer.invoke('onboarding:get'),
diff --git a/src/preload/api/star-nag-bridge.ts b/src/preload/api/onboarding/star-nag-bridge.ts
similarity index 96%
rename from src/preload/api/star-nag-bridge.ts
rename to src/preload/api/onboarding/star-nag-bridge.ts
index 49e56e4aa91..f63fd1f141d 100644
--- a/src/preload/api/star-nag-bridge.ts
+++ b/src/preload/api/onboarding/star-nag-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const starNagApi = {
   onShow: (
diff --git a/src/preload/api/open-code-usage-bridge.ts b/src/preload/api/open-code-usage-bridge.ts
deleted file mode 100644
index beb6ee468a9..00000000000
--- a/src/preload/api/open-code-usage-bridge.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { backendUsageTransport } from '../usage/backend-port-client'
-import { createUsageProviderApi } from '../usage/usage-provider-api'
-import type { PreloadApi } from '../api-types'
-
-export const openCodeUsageApi = createUsageProviderApi(
-  backendUsageTransport,
-  'openCodeUsage'
-) satisfies PreloadApi['openCodeUsage']
diff --git a/src/preload/api/pet-api.ts b/src/preload/api/pets/pet-api.ts
similarity index 70%
rename from src/preload/api/pet-api.ts
rename to src/preload/api/pets/pet-api.ts
index ebb6937b43a..79052d60cc8 100644
--- a/src/preload/api/pet-api.ts
+++ b/src/preload/api/pets/pet-api.ts
@@ -1,5 +1,5 @@
-import type { CustomPet } from '../../shared/pet-types'
-import type { PetImportFailure } from '../../shared/pet-import-failure-copy'
+import type { CustomPet } from '../../../shared/pet-types'
+import type { PetImportFailure } from '../../../shared/pet-import-failure-copy'
 
 export type PetApi = {
   import: () => Promise<CustomPet | PetImportFailure | null>
diff --git a/src/preload/api/pet-bridge.ts b/src/preload/api/pets/pet-bridge.ts
similarity index 76%
rename from src/preload/api/pet-bridge.ts
rename to src/preload/api/pets/pet-bridge.ts
index e957f0b1535..7cbfc2a9d1c 100644
--- a/src/preload/api/pet-bridge.ts
+++ b/src/preload/api/pets/pet-bridge.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron'
-import type { CustomPet } from '../../shared/pet-types'
-import type { PetImportFailure } from '../../shared/pet-import-failure-copy'
-import type { PreloadApi } from '../api-types'
+import type { CustomPet } from '../../../shared/pet-types'
+import type { PetImportFailure } from '../../../shared/pet-import-failure-copy'
+import type { PreloadApi } from '../../api-types'
 
 export const petApi = {
   import: (): Promise<CustomPet | PetImportFailure | null> => ipcRenderer.invoke('pet:import'),
diff --git a/src/preload/api/plugin-host-api.ts b/src/preload/api/plugins/plugin-host-api.ts
similarity index 83%
rename from src/preload/api/plugin-host-api.ts
rename to src/preload/api/plugins/plugin-host-api.ts
index f5d9f7097fe..9b52cc6e9f0 100644
--- a/src/preload/api/plugin-host-api.ts
+++ b/src/preload/api/plugins/plugin-host-api.ts
@@ -1,55 +1,48 @@
-import type { PluginHostImages } from '../../shared/plugins/images/plugin-image-url'
-import type { EditorSaveHookDecision } from '../../shared/plugins/events/plugin-editor-save-hook'
-import type { PluginUpdateAccessGrowth } from '../../shared/plugins/approval/plugin-update-access-growth'
+import type { PluginHostImages } from '../../../shared/plugins/images/plugin-image-url'
+import type { EditorSaveHookDecision } from '../../../shared/plugins/events/plugin-editor-save-hook'
+import type { PluginUpdateAccessGrowth } from '../../../shared/plugins/approval/plugin-update-access-growth'
 import type {
   PluginAutoUpdateState,
   PluginUpdateReviewNotice
-} from '../../shared/plugins/catalog/plugin-update-policy'
+} from '../../../shared/plugins/catalog/plugin-update-policy'
 import type {
   PluginIconThemeMetadata,
   PluginIconThemeRegistration
-} from '../../shared/plugins/artifacts/plugin-icon-theme-artifact'
-import type { PluginThemeRegistration } from '../../shared/plugins/artifacts/plugin-theme-artifact'
+} from '../../../shared/plugins/artifacts/plugin-icon-theme-artifact'
+import type { PluginThemeRegistration } from '../../../shared/plugins/artifacts/plugin-theme-artifact'
 import type {
   PluginSyntaxMetadata,
   PluginSyntaxPayload
-} from '../../shared/plugins/artifacts/plugin-syntax-artifact'
-import type { PluginTerminalThemeRegistration } from '../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
+} from '../../../shared/plugins/artifacts/plugin-syntax-artifact'
+import type { PluginTerminalThemeRegistration } from '../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 import type {
   PluginFrameEntry,
   PluginFrameTheme
-} from '../../shared/plugins/frames/plugin-frame-bridge'
-import type { PluginHostCallOutcome } from '../../shared/plugins/frames/plugin-protocol'
+} from '../../../shared/plugins/frames/plugin-frame-bridge'
+import type { PluginHostCallOutcome } from '../../../shared/plugins/frames/plugin-protocol'
 import type {
   PluginPanelStateRequest,
   PluginPanelStateResult
-} from '../../shared/plugins/declarative/plugin-declarative-panel-state'
-import type { PluginConsentRequest } from '../../shared/plugins/approval/plugin-consent-request'
-import type { PluginLanguagePackRegistration } from '../../shared/plugins/artifacts/plugin-language-pack-artifact'
-import type { PluginChangeEvent } from '../../shared/plugins/events/plugin-change-event'
+} from '../../../shared/plugins/declarative/plugin-declarative-panel-state'
+import type { PluginConsentRequest } from '../../../shared/plugins/approval/plugin-consent-request'
+import type { PluginLanguagePackRegistration } from '../../../shared/plugins/artifacts/plugin-language-pack-artifact'
+import type { PluginChangeEvent } from '../../../shared/plugins/events/plugin-change-event'
 import type {
   PluginViewReply,
   PluginViewRequest
-} from '../../shared/plugins/view/plugin-view-protocol'
-import type { PluginManifest } from '../../shared/plugins/manifest/plugin-manifest'
+} from '../../../shared/plugins/view/plugin-view-protocol'
+import type { PluginManifest } from '../../../shared/plugins/manifest/plugin-manifest'
 import type {
   PluginCatalogGitSource,
   PluginMarketplaceGitSource
-} from '../../shared/plugins/catalog/plugin-marketplace'
-import type { PluginCatalogRelease } from '../../shared/plugins/catalog/plugin-catalog-release'
-import type { PluginGitSourceResolution } from '../../shared/plugins/installation/plugin-git-resolution'
+} from '../../../shared/plugins/catalog/plugin-marketplace'
+import type { PluginCatalogRelease } from '../../../shared/plugins/catalog/plugin-catalog-release'
+import type { PluginGitSourceResolution } from '../../../shared/plugins/installation/plugin-git-resolution'
 
-export type {
-  PluginHostCustomEditor,
-  PluginHostListEntry,
-  PluginHostNewFile,
-  PluginHostPanel,
-  PluginHostStatus
-} from '../../shared/plugins/plugin-list-entry'
-import type { PluginHostListEntry } from '../../shared/plugins/plugin-list-entry'
-import type { PluginStatusBarOverrides } from '../../shared/plugins/contributions/plugin-status-bar-state'
-import type { PluginDeclaredSettingsSnapshot } from '../../shared/plugins/contributions/plugin-settings-values'
-import type { PluginJsonValue } from '../../shared/plugins/workers/plugin-host-api'
+import type { PluginHostListEntry } from '../../../shared/plugins/plugin-list-entry'
+import type { PluginStatusBarOverrides } from '../../../shared/plugins/contributions/plugin-status-bar-state'
+import type { PluginDeclaredSettingsSnapshot } from '../../../shared/plugins/contributions/plugin-settings-values'
+import type { PluginJsonValue } from '../../../shared/plugins/workers/plugin-host-api-storage-schemas'
 
 export type PluginHostLogLine = {
   ts: number
diff --git a/src/preload/api/plugin-panel-push-bridge.ts b/src/preload/api/plugins/plugin-panel-push-bridge.ts
similarity index 100%
rename from src/preload/api/plugin-panel-push-bridge.ts
rename to src/preload/api/plugins/plugin-panel-push-bridge.ts
diff --git a/src/preload/api/plugins-bridge.ts b/src/preload/api/plugins/plugins-bridge.ts
similarity index 91%
rename from src/preload/api/plugins-bridge.ts
rename to src/preload/api/plugins/plugins-bridge.ts
index 54fc1c5eb61..4202674847f 100644
--- a/src/preload/api/plugins-bridge.ts
+++ b/src/preload/api/plugins/plugins-bridge.ts
@@ -3,27 +3,27 @@ import { subscribePluginPanelPush } from './plugin-panel-push-bridge'
 import type {
   PluginFrameEntry,
   PluginFrameTheme
-} from '../../shared/plugins/frames/plugin-frame-bridge'
-import type { PluginHostCallOutcome } from '../../shared/plugins/frames/plugin-protocol'
-import type { PluginConsentRequest } from '../../shared/plugins/approval/plugin-consent-request'
-import type { PluginChangeEvent } from '../../shared/plugins/events/plugin-change-event'
+} from '../../../shared/plugins/frames/plugin-frame-bridge'
+import type { PluginHostCallOutcome } from '../../../shared/plugins/frames/plugin-protocol'
+import type { PluginConsentRequest } from '../../../shared/plugins/approval/plugin-consent-request'
+import type { PluginChangeEvent } from '../../../shared/plugins/events/plugin-change-event'
 import {
   PLUGIN_STATUS_BAR_CHANGED_CHANNEL,
   type PluginStatusBarOverrides
-} from '../../shared/plugins/contributions/plugin-status-bar-state'
+} from '../../../shared/plugins/contributions/plugin-status-bar-state'
 import {
   PLUGIN_VIEW_REPLY_CHANNEL,
   PLUGIN_VIEW_REQUEST_CHANNEL,
   type PluginViewRequest
-} from '../../shared/plugins/view/plugin-view-protocol'
+} from '../../../shared/plugins/view/plugin-view-protocol'
 import type {
   PluginAutoUpdateEvent,
   PluginHostInstallResult,
   PluginHostInstallSource,
   PluginHostLogLine
 } from './plugin-host-api'
-import type { PluginHostListEntry } from '../../shared/plugins/plugin-list-entry'
-import type { PreloadApi } from '../api-types'
+import type { PluginHostListEntry } from '../../../shared/plugins/plugin-list-entry'
+import type { PreloadApi } from '../../api-types'
 
 export const pluginsApi = {
   list: (): Promise<PluginHostListEntry[]> => ipcRenderer.invoke('plugins:list'),
diff --git a/src/preload/api/keybindings-bridge.ts b/src/preload/api/preferences/keybindings-bridge.ts
similarity index 93%
rename from src/preload/api/keybindings-bridge.ts
rename to src/preload/api/preferences/keybindings-bridge.ts
index e91e587313d..595bd240f7a 100644
--- a/src/preload/api/keybindings-bridge.ts
+++ b/src/preload/api/preferences/keybindings-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { KeybindingActionId, KeybindingFileSnapshot } from '../../shared/keybindings'
-import type { PreloadApi } from '../api-types'
+import type { KeybindingActionId, KeybindingFileSnapshot } from '../../../shared/keybindings/types'
+import type { PreloadApi } from '../../api-types'
 
 export const keybindingsApi = {
   get: (): Promise<KeybindingFileSnapshot> => ipcRenderer.invoke('keybindings:get'),
diff --git a/src/preload/api/settings-api.ts b/src/preload/api/preferences/settings-api.ts
similarity index 86%
rename from src/preload/api/settings-api.ts
rename to src/preload/api/preferences/settings-api.ts
index 507a434dbfa..861182dd2e0 100644
--- a/src/preload/api/settings-api.ts
+++ b/src/preload/api/preferences/settings-api.ts
@@ -1,13 +1,13 @@
-import type { KeybindingActionId, KeybindingFileSnapshot } from '../../shared/keybindings'
+import type { KeybindingActionId, KeybindingFileSnapshot } from '../../../shared/keybindings/types'
 import type {
   WarpThemeImportPreview,
   WarpThemeImportSource
-} from '../../shared/terminal-themes/terminal-custom-themes'
-import type { GlobalSettings } from '../../shared/global-settings-types'
+} from '../../../shared/terminal-themes/terminal-custom-themes'
+import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type {
   TerminalConfigImportPreview,
   TerminalConfigImportSource
-} from '../../shared/terminal/appearance/terminal-config-import-preview'
+} from '../../../shared/terminal/appearance/terminal-config-import-preview'
 
 export type SettingsApi = {
   get: () => Promise<GlobalSettings>
diff --git a/src/preload/api/settings-bridge.ts b/src/preload/api/preferences/settings-bridge.ts
similarity index 89%
rename from src/preload/api/settings-bridge.ts
rename to src/preload/api/preferences/settings-bridge.ts
index fc66f89a0e1..a1abc25a3f3 100644
--- a/src/preload/api/settings-bridge.ts
+++ b/src/preload/api/preferences/settings-bridge.ts
@@ -2,12 +2,12 @@ import { ipcRenderer } from 'electron'
 import type {
   TerminalConfigImportPreview,
   TerminalConfigImportSource
-} from '../../shared/terminal/appearance/terminal-config-import-preview'
+} from '../../../shared/terminal/appearance/terminal-config-import-preview'
 import type {
   WarpThemeImportPreview,
   WarpThemeImportSource
-} from '../../shared/terminal-themes/terminal-custom-themes'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/terminal-themes/terminal-custom-themes'
+import type { PreloadApi } from '../../api-types'
 
 export const settingsApi = {
   get: () => ipcRenderer.invoke('settings:get'),
diff --git a/src/preload/api/preflight-api.ts b/src/preload/api/preflight/preflight-api.ts
similarity index 89%
rename from src/preload/api/preflight-api.ts
rename to src/preload/api/preflight/preflight-api.ts
index 829da72a536..1a302473560 100644
--- a/src/preload/api/preflight-api.ts
+++ b/src/preload/api/preflight/preflight-api.ts
@@ -1,9 +1,9 @@
-import type { ZCodeInteractiveCapability } from '../../shared/zcode-missing-tui'
-import type { ProjectExecutionRuntimeResolution } from '../../shared/execution-host/project-execution-runtime'
+import type { ZCodeInteractiveCapability } from '../../../shared/zcode-missing-tui'
+import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime'
 import type {
   PathSource,
   ShellHydrationFailureReason
-} from '../../shared/shell/launch/shell-path-hydration-types'
+} from '../../../shared/shell/launch/shell-path-hydration-types'
 
 export type PreflightStatus = {
   git: { installed: boolean }
diff --git a/src/preload/api/preflight-bridge.ts b/src/preload/api/preflight/preflight-bridge.ts
similarity index 94%
rename from src/preload/api/preflight-bridge.ts
rename to src/preload/api/preflight/preflight-bridge.ts
index 945f6d28531..e337af98440 100644
--- a/src/preload/api/preflight-bridge.ts
+++ b/src/preload/api/preflight/preflight-bridge.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron'
 import type { PreflightRuntimeContext, RefreshAgentsResult } from './preflight-api'
-import type { PreloadApi } from '../api-types'
-import type { ZCodeInteractiveCapability } from '../../shared/zcode-missing-tui'
+import type { PreloadApi } from '../../api-types'
+import type { ZCodeInteractiveCapability } from '../../../shared/zcode-missing-tui'
 
 export const preflightApi = {
   check: (args?: {
diff --git a/src/preload/api/orca-profile-api.ts b/src/preload/api/profiles/orca-profile-api.ts
similarity index 98%
rename from src/preload/api/orca-profile-api.ts
rename to src/preload/api/profiles/orca-profile-api.ts
index 8fe63dd6375..21c5f4262e8 100644
--- a/src/preload/api/orca-profile-api.ts
+++ b/src/preload/api/profiles/orca-profile-api.ts
@@ -24,7 +24,7 @@ import type {
   SwitchOrcaProfileResult,
   TransferOrcaProfileProjectArgs,
   TransferOrcaProfileProjectResult
-} from '../../shared/orca-profiles'
+} from '../../../shared/orca-profiles'
 
 export type OrcaProfileApi = {
   list: () => Promise<OrcaProfileListResult>
diff --git a/src/preload/api/orca-profiles-bridge.ts b/src/preload/api/profiles/orca-profiles-bridge.ts
similarity index 92%
rename from src/preload/api/orca-profiles-bridge.ts
rename to src/preload/api/profiles/orca-profiles-bridge.ts
index 063de33913f..0a005e384c3 100644
--- a/src/preload/api/orca-profiles-bridge.ts
+++ b/src/preload/api/profiles/orca-profiles-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 import {
   ORCA_PROFILE_AUTH_STATUS_CHANGED_CHANNEL,
   ORCA_PROFILE_SIGN_IN_PROGRESS_CHANGED_CHANNEL,
@@ -7,9 +7,9 @@ import {
   type OrcaProfileListResult,
   type SwitchOrcaProfileResult,
   type TransferOrcaProfileProjectResult
-} from '../../shared/orca-profiles'
-import { prepareAndInvokeAppRestart } from '../renderer/restart/renderer-restart-wiring'
-import { awaitBeforeUnloadCheckpoint } from '../renderer/renderer-runtime'
+} from '../../../shared/orca-profiles'
+import { prepareAndInvokeAppRestart } from '../../renderer/restart/renderer-restart-wiring'
+import { awaitBeforeUnloadCheckpoint } from '../../renderer/renderer-runtime'
 
 export const orcaProfilesApi = {
   list: () => ipcRenderer.invoke('orcaProfiles:list'),
diff --git a/src/preload/api/project-groups-bridge.ts b/src/preload/api/projects/project-groups-bridge.ts
similarity index 89%
rename from src/preload/api/project-groups-bridge.ts
rename to src/preload/api/projects/project-groups-bridge.ts
index b7748aca427..006b3f17d72 100644
--- a/src/preload/api/project-groups-bridge.ts
+++ b/src/preload/api/projects/project-groups-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { NestedRepoScanResult } from '../../shared/project-group-types'
-import type { PreloadApi } from '../api-types'
+import type { NestedRepoScanResult } from '../../../shared/project-group-types'
+import type { PreloadApi } from '../../api-types'
 
 export const projectGroupsApi = {
   list: () => ipcRenderer.invoke('projectGroups:list'),
diff --git a/src/preload/api/projects-bridge.ts b/src/preload/api/projects/projects-bridge.ts
similarity index 92%
rename from src/preload/api/projects-bridge.ts
rename to src/preload/api/projects/projects-bridge.ts
index c8114fbdf4a..b7749ea226e 100644
--- a/src/preload/api/projects-bridge.ts
+++ b/src/preload/api/projects/projects-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const projectsApi = {
   list: () => ipcRenderer.invoke('projects:list'),
diff --git a/src/preload/api/repos-bridge.ts b/src/preload/api/projects/repos-bridge.ts
similarity index 94%
rename from src/preload/api/repos-bridge.ts
rename to src/preload/api/projects/repos-bridge.ts
index af5c8549aa7..b37a526107d 100644
--- a/src/preload/api/repos-bridge.ts
+++ b/src/preload/api/projects/repos-bridge.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron'
-import type { BaseRefDefaultResult, BaseRefSearchResult } from '../../shared/repo-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { PreloadApi } from '../api-types'
+import type { BaseRefDefaultResult, BaseRefSearchResult } from '../../../shared/repo-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { PreloadApi } from '../../api-types'
 
 export const reposApi = {
   list: () => ipcRenderer.invoke('repos:list'),
diff --git a/src/preload/api/repository-api.ts b/src/preload/api/projects/repository-api.ts
similarity index 89%
rename from src/preload/api/repository-api.ts
rename to src/preload/api/projects/repository-api.ts
index f8f23e4aaca..6e0bdfca26d 100644
--- a/src/preload/api/repository-api.ts
+++ b/src/preload/api/projects/repository-api.ts
@@ -1,7 +1,10 @@
-import type { RepoCreateFailure } from '../../shared/repo-create-failure-copy'
-import type { CloneTargetArgs, CloneTargetCheck } from '../../shared/git/clone/clone-target-check'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { GhAccountBinding } from '../../shared/github/accounts/account-binding'
+import type { RepoCreateFailure } from '../../../shared/repo-create-failure-copy'
+import type {
+  CloneTargetArgs,
+  CloneTargetCheck
+} from '../../../shared/git/clone/clone-target-check'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { GhAccountBinding } from '../../../shared/github/accounts/account-binding'
 import type {
   NestedRepoScanResult,
   ProjectGroup,
@@ -9,7 +12,7 @@ import type {
   ProjectGroupMutation,
   ProjectGroupImportMode,
   ProjectGroupImportResult
-} from '../../shared/project-group-types'
+} from '../../../shared/project-group-types'
 import type {
   Project,
   ProjectHostSetup,
@@ -22,10 +25,10 @@ import type {
   ProjectHostSetupUpdateArgs,
   ProjectHostSetupUpdateResult,
   ProjectUpdateArgs
-} from '../../shared/project-types'
-import type { BaseRefDefaultResult, BaseRefSearchResult, Repo } from '../../shared/repo-types'
-import type { WslMovedProject } from '../../shared/wsl-move/wsl-moved-project'
-import type { HostRepoCatalogSnapshot } from '../../shared/host-repo-catalog-snapshot'
+} from '../../../shared/project-types'
+import type { BaseRefDefaultResult, BaseRefSearchResult, Repo } from '../../../shared/repo-types'
+import type { WslMovedProject } from '../../../shared/wsl-move/wsl-moved-project'
+import type { HostRepoCatalogSnapshot } from '../../../shared/host-repo-catalog-snapshot'
 
 export type RepositoryApi = {
   list: () => Promise<Repo[]>
diff --git a/src/preload/api/managed-orcad-api.ts b/src/preload/api/runtime/managed-orcad-api.ts
similarity index 95%
rename from src/preload/api/managed-orcad-api.ts
rename to src/preload/api/runtime/managed-orcad-api.ts
index 6cd260f6bf1..06a25b53738 100644
--- a/src/preload/api/managed-orcad-api.ts
+++ b/src/preload/api/runtime/managed-orcad-api.ts
@@ -16,12 +16,12 @@ import type {
   OrcadManagedRollbackResult,
   OrcadManagedRuntimeStatus,
   OrcadManagedStopResult
-} from '../../shared/orcad-managed-runtime'
-import type { PublicKnownRuntimeEnvironment } from '../../shared/remote-runtime/host-catalog/runtime-environments'
+} from '../../../shared/orcad-managed-runtime'
+import type { PublicKnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type {
   RuntimeSshAccessLinkRequest,
   RuntimeSshAccessUnlinkRequest
-} from '../../shared/runtime-ssh-access'
+} from '../../../shared/runtime-ssh-access'
 
 export type ManagedOrcadPreloadApi = {
   deploy: (args: {
diff --git a/src/preload/api/runtime-api.ts b/src/preload/api/runtime/runtime-api.ts
similarity index 86%
rename from src/preload/api/runtime-api.ts
rename to src/preload/api/runtime/runtime-api.ts
index cd257b576ef..4fe42605caf 100644
--- a/src/preload/api/runtime-api.ts
+++ b/src/preload/api/runtime/runtime-api.ts
@@ -2,32 +2,30 @@ import type {
   CrewSubscriptionAttemptArgs,
   CrewSubscriptionAttemptCallbacks,
   CrewSubscriptionSetupResult
-} from '../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
+} from '../../../shared/remote-runtime/host-catalog/runtime-environment-subscription-setup'
 import type { ManagedOrcadPreloadApi } from './managed-orcad-api'
-import type { WslHostsPreloadApi } from './wsl-hosts-api'
-import type { RuntimeHostStatusSnapshot } from '../../shared/remote-runtime/host-status/runtime-host-status'
+import type { WslHostsPreloadApi } from '../wsl/wsl-hosts-api'
+import type { RuntimeHostStatusSnapshot } from '../../../shared/remote-runtime/host-status/runtime-host-status'
 import type {
   RuntimeRendererSyncWindowGraph,
-  RuntimeSyncWindowGraphResult
-} from '../../shared/runtime-types'
-import type {
+  RuntimeSyncWindowGraphResult,
   RuntimeStatus,
   RuntimeTerminalDriverState
-} from '../../shared/runtime-session-contracts'
-import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
-import type { ClientHostedBrowserRowsEvent } from '../../shared/client-hosted-browser-rows'
-import type { SidebarInputsChangedEvent } from '../../shared/sidebar-list/sidebar-inputs-feed-contract'
+} from '../../../shared/runtime-session-contracts'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows'
+import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/sidebar-inputs-feed-contract'
 import type {
   PublicKnownRuntimeEnvironment,
   RuntimeEnvironmentRemoval
-} from '../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { VerifyAndAddRuntimeEnvironmentResult } from '../../shared/remote-runtime/pairing/remote-pairing-verification'
+} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
 import type {
   BrowserClientHostPlacementPreparationRequest,
   BrowserPageCreationPlacement
-} from '../../shared/browser/client-hosting/browser-client-host-placement'
-import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../shared/remote-runtime/control/remote-runtime-shared-control-types'
-import type { WslOrcadAccountNotAppliedEvent } from '../../shared/wsl-orcad-account-notice'
+} from '../../../shared/browser/client-hosting/browser-client-host-placement'
+import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import type { WslOrcadAccountNotAppliedEvent } from '../../../shared/wsl-orcad-account-notice'
 
 export type RuntimeEnvironmentSubscriptionHandle = {
   unsubscribe: () => void
diff --git a/src/preload/api/runtime-bridge.ts b/src/preload/api/runtime/runtime-bridge.ts
similarity index 91%
rename from src/preload/api/runtime-bridge.ts
rename to src/preload/api/runtime/runtime-bridge.ts
index 96515e0fe59..05a122c4fc0 100644
--- a/src/preload/api/runtime-bridge.ts
+++ b/src/preload/api/runtime/runtime-bridge.ts
@@ -1,15 +1,15 @@
 import { ipcRenderer } from 'electron'
-import type { ClientHostedBrowserRowsEvent } from '../../shared/client-hosted-browser-rows'
-import type { SidebarInputsChangedEvent } from '../../shared/sidebar-list/sidebar-inputs-feed-contract'
+import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows'
+import type { SidebarInputsChangedEvent } from '../../../shared/sidebar-list/sidebar-inputs-feed-contract'
 import type {
   RuntimeRendererSyncWindowGraph,
   RuntimeStatus,
-  RuntimeSyncWindowGraphResult
-} from '../../shared/runtime-types'
-import type { RuntimeTerminalDriverState } from '../../shared/runtime-session-contracts'
-import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
-import type { RuntimeEnvironmentSubscriptionHandle } from '../runtime/runtime-environment-subscriptions'
-import type { PreloadApi } from '../api-types'
+  RuntimeSyncWindowGraphResult,
+  RuntimeTerminalDriverState
+} from '../../../shared/runtime-session-contracts'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
+import type { RuntimeEnvironmentSubscriptionHandle } from '../../runtime/runtime-environment-subscriptions'
+import type { PreloadApi } from '../../api-types'
 
 export const runtimeApi = {
   syncWindowGraph: (graph: RuntimeRendererSyncWindowGraph): Promise<RuntimeSyncWindowGraphResult> =>
diff --git a/src/preload/api/runtime-environments-bridge.ts b/src/preload/api/runtime/runtime-environments-bridge.ts
similarity index 87%
rename from src/preload/api/runtime-environments-bridge.ts
rename to src/preload/api/runtime/runtime-environments-bridge.ts
index 517b443e774..685561dd6db 100644
--- a/src/preload/api/runtime-environments-bridge.ts
+++ b/src/preload/api/runtime/runtime-environments-bridge.ts
@@ -2,30 +2,30 @@ import { ipcRenderer } from 'electron'
 import {
   RUNTIME_HOST_STATUS_CHANNEL,
   type RuntimeHostStatusSnapshot
-} from '../../shared/remote-runtime/host-status/runtime-host-status'
-import type { VerifyAndAddRuntimeEnvironmentResult } from '../../shared/remote-runtime/pairing/remote-pairing-verification'
-import type { RuntimeStatus } from '../../shared/runtime-session-contracts'
-import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
+} from '../../../shared/remote-runtime/host-status/runtime-host-status'
+import type { VerifyAndAddRuntimeEnvironmentResult } from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
+import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
+import type { RuntimeRpcResponse } from '../../../shared/runtime-rpc-envelope'
 import type {
   PublicKnownRuntimeEnvironment,
   RuntimeEnvironmentRemoval
-} from '../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../shared/remote-runtime/control/remote-runtime-shared-control-types'
-import { RUNTIME_ENVIRONMENT_DIAGNOSTICS_CHANNEL } from '../../shared/remote-runtime/host-catalog/runtime-environment-diagnostics'
-import { RUNTIME_ENVIRONMENT_CATALOG_CHANGED_CHANNEL } from '../../shared/remote-runtime/host-catalog/runtime-environment-catalog-channel'
+} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../shared/remote-runtime/control/remote-runtime-shared-control-types'
+import { RUNTIME_ENVIRONMENT_DIAGNOSTICS_CHANNEL } from '../../../shared/remote-runtime/host-catalog/runtime-environment-diagnostics'
+import { RUNTIME_ENVIRONMENT_CATALOG_CHANGED_CHANNEL } from '../../../shared/remote-runtime/host-catalog/runtime-environment-catalog-channel'
 import {
   WSL_ORCAD_ACCOUNT_NOT_APPLIED_CHANNEL,
   type WslOrcadAccountNotAppliedEvent
-} from '../../shared/wsl-orcad-account-notice'
+} from '../../../shared/wsl-orcad-account-notice'
 import {
   subscribeRuntimeEnvironmentFromPreload,
   subscribeCrewAttemptFromPreload,
   cancelRuntimeEnvironmentSubscriptionFromPreload,
   type RuntimeEnvironmentSubscriptionHandle
-} from '../runtime/runtime-environment-subscriptions'
-import type { PreloadApi } from '../api-types'
+} from '../../runtime/runtime-environment-subscriptions'
+import type { PreloadApi } from '../../api-types'
 import { managedOrcadApi } from './managed-orcad-api'
-import { getWslHostsApi } from './wsl-hosts-api'
+import { getWslHostsApi } from '../wsl/wsl-hosts-api'
 
 export const runtimeEnvironmentsApi = {
   desktopCreatedChatIds: (): Promise<string[]> =>
diff --git a/src/preload/api/agent-skill-api.ts b/src/preload/api/skills/agent-skill-api.ts
similarity index 94%
rename from src/preload/api/agent-skill-api.ts
rename to src/preload/api/skills/agent-skill-api.ts
index def9240bd7d..03be1ca7a10 100644
--- a/src/preload/api/agent-skill-api.ts
+++ b/src/preload/api/skills/agent-skill-api.ts
@@ -1,9 +1,9 @@
-import type { SkillDiscoveryResult, SkillDiscoveryTarget } from '../../shared/skills'
+import type { SkillDiscoveryResult, SkillDiscoveryTarget } from '../../../shared/skills'
 import type {
   SkillCloudOperation,
   SkillCloudOwnedShare,
   SkillCloudPackageDetails
-} from '../../shared/skill-cloud-contract'
+} from '../../../shared/skill-cloud-contract'
 import type {
   ManagedSkillInstallListOperation,
   SkillBundleInstallPreviewInput,
@@ -25,20 +25,20 @@ import type {
   SkillSharePublishInput,
   SkillSharePublishOperation,
   SkillShareResolvedOperation
-} from '../../shared/skill-sharing-contract'
+} from '../../../shared/skill-sharing-contract'
 import type {
   BundledSkillAutoUpdateRequest,
   LocalBundledSkillExecuteRequest,
   BundledSkillInstallResult,
   BundledSkillPlan,
   LocalBundledSkillPlanRequest
-} from '../../shared/bundled-skill-plan'
+} from '../../../shared/bundled-skill-plan'
 
 import type {
   SkillDeletePlan,
   SkillDeleteRequest,
   SkillDeleteResult
-} from '../../shared/skill-delete-contract'
+} from '../../../shared/skill-delete-contract'
 
 export type SkillsApi = {
   discover: (target?: SkillDiscoveryTarget) => Promise<SkillDiscoveryResult>
diff --git a/src/preload/api/skills-bridge.ts b/src/preload/api/skills/skills-bridge.ts
similarity index 95%
rename from src/preload/api/skills-bridge.ts
rename to src/preload/api/skills/skills-bridge.ts
index a270f88da0a..54e73b82282 100644
--- a/src/preload/api/skills-bridge.ts
+++ b/src/preload/api/skills/skills-bridge.ts
@@ -3,13 +3,13 @@ import type {
   SkillDeletePlan,
   SkillDeleteRequest,
   SkillDeleteResult
-} from '../../shared/skill-delete-contract'
-import type { SkillDiscoveryResult, SkillDiscoveryTarget } from '../../shared/skills'
+} from '../../../shared/skill-delete-contract'
+import type { SkillDiscoveryResult, SkillDiscoveryTarget } from '../../../shared/skills'
 import type {
   SkillCloudOwnedShare,
   SkillCloudOperation,
   SkillCloudPackageDetails
-} from '../../shared/skill-cloud-contract'
+} from '../../../shared/skill-cloud-contract'
 import type {
   SkillBundleInstallPreviewInput,
   SkillBundleInstallPreviewOperation,
@@ -31,15 +31,15 @@ import type {
   SkillSharePublishInput,
   SkillSharePublishOperation,
   SkillShareResolvedOperation
-} from '../../shared/skill-sharing-contract'
+} from '../../../shared/skill-sharing-contract'
 import type {
   BundledSkillAutoUpdateRequest,
   LocalBundledSkillExecuteRequest,
   BundledSkillInstallResult,
   BundledSkillPlan,
   LocalBundledSkillPlanRequest
-} from '../../shared/bundled-skill-plan'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/bundled-skill-plan'
+import type { PreloadApi } from '../../api-types'
 
 export const skillsApi = {
   discover: (target?: SkillDiscoveryTarget): Promise<SkillDiscoveryResult> =>
diff --git a/src/preload/api/git-bridge.ts b/src/preload/api/source-control/git-bridge.ts
similarity index 93%
rename from src/preload/api/git-bridge.ts
rename to src/preload/api/source-control/git-bridge.ts
index e2d8ed47d92..ae1a5862fcc 100644
--- a/src/preload/api/git-bridge.ts
+++ b/src/preload/api/source-control/git-bridge.ts
@@ -1,23 +1,23 @@
 import type {
   GitCommitAction,
   GitCommitActionResult
-} from '../../shared/git/commands/git-commit-action'
+} from '../../../shared/git/commands/git-commit-action'
 import { ipcRenderer } from 'electron'
 import type {
   GitForkSyncExpectedUpstream,
   GitForkSyncResult
-} from '../../shared/git/remotes/git-fork-sync'
-import type { GitStagingArea, GitUpstreamStatus } from '../../shared/git/status/git-status-types'
-import type { ConflictResolution } from '../../shared/source-control/listing/source-control-entry-actions'
-import type { GitPushTarget } from '../../shared/worktree/types'
-import type { WorktreeAtRiskLocalFiles } from '../../shared/worktree/at-risk-local-files'
-import type { GitStageWorktreeScope } from '../../shared/git/paths/git-stage-worktree-scope'
+} from '../../../shared/git/remotes/git-fork-sync'
+import type { GitStagingArea, GitUpstreamStatus } from '../../../shared/git/status/git-status-types'
+import type { ConflictResolution } from '../../../shared/source-control/listing/source-control-entry-actions'
+import type { GitPushTarget } from '../../../shared/worktree/types'
+import type { WorktreeAtRiskLocalFiles } from '../../../shared/worktree/at-risk-local-files'
+import type { GitStageWorktreeScope } from '../../../shared/git/paths/git-stage-worktree-scope'
 import type {
   GitHistoryItemRef,
   GitHistoryOptions,
   GitHistoryResult
-} from '../../shared/git/history/git-history-types'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/git/history/git-history-types'
+import type { PreloadApi } from '../../api-types'
 
 export const gitApi = {
   status: (args: {
diff --git a/src/preload/api/git-inspection-api.ts b/src/preload/api/source-control/git-inspection-api.ts
similarity index 89%
rename from src/preload/api/git-inspection-api.ts
rename to src/preload/api/source-control/git-inspection-api.ts
index 939cc7a9a88..6aabefcd68d 100644
--- a/src/preload/api/git-inspection-api.ts
+++ b/src/preload/api/source-control/git-inspection-api.ts
@@ -2,25 +2,25 @@ import type {
   GitBranchCompareResult,
   GitCommitCompareResult,
   GitDiffResult
-} from '../../shared/git/diff/git-diff-compare-types'
-import type { GitMutationInFlight } from '../../shared/git/commands/git-mutation-in-flight'
+} from '../../../shared/git/diff/git-diff-compare-types'
+import type { GitMutationInFlight } from '../../../shared/git/commands/git-mutation-in-flight'
 import type {
   GitConflictOperation,
   GitStagingArea,
   GitStatusResult,
   GitUpstreamStatus
-} from '../../shared/git/status/git-status-types'
-import type { GitPushTarget } from '../../shared/worktree/types'
-import type { WorktreeAtRiskLocalFiles } from '../../shared/worktree/at-risk-local-files'
+} from '../../../shared/git/status/git-status-types'
+import type { GitPushTarget } from '../../../shared/worktree/types'
+import type { WorktreeAtRiskLocalFiles } from '../../../shared/worktree/at-risk-local-files'
 import type {
   GitHistoryItemRef,
   GitHistoryOptions,
   GitHistoryResult
-} from '../../shared/git/history/git-history-types'
+} from '../../../shared/git/history/git-history-types'
 import type {
   CommitMessageAgentCapability,
   CommitMessageModelCapability
-} from '../../shared/source-control/ai/generation/commit-message-agent-spec'
+} from '../../../shared/source-control/ai/generation/commit-message-agent-spec'
 
 export type GitInspectionApi = {
   status: (args: {
diff --git a/src/preload/api/git-operation-api.ts b/src/preload/api/source-control/git-operation-api.ts
similarity index 84%
rename from src/preload/api/git-operation-api.ts
rename to src/preload/api/source-control/git-operation-api.ts
index 0a8bdad2c86..70ee12d7f7d 100644
--- a/src/preload/api/git-operation-api.ts
+++ b/src/preload/api/source-control/git-operation-api.ts
@@ -1,19 +1,19 @@
 import type {
   GitCommitAction,
   GitCommitActionResult
-} from '../../shared/git/commands/git-commit-action'
+} from '../../../shared/git/commands/git-commit-action'
 import type {
   GitForkSyncExpectedUpstream,
   GitForkSyncResult
-} from '../../shared/git/remotes/git-fork-sync'
-import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
-import type { GitPushTarget } from '../../shared/worktree/types'
-import type { GitStageWorktreeScope } from '../../shared/git/paths/git-stage-worktree-scope'
-import type { ConflictResolution } from '../../shared/source-control/listing/source-control-entry-actions'
-import type { HostedReviewProvider } from '../../shared/source-control/hosted-review/hosted-review-contracts'
-import type { ResolvedSourceControlAiGenerationParams } from '../../shared/source-control/ai/source-control-ai-operation-resolution'
-import type { SourceControlAiSettings } from '../../shared/source-control/ai/settings/source-control-ai-settings-types'
-import type { TextGenerationFailureFields } from '../../shared/text-generation-failure-copy'
+} from '../../../shared/git/remotes/git-fork-sync'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
+import type { GitPushTarget } from '../../../shared/worktree/types'
+import type { GitStageWorktreeScope } from '../../../shared/git/paths/git-stage-worktree-scope'
+import type { ConflictResolution } from '../../../shared/source-control/listing/source-control-entry-actions'
+import type { HostedReviewProvider } from '../../../shared/source-control/hosted-review/hosted-review-contracts'
+import type { ResolvedSourceControlAiGenerationParams } from '../../../shared/source-control/ai/source-control-ai-operation-resolution'
+import type { SourceControlAiSettings } from '../../../shared/source-control/ai/settings/source-control-ai-settings-types'
+import type { TextGenerationFailureFields } from '../../../shared/text-generation-failure-copy'
 
 export type GitOperationApi = {
   appendGitignore: (args: { worktreePath: string; folderName: string }) => Promise<boolean>
diff --git a/src/preload/api/sparse-presets-bridge.ts b/src/preload/api/source-control/sparse-presets-bridge.ts
similarity index 92%
rename from src/preload/api/sparse-presets-bridge.ts
rename to src/preload/api/source-control/sparse-presets-bridge.ts
index 91676740e6e..dfaa9c612e0 100644
--- a/src/preload/api/sparse-presets-bridge.ts
+++ b/src/preload/api/source-control/sparse-presets-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const sparsePresetsApi = {
   list: (args) => ipcRenderer.invoke('sparsePresets:list', args),
diff --git a/src/preload/api/speech-api.ts b/src/preload/api/speech/speech-api.ts
similarity index 92%
rename from src/preload/api/speech-api.ts
rename to src/preload/api/speech/speech-api.ts
index 3120e6ec82e..8023455291f 100644
--- a/src/preload/api/speech-api.ts
+++ b/src/preload/api/speech/speech-api.ts
@@ -1,5 +1,5 @@
-import type { SecretAtRestProtection } from '../../shared/secret-at-rest-protection'
-import type { DictationCleanupResult } from '../../shared/dictation-cleanup'
+import type { SecretAtRestProtection } from '../../../shared/secret-at-rest-protection'
+import type { DictationCleanupResult } from '../../../shared/dictation-cleanup'
 import type {
   DictationContext,
   OpenAiCompatibleSpeechProvider,
@@ -10,7 +10,7 @@ import type {
   SpeechModelState,
   SpeechPendingEvent,
   SpeechTranscriptEvent
-} from '../../shared/speech-types'
+} from '../../../shared/speech-types'
 
 export type SpeechApi = {
   getCatalog: () => Promise<SpeechModelManifest[]>
diff --git a/src/preload/api/speech-bridge.ts b/src/preload/api/speech/speech-bridge.ts
similarity index 96%
rename from src/preload/api/speech-bridge.ts
rename to src/preload/api/speech/speech-bridge.ts
index ee3eb951e4a..5aeb1dce4fd 100644
--- a/src/preload/api/speech-bridge.ts
+++ b/src/preload/api/speech/speech-bridge.ts
@@ -1,5 +1,5 @@
-import type { SecretAtRestProtection } from '../../shared/secret-at-rest-protection'
-import type { DictationCleanupResult } from '../../shared/dictation-cleanup'
+import type { SecretAtRestProtection } from '../../../shared/secret-at-rest-protection'
+import type { DictationCleanupResult } from '../../../shared/dictation-cleanup'
 import { ipcRenderer } from 'electron'
 import type {
   DictationContext,
@@ -12,8 +12,8 @@ import type {
   SpeechModelState,
   SpeechPendingEvent,
   SpeechTranscriptEvent
-} from '../../shared/speech-types'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/speech-types'
+import type { PreloadApi } from '../../api-types'
 
 // On-device sessions get a port to the speech process, so their audio skips main.
 const audioPorts = new Map<string, MessagePort>()
diff --git a/src/preload/api/ssh-authority-forwarding.test.ts b/src/preload/api/ssh-authority-forwarding.test.ts
deleted file mode 100644
index 4594039a0ca..00000000000
--- a/src/preload/api/ssh-authority-forwarding.test.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { afterEach, beforeEach, describe, expect, expectTypeOf, it, vi } from 'vitest'
-import type { PreloadApi } from '../api-types'
-import type { SshConnectionState, SshProviderEpoch } from '../../shared/ssh-types'
-import type {
-  HostQualifiedDetectedWorktreeResult,
-  ListDetectedWorktreesArgs
-} from '../../shared/detected-worktree-provider-contract'
-import type { DetectedWorktreeListResult } from '../../shared/worktree/types'
-
-function listDetectedVariableTypeProbe(api: PreloadApi, args: ListDetectedWorktreesArgs) {
-  return api.worktrees.listDetected(args)
-}
-
-const { exposeInMainWorld, invoke, on, removeListener, send, sendSync } = vi.hoisted(() => ({
-  exposeInMainWorld: vi.fn(),
-  invoke: vi.fn(),
-  on: vi.fn(),
-  removeListener: vi.fn(),
-  send: vi.fn(),
-  sendSync: vi.fn()
-}))
-
-vi.mock('electron', () => ({
-  contextBridge: { exposeInMainWorld },
-  ipcRenderer: { invoke, on, removeListener, send, sendSync },
-  webFrame: {
-    getZoomFactor: vi.fn(() => 1),
-    setZoomFactor: vi.fn(),
-    setVisualZoomLevelLimits: vi.fn()
-  },
-  webUtils: { getPathForFile: vi.fn(() => '') }
-}))
-
-describe('native preload SSH authority forwarding', () => {
-  const originalContextIsolated = Object.getOwnPropertyDescriptor(process, 'contextIsolated')
-
-  beforeEach(() => {
-    vi.resetModules()
-    exposeInMainWorld.mockReset()
-    invoke.mockReset()
-    on.mockReset()
-    removeListener.mockReset()
-    send.mockReset()
-    sendSync.mockReset()
-    Object.defineProperty(process, 'contextIsolated', { configurable: true, value: true })
-    vi.stubGlobal('window', {
-      addEventListener: vi.fn(),
-      dispatchEvent: vi.fn(),
-      removeEventListener: vi.fn()
-    })
-    vi.stubGlobal('document', { addEventListener: vi.fn() })
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-    if (originalContextIsolated) {
-      Object.defineProperty(process, 'contextIsolated', originalContextIsolated)
-    } else {
-      Reflect.deleteProperty(process, 'contextIsolated')
-    }
-  })
-
-  it('retains host-qualified outcomes for variable-form detected-worktree requests', () => {
-    expectTypeOf(listDetectedVariableTypeProbe).returns.toEqualTypeOf<
-      Promise<HostQualifiedDetectedWorktreeResult | DetectedWorktreeListResult>
-    >()
-  })
-
-  it('forwards full-pair get and push states without cloning away authority', async () => {
-    const state: SshConnectionState = {
-      targetId: 'ssh-1',
-      status: 'connected',
-      error: null,
-      reconnectAttempt: 0,
-      providerEpoch: 'native-provider-epoch' as SshProviderEpoch,
-      connectionGeneration: 29
-    }
-    invoke.mockResolvedValueOnce(state)
-    await import('../index')
-    const api = exposeInMainWorld.mock.calls.find(([name]) => name === 'api')?.[1] as PreloadApi
-
-    await expect(api.ssh.getState({ targetId: 'ssh-1' })).resolves.toEqual(state)
-    expect(invoke).toHaveBeenCalledWith('ssh:getState', { targetId: 'ssh-1' })
-
-    const onStateChanged = vi.fn()
-    api.ssh.onStateChanged(onStateChanged)
-    const listener = on.mock.calls.find(([channel]) => channel === 'ssh:state-changed')?.[1] as (
-      event: unknown,
-      data: { targetId: string; state: SshConnectionState }
-    ) => void
-    listener({}, { targetId: 'ssh-1', state })
-
-    expect(onStateChanged).toHaveBeenCalledWith({ targetId: 'ssh-1', state })
-  })
-
-  it('normalizes partial compatibility authority to unknown for reconciliation', async () => {
-    const partialState = {
-      targetId: 'ssh-1',
-      status: 'connected',
-      error: null,
-      reconnectAttempt: 0,
-      providerEpoch: 'partial-provider-epoch'
-    } as SshConnectionState
-    invoke.mockResolvedValueOnce(partialState)
-    await import('../index')
-    const api = exposeInMainWorld.mock.calls.find(([name]) => name === 'api')?.[1] as PreloadApi
-
-    const returned = await api.ssh.getState({ targetId: 'ssh-1' })
-    expect(returned).toEqual({
-      targetId: 'ssh-1',
-      status: 'connected',
-      error: null,
-      reconnectAttempt: 0,
-      providerEpoch: null
-    })
-
-    const onStateChanged = vi.fn()
-    api.ssh.onStateChanged(onStateChanged)
-    const listener = on.mock.calls.find(([channel]) => channel === 'ssh:state-changed')?.[1] as (
-      event: unknown,
-      data: { targetId: string; state: SshConnectionState }
-    ) => void
-    listener({}, { targetId: 'ssh-1', state: partialState })
-
-    expect(onStateChanged.mock.calls[0]?.[0].state).toEqual({
-      targetId: 'ssh-1',
-      status: 'connected',
-      error: null,
-      reconnectAttempt: 0,
-      providerEpoch: null
-    })
-  })
-
-  it('drops malformed full authority before it reaches the renderer', async () => {
-    await import('../index')
-    const api = exposeInMainWorld.mock.calls.find(([name]) => name === 'api')?.[1] as PreloadApi
-    const onStateChanged = vi.fn()
-    api.ssh.onStateChanged(onStateChanged)
-    const listener = on.mock.calls.find(([channel]) => channel === 'ssh:state-changed')?.[1] as (
-      event: unknown,
-      data: { targetId: string; state: SshConnectionState }
-    ) => void
-
-    listener(
-      {},
-      {
-        targetId: 'ssh-1',
-        state: {
-          targetId: 'ssh-1',
-          status: 'connected',
-          error: null,
-          reconnectAttempt: 0,
-          providerEpoch: '' as SshProviderEpoch,
-          connectionGeneration: 29
-        }
-      }
-    )
-
-    expect(onStateChanged).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/preload/api/ssh-api.ts b/src/preload/api/ssh/ssh-api.ts
similarity index 96%
rename from src/preload/api/ssh-api.ts
rename to src/preload/api/ssh/ssh-api.ts
index fcb008740d0..160e21ebf6c 100644
--- a/src/preload/api/ssh-api.ts
+++ b/src/preload/api/ssh/ssh-api.ts
@@ -11,8 +11,8 @@ import type {
   SshTargetAddResult,
   SshTargetCreateInput,
   SshTargetUpdateInput
-} from '../../shared/ssh-types'
-import type { FilesystemPathFlavor } from '../../shared/file-access/filesystem-path-flavor'
+} from '../../../shared/ssh-types'
+import type { FilesystemPathFlavor } from '../../../shared/file-access/filesystem-path-flavor'
 
 export type SshApi = {
   listTargets: () => Promise<SshTarget[]>
diff --git a/src/preload/api/ssh-bridge.ts b/src/preload/api/ssh/ssh-bridge.ts
similarity index 96%
rename from src/preload/api/ssh-bridge.ts
rename to src/preload/api/ssh/ssh-bridge.ts
index 9e63dddc6ea..652ef37d957 100644
--- a/src/preload/api/ssh-bridge.ts
+++ b/src/preload/api/ssh/ssh-bridge.ts
@@ -12,13 +12,13 @@ import type {
   PortForwardEntry,
   UnrestoredPortForward,
   EnrichedDetectedPort
-} from '../../shared/ssh-types'
+} from '../../../shared/ssh-types'
 import {
   admitSshConnectionStateForAuthorityReconciliation,
   admitSshDetectedPorts
-} from '../../shared/ssh-retained-payload-admission'
-import type { FilesystemPathFlavor } from '../../shared/file-access/filesystem-path-flavor'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/ssh-retained-payload-admission'
+import type { FilesystemPathFlavor } from '../../../shared/file-access/filesystem-path-flavor'
+import type { PreloadApi } from '../../api-types'
 
 export const sshApi = {
   listTargets: (): Promise<SshTarget[]> => ipcRenderer.invoke('ssh:listTargets'),
diff --git a/src/preload/api/git-bash-bridge.ts b/src/preload/api/terminal/git-bash-bridge.ts
similarity index 78%
rename from src/preload/api/git-bash-bridge.ts
rename to src/preload/api/terminal/git-bash-bridge.ts
index c2186d12aa3..289cde443b3 100644
--- a/src/preload/api/git-bash-bridge.ts
+++ b/src/preload/api/terminal/git-bash-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const gitBashApi = {
   isAvailable: (): Promise<boolean> => ipcRenderer.invoke('gitBash:isAvailable')
diff --git a/src/preload/api/plain-ssh-terminal-bridge.ts b/src/preload/api/terminal/plain-ssh-terminal-bridge.ts
similarity index 96%
rename from src/preload/api/plain-ssh-terminal-bridge.ts
rename to src/preload/api/terminal/plain-ssh-terminal-bridge.ts
index f9f6aa4856e..37da47728e4 100644
--- a/src/preload/api/plain-ssh-terminal-bridge.ts
+++ b/src/preload/api/terminal/plain-ssh-terminal-bridge.ts
@@ -3,7 +3,7 @@ import {
   PLAIN_SSH_TERMINAL_CHANNELS,
   type PlainSshTerminalEvent,
   type PlainSshTerminalOpenResult
-} from '../../shared/plain-ssh-terminal'
+} from '../../../shared/plain-ssh-terminal'
 
 export type PlainSshTerminalApi = {
   open: (args: {
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/terminal/pty-api.ts
similarity index 85%
rename from src/preload/api/pty-api.ts
rename to src/preload/api/terminal/pty-api.ts
index 84f850521ab..4e569e77134 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/terminal/pty-api.ts
@@ -1,45 +1,52 @@
-import type { RuntimeTerminalAttention } from '../../shared/runtime-terminal-contracts'
-import type { PaintedRestorePane } from '../../shared/painted-restore-ack'
+import type { RuntimeTerminalAttention } from '../../../shared/runtime-terminal-contracts'
+import type { PaintedRestorePane } from '../../../shared/painted-restore-ack'
 import type {
   PtyFencedTerminationRequest,
   PtyFencedTerminationOutcome
-} from '../../shared/terminal/pty/lifecycle/pty-fenced-termination'
-import type { ResourceViewAdmission } from '../../shared/resource-view-admission'
-import type { SpawnIntent } from '../../shared/terminal/pty/admission/spawn-admission-contract'
+} from '../../../shared/terminal/pty/lifecycle/pty-fenced-termination'
+import type { ResourceViewAdmission } from '../../../shared/resource-view-admission'
+import type { SpawnIntent } from '../../../shared/terminal/pty/admission/spawn-admission-contract'
 import type {
   SavedResumeDecision,
   TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
-} from '../../shared/agent-session/lifecycle/agent-session-resume'
-import type { StartupCommandDelivery } from '../../shared/agent-launch/startup/codex-startup-delivery'
-import type { TerminalInputKind } from '../../shared/terminal/input/terminal-input-kind'
+} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { StartupCommandDelivery } from '../../../shared/agent-launch/startup/codex-startup-delivery'
+import type { TerminalInputKind } from '../../../shared/terminal/input/terminal-input-kind'
 import type {
   TerminalLeafMoveRequest,
   TerminalLeafMoveResult
-} from '../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
-import type { ProjectExecutionRuntimeResolution } from '../../shared/execution-host/project-execution-runtime'
+} from '../../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
+import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime'
 import type {
   PtyListedSession,
   PtySessionListScope,
   PtySessionLifecycle
-} from '../../shared/terminal/pty/lifecycle/pty-listed-session'
-import type { PtyMainDeliveryDiagnostics } from '../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
-import type { PtyModelRestoreNeededEvent } from '../../shared/terminal/replay/pty-model-restore-marker'
+} from '../../../shared/terminal/pty/lifecycle/pty-listed-session'
+import type { PtyMainDeliveryDiagnostics } from '../../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
+import type { PtyModelRestoreNeededEvent } from '../../../shared/terminal/replay/pty-model-restore-marker'
 import type {
   PtyRendererDeliveryHealthReply,
   PtyRendererDeliveryStateReport
-} from '../../shared/terminal/pty/diagnostics/pty-renderer-delivery-health'
-import type { AgentKind, LaunchSource, RequestKind } from '../../shared/telemetry-events'
-import type { TerminalSideEffectBatch } from '../../shared/terminal/output/terminal-side-effect-facts'
-import type { TerminalViewAttributes } from '../../shared/terminal/protocol/queries/terminal-view-attributes'
-import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
-import type { TerminalPanePlacement } from '../../shared/workspace-layout/terminal-topology/terminal-pane-placement'
-import type { AgentPaneLaunchRequest } from '../../shared/agent-launch/contracts/agent-pane-launch-request'
+} from '../../../shared/terminal/pty/diagnostics/pty-renderer-delivery-health'
+import type {
+  AgentKind,
+  LaunchSource,
+  RequestKind
+} from '../../../shared/telemetry-property-schemas'
+import type { TerminalSideEffectBatch } from '../../../shared/terminal/output/terminal-side-effect-facts'
+import type { TerminalViewAttributes } from '../../../shared/terminal/protocol/queries/terminal-view-attributes'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
+import type { TerminalPanePlacement } from '../../../shared/workspace-layout/terminal-topology/terminal-pane-placement'
+import type { AgentPaneLaunchRequest } from '../../../shared/agent-launch/contracts/agent-pane-launch-request'
 import type { PtyManagementApi } from './pty-management-api'
-import type { TerminalProcessInspection } from '../../shared/terminal/pty/lifecycle/terminal-process-inspection'
-import type { CodexSharedServerStatus } from '../../shared/codex-shared-server-command'
-import type { NewerDaemonHeldScreen, NewerDaemonReopenResult } from '../../shared/newer-daemon-hold'
+import type { TerminalProcessInspection } from '../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import type { CodexSharedServerStatus } from '../../../shared/codex-shared-server-command'
+import type {
+  NewerDaemonHeldScreen,
+  NewerDaemonReopenResult
+} from '../../../shared/newer-daemon-hold'
 
 export type PtyApi = {
   spawn: (opts: {
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/terminal/pty-bridge-session-control.ts
similarity index 84%
rename from src/preload/api/pty-bridge-session-control.ts
rename to src/preload/api/terminal/pty-bridge-session-control.ts
index 66a25ed8679..2d421b6b5bd 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/terminal/pty-bridge-session-control.ts
@@ -1,40 +1,44 @@
-import type { RuntimeTerminalAttention } from '../../shared/runtime-terminal-contracts'
-import type { PaintedRestorePane } from '../../shared/painted-restore-ack'
+import type { RuntimeTerminalAttention } from '../../../shared/runtime-terminal-contracts'
+import type { PaintedRestorePane } from '../../../shared/painted-restore-ack'
 import type {
   PtyFencedTerminationRequest,
   PtyFencedTerminationOutcome
-} from '../../shared/terminal/pty/lifecycle/pty-fenced-termination'
-import type { ResourceViewAdmission } from '../../shared/resource-view-admission'
-import type { SpawnIntent } from '../../shared/terminal/pty/admission/spawn-admission-contract'
+} from '../../../shared/terminal/pty/lifecycle/pty-fenced-termination'
+import type { ResourceViewAdmission } from '../../../shared/resource-view-admission'
+import type { SpawnIntent } from '../../../shared/terminal/pty/admission/spawn-admission-contract'
 import { ipcRenderer } from 'electron'
-import type { ProjectExecutionRuntimeResolution } from '../../shared/execution-host/project-execution-runtime'
-import type { StartupCommandDelivery } from '../../shared/agent-launch/startup/codex-startup-delivery'
-import type { TerminalInputKind } from '../../shared/terminal/input/terminal-input-kind'
+import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime'
+import type { StartupCommandDelivery } from '../../../shared/agent-launch/startup/codex-startup-delivery'
+import type { TerminalInputKind } from '../../../shared/terminal/input/terminal-input-kind'
 import type {
   TerminalLeafMoveRequest,
   TerminalLeafMoveResult
-} from '../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
+} from '../../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
 import type {
   SavedResumeDecision,
   TerminalLaunchResult,
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
-} from '../../shared/agent-session/lifecycle/agent-session-resume'
-import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
+} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
 import type {
   PtyListedSession,
   PtySessionListScope
-} from '../../shared/terminal/pty/lifecycle/pty-listed-session'
+} from '../../../shared/terminal/pty/lifecycle/pty-listed-session'
 import type {
   PtyRendererDeliveryHealthReply,
   PtyRendererDeliveryStateReport
-} from '../../shared/terminal/pty/diagnostics/pty-renderer-delivery-health'
-import type { TerminalViewAttributes } from '../../shared/terminal/protocol/queries/terminal-view-attributes'
-import type { PtyMainDeliveryDiagnostics } from '../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
-import type { AgentKind, LaunchSource, RequestKind } from '../../shared/telemetry-events'
-import type { PreloadApi } from '../api-types'
-import type { TerminalPanePlacement } from '../../shared/workspace-layout/terminal-topology/terminal-pane-placement'
-import type { AgentPaneLaunchRequest } from '../../shared/agent-launch/contracts/agent-pane-launch-request'
+} from '../../../shared/terminal/pty/diagnostics/pty-renderer-delivery-health'
+import type { TerminalViewAttributes } from '../../../shared/terminal/protocol/queries/terminal-view-attributes'
+import type { PtyMainDeliveryDiagnostics } from '../../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
+import type {
+  AgentKind,
+  LaunchSource,
+  RequestKind
+} from '../../../shared/telemetry-property-schemas'
+import type { PreloadApi } from '../../api-types'
+import type { TerminalPanePlacement } from '../../../shared/workspace-layout/terminal-topology/terminal-pane-placement'
+import type { AgentPaneLaunchRequest } from '../../../shared/agent-launch/contracts/agent-pane-launch-request'
 
 export const ptySessionControlApi = {
   spawn: (opts: {
diff --git a/src/preload/api/pty-bridge-stream-and-serialization.ts b/src/preload/api/terminal/pty-bridge-stream-and-serialization.ts
similarity index 91%
rename from src/preload/api/pty-bridge-stream-and-serialization.ts
rename to src/preload/api/terminal/pty-bridge-stream-and-serialization.ts
index 9a8474b5661..ded94904c0d 100644
--- a/src/preload/api/pty-bridge-stream-and-serialization.ts
+++ b/src/preload/api/terminal/pty-bridge-stream-and-serialization.ts
@@ -1,11 +1,14 @@
-import type { PtySessionLifecycle } from '../../shared/terminal/pty/lifecycle/pty-listed-session'
+import type { PtySessionLifecycle } from '../../../shared/terminal/pty/lifecycle/pty-listed-session'
 import { ipcRenderer } from 'electron'
-import type { PtyModelRestoreNeededEvent } from '../../shared/terminal/replay/pty-model-restore-marker'
-import type { TerminalSideEffectBatch } from '../../shared/terminal/output/terminal-side-effect-facts'
-import type { PreloadApi } from '../api-types'
-import type { TerminalProcessInspection } from '../../shared/terminal/pty/lifecycle/terminal-process-inspection'
-import type { CodexSharedServerStatus } from '../../shared/codex-shared-server-command'
-import type { NewerDaemonHeldScreen, NewerDaemonReopenResult } from '../../shared/newer-daemon-hold'
+import type { PtyModelRestoreNeededEvent } from '../../../shared/terminal/replay/pty-model-restore-marker'
+import type { TerminalSideEffectBatch } from '../../../shared/terminal/output/terminal-side-effect-facts'
+import type { PreloadApi } from '../../api-types'
+import type { TerminalProcessInspection } from '../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import type { CodexSharedServerStatus } from '../../../shared/codex-shared-server-command'
+import type {
+  NewerDaemonHeldScreen,
+  NewerDaemonReopenResult
+} from '../../../shared/newer-daemon-hold'
 
 export const ptyStreamAndSerializationApi = {
   inspectProcess: (
diff --git a/src/preload/api/pty-bridge.ts b/src/preload/api/terminal/pty-bridge.ts
similarity index 84%
rename from src/preload/api/pty-bridge.ts
rename to src/preload/api/terminal/pty-bridge.ts
index 18f867e6426..18911ecff77 100644
--- a/src/preload/api/pty-bridge.ts
+++ b/src/preload/api/terminal/pty-bridge.ts
@@ -1,4 +1,4 @@
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 import { ptySessionControlApi } from './pty-bridge-session-control'
 import { ptyStreamAndSerializationApi } from './pty-bridge-stream-and-serialization'
 
diff --git a/src/preload/api/pty-management-api.ts b/src/preload/api/terminal/pty-management-api.ts
similarity index 94%
rename from src/preload/api/pty-management-api.ts
rename to src/preload/api/terminal/pty-management-api.ts
index 0d5799b74f8..ae0324cd599 100644
--- a/src/preload/api/pty-management-api.ts
+++ b/src/preload/api/terminal/pty-management-api.ts
@@ -1,5 +1,5 @@
-import type { DaemonPtyCwdClass } from '../../shared/daemon-adoption-telemetry'
-import type { DaemonAsyncIoStatus } from '../../shared/daemon-async-io-health'
+import type { DaemonPtyCwdClass } from '../../../shared/daemon-adoption-telemetry'
+import type { DaemonAsyncIoStatus } from '../../../shared/daemon-async-io-health'
 
 // Mirrors DaemonSessionInfo; preload cannot import main-only daemon protocol types.
 export type PtyManagementSession = {
diff --git a/src/preload/api/pwsh-bridge.ts b/src/preload/api/terminal/pwsh-bridge.ts
similarity index 77%
rename from src/preload/api/pwsh-bridge.ts
rename to src/preload/api/terminal/pwsh-bridge.ts
index 34ed9880ada..53ef712dc5c 100644
--- a/src/preload/api/pwsh-bridge.ts
+++ b/src/preload/api/terminal/pwsh-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const pwshApi = {
   isAvailable: (): Promise<boolean> => ipcRenderer.invoke('pwsh:isAvailable')
diff --git a/src/preload/api/shell-api.ts b/src/preload/api/terminal/shell-api.ts
similarity index 81%
rename from src/preload/api/shell-api.ts
rename to src/preload/api/terminal/shell-api.ts
index fe70305cf47..7f967b85885 100644
--- a/src/preload/api/shell-api.ts
+++ b/src/preload/api/terminal/shell-api.ts
@@ -1,12 +1,12 @@
-import type { RepoIconPickResult } from '../../shared/repo-icon-pick-failure-copy'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { ShellPathExistence } from '../../shared/file-access/path-existence-batch'
+import type { RepoIconPickResult } from '../../../shared/repo-icon-pick-failure-copy'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { ShellPathExistence } from '../../../shared/file-access/path-existence-batch'
 import type {
   ShellOpenExternalEditorRequest,
   ShellOpenExternalEditorResult,
   ShellOpenFileResult,
   ShellOpenLocalPathResult
-} from '../../shared/shell/opening/shell-open-types'
+} from '../../../shared/shell/opening/shell-open-types'
 
 export type ShellApi = {
   /** Every OS open names the path's owner; main refuses anything not owned by this computer. */
diff --git a/src/preload/api/shell-bridge.ts b/src/preload/api/terminal/shell-bridge.ts
similarity index 84%
rename from src/preload/api/shell-bridge.ts
rename to src/preload/api/terminal/shell-bridge.ts
index d638d61dd7a..852efd71561 100644
--- a/src/preload/api/shell-bridge.ts
+++ b/src/preload/api/terminal/shell-bridge.ts
@@ -1,14 +1,14 @@
-import type { RepoIconPickResult } from '../../shared/repo-icon-pick-failure-copy'
+import type { RepoIconPickResult } from '../../../shared/repo-icon-pick-failure-copy'
 import { ipcRenderer } from 'electron'
 import type {
   ShellOpenExternalEditorRequest,
   ShellOpenExternalEditorResult,
   ShellOpenFileResult,
   ShellOpenLocalPathResult
-} from '../../shared/shell/opening/shell-open-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { ShellPathExistence } from '../../shared/file-access/path-existence-batch'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/shell/opening/shell-open-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { ShellPathExistence } from '../../../shared/file-access/path-existence-batch'
+import type { PreloadApi } from '../../api-types'
 
 export const shellApi = {
   openPath: (path: string, ownerHostId: ExecutionHostId): Promise<void> =>
diff --git a/src/preload/api/terminal-preview-bridge.ts b/src/preload/api/terminal/terminal-preview-bridge.ts
similarity index 92%
rename from src/preload/api/terminal-preview-bridge.ts
rename to src/preload/api/terminal/terminal-preview-bridge.ts
index fb607d6db96..6283315bddf 100644
--- a/src/preload/api/terminal-preview-bridge.ts
+++ b/src/preload/api/terminal/terminal-preview-bridge.ts
@@ -2,8 +2,8 @@ import { ipcRenderer } from 'electron'
 import type {
   TerminalPreviewConnectResult,
   TerminalPreviewDataPayload
-} from '../../shared/terminal/replay/terminal-preview'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/terminal/replay/terminal-preview'
+import type { PreloadApi } from '../../api-types'
 
 export const terminalPreviewApi = {
   connect: (
diff --git a/src/preload/api/updater-api.ts b/src/preload/api/updater/updater-api.ts
similarity index 90%
rename from src/preload/api/updater-api.ts
rename to src/preload/api/updater/updater-api.ts
index 6c2fe707f54..8630691d70b 100644
--- a/src/preload/api/updater-api.ts
+++ b/src/preload/api/updater/updater-api.ts
@@ -3,8 +3,8 @@ import type {
   ReleaseBuildListResult,
   UpdateCheckOptions,
   UpdateStatus
-} from '../../shared/update-status-types'
-import type { ReleaseChannel } from '../../shared/release-channel'
+} from '../../../shared/update-status-types'
+import type { ReleaseChannel } from '../../../shared/release-channel'
 
 export type UpdaterApi = {
   getVersion: () => Promise<string>
diff --git a/src/preload/api/updater-bridge.ts b/src/preload/api/updater/updater-bridge.ts
similarity index 85%
rename from src/preload/api/updater-bridge.ts
rename to src/preload/api/updater/updater-bridge.ts
index af55a0967d0..3f393615e9b 100644
--- a/src/preload/api/updater-bridge.ts
+++ b/src/preload/api/updater/updater-bridge.ts
@@ -1,8 +1,8 @@
 import { ipcRenderer } from 'electron'
-import type { UpdateStatus } from '../../shared/update-status-types'
-import { prepareAndInvokeUpdaterInstall } from '../renderer/restart/renderer-restart-wiring'
-import { awaitBeforeUnloadCheckpoint, updaterQuitAbortRelay } from '../renderer/renderer-runtime'
-import type { PreloadApi } from '../api-types'
+import type { UpdateStatus } from '../../../shared/update-status-types'
+import { prepareAndInvokeUpdaterInstall } from '../../renderer/restart/renderer-restart-wiring'
+import { awaitBeforeUnloadCheckpoint, updaterQuitAbortRelay } from '../../renderer/renderer-runtime'
+import type { PreloadApi } from '../../api-types'
 
 export const updaterApi = {
   getStatus: () => ipcRenderer.invoke('updater:getStatus'),
diff --git a/src/preload/api/app-icon-api.ts b/src/preload/api/window-ui/app-icon-api.ts
similarity index 70%
rename from src/preload/api/app-icon-api.ts
rename to src/preload/api/window-ui/app-icon-api.ts
index d41dd0a2957..c3a48f85be3 100644
--- a/src/preload/api/app-icon-api.ts
+++ b/src/preload/api/window-ui/app-icon-api.ts
@@ -1,4 +1,4 @@
-import type { CustomAppIconImportResult } from '../../shared/app-icon'
+import type { CustomAppIconImportResult } from '../../../shared/app-icon'
 
 export type AppIconApi = {
   importCustom: () => Promise<CustomAppIconImportResult | null>
diff --git a/src/preload/api/app-icon-bridge.ts b/src/preload/api/window-ui/app-icon-bridge.ts
similarity index 86%
rename from src/preload/api/app-icon-bridge.ts
rename to src/preload/api/window-ui/app-icon-bridge.ts
index aad315bd00b..ba708ba0f43 100644
--- a/src/preload/api/app-icon-bridge.ts
+++ b/src/preload/api/window-ui/app-icon-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const appIconApi = {
   importCustom: () => ipcRenderer.invoke('appIcon:importCustom'),
diff --git a/src/preload/api/dashboard-api.ts b/src/preload/api/window-ui/dashboard-api.ts
similarity index 89%
rename from src/preload/api/dashboard-api.ts
rename to src/preload/api/window-ui/dashboard-api.ts
index 36a7747c819..572d6e9c323 100644
--- a/src/preload/api/dashboard-api.ts
+++ b/src/preload/api/window-ui/dashboard-api.ts
@@ -1,8 +1,11 @@
-import type { DashboardRevealAgentArgs, DashboardSnapshot } from '../../shared/dashboard-snapshot'
+import type {
+  DashboardRevealAgentArgs,
+  DashboardSnapshot
+} from '../../../shared/dashboard-snapshot'
 import type {
   TerminalPreviewConnectResult,
   TerminalPreviewDataPayload
-} from '../../shared/terminal/replay/terminal-preview'
+} from '../../../shared/terminal/replay/terminal-preview'
 
 export type DashboardApi = {
   openPopout: () => Promise<void>
diff --git a/src/preload/api/dashboard-bridge.ts b/src/preload/api/window-ui/dashboard-bridge.ts
similarity index 94%
rename from src/preload/api/dashboard-bridge.ts
rename to src/preload/api/window-ui/dashboard-bridge.ts
index 4663b87459e..fe5c17c8a98 100644
--- a/src/preload/api/dashboard-bridge.ts
+++ b/src/preload/api/window-ui/dashboard-bridge.ts
@@ -1,6 +1,9 @@
 import { ipcRenderer } from 'electron'
-import type { DashboardRevealAgentArgs, DashboardSnapshot } from '../../shared/dashboard-snapshot'
-import type { PreloadApi } from '../api-types'
+import type {
+  DashboardRevealAgentArgs,
+  DashboardSnapshot
+} from '../../../shared/dashboard-snapshot'
+import type { PreloadApi } from '../../api-types'
 
 export const dashboardApi = {
   openPopout: (): Promise<void> => ipcRenderer.invoke('dashboardPopout:open'),
diff --git a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts b/src/preload/api/window-ui/ui-bridge-clipboard-and-window-controls.ts
similarity index 94%
rename from src/preload/api/ui-bridge-clipboard-and-window-controls.ts
rename to src/preload/api/window-ui/ui-bridge-clipboard-and-window-controls.ts
index d3cfacc2098..7fb38e7da65 100644
--- a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
+++ b/src/preload/api/window-ui/ui-bridge-clipboard-and-window-controls.ts
@@ -1,4 +1,4 @@
-import type { AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session/agent-session-attachments'
+import type { AgentSessionAttachmentClipboardTarget } from '../../../shared/agent-session/agent-session-attachments'
 import { ipcRenderer, webFrame } from 'electron'
 import {
   richMarkdownContextMenuCommandChannel,
@@ -6,16 +6,16 @@ import {
   plainTextContextMenuTargetChannel,
   type RichMarkdownContextMenuCommandPayload,
   type RichMarkdownContextMenuTableTarget
-} from '../../shared/rich-markdown-context-menu'
-import type { RuntimeNavigationTarget } from '../../shared/runtime-navigation'
-import type { TerminalSurfaceCloseTarget } from '../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
-import type { ClipboardImageThumbnail } from '../../shared/clipboard-image'
-import type { ReadClipboardTextOptions } from '../../shared/clipboard-text'
+} from '../../../shared/rich-markdown-context-menu'
+import type { RuntimeNavigationTarget } from '../../../shared/runtime-navigation'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
+import type { ClipboardImageThumbnail } from '../../../shared/clipboard-image'
+import type { ReadClipboardTextOptions } from '../../../shared/clipboard-text'
 import type {
   AgentPaneActivityReply,
   AgentPaneActivityRequest
-} from '../../shared/agent-status/presentation/agent-list-status'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/agent-status/presentation/agent-list-status'
+import type { PreloadApi } from '../../api-types'
 
 export const uiClipboardAndWindowControlsApi = {
   onOpenDiffFromMobile: (
diff --git a/src/preload/api/ui-bridge-state-and-menu-commands.ts b/src/preload/api/window-ui/ui-bridge-state-and-menu-commands.ts
similarity index 95%
rename from src/preload/api/ui-bridge-state-and-menu-commands.ts
rename to src/preload/api/window-ui/ui-bridge-state-and-menu-commands.ts
index 0a9c96449cf..127b72c268a 100644
--- a/src/preload/api/ui-bridge-state-and-menu-commands.ts
+++ b/src/preload/api/window-ui/ui-bridge-state-and-menu-commands.ts
@@ -1,13 +1,13 @@
-import type { MarkdownDocument } from '../../shared/file-listing/file-document'
-import type { BrowserTabCreateRequest } from '../../shared/browser-tab-create-request'
+import type { MarkdownDocument } from '../../../shared/file-listing/file-document'
+import type { BrowserTabCreateRequest } from '../../../shared/browser-tab-create-request'
 import { ipcRenderer } from 'electron'
-import type { PersistedUIState } from '../../shared/persisted-ui-state-types'
-import type { KeybindingActionId } from '../../shared/keybindings'
-import type { PreloadApi } from '../api-types'
+import type { PersistedUIState } from '../../../shared/persisted-ui-state-types'
+import type { KeybindingActionId } from '../../../shared/keybindings/types'
+import type { PreloadApi } from '../../api-types'
 import type {
   RemoteCliBrowserScopeQuery,
   RemoteCliBrowserScopeReply
-} from '../../shared/desktop-browser-bridge-protocol'
+} from '../../../shared/desktop-browser-bridge-protocol'
 
 export const uiStateAndMenuCommandsApi = {
   getJiraQuickFilters: () => ipcRenderer.invoke('ui:getJiraQuickFilters'),
diff --git a/src/preload/api/ui-bridge-tab-and-browser-commands.ts b/src/preload/api/window-ui/ui-bridge-tab-and-browser-commands.ts
similarity index 95%
rename from src/preload/api/ui-bridge-tab-and-browser-commands.ts
rename to src/preload/api/window-ui/ui-bridge-tab-and-browser-commands.ts
index ea87e6e2b61..fcc78518320 100644
--- a/src/preload/api/ui-bridge-tab-and-browser-commands.ts
+++ b/src/preload/api/window-ui/ui-bridge-tab-and-browser-commands.ts
@@ -1,18 +1,18 @@
 import { ipcRenderer } from 'electron'
-import { admitCloseActiveTabPayload } from '../renderer/window-commands/close-active-tab-payload-admission'
-import type { CloseActiveTabPayload } from '../api/ui-command-event-api'
+import { admitCloseActiveTabPayload } from '../../renderer/window-commands/close-active-tab-payload-admission'
+import type { CloseActiveTabPayload } from './ui-command-event-api'
 import type {
   BrowserHistoryNavigateCommand,
   BrowserPageCommandTarget,
   BrowserPageTabShortcut
-} from '../../shared/browser-page-command-target'
-import type { BrowserPageZoomCommand } from '../../shared/browser-page-zoom'
+} from '../../../shared/browser-page-command-target'
+import type { BrowserPageZoomCommand } from '../../../shared/browser-page-zoom'
 import type {
   WorktreeDefaultTabsLaunch,
   WorktreeSetupLaunch
-} from '../../shared/worktree/launch-types'
-import { browserFindSubscriptions } from '../renderer/renderer-runtime'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/worktree/launch-types'
+import { browserFindSubscriptions } from '../../renderer/renderer-runtime'
+import type { PreloadApi } from '../../api-types'
 
 export const uiTabAndBrowserCommandsApi = {
   onRequestTabSetProfile: (
diff --git a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts b/src/preload/api/window-ui/ui-bridge-terminal-and-session-tabs.ts
similarity index 90%
rename from src/preload/api/ui-bridge-terminal-and-session-tabs.ts
rename to src/preload/api/window-ui/ui-bridge-terminal-and-session-tabs.ts
index 56c17ce2f56..11f75d66557 100644
--- a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
+++ b/src/preload/api/window-ui/ui-bridge-terminal-and-session-tabs.ts
@@ -1,33 +1,33 @@
 import type {
   RuntimeEditorTabReveal,
   RuntimeFileOpenPosition
-} from '../../shared/file-access/runtime-editor-file-open'
+} from '../../../shared/file-access/runtime-editor-file-open'
 import { ipcRenderer } from 'electron'
-import type { TerminalPaneSplitSource } from '../../shared/feature-education-telemetry'
-import type { TerminalTabCreateReply } from '../../shared/workspace-layout/terminal-surfaces/terminal-reveal-identity'
+import type { TerminalPaneSplitSource } from '../../../shared/feature-education-telemetry'
+import type { TerminalTabCreateReply } from '../../../shared/workspace-layout/terminal-surfaces/terminal-reveal-identity'
 import type {
   AgentLaunchTabPublishReply,
   AgentLaunchTabViewerRule,
   AgentLaunchTabPublishRequest
-} from '../../shared/agent-launch/contracts/agent-launch-tab-publication'
-import type { AgentLaunchPaneVerdictEvent } from '../../shared/agent-launch/contracts/agent-launch-pane-verdict'
-import type { PaneLaunchRecipe } from '../../shared/terminal/pty/lifecycle/terminal-attachment-launch-result'
+} from '../../../shared/agent-launch/contracts/agent-launch-tab-publication'
+import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch/contracts/agent-launch-pane-verdict'
+import type { PaneLaunchRecipe } from '../../../shared/terminal/pty/lifecycle/terminal-attachment-launch-result'
 import type {
   TerminalPaneRevealReply,
   TerminalPaneRevealRequest
-} from '../../shared/workspace-layout/terminal-surfaces/terminal-pane-reveal'
+} from '../../../shared/workspace-layout/terminal-surfaces/terminal-pane-reveal'
 import type {
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
-} from '../../shared/agent-session/lifecycle/agent-session-resume'
-import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
-import type { RuntimeNavigationTarget } from '../../shared/runtime-navigation'
+} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
+import type { RuntimeNavigationTarget } from '../../../shared/runtime-navigation'
+import type { RuntimeMobileSessionTabMove } from '../../../shared/runtime-session-contracts'
 import type {
-  RuntimeMobileSessionTabMove,
   RuntimeTerminalCreateRequestPayload,
   RuntimeTerminalPresentation
-} from '../../shared/runtime-types'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/runtime-terminal-contracts'
+import type { PreloadApi } from '../../api-types'
 
 export const uiTerminalAndSessionTabsApi = {
   onCreateTerminal: (
diff --git a/src/preload/api/ui-bridge.ts b/src/preload/api/window-ui/ui-bridge.ts
similarity index 91%
rename from src/preload/api/ui-bridge.ts
rename to src/preload/api/window-ui/ui-bridge.ts
index 200d49ba1c1..0b3b442719b 100644
--- a/src/preload/api/ui-bridge.ts
+++ b/src/preload/api/window-ui/ui-bridge.ts
@@ -1,4 +1,4 @@
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 import { uiStateAndMenuCommandsApi } from './ui-bridge-state-and-menu-commands'
 import { uiTabAndBrowserCommandsApi } from './ui-bridge-tab-and-browser-commands'
 import { uiTerminalAndSessionTabsApi } from './ui-bridge-terminal-and-session-tabs'
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/window-ui/ui-command-event-api.ts
similarity index 83%
rename from src/preload/api/ui-command-event-api.ts
rename to src/preload/api/window-ui/ui-command-event-api.ts
index 5d8d54b112e..b3b666b812b 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/window-ui/ui-command-event-api.ts
@@ -1,79 +1,79 @@
 import type {
   RuntimeEditorTabReveal,
   RuntimeFileOpenPosition
-} from '../../shared/file-access/runtime-editor-file-open'
-import type { JiraQuickFilterState } from '../../shared/jira/jira-quick-filters'
+} from '../../../shared/file-access/runtime-editor-file-open'
+import type { JiraQuickFilterState } from '../../../shared/jira/jira-quick-filters'
 import type {
   JiraSavedFilterState,
   JiraSavedFilterMutation
-} from '../../shared/jira/jira-saved-filters'
-import type { BrowserTabCreateRequest } from '../../shared/browser-tab-create-request'
-import type { MarkdownDocument } from '../../shared/file-listing/file-document'
-import type { PersistedUIState } from '../../shared/persisted-ui-state-types'
-import type { TuiAgent } from '../../shared/agent-launch/catalog/tui-agent'
+} from '../../../shared/jira/jira-saved-filters'
+import type { BrowserTabCreateRequest } from '../../../shared/browser-tab-create-request'
+import type { MarkdownDocument } from '../../../shared/file-listing/file-document'
+import type { PersistedUIState } from '../../../shared/persisted-ui-state-types'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
 import type {
   AgentLaunchTabPublishReply,
   AgentLaunchTabViewerRule,
   AgentLaunchTabPublishRequest
-} from '../../shared/agent-launch/contracts/agent-launch-tab-publication'
-import type { AgentLaunchPaneVerdictEvent } from '../../shared/agent-launch/contracts/agent-launch-pane-verdict'
-import type { PaneLaunchRecipe } from '../../shared/terminal/pty/lifecycle/terminal-attachment-launch-result'
+} from '../../../shared/agent-launch/contracts/agent-launch-tab-publication'
+import type { AgentLaunchPaneVerdictEvent } from '../../../shared/agent-launch/contracts/agent-launch-pane-verdict'
+import type { PaneLaunchRecipe } from '../../../shared/terminal/pty/lifecycle/terminal-attachment-launch-result'
 import type {
   TerminalPaneMoveToNewTabReply,
   TerminalPaneMoveToNewTabRequest
-} from '../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
+} from '../../../shared/workspace-layout/terminal-topology/terminal-leaf-move'
 import type {
   TerminalPaneRevealReply,
   TerminalPaneRevealRequest
-} from '../../shared/workspace-layout/terminal-surfaces/terminal-pane-reveal'
+} from '../../../shared/workspace-layout/terminal-surfaces/terminal-pane-reveal'
 import type {
   AgentPaneActivityReply,
   AgentPaneActivityRequest
-} from '../../shared/agent-status/presentation/agent-list-status'
-import type { RuntimeNavigationTarget } from '../../shared/runtime-navigation'
+} from '../../../shared/agent-status/presentation/agent-list-status'
+import type { RuntimeNavigationTarget } from '../../../shared/runtime-navigation'
 import type {
   ProjectMovePauseRequest,
   ProjectMovePauseResponse
-} from '../../shared/project-move-pause'
-import type { TerminalSurfaceCloseTarget } from '../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
+} from '../../../shared/project-move-pause'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
 import type {
   WorktreeDefaultTabsLaunch,
   WorktreeSetupLaunch,
   WorktreeStartupLaunch
-} from '../../shared/worktree/launch-types'
-import type { FeatureInteractionId } from '../../shared/feature-interactions'
-import type { KeybindingActionId } from '../../shared/keybindings'
-import type { BrowserFindSource } from '../../shared/browser-find-source'
+} from '../../../shared/worktree/launch-types'
+import type { FeatureInteractionId } from '../../../shared/feature-interaction-catalog'
+import type { KeybindingActionId } from '../../../shared/keybindings/types'
+import type { BrowserFindSource } from '../../../shared/browser-find-source'
 import type {
   BrowserHistoryNavigateCommand,
   BrowserPageCommandTarget,
   BrowserPageTabShortcut
-} from '../../shared/browser-page-command-target'
-import type { BrowserPageZoomCommand } from '../../shared/browser-page-zoom'
+} from '../../../shared/browser-page-command-target'
+import type { BrowserPageZoomCommand } from '../../../shared/browser-page-zoom'
 import type {
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
-} from '../../shared/agent-session/lifecycle/agent-session-resume'
-import type { TerminalPaneSplitSource } from '../../shared/feature-education-telemetry'
+} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { TerminalPaneSplitSource } from '../../../shared/feature-education-telemetry'
+import type { RuntimeMobileSessionTabMove } from '../../../shared/runtime-session-contracts'
 import type {
-  RuntimeMobileSessionTabMove,
   RuntimeTerminalCreateRequestPayload,
   RuntimeTerminalPresentation
-} from '../../shared/runtime-types'
-import type { TerminalTabCreateReply } from '../../shared/workspace-layout/terminal-surfaces/terminal-reveal-identity'
+} from '../../../shared/runtime-terminal-contracts'
+import type { TerminalTabCreateReply } from '../../../shared/workspace-layout/terminal-surfaces/terminal-reveal-identity'
 import type {
   TerminalTabCloseRequest,
   TerminalTabCloseResponse
-} from '../../shared/workspace-layout/terminal-surfaces/terminal-tab-close'
+} from '../../../shared/workspace-layout/terminal-surfaces/terminal-tab-close'
 import type {
   SessionTabCloseRequest,
   SessionTabCloseResponse
-} from '../../shared/session-tab-close'
-import type { WorkspaceSleepNotice } from '../../shared/workspace-sleep'
+} from '../../../shared/session-tab-close'
+import type { WorkspaceSleepNotice } from '../../../shared/workspace-sleep'
 import type {
   RemoteCliBrowserScopeQuery,
   RemoteCliBrowserScopeReply
-} from '../../shared/desktop-browser-bridge-protocol'
+} from '../../../shared/desktop-browser-bridge-protocol'
 
 export type CloseActiveTabPayload = { sourceId: string }
 
diff --git a/src/preload/api/ui-window-api.ts b/src/preload/api/window-ui/ui-window-api.ts
similarity index 93%
rename from src/preload/api/ui-window-api.ts
rename to src/preload/api/window-ui/ui-window-api.ts
index e97ee1730e6..ee05d53254e 100644
--- a/src/preload/api/ui-window-api.ts
+++ b/src/preload/api/window-ui/ui-window-api.ts
@@ -1,10 +1,10 @@
-import type { AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session/agent-session-attachments'
-import type { ClipboardImageThumbnail } from '../../shared/clipboard-image'
-import type { ReadClipboardTextOptions } from '../../shared/clipboard-text'
+import type { AgentSessionAttachmentClipboardTarget } from '../../../shared/agent-session/agent-session-attachments'
+import type { ClipboardImageThumbnail } from '../../../shared/clipboard-image'
+import type { ReadClipboardTextOptions } from '../../../shared/clipboard-text'
 import type {
   RichMarkdownContextMenuCommandPayload,
   RichMarkdownContextMenuTableTarget
-} from '../../shared/rich-markdown-context-menu'
+} from '../../../shared/rich-markdown-context-menu'
 
 export type UiWindowApi = {
   readClipboardText: (options?: ReadClipboardTextOptions) => Promise<string>
diff --git a/src/preload/api/jira-api.ts b/src/preload/api/work-items/jira-api.ts
similarity index 92%
rename from src/preload/api/jira-api.ts
rename to src/preload/api/work-items/jira-api.ts
index ce3f1529d11..87c4082f004 100644
--- a/src/preload/api/jira-api.ts
+++ b/src/preload/api/work-items/jira-api.ts
@@ -1,10 +1,10 @@
-import type { JiraMediaFormat } from '../../shared/jira/jira-attachment-image'
-import type { JiraFavouriteFilterList } from '../../shared/jira/jira-favourite-filters'
+import type { JiraMediaFormat } from '../../../shared/jira/jira-attachment-image'
+import type { JiraFavouriteFilterList } from '../../../shared/jira/jira-favourite-filters'
 import type {
   JiraIssueSummaryGenerationRequest,
   JiraIssueSummaryGenerationCancellation,
   JiraIssueSummaryGenerationResult
-} from '../../shared/jira/jira-issue-summary-generation'
+} from '../../../shared/jira/jira-issue-summary-generation'
 import type {
   JiraComment,
   JiraConnectionStatus,
@@ -22,7 +22,7 @@ import type {
   JiraTransition,
   JiraUser,
   JiraViewer
-} from '../../shared/jira/jira-types'
+} from '../../../shared/jira/jira-types'
 
 export type JiraApi = {
   connect: (args: {
diff --git a/src/preload/api/jira-bridge.ts b/src/preload/api/work-items/jira-bridge.ts
similarity index 94%
rename from src/preload/api/jira-bridge.ts
rename to src/preload/api/work-items/jira-bridge.ts
index f1953137c6d..cc4fa33c3bb 100644
--- a/src/preload/api/jira-bridge.ts
+++ b/src/preload/api/work-items/jira-bridge.ts
@@ -1,11 +1,11 @@
-import type { JiraMediaFormat } from '../../shared/jira/jira-attachment-image'
+import type { JiraMediaFormat } from '../../../shared/jira/jira-attachment-image'
 import type {
   JiraIssueSummaryGenerationRequest,
   JiraIssueSummaryGenerationCancellation
-} from '../../shared/jira/jira-issue-summary-generation'
+} from '../../../shared/jira/jira-issue-summary-generation'
 import { ipcRenderer } from 'electron'
-import type { JiraIssueListFilters, JiraProjectStatusOrder } from '../../shared/jira/jira-types'
-import type { PreloadApi } from '../api-types'
+import type { JiraIssueListFilters, JiraProjectStatusOrder } from '../../../shared/jira/jira-types'
+import type { PreloadApi } from '../../api-types'
 
 export const jiraApi = {
   connect: (args: {
diff --git a/src/preload/api/linear-api.ts b/src/preload/api/work-items/linear-api.ts
similarity index 90%
rename from src/preload/api/linear-api.ts
rename to src/preload/api/work-items/linear-api.ts
index 8e2e597a1ce..7a52e1ce96e 100644
--- a/src/preload/api/linear-api.ts
+++ b/src/preload/api/work-items/linear-api.ts
@@ -1,13 +1,13 @@
-import type { RuntimeClientEvent } from '../../shared/runtime-client-events'
-import type { LinearIssueAttributeFilter } from '../../shared/linear/issue-attribute-filter'
-import type { LinearIssueUpdate } from '../../shared/issue-mutation-types'
-import type { LinearComment, LinearIssue } from '../../shared/linear/issue-types'
+import type { RuntimeClientEvent } from '../../../shared/runtime-client-events'
+import type { LinearIssueAttributeFilter } from '../../../shared/linear/issue-attribute-filter'
+import type { LinearIssueUpdate } from '../../../shared/issue-mutation-types'
+import type { LinearComment, LinearIssue } from '../../../shared/linear/issue-types'
 import type {
   LinearCustomViewModel,
   LinearCustomViewSummary,
   LinearProjectDetail,
   LinearProjectSummary
-} from '../../shared/linear/project-types'
+} from '../../../shared/linear/project-types'
 import type {
   LinearCollectionResult,
   LinearConnectionStatus,
@@ -17,7 +17,7 @@ import type {
   LinearViewer,
   LinearWorkflowState,
   LinearWorkspaceSelection
-} from '../../shared/linear/workspace-types'
+} from '../../../shared/linear/workspace-types'
 
 export type LinearLinkedIssueUpdated = Extract<
   RuntimeClientEvent,
diff --git a/src/preload/api/linear-bridge.ts b/src/preload/api/work-items/linear-bridge.ts
similarity index 97%
rename from src/preload/api/linear-bridge.ts
rename to src/preload/api/work-items/linear-bridge.ts
index 86d4a7a931c..04fa03b99fa 100644
--- a/src/preload/api/linear-bridge.ts
+++ b/src/preload/api/work-items/linear-bridge.ts
@@ -1,7 +1,7 @@
 import type { LinearLinkedIssueUpdated } from './linear-api'
 import { ipcRenderer } from 'electron'
-import type { LinearProjectDetail } from '../../shared/linear/project-types'
-import type { PreloadApi } from '../api-types'
+import type { LinearProjectDetail } from '../../../shared/linear/project-types'
+import type { PreloadApi } from '../../api-types'
 
 export const linearApi = {
   onLinkedIssueUpdated: (callback: (event: LinearLinkedIssueUpdated) => void) => {
diff --git a/src/preload/api/folder-workspaces-bridge.ts b/src/preload/api/workspaces/folder-workspaces-bridge.ts
similarity index 90%
rename from src/preload/api/folder-workspaces-bridge.ts
rename to src/preload/api/workspaces/folder-workspaces-bridge.ts
index d085719d8ab..a7aff81b6b7 100644
--- a/src/preload/api/folder-workspaces-bridge.ts
+++ b/src/preload/api/workspaces/folder-workspaces-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const folderWorkspacesApi = {
   list: () => ipcRenderer.invoke('folderWorkspaces:list'),
diff --git a/src/preload/api/localhost-worktree-labels-bridge.ts b/src/preload/api/workspaces/localhost-worktree-labels-bridge.ts
similarity index 78%
rename from src/preload/api/localhost-worktree-labels-bridge.ts
rename to src/preload/api/workspaces/localhost-worktree-labels-bridge.ts
index a44dcffff69..bb635af83a6 100644
--- a/src/preload/api/localhost-worktree-labels-bridge.ts
+++ b/src/preload/api/workspaces/localhost-worktree-labels-bridge.ts
@@ -2,8 +2,8 @@ import { ipcRenderer } from 'electron'
 import type {
   LocalhostWorktreeLabelResult,
   LocalhostWorktreeLabelRoute
-} from '../../shared/localhost-worktree-labels'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/localhost-worktree-labels'
+import type { PreloadApi } from '../../api-types'
 
 export const localhostWorktreeLabelsApi = {
   register: (args: LocalhostWorktreeLabelRoute): Promise<LocalhostWorktreeLabelResult> =>
diff --git a/src/preload/api/session-bridge.ts b/src/preload/api/workspaces/session-bridge.ts
similarity index 92%
rename from src/preload/api/session-bridge.ts
rename to src/preload/api/workspaces/session-bridge.ts
index c456b99dc4b..3ed06775c0a 100644
--- a/src/preload/api/session-bridge.ts
+++ b/src/preload/api/workspaces/session-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const sessionApi = {
   get: (hostId) => ipcRenderer.invoke('session:get', hostId),
diff --git a/src/preload/api/workspace-cleanup-api.ts b/src/preload/api/workspaces/workspace-cleanup-api.ts
similarity index 89%
rename from src/preload/api/workspace-cleanup-api.ts
rename to src/preload/api/workspaces/workspace-cleanup-api.ts
index 84458b41907..e286bbd2913 100644
--- a/src/preload/api/workspace-cleanup-api.ts
+++ b/src/preload/api/workspaces/workspace-cleanup-api.ts
@@ -5,14 +5,14 @@ import type {
   WorkspaceCleanupScanResult,
   WorkspaceCleanupSnapshotPruneBatchArgs,
   WorkspaceCleanupSnapshotPruneRecordArgs
-} from '../../shared/workspace-cleanup/workspace-cleanup'
+} from '../../../shared/workspace-cleanup/workspace-cleanup'
 import type {
   WorkspaceSpaceAnalysis,
   WorkspaceSpaceAnalyzeResult,
   WorkspaceSpaceScanProgress
-} from '../../shared/workspace-disk-space/workspace-space-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { WorkspaceSpaceChange } from '../../shared/workspace-disk-space/workspace-space-change'
+} from '../../../shared/workspace-disk-space/workspace-space-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorkspaceSpaceChange } from '../../../shared/workspace-disk-space/workspace-space-change'
 
 export type WorkspaceCleanupApi = {
   scan: (
diff --git a/src/preload/api/workspace-cleanup-bridge.ts b/src/preload/api/workspaces/workspace-cleanup-bridge.ts
similarity index 90%
rename from src/preload/api/workspace-cleanup-bridge.ts
rename to src/preload/api/workspaces/workspace-cleanup-bridge.ts
index f2a6d90152f..4c979e55e84 100644
--- a/src/preload/api/workspace-cleanup-bridge.ts
+++ b/src/preload/api/workspaces/workspace-cleanup-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { WorkspaceCleanupScanProgress } from '../../shared/workspace-cleanup/workspace-cleanup'
-import type { PreloadApi } from '../api-types'
+import type { WorkspaceCleanupScanProgress } from '../../../shared/workspace-cleanup/workspace-cleanup'
+import type { PreloadApi } from '../../api-types'
 
 export const workspaceCleanupApi = {
   scan: (args, onProgress) => {
diff --git a/src/preload/api/workspace-port-api.ts b/src/preload/api/workspaces/workspace-port-api.ts
similarity index 90%
rename from src/preload/api/workspace-port-api.ts
rename to src/preload/api/workspaces/workspace-port-api.ts
index 06c91c645ea..3da0f4e53f8 100644
--- a/src/preload/api/workspace-port-api.ts
+++ b/src/preload/api/workspaces/workspace-port-api.ts
@@ -1,7 +1,7 @@
 import type {
   LocalhostWorktreeLabelResult,
   LocalhostWorktreeLabelRoute
-} from '../../shared/localhost-worktree-labels'
+} from '../../../shared/localhost-worktree-labels'
 import type {
   WorkspacePortAdvertisedUrlChangedEvent,
   WorkspacePortKillRequest,
@@ -10,7 +10,7 @@ import type {
   WorkspacePortPageProbeResult,
   WorkspacePortScanRequest,
   WorkspacePortScanResult
-} from '../../shared/workspace-ports'
+} from '../../../shared/workspace-ports'
 
 export type WorkspacePortsApi = {
   scan: (args: WorkspacePortScanRequest) => Promise<WorkspacePortScanResult>
diff --git a/src/preload/api/workspace-ports-bridge.ts b/src/preload/api/workspaces/workspace-ports-bridge.ts
similarity index 90%
rename from src/preload/api/workspace-ports-bridge.ts
rename to src/preload/api/workspaces/workspace-ports-bridge.ts
index fba9a274adf..9a4c5e65671 100644
--- a/src/preload/api/workspace-ports-bridge.ts
+++ b/src/preload/api/workspaces/workspace-ports-bridge.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron'
-import type { WorkspacePortAdvertisedUrlChangedEvent } from '../../shared/workspace-ports'
-import type { PreloadApi } from '../api-types'
+import type { WorkspacePortAdvertisedUrlChangedEvent } from '../../../shared/workspace-ports'
+import type { PreloadApi } from '../../api-types'
 
 export const workspacePortsApi = {
   scan: (args) => ipcRenderer.invoke('workspacePorts:scan', args),
diff --git a/src/preload/api/workspace-session-api.ts b/src/preload/api/workspaces/workspace-session-api.ts
similarity index 78%
rename from src/preload/api/workspace-session-api.ts
rename to src/preload/api/workspaces/workspace-session-api.ts
index 16c4aab23f5..b5c3cef456b 100644
--- a/src/preload/api/workspace-session-api.ts
+++ b/src/preload/api/workspaces/workspace-session-api.ts
@@ -1,10 +1,10 @@
-import type { IssueInfo, PRInfo } from '../../shared/github/pull-requests/pull-request-types'
+import type { IssueInfo, PRInfo } from '../../../shared/github/pull-requests/pull-request-types'
 import type {
   WorkspaceSessionPatch,
   WorkspaceSessionState
-} from '../../shared/workspace-session/workspace-session-state-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { TerminalSurfaceCloseTarget } from '../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
+} from '../../../shared/workspace-session/workspace-session-state-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/workspace-layout/terminal-surfaces/terminal-surface-close-target'
 
 export type WorkspaceSessionApi = {
   session: {
diff --git a/src/preload/api/workspace-space-bridge.ts b/src/preload/api/workspaces/workspace-space-bridge.ts
similarity index 93%
rename from src/preload/api/workspace-space-bridge.ts
rename to src/preload/api/workspaces/workspace-space-bridge.ts
index cfab82ca3bd..2e6495fa82d 100644
--- a/src/preload/api/workspace-space-bridge.ts
+++ b/src/preload/api/workspaces/workspace-space-bridge.ts
@@ -2,10 +2,10 @@ import { ipcRenderer } from 'electron'
 import type {
   WorkspaceSpaceAnalysis,
   WorkspaceSpaceScanProgress
-} from '../../shared/workspace-disk-space/workspace-space-types'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { WorkspaceSpaceChange } from '../../shared/workspace-disk-space/workspace-space-change'
-import type { PreloadApi } from '../api-types'
+} from '../../../shared/workspace-disk-space/workspace-space-types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorkspaceSpaceChange } from '../../../shared/workspace-disk-space/workspace-space-change'
+import type { PreloadApi } from '../../api-types'
 
 export const workspaceSpaceApi = {
   analyze: () => ipcRenderer.invoke('workspaceSpace:analyze'),
diff --git a/src/preload/api/worktree-api.ts b/src/preload/api/workspaces/worktree-api.ts
similarity index 88%
rename from src/preload/api/worktree-api.ts
rename to src/preload/api/workspaces/worktree-api.ts
index c2cb7654a05..9715f8bf021 100644
--- a/src/preload/api/worktree-api.ts
+++ b/src/preload/api/workspaces/worktree-api.ts
@@ -1,5 +1,5 @@
-import type { WorkspaceMetadataSet } from '../../shared/worktree/workspace-metadata-set'
-import type { SparsePresetFailure } from '../../shared/worktree/sparse-preset-failure'
+import type { WorkspaceMetadataSet } from '../../../shared/worktree/workspace-metadata-set'
+import type { SparsePresetFailure } from '../../../shared/worktree/sparse-preset-failure'
 import type {
   ForgetRemovedWorktreesForExecutionHostArgs,
   ForgetRemovedWorktreesForExecutionHostResult,
@@ -9,20 +9,20 @@ import type {
   ListDetectedWorktreesArgs,
   ListKnownWorktreesForExecutionHostArgs,
   ProviderRequestId
-} from '../../shared/detected-worktree-provider-contract'
-import type { NestedWorktreeRemovalApproval } from '../../shared/worktree/nested-removal'
-import type { ExecutionHostId } from '../../shared/execution-host'
-import type { WorkspaceSleepOutcome, WorkspaceSleepRequest } from '../../shared/workspace-sleep'
-import type { RetiredNameRegistry } from '../../shared/worktree/retired-name-registry'
+} from '../../../shared/detected-worktree-provider-contract'
+import type { NestedWorktreeRemovalApproval } from '../../../shared/worktree/nested-removal'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorkspaceSleepOutcome, WorkspaceSleepRequest } from '../../../shared/workspace-sleep'
+import type { RetiredNameRegistry } from '../../../shared/worktree/retired-name-registry'
 import type {
   FolderWorkspacePathStatus,
   FolderWorkspacePathStatusRequest
-} from '../../shared/folder-workspaces/folder-workspace-path-status'
-import type { FolderWorkspace } from '../../shared/folder-workspaces/folder-workspace-types'
+} from '../../../shared/folder-workspaces/folder-workspace-path-status'
+import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
 import type {
   WorktreeBaseStatusEvent,
   WorktreeRemoteBranchConflictEvent
-} from '../../shared/worktree/base-ref-drift-types'
+} from '../../../shared/worktree/base-ref-drift-types'
 import type {
   AdoptProvisionedRootArgs,
   CreateWorktreeArgs,
@@ -33,9 +33,9 @@ import type {
   RunApprovedWorktreeSetupArgs,
   RunApprovedWorktreeSetupResult,
   SparsePreset
-} from '../../shared/worktree/create-types'
-import type { WorkspaceLineage, WorktreeLineage } from '../../shared/worktree/lineage-types'
-import type { WorktreeMeta } from '../../shared/worktree/meta-types'
+} from '../../../shared/worktree/create-types'
+import type { WorkspaceLineage, WorktreeLineage } from '../../../shared/worktree/lineage-types'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
 import type {
   DetectedWorktreeListResult,
   GitHubPrStartPoint,
@@ -44,7 +44,7 @@ import type {
   GitWorktreeInfo,
   Worktree,
   WorktreeHeadIdentity
-} from '../../shared/worktree/types'
+} from '../../../shared/worktree/types'
 
 export type WorktreeApi = {
   /** Retired names prevent path reuse; fully spent tiers are compacted into a watermark. */
diff --git a/src/preload/api/worktrees-bridge.ts b/src/preload/api/workspaces/worktrees-bridge.ts
similarity index 94%
rename from src/preload/api/worktrees-bridge.ts
rename to src/preload/api/workspaces/worktrees-bridge.ts
index 9bbfb55fed1..fa4373d7495 100644
--- a/src/preload/api/worktrees-bridge.ts
+++ b/src/preload/api/workspaces/worktrees-bridge.ts
@@ -2,14 +2,14 @@ import { ipcRenderer } from 'electron'
 import type {
   WorktreeBaseStatusEvent,
   WorktreeRemoteBranchConflictEvent
-} from '../../shared/worktree/base-ref-drift-types'
-import type { CreateWorktreeProgressEvent } from '../../shared/worktree/create-types'
+} from '../../../shared/worktree/base-ref-drift-types'
+import type { CreateWorktreeProgressEvent } from '../../../shared/worktree/create-types'
 import type {
   GitStatusMetadataChangedEvent,
   WorktreeHeadIdentity
-} from '../../shared/worktree/types'
-import type { PreloadApi } from '../api-types'
-import type { WorkspaceMetadataSet } from '../../shared/worktree/workspace-metadata-set'
+} from '../../../shared/worktree/types'
+import type { PreloadApi } from '../../api-types'
+import type { WorkspaceMetadataSet } from '../../../shared/worktree/workspace-metadata-set'
 
 export const worktreesApi = {
   listRetiredNames: (args) => ipcRenderer.invoke('worktrees:listRetiredNames', args),
diff --git a/src/preload/api/wsl-bridge.ts b/src/preload/api/wsl/wsl-bridge.ts
similarity index 83%
rename from src/preload/api/wsl-bridge.ts
rename to src/preload/api/wsl/wsl-bridge.ts
index bc7869000e4..682cb6820ad 100644
--- a/src/preload/api/wsl-bridge.ts
+++ b/src/preload/api/wsl/wsl-bridge.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import type { PreloadApi } from '../api-types'
+import type { PreloadApi } from '../../api-types'
 
 export const wslApi = {
   isAvailable: (): Promise<boolean> => ipcRenderer.invoke('wsl:isAvailable'),
diff --git a/src/preload/api/wsl-drive-project-bridge.ts b/src/preload/api/wsl/wsl-drive-project-bridge.ts
similarity index 93%
rename from src/preload/api/wsl-drive-project-bridge.ts
rename to src/preload/api/wsl/wsl-drive-project-bridge.ts
index dbefb68f3df..75a8d93837c 100644
--- a/src/preload/api/wsl-drive-project-bridge.ts
+++ b/src/preload/api/wsl/wsl-drive-project-bridge.ts
@@ -2,7 +2,7 @@ import { ipcRenderer } from 'electron'
 import type {
   WslDriveProjectConversionResult,
   WslDriveProjectPreview
-} from '../../shared/wsl-drive-project-types'
+} from '../../../shared/wsl-drive-project-types'
 
 /** Converting a WSL project on a Windows drive to Windows Git; main gates every call. */
 export type WslDriveProjectApi = {
diff --git a/src/preload/api/wsl-drive-unc-conversion-bridge.ts b/src/preload/api/wsl/wsl-drive-unc-conversion-bridge.ts
similarity index 77%
rename from src/preload/api/wsl-drive-unc-conversion-bridge.ts
rename to src/preload/api/wsl/wsl-drive-unc-conversion-bridge.ts
index 13fb158c4b8..d4b03d5b78e 100644
--- a/src/preload/api/wsl-drive-unc-conversion-bridge.ts
+++ b/src/preload/api/wsl/wsl-drive-unc-conversion-bridge.ts
@@ -2,9 +2,9 @@ import { ipcRenderer } from 'electron'
 import type {
   WslDriveUncConversionRequest,
   WslDriveUncConversionResult
-} from '../../shared/wsl-drive-unc-conversion-types'
-import type { WslDriveUncPendingRendererRewrite } from '../../shared/wsl-drive-unc-renderer-store-keys'
-import type { WslMoveRecordStoreRewrittenResult } from '../../shared/wsl-move/wsl-move-renderer-rewrite-types'
+} from '../../../shared/wsl-drive-unc-conversion-types'
+import type { WslDriveUncPendingRendererRewrite } from '../../../shared/wsl-drive-unc-renderer-store-keys'
+import type { WslMoveRecordStoreRewrittenResult } from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types'
 
 /** Converting a UNC Windows-drive project to its drive path; main gates every call. */
 export type WslDriveUncConversionApi = {
diff --git a/src/preload/api/wsl-hosts-api.ts b/src/preload/api/wsl/wsl-hosts-api.ts
similarity index 96%
rename from src/preload/api/wsl-hosts-api.ts
rename to src/preload/api/wsl/wsl-hosts-api.ts
index f90511203fe..9e15134441a 100644
--- a/src/preload/api/wsl-hosts-api.ts
+++ b/src/preload/api/wsl/wsl-hosts-api.ts
@@ -9,8 +9,8 @@ import {
   type WslHostDistro,
   type WslHostServerStop,
   type WslHostStatus
-} from '../../shared/wsl-host-types'
-import { isWslHostsServingForWindow } from '../../shared/wsl-host-internal-gate'
+} from '../../../shared/wsl-host-types'
+import { isWslHostsServingForWindow } from '../../../shared/wsl-host-internal-gate'
 
 export type WslHostsPreloadApi = {
   getCapability: () => Promise<WslHostCapability>
diff --git a/src/preload/api/wsl-move-bridge.ts b/src/preload/api/wsl/wsl-move-bridge.ts
similarity index 95%
rename from src/preload/api/wsl-move-bridge.ts
rename to src/preload/api/wsl/wsl-move-bridge.ts
index 75f4d13bc89..e7b0786d30b 100644
--- a/src/preload/api/wsl-move-bridge.ts
+++ b/src/preload/api/wsl/wsl-move-bridge.ts
@@ -6,22 +6,22 @@ import {
   type WslMoveRequest,
   type WslMoveResult,
   type WslMoveUnfinished
-} from '../../shared/wsl-move/wsl-move-driver-types'
+} from '../../../shared/wsl-move/wsl-move-driver-types'
 import type {
   WslMovePendingRendererRewrite,
   WslMoveRecordStoreRewrittenRequest,
   WslMoveRecordStoreRewrittenResult
-} from '../../shared/wsl-move/wsl-move-renderer-rewrite-types'
+} from '../../../shared/wsl-move/wsl-move-renderer-rewrite-types'
 import type {
   WslMovedProjectKind,
   WslMoveUseLocallyResult
-} from '../../shared/wsl-move/wsl-moved-project'
+} from '../../../shared/wsl-move/wsl-moved-project'
 import {
   WSL_MOVE_ORCHESTRATOR_SLEPT_PANES_REQUEST_CHANNEL,
   WSL_MOVE_ORCHESTRATOR_STATUS_CHANNEL,
   type WslMoveOrchestratorRecord,
   type WslMoveOrchestratorUserAction
-} from '../../shared/wsl-move/wsl-move-orchestrator-types'
+} from '../../../shared/wsl-move/wsl-move-orchestrator-types'
 
 /** A WSL move and the renderer half of its desktop rewrite; main gates every call. */
 export type WslMoveApi = {
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 1830e09c681..3ddcae7293e 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -4,94 +4,94 @@ import { installHiddenWindowFramePump } from './renderer/hidden-window-frame-pum
 import type { PreloadApi } from './api-types'
 import { installBrowserFindListener } from './renderer/renderer-runtime'
 import { appApi } from './api/app-bridge'
-import { orcaProfilesApi } from './api/orca-profiles-bridge'
+import { orcaProfilesApi } from './api/profiles/orca-profiles-bridge'
 import { platformApi } from './api/platform-bridge'
-import { wslApi } from './api/wsl-bridge'
-import { wslMoveApi } from './api/wsl-move-bridge'
-import { wslDriveProjectApi } from './api/wsl-drive-project-bridge'
-import { wslDriveUncConversionApi } from './api/wsl-drive-unc-conversion-bridge'
-import { pwshApi } from './api/pwsh-bridge'
-import { gitBashApi } from './api/git-bash-bridge'
-import { pluginsApi } from './api/plugins-bridge'
-import { reposApi } from './api/repos-bridge'
-import { projectsApi } from './api/projects-bridge'
-import { projectGroupsApi } from './api/project-groups-bridge'
-import { folderWorkspacesApi } from './api/folder-workspaces-bridge'
-import { sparsePresetsApi } from './api/sparse-presets-bridge'
-import { worktreesApi } from './api/worktrees-bridge'
-import { workspaceCleanupApi } from './api/workspace-cleanup-bridge'
-import { workspaceSpaceApi } from './api/workspace-space-bridge'
-import { workspacePortsApi } from './api/workspace-ports-bridge'
-import { linkPreviewApi } from './api/link-preview-bridge'
-import { ptyApi } from './api/pty-bridge'
-import { feedbackApi } from './api/feedback-bridge'
-import { crashReportsApi } from './api/crash-reports-bridge'
-import { exportApi } from './api/export-bridge'
-import { ghApi } from './api/gh-bridge'
-import { hostedReviewApi } from './api/hosted-review-bridge'
-import { glApi } from './api/gitlab'
-import { bitbucketApi } from './api/bitbucket-bridge'
-import { linearApi } from './api/linear-bridge'
-import { jiraApi } from './api/jira-bridge'
-import { starNagApi } from './api/star-nag-bridge'
-import { diagnosticsApi } from './api/diagnostics-bridge'
-import { settingsApi } from './api/settings-bridge'
-import { agentAwakeApi } from './api/agent-awake-bridge'
-import { localhostWorktreeLabelsApi } from './api/localhost-worktree-labels-bridge'
-import { keybindingsApi } from './api/keybindings-bridge'
-import { codexAccountsApi } from './api/codex-accounts-bridge'
-import { claudeAccountsApi } from './api/claude-accounts-bridge'
-import { cliApi } from './api/cli-bridge'
-import { codexConfigSyncApi } from './api/codex-config-sync-bridge'
-import { preflightApi } from './api/preflight-bridge'
-import { notificationsApi } from './api/notifications-bridge'
-import { onboardingApi } from './api/onboarding-bridge'
-import { dashboardApi } from './api/dashboard-bridge'
-import { terminalPreviewApi } from './api/terminal-preview-bridge'
-import { macosTccPromptsApi } from './api/macos-tcc-prompts-bridge'
-import { developerPermissionsApi } from './api/developer-permissions-bridge'
-import { computerUsePermissionsApi } from './api/computer-use-permissions-bridge'
-import { shellApi } from './api/shell-bridge'
-import { skillsApi } from './api/skills-bridge'
-import { petApi } from './api/pet-bridge'
-import { appIconApi } from './api/app-icon-bridge'
-import { browserPasswordsApi } from './api/browser-passwords-bridge'
+import { wslApi } from './api/wsl/wsl-bridge'
+import { wslMoveApi } from './api/wsl/wsl-move-bridge'
+import { wslDriveProjectApi } from './api/wsl/wsl-drive-project-bridge'
+import { wslDriveUncConversionApi } from './api/wsl/wsl-drive-unc-conversion-bridge'
+import { pwshApi } from './api/terminal/pwsh-bridge'
+import { gitBashApi } from './api/terminal/git-bash-bridge'
+import { pluginsApi } from './api/plugins/plugins-bridge'
+import { reposApi } from './api/projects/repos-bridge'
+import { projectsApi } from './api/projects/projects-bridge'
+import { projectGroupsApi } from './api/projects/project-groups-bridge'
+import { folderWorkspacesApi } from './api/workspaces/folder-workspaces-bridge'
+import { sparsePresetsApi } from './api/source-control/sparse-presets-bridge'
+import { worktreesApi } from './api/workspaces/worktrees-bridge'
+import { workspaceCleanupApi } from './api/workspaces/workspace-cleanup-bridge'
+import { workspaceSpaceApi } from './api/workspaces/workspace-space-bridge'
+import { workspacePortsApi } from './api/workspaces/workspace-ports-bridge'
+import { linkPreviewApi } from './api/link-preview/link-preview-bridge'
+import { ptyApi } from './api/terminal/pty-bridge'
+import { feedbackApi } from './api/diagnostics/feedback-bridge'
+import { crashReportsApi } from './api/diagnostics/crash-reports-bridge'
+import { exportApi } from './api/document-preview/export-bridge'
+import { ghApi } from './api/github/gh-bridge'
+import { hostedReviewApi } from './api/hosted-review/hosted-review-bridge'
+import { glApi } from './api/gitlab/gitlab'
+import { bitbucketApi } from './api/hosted-review/bitbucket-bridge'
+import { linearApi } from './api/work-items/linear-bridge'
+import { jiraApi } from './api/work-items/jira-bridge'
+import { starNagApi } from './api/onboarding/star-nag-bridge'
+import { diagnosticsApi } from './api/diagnostics/diagnostics-bridge'
+import { settingsApi } from './api/preferences/settings-bridge'
+import { agentAwakeApi } from './api/agent-status/agent-awake-bridge'
+import { localhostWorktreeLabelsApi } from './api/workspaces/localhost-worktree-labels-bridge'
+import { keybindingsApi } from './api/preferences/keybindings-bridge'
+import { codexAccountsApi } from './api/agent-accounts/codex-accounts-bridge'
+import { claudeAccountsApi } from './api/agent-accounts/claude-accounts-bridge'
+import { cliApi } from './api/cli-install/cli-bridge'
+import { codexConfigSyncApi } from './api/agent-accounts/codex-config-sync-bridge'
+import { preflightApi } from './api/preflight/preflight-bridge'
+import { notificationsApi } from './api/notifications/notifications-bridge'
+import { onboardingApi } from './api/onboarding/onboarding-bridge'
+import { dashboardApi } from './api/window-ui/dashboard-bridge'
+import { terminalPreviewApi } from './api/terminal/terminal-preview-bridge'
+import { macosTccPromptsApi } from './api/desktop-permissions/macos-tcc-prompts-bridge'
+import { developerPermissionsApi } from './api/desktop-permissions/developer-permissions-bridge'
+import { computerUsePermissionsApi } from './api/desktop-permissions/computer-use-permissions-bridge'
+import { shellApi } from './api/terminal/shell-bridge'
+import { skillsApi } from './api/skills/skills-bridge'
+import { petApi } from './api/pets/pet-bridge'
+import { appIconApi } from './api/window-ui/app-icon-bridge'
+import { browserPasswordsApi } from './api/browser/browser-passwords-bridge'
 import { browserApi } from './api/browser/browser-bridge'
-import { emulatorApi } from './api/emulator-bridge'
-import { hooksApi } from './api/hooks-bridge'
-import { ephemeralVmApi } from './api/ephemeral-vm-bridge'
-import { cacheApi } from './api/cache-bridge'
-import { sessionApi } from './api/session-bridge'
-import { updaterApi } from './api/updater-bridge'
-import { docPreviewApi } from './api/doc-preview-bridge'
-import { notebookApi } from './api/notebook-bridge'
-import { fsApi } from './api/fs-bridge'
-import { gitApi } from './api/git-bridge'
-import { uiApi } from './api/ui-bridge'
-import { statsApi } from './api/stats-bridge'
-import { memoryApi } from './api/memory-bridge'
-import { claudeUsageApi } from './api/claude-usage-bridge'
-import { codexUsageApi } from './api/codex-usage-bridge'
-import { openCodeUsageApi } from './api/open-code-usage-bridge'
-import { museUsageApi } from './api/muse-usage-bridge'
-import { aiVaultApi } from './api/ai-vault-bridge'
-import { nativeChatApi } from './api/native-chat-bridge'
-import { runtimeApi } from './api/runtime-bridge'
-import { runtimeEnvironmentsApi } from './api/runtime-environments-bridge'
-import { rateLimitsApi } from './api/rate-limits-bridge'
-import { opencodeGoCredentialsApi } from './api/opencode-go-credentials-bridge'
-import { minimaxCredentialsApi } from './api/minimax-credentials-bridge'
-import { zcodePlanCredentialsApi } from './api/zcode-plan-credentials-bridge'
-import { grokAccountsApi } from './api/grok-accounts-bridge'
-import { cursorAccountsApi } from './api/cursor-accounts-bridge'
-import { sshApi } from './api/ssh-bridge'
-import { plainSshTerminalApi } from './api/plain-ssh-terminal-bridge'
-import { legacyRelayBridgeApi } from './api/legacy-relay-bridge-api'
-import { automationsApi } from './api/automations-bridge'
-import { e2eApi } from './api/e2e-bridge'
-import { mobileApi } from './api/mobile-bridge'
-import { agentStatusApi } from './api/agent-status-bridge'
-import { speechApi } from './api/speech-bridge'
+import { emulatorApi } from './api/emulator/emulator-bridge'
+import { hooksApi } from './api/agent-hooks/hooks-bridge'
+import { ephemeralVmApi } from './api/cloud-workspaces/ephemeral-vm-bridge'
+import { cacheApi } from './api/github/cache-bridge'
+import { sessionApi } from './api/workspaces/session-bridge'
+import { updaterApi } from './api/updater/updater-bridge'
+import { docPreviewApi } from './api/document-preview/doc-preview-bridge'
+import { notebookApi } from './api/document-preview/notebook-bridge'
+import { fsApi } from './api/filesystem/fs-bridge'
+import { gitApi } from './api/source-control/git-bridge'
+import { uiApi } from './api/window-ui/ui-bridge'
+import { statsApi } from './api/diagnostics/stats-bridge'
+import { memoryApi } from './api/diagnostics/memory-bridge'
+import { claudeUsageApi } from './api/agent-usage/claude-usage-bridge'
+import { codexUsageApi } from './api/agent-usage/codex-usage-bridge'
+import { openCodeUsageApi } from './api/agent-usage/open-code-usage-bridge'
+import { museUsageApi } from './api/agent-usage/muse-usage-bridge'
+import { aiVaultApi } from './api/ai-vault/ai-vault-bridge'
+import { nativeChatApi } from './api/native-chat/native-chat-bridge'
+import { runtimeApi } from './api/runtime/runtime-bridge'
+import { runtimeEnvironmentsApi } from './api/runtime/runtime-environments-bridge'
+import { rateLimitsApi } from './api/agent-usage/rate-limits-bridge'
+import { opencodeGoCredentialsApi } from './api/agent-accounts/opencode-go-credentials-bridge'
+import { minimaxCredentialsApi } from './api/agent-accounts/minimax-credentials-bridge'
+import { zcodePlanCredentialsApi } from './api/agent-accounts/zcode-plan-credentials-bridge'
+import { grokAccountsApi } from './api/agent-accounts/grok-accounts-bridge'
+import { cursorAccountsApi } from './api/agent-accounts/cursor-accounts-bridge'
+import { sshApi } from './api/ssh/ssh-bridge'
+import { plainSshTerminalApi } from './api/terminal/plain-ssh-terminal-bridge'
+import { legacyRelayBridgeApi } from './api/mobile/legacy-relay-bridge-api'
+import { automationsApi } from './api/automations/automations-bridge'
+import { e2eApi } from './api/diagnostics/e2e-bridge'
+import { mobileApi } from './api/mobile/mobile-bridge'
+import { agentStatusApi } from './api/agent-status/agent-status-bridge'
+import { speechApi } from './api/speech/speech-bridge'
 
 installBrowserFindListener()
 
diff --git a/src/preload/renderer/window-commands/close-active-tab-payload-admission.ts b/src/preload/renderer/window-commands/close-active-tab-payload-admission.ts
index c407c94376e..cfa12485b72 100644
--- a/src/preload/renderer/window-commands/close-active-tab-payload-admission.ts
+++ b/src/preload/renderer/window-commands/close-active-tab-payload-admission.ts
@@ -1,4 +1,4 @@
-import type { CloseActiveTabPayload } from '../../api/ui-command-event-api'
+import type { CloseActiveTabPayload } from '../../api/window-ui/ui-command-event-api'
 
 export type AdmittedCloseActiveTabPayload =
   | { kind: 'legacy' }
diff --git a/src/renderer/src/components/__mocks__/task-page-jira-favourite-fixture.ts b/src/renderer/src/components/__mocks__/task-page-jira-favourite-fixture.ts
deleted file mode 100644
index b724951f850..00000000000
--- a/src/renderer/src/components/__mocks__/task-page-jira-favourite-fixture.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { useMemo, useRef } from 'react'
-import { vi, type Mock } from 'vitest'
-import type { ExecutionHostId } from '../../../../shared/execution-host'
-import type { JiraIssue } from '../../../../shared/jira/jira-types'
-import type { JiraSavedFilterState } from '../../../../shared/jira/jira-saved-filters'
-import type { TaskPageLinearViewStateModel } from '../task-page/linear/use-task-page-linear-view-state'
-import type { TaskPageLinearCollectionEffectsModel } from '../task-page/linear/use-task-page-linear-collection-effects'
-import { useTaskPageJiraListState } from '../task-page/jira/use-task-page-jira-list-state'
-import { useTaskPageJiraListEffects } from '../task-page/jira/use-task-page-jira-list-effects'
-
-const favouriteTransport: {
-  catalogue: Mock
-  readSaved: Mock
-  mutateSaved: Mock
-  readQuick: Mock
-  list: Mock
-  search: Mock
-  resume: Mock
-} = vi.hoisted(() => ({
-  catalogue: vi.fn(),
-  readSaved: vi.fn(),
-  mutateSaved: vi.fn(),
-  readQuick: vi.fn(),
-  list: vi.fn(),
-  search: vi.fn(),
-  resume: vi.fn()
-}))
-export { favouriteTransport }
-vi.mock('@/runtime/jira/runtime-jira-favourite-filters-client', () => ({
-  jiraListFavouriteFiltersForTarget: favouriteTransport.catalogue
-}))
-vi.mock('@/runtime/jira/runtime-jira-saved-filter-state', () => ({
-  readJiraSavedFilterState: favouriteTransport.readSaved,
-  mutateJiraSavedFilters: favouriteTransport.mutateSaved
-}))
-vi.mock('@/runtime/jira/runtime-jira-quick-filter-state', () => ({
-  readJiraQuickFilterState: favouriteTransport.readQuick
-}))
-vi.mock('@/runtime/jira/runtime-jira-detail-client', () => ({
-  jiraListPrioritiesForTarget: vi.fn()
-}))
-vi.mock('@/runtime/jira/runtime-jira-client', () => ({
-  jiraGetProjectStatusOrder: vi.fn()
-}))
-
-export const favourite = {
-  id: 'fav-1',
-  name: 'My Jira favourite',
-  jql: 'filter = 12345 ORDER BY updated DESC',
-  siteId: 'site-a'
-}
-export const named = { id: 'named', name: 'Custom named filter', jql: 'project = CUSTOM' }
-export const emptySaved: JiraSavedFilterState = { filters: [named], activeFilterId: null }
-const emptyIssues: JiraIssue[] = []
-const noop = () => {}
-
-export function resetFavouriteTransport() {
-  vi.resetAllMocks()
-  favouriteTransport.catalogue.mockImplementation(async (_target, siteId: string) => ({
-    supported: true,
-    filters: [{ ...favourite, siteId }],
-    truncated: false
-  }))
-  favouriteTransport.readSaved.mockResolvedValue(emptySaved)
-  favouriteTransport.mutateSaved.mockImplementation(async (_target, mutation) => ({
-    ...emptySaved,
-    activeFilterId: mutation.kind === 'select' ? mutation.id : null
-  }))
-  favouriteTransport.readQuick.mockResolvedValue({ statuses: [] })
-  favouriteTransport.list.mockResolvedValue(emptyIssues)
-  favouriteTransport.search.mockResolvedValue(emptyIssues)
-}
-
-export type FavouriteFixtureProps = { hostId?: ExecutionHostId; siteId?: string; enabled?: boolean }
-export function useFavouriteTaskPage({
-  hostId = 'runtime:owner-a',
-  siteId = 'site-a',
-  enabled = true
-}: FavouriteFixtureProps = {}) {
-  const sourceContext = useMemo(
-    () => ({
-      kind: 'task-source' as const,
-      provider: 'jira' as const,
-      projectId: 'folder-project',
-      hostId,
-      providerIdentity: { provider: 'jira' as const, siteId: siteId === 'all' ? null : siteId }
-    }),
-    [hostId, siteId]
-  )
-  const model = {
-    accountBackedTaskSourceHostId: hostId,
-    jiraTaskSourceContext: sourceContext,
-    jiraTaskSourceScopeKey: JSON.stringify([hostId, siteId]),
-    taskSource: enabled ? 'jira' : 'github',
-    taskResumeApplied: true,
-    jiraConnected: true,
-    selectedJiraSiteId: siteId,
-    repos: [],
-    selectedRepos: [],
-    pageData: {},
-    settings: { activeRuntimeEnvironmentId: 'different-focused-server' },
-    jiraSearchPersistReadyRef: useRef(true),
-    selectedJiraIssueKey: null,
-    selectedJiraIssueFallback: null,
-    setSelectedJiraIssueKey: noop,
-    setSelectedJiraIssueFallback: noop,
-    setTaskResumeState: favouriteTransport.resume,
-    linkedJiraIssueRefs: [],
-    linkedJiraIssueRefsSignature: '[]',
-    listJiraIssues: favouriteTransport.list,
-    searchJiraIssues: favouriteTransport.search
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The actual Jira hooks only read the supplied fields from the preceding provider pipeline.
-  const state = useTaskPageJiraListState(model as unknown as TaskPageLinearViewStateModel)
-  const effects = { ...state, displayedJiraIssues: state.jiraIssues }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: All fields read by the actual Jira list effect are supplied; unrelated provider stages are omitted.
-  useTaskPageJiraListEffects(effects as unknown as TaskPageLinearCollectionEffectsModel)
-  return state
-}
diff --git a/src/renderer/src/components/automations/AutomationsPage.behavior.test.tsx b/src/renderer/src/components/automations/AutomationsPage.behavior.test.tsx
deleted file mode 100644
index c5510a4f3e1..00000000000
--- a/src/renderer/src/components/automations/AutomationsPage.behavior.test.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-// @vitest-environment happy-dom
-import './AutomationsPage.escape-precedence.spec'
-import './AutomationsPage.external-scope.spec'
-import './AutomationsPage.refresh-selection.spec'
diff --git a/src/renderer/src/components/automations/AutomationsPage.escape-precedence.spec.tsx b/src/renderer/src/components/automations/AutomationsPage.escape-precedence.spec.tsx
deleted file mode 100644
index 99171389359..00000000000
--- a/src/renderer/src/components/automations/AutomationsPage.escape-precedence.spec.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-// @vitest-environment happy-dom
-
-/** Window capture runs before Radix document capture; preventing Escape here would veto dismissal of an overlaid dialog (STA-5207). */
-
-import { describe, expect, it, vi } from 'vitest'
-import {
-  installAutomationsPageHarness,
-  mocks,
-  renderPage,
-  settleHostQueries
-} from './automations-page-test-harness'
-
-function pressEscape(target: EventTarget): KeyboardEvent {
-  const event = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true, cancelable: true })
-  target.dispatchEvent(event)
-  return event
-}
-
-async function renderWithCloseSpy(): Promise<ReturnType<typeof vi.fn>> {
-  const closeAutomationsPage = vi.fn()
-  mocks.state.closeAutomationsPage = closeAutomationsPage
-  await renderPage()
-  await settleHostQueries()
-  return closeAutomationsPage
-}
-
-describe('automations page Escape precedence', () => {
-  installAutomationsPageHarness()
-
-  it('closes the page when nothing is layered above it', async () => {
-    const closeAutomationsPage = await renderWithCloseSpy()
-
-    const event = pressEscape(document.body)
-
-    expect(event.defaultPrevented).toBe(true)
-    expect(closeAutomationsPage).toHaveBeenCalledTimes(1)
-  })
-
-  it('leaves Escape to a store modal opened over the page', async () => {
-    mocks.state.activeModal = 'new-workspace-composer'
-    const closeAutomationsPage = await renderWithCloseSpy()
-    const input = document.createElement('input')
-    document.body.appendChild(input)
-
-    const event = pressEscape(input)
-
-    expect(event.defaultPrevented).toBe(false)
-    expect(closeAutomationsPage).not.toHaveBeenCalled()
-  })
-
-  it('leaves Escape to a store modal even when focus is on page chrome', async () => {
-    mocks.state.activeModal = 'worktree-palette'
-    const closeAutomationsPage = await renderWithCloseSpy()
-
-    const event = pressEscape(document.body)
-
-    expect(event.defaultPrevented).toBe(false)
-    expect(closeAutomationsPage).not.toHaveBeenCalled()
-  })
-
-  it('leaves Escape to a visible overlay that the store does not track', async () => {
-    const closeAutomationsPage = await renderWithCloseSpy()
-    const overlay = document.createElement('div')
-    overlay.setAttribute('role', 'dialog')
-    document.body.appendChild(overlay)
-
-    const event = pressEscape(document.body)
-
-    expect(event.defaultPrevented).toBe(false)
-    expect(closeAutomationsPage).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/automations/AutomationsPage.external-scope.spec.tsx b/src/renderer/src/components/automations/AutomationsPage.external-scope.spec.tsx
deleted file mode 100644
index 6b417860ff1..00000000000
--- a/src/renderer/src/components/automations/AutomationsPage.external-scope.spec.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// @vitest-environment happy-dom
-
-/** Drive the page’s scope producer and inspect IPC; client tests with pre-narrowed scopes cannot verify which hosts the page asks. */
-
-import { describe, expect, it } from 'vitest'
-
-import {
-  api,
-  installAutomationsPageHarness,
-  mocks,
-  renderPage,
-  settleHostQueries
-} from './automations-page-test-harness'
-import { listedExternalEntries } from './automations-page-listed-items'
-import { makeExternalManager } from './automations-page-fixtures'
-
-const DESKTOP_SELF_FILTER = {
-  kind: 'host' as const,
-  host: { authority: { kind: 'desktop' as const }, selector: { kind: 'self' as const } }
-}
-
-function sshFilter(targetId: string): unknown {
-  return {
-    kind: 'host',
-    host: { authority: { kind: 'desktop' }, selector: { kind: 'ssh', targetId } }
-  }
-}
-
-/** Registered SSH targets, each with the generation that makes it fenceable. */
-function withSshHosts(...targetIds: string[]): void {
-  mocks.state.sshTargetLabels = new Map(targetIds.map((targetId) => [targetId, targetId]))
-  mocks.state.sshTargetGenerations = new Map(targetIds.map((targetId) => [targetId, 1]))
-  mocks.state.sshConnectionStates = new Map(
-    targetIds.map((targetId) => [targetId, { status: 'connected' }])
-  )
-}
-
-function openclawOnly(): void {
-  api.automations.listExternalManagerForOwner.mockImplementation(
-    async ({ provider }: { provider: string }) =>
-      provider === 'openclaw'
-        ? { manager: makeExternalManager(), error: null, updatedAt: 1 }
-        : { manager: null, error: null, updatedAt: 1 }
-  )
-}
-
-describe('AutomationsPage external manager probes', () => {
-  installAutomationsPageHarness()
-
-  it('drops the previous host rows when the selection moves, not when the new probe lands', async () => {
-    withSshHosts('staging')
-    mocks.state.automationHostFilter = DESKTOP_SELF_FILTER
-    openclawOnly()
-
-    const { rerender } = await renderPage()
-    await settleHostQueries()
-    expect(listedExternalEntries().length).toBeGreaterThan(0)
-
-    // The new host never answers, so anything still listed belongs to the old one.
-    api.automations.listExternalManagerForOwner.mockImplementation(
-      async () => await new Promise(() => undefined)
-    )
-    mocks.state.automationHostFilter = sshFilter('staging')
-    await rerender()
-    await settleHostQueries()
-
-    expect(listedExternalEntries()).toEqual([])
-  })
-})
diff --git a/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx b/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx
deleted file mode 100644
index 2a96389539d..00000000000
--- a/src/renderer/src/components/automations/AutomationsPage.refresh-selection.spec.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-// @vitest-environment happy-dom
-
-/** Refresh reaches one authority at a time; deriving selection/history from that answer would drop or mislabel other hosts’ rows under All hosts. */
-
-import { act } from 'react'
-import { describe, expect, it, vi } from 'vitest'
-import {
-  api,
-  installAutomationsPageHarness,
-  mocks,
-  refreshOnFocus,
-  renderPage,
-  RUNTIME_SELF_FILTER,
-  runtimeHost,
-  scopedList,
-  SELF_PRECONDITION,
-  settleHostQueries
-} from './automations-page-test-harness'
-import { listedRows } from './automations-page-listed-items'
-import { makeAutomation, makeRun } from './automations-page-fixtures'
-
-async function openAutomationRow(container: HTMLElement, name: string): Promise<void> {
-  const row = [
-    ...container.querySelectorAll<HTMLButtonElement>('[data-testid="automation-row"]')
-  ].find((candidate) => candidate.textContent === name)
-  expect(row).toBeTruthy()
-  await act(async () => row?.click())
-  await settleHostQueries()
-}
-
-describe('AutomationsPage selection', () => {
-  installAutomationsPageHarness()
-
-  it('fetches the newly selected automation runs when the selection changes', async () => {
-    scopedList([
-      makeAutomation({ id: 'a-1', name: 'Nightly' }),
-      makeAutomation({ id: 'a-2', name: 'Weekly' })
-    ])
-
-    const { container, rerender } = await renderPage()
-    api.automations.listRuns.mockClear()
-
-    mocks.state.selectedAutomationId = 'a-2'
-    await rerender()
-    await openAutomationRow(container, 'Weekly')
-
-    // Fence history reads too so moved rows refuse rather than answer from a former host.
-    expect(api.automations.listRuns).toHaveBeenCalledWith({
-      automationId: 'a-2',
-      expectedOwner: SELF_PRECONDITION,
-      preview: true
-    })
-    expect(mocks.detailPane?.selected?.id).toBe('a-2')
-  })
-})
-
-describe('AutomationsPage multi-host selection', () => {
-  installAutomationsPageHarness()
-
-  it('keeps a selection that lives on another host when the window regains focus', async () => {
-    runtimeHost([makeAutomation({ id: 'a-remote', name: 'Remote nightly' })], [])
-    const desktop = makeAutomation({ id: 'a-desktop', name: 'Desktop nightly' })
-    scopedList([desktop])
-    api.automations.list.mockResolvedValue([desktop])
-    const setSelectedAutomationId = vi.fn((id: string | null) => {
-      mocks.state.selectedAutomationId = id
-    })
-    mocks.state.selectedAutomationId = 'a-remote'
-    mocks.state.setSelectedAutomationId = setSelectedAutomationId
-
-    const { container, rerender } = await renderPage()
-    await settleHostQueries()
-    await refreshOnFocus()
-    await rerender()
-
-    // One authority’s refresh cannot decide whether another authority’s selected row still exists.
-    expect(setSelectedAutomationId).not.toHaveBeenCalled()
-    await openAutomationRow(container, 'Remote nightly')
-    expect(container.querySelector('[data-testid="detail-name"]')?.textContent).toBe(
-      'Remote nightly'
-    )
-  })
-
-  it('shows the selected host’s runs when another authority holds the same id', async () => {
-    runtimeHost(
-      [makeAutomation({ id: 'a-1', name: 'Remote nightly' })],
-      [makeRun({ id: 'run-remote', automationId: 'a-1' })]
-    )
-    // IDs can collide across authorities; desktop remains independently reachable.
-    api.automations.list.mockResolvedValue([makeAutomation({ id: 'a-1', name: 'Desktop nightly' })])
-    api.automations.listRuns.mockResolvedValue([
-      makeRun({ id: 'run-desktop', automationId: 'a-1' })
-    ])
-    scopedList([])
-    mocks.state.automationHostFilter = RUNTIME_SELF_FILTER
-    mocks.state.selectedAutomationId = 'a-1'
-
-    const { container } = await renderPage()
-    await settleHostQueries()
-    await refreshOnFocus()
-    await openAutomationRow(container, 'Remote nightly')
-
-    expect(mocks.detailPane?.selected?.name).toBe('Remote nightly')
-    expect(mocks.detailPane?.selectedRuns.map((run) => run.id)).toEqual(['run-remote'])
-  })
-
-  it('keeps both authorities’ rows on screen and selectable under All hosts', async () => {
-    runtimeHost(
-      [makeAutomation({ id: 'a-1', name: 'Remote nightly' })],
-      [makeRun({ id: 'run-remote', automationId: 'a-1' })]
-    )
-    scopedList([makeAutomation({ id: 'a-1', name: 'Desktop nightly' })])
-    // The stored id names the record; only the row key can say whose copy.
-    mocks.state.selectedAutomationId = 'a-1'
-
-    const { container } = await renderPage()
-    await settleHostQueries()
-
-    // Two stored records, not one row and a silent drop into #44's empty state.
-    expect(
-      [...container.querySelectorAll('[data-testid="automation-row"]')].map(
-        (row) => row.textContent
-      )
-    ).toEqual(['Desktop nightly', 'Remote nightly'])
-
-    const remote = listedRows().find((row) => row.automation.name === 'Remote nightly')
-    await act(async () => {
-      mocks.listPanel?.selectAutomationRow(remote?.key ?? '')
-    })
-
-    expect(mocks.detailPane?.selected?.name).toBe('Remote nightly')
-  })
-})
diff --git a/src/renderer/src/components/automations/automations-page-actions-test-harness.ts b/src/renderer/src/components/automations/automations-page-actions-test-harness.ts
deleted file mode 100644
index cb581cd733e..00000000000
--- a/src/renderer/src/components/automations/automations-page-actions-test-harness.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { EVERY_AGENT_CHAT } from '../../../../shared/native-chat/every-agent-chat.test-fixture'
-import {
-  addRuntimeProject,
-  api,
-  mocks,
-  renderPage,
-  runtimeHost,
-  RUNTIME_ID,
-  RUNTIME_SELF_FILTER,
-  scopedList,
-  settleHostQueries
-} from './automations-page-test-harness'
-import { RUNTIME_REPO_ID, RUNTIME_WORKSPACE_ID } from './automations-page-runtime-fixtures'
-import { act } from 'react'
-import { expect, vi } from 'vitest'
-import { checkRuntimeHooks, type HookCheckResult } from '@/runtime/repo-hooks/runtime-hooks-client'
-import { loadHostStructuredAgents } from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
-import { getDefaultSettings } from '../../../../shared/constants'
-import type { Automation } from '../../../../shared/automations/automation-definition'
-import type { AutomationDraft } from './authoring/AutomationEditorDialog'
-import {
-  AUTOMATION_LIST_HOST_SCOPE_RUNTIME_CAPABILITY as LIST_HOST_SCOPE,
-  AUTOMATION_OWNER_FENCING_RUNTIME_CAPABILITY as OWNER_FENCING,
-  AUTOMATION_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY as CREATE_IDEMPOTENCY,
-  AUTOMATION_SURFACE_RUNTIME_CAPABILITY,
-  AUTOMATION_EXTRA_AGENT_ARGS_RUNTIME_CAPABILITY
-} from '../../../../shared/automations/automation-runtime-capabilities'
-import {
-  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY
-} from '../../../../shared/agent-session/agent-session-runtime-capabilities'
-import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../../../shared/agent-session/structured-agent-session-surface-capabilities'
-import { makeAutomation } from './automations-page-fixtures'
-
-export const CHAT_CAPABILITIES = [
-  LIST_HOST_SCOPE,
-  OWNER_FENCING,
-  CREATE_IDEMPOTENCY,
-  AUTOMATION_SURFACE_RUNTIME_CAPABILITY,
-  AUTOMATION_EXTRA_AGENT_ARGS_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
-]
-
-export function draftRecord(current: unknown): object {
-  if (current === null || typeof current !== 'object') {
-    throw new Error('Missing editor draft')
-  }
-  return current
-}
-
-/** The runtime answers a create; without this the RPC double returns an empty result. */
-export function runtimeCreateReturns(automation: Automation): void {
-  const previous = mocks.callRuntimeRpc.getMockImplementation()
-  mocks.callRuntimeRpc.mockImplementation(
-    async (target: unknown, method: string, params: unknown, options: unknown) => {
-      if (method === 'automation.create') {
-        return { automation }
-      }
-      return await previous?.(target, method, params, options)
-    }
-  )
-}
-
-export async function save(): Promise<void> {
-  await act(async () => {
-    mocks.editorDialog?.onSave()
-  })
-}
-
-export function createRpcCalls(): unknown[][] {
-  return mocks.callRuntimeRpc.mock.calls.filter((call) => call[1] === 'automation.create')
-}
-
-export const REGISTERED_CHAT_CAPABILITIES = [
-  ...CHAT_CAPABILITIES,
-  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
-]
-
-export function observeRuntimeIncarnation(
-  runtimeId: string,
-  capabilities = REGISTERED_CHAT_CAPABILITIES
-): void {
-  const status = { runtimeId, capabilities }
-  mocks.state.runtimeStatusByEnvironmentId = new Map([[RUNTIME_ID, { status }]])
-  mocks.getRuntimeEnvironmentStatus.mockResolvedValue(status)
-}
-
-export async function learnRuntimeAgents(runtimeId: string, agents: string[]): Promise<void> {
-  const previous = mocks.callRuntimeRpc.getMockImplementation()
-  mocks.callRuntimeRpc.mockImplementation(async (target, method, params, options) =>
-    method === 'agentSession.agents'
-      ? { agents: agents.map((agent) => ({ agent, capabilities: {} })) }
-      : await previous?.(target, method, params, options)
-  )
-  try {
-    await loadHostStructuredAgents(`runtime:${RUNTIME_ID}`, REGISTERED_CHAT_CAPABILITIES, runtimeId)
-  } finally {
-    mocks.callRuntimeRpc.mockImplementation(previous ?? (() => ({})))
-  }
-}
-
-export async function openCreateDialogFor(projectId: string, workspaceId: string): Promise<void> {
-  await act(async () => {
-    mocks.listPanel?.openCreateDialog()
-  })
-  await act(async () => {
-    mocks.editorDialog?.onDraftChange((current) => ({
-      ...draftRecord(current),
-      name: 'Sweep',
-      prompt: 'Do the sweep',
-      projectId,
-      workspaceMode: 'existing',
-      workspaceId
-    }))
-  })
-}
-
-export async function holdRuntimeSave(
-  draft: Partial<AutomationDraft> = {},
-  initialAgents = ['pi']
-) {
-  api.automations.list.mockResolvedValue([])
-  scopedList([])
-  runtimeHost([], [])
-  addRuntimeProject()
-  mocks.state.settings = { ...getDefaultSettings('/tmp'), nativeChatProviders: EVERY_AGENT_CHAT }
-  mocks.state.automationHostFilter = RUNTIME_SELF_FILTER
-  observeRuntimeIncarnation('A')
-  await learnRuntimeAgents('A', initialAgents)
-  runtimeCreateReturns(makeAutomation({ id: 'a-new' }))
-  const held = Promise.withResolvers<HookCheckResult>()
-  vi.mocked(checkRuntimeHooks).mockReturnValue(held.promise)
-  const page = await renderPage()
-  await settleHostQueries()
-  await openCreateDialogFor(RUNTIME_REPO_ID, RUNTIME_WORKSPACE_ID)
-  await act(async () => {
-    mocks.editorDialog?.onDraftChange((current) => ({
-      ...draftRecord(current),
-      agentId: 'pi',
-      workspaceMode: 'new_per_run',
-      workspaceId: '',
-      ...draft
-    }))
-  })
-  await save()
-  expect(checkRuntimeHooks).toHaveBeenCalledWith(`runtime:${RUNTIME_ID}`, RUNTIME_REPO_ID, {})
-  expect(createRpcCalls()).toHaveLength(0)
-  return {
-    page,
-    async release() {
-      await act(async () => {
-        held.resolve({ status: 'ok', hasHooks: false, hooks: null, mayNeedUpdate: false })
-      })
-      await settleHostQueries()
-    }
-  }
-}
diff --git a/src/renderer/src/components/automations/automations-page-child-props.test-fixture.ts b/src/renderer/src/components/automations/automations-page-child-props.test-fixture.ts
deleted file mode 100644
index 7852a857b10..00000000000
--- a/src/renderer/src/components/automations/automations-page-child-props.test-fixture.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type { AutomationAuthorityRef } from '../../../../shared/automations/ownership/automation-owner-ref'
-import type { Automation } from '../../../../shared/automations/automation-definition'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type { AutomationHostCatalogView } from './hosts/use-automation-host-catalog'
-import type { AutomationCreateDestinationControl } from './authoring/use-automation-create-destination'
-import type { ExternalAutomationListEntry } from './external/external-automation-list-entries'
-import type { AutomationListRow } from './listing/automation-list-row-identity'
-import type { AutomationListViewItem } from './listing/automation-list-view'
-import type { AutomationTemplate } from './authoring/automation-templates'
-
-export type ListPanelProps = {
-  sortedListItems: readonly AutomationListViewItem[]
-  selectedExternal: ExternalAutomationListEntry | null
-  externalActionKey: string | null
-  requestExternalAction: (
-    manager: ExternalAutomationListEntry['manager'],
-    job: ExternalAutomationListEntry['job'],
-    action: 'run' | 'pause' | 'resume' | 'delete',
-    scope: ExternalAutomationListEntry['scope']
-  ) => void
-  hasListItems: boolean
-  hasFilteredListItems: boolean
-  selectedRowKey: string | null
-  selectedExternalKey: string | null
-  hostCatalog: AutomationHostCatalogView
-  searchCounts: { hostRowCount: number; visibleRowCount: number; searchActive: boolean }
-  externalManagersUncheckedNotice: string | null
-  isActionEnabled: (row: AutomationListRow, action: string) => boolean
-  onSelectHost: (filter: unknown) => void
-  selectAutomationRow: (rowKey: string | null) => void
-  selectExternalKey: (entryKey: string | null) => void
-  onOpenDetail: () => void
-  onRefresh: () => void
-  onOpenRuns: () => void
-  runNow: (row: AutomationListRow) => void
-  openEditDialog: (row: AutomationListRow) => void
-  toggleAutomation: (row: AutomationListRow) => void
-  requestDeleteAutomation: (row: AutomationListRow) => void
-  openCreateDialog: () => void
-  canCreateAutomation: boolean
-}
-
-export type EditorDialogProps = {
-  launchAuthority?: AutomationAuthorityRef
-  open: boolean
-  isEditing: boolean
-  isSaving: boolean
-  createDestination?: AutomationCreateDestinationControl
-  editDestination?: AutomationCreateDestinationControl
-  notice?: { message: string; recovery: string | null } | null
-  onNoticeRecover?: (action: string) => void
-  repos?: { id: string }[]
-  worktrees: Worktree[]
-  draft?: { projectId: string; workspaceId: string }
-  canSave?: boolean
-  onSave: () => void
-  onProjectChange: (projectId: string) => void
-  onDraftChange: (updater: (current: unknown) => unknown) => void
-  onApplyTemplate: (template: AutomationTemplate) => void
-}
-
-export type DeleteDialogProps = {
-  deleteTarget: Automation | null
-  onConfirm: () => void
-}
diff --git a/src/renderer/src/components/automations/automations-page-destination-fixtures.ts b/src/renderer/src/components/automations/automations-page-destination-fixtures.ts
deleted file mode 100644
index 53a9be5a2dc..00000000000
--- a/src/renderer/src/components/automations/automations-page-destination-fixtures.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { mocks, RUNTIME_ID } from './automations-page-test-harness'
-import { CHAT_CAPABILITIES } from './automations-page-actions-test-harness'
-import type { Repo } from '../../../../shared/repo-types'
-import { hostStableKey } from '../../../../shared/automations/ownership/automation-owner-key'
-
-export function observeRuntimeChat(capabilities: string[] | null): void {
-  mocks.state.runtimeStatusByEnvironmentId = new Map(
-    capabilities === null ? [] : [[RUNTIME_ID, { status: { capabilities } }]]
-  )
-}
-
-export function capableChatDestination(): void {
-  observeRuntimeChat(CHAT_CAPABILITIES)
-  mocks.getRuntimeEnvironmentStatus.mockResolvedValue({ capabilities: CHAT_CAPABILITIES })
-}
-
-export const SSH_TARGET_ID = 'ssh-target-1'
-export const SSH_REPO_ID = 'repo-ssh'
-export const SSH_HOST_KEY = hostStableKey({
-  authority: { kind: 'desktop' },
-  selector: { kind: 'ssh', targetId: SSH_TARGET_ID }
-})
-
-export const DESKTOP_SELF_KEY = hostStableKey({
-  authority: { kind: 'desktop' },
-  selector: { kind: 'self' }
-})
-export const RUNTIME_SELF_KEY = hostStableKey({
-  authority: { kind: 'runtime', environmentId: RUNTIME_ID },
-  selector: { kind: 'self' }
-})
-
-/** A desktop-registered SSH host, with the generation that makes it fenceable. */
-export function addSshHost(): void {
-  mocks.state.sshTargetLabels = new Map([[SSH_TARGET_ID, 'openclaw']])
-  mocks.state.sshTargetGenerations = new Map([[SSH_TARGET_ID, 1]])
-  mocks.state.sshConnectionStates = new Map([[SSH_TARGET_ID, { status: 'connected' }]])
-}
-
-/** A project checked out on that SSH host rather than locally. */
-export function addSshProject(): void {
-  const repo: Repo = {
-    id: SSH_REPO_ID,
-    displayName: 'orca',
-    path: '/repos/orca',
-    badgeColor: '#222222',
-    addedAt: 1,
-    worktreeBaseRef: 'main',
-    connectionId: SSH_TARGET_ID
-  }
-  mocks.state.repos = [...(mocks.state.repos as Repo[]), repo]
-  mocks.repoMap.set(SSH_REPO_ID, repo)
-  // The host needs a ready setup or save refuses the project before choosing a destination.
-  mocks.state.projectHostSetups = [
-    ...mocks.state.projectHostSetups,
-    {
-      id: 'setup-ssh',
-      projectId: 'project-ssh',
-      hostId: `ssh:${SSH_TARGET_ID}`,
-      repoId: SSH_REPO_ID,
-      path: '/repos/orca',
-      displayName: 'orca',
-      setupState: 'ready',
-      setupMethod: 'legacy-repo',
-      createdAt: 1,
-      updatedAt: 1
-    }
-  ]
-}
diff --git a/src/renderer/src/components/automations/automations-page-fixtures.ts b/src/renderer/src/components/automations/automations-page-fixtures.ts
index 9b60daacd74..02c5c2e0fd5 100644
--- a/src/renderer/src/components/automations/automations-page-fixtures.ts
+++ b/src/renderer/src/components/automations/automations-page-fixtures.ts
@@ -1,29 +1,14 @@
-/** Default to runnable local records so Run Now reaches its handler; cases needing refusal override the relevant fields. */
-
 import type { Automation } from '../../../../shared/automations/automation-definition'
 import type {
   AutomationRun,
   AutomationRunUsage
 } from '../../../../shared/automations/history/automation-run'
-import type { ExternalAutomationManager } from '../../../../shared/automations/external/external-automation'
-import type { ProjectHostSetup } from '../../../../shared/project-types'
-import type { AutomationHostCatalogEntry } from './hosts/automation-host-catalog-types'
-import type { AppState } from '@/store/types'
-import type { Repo } from '../../../../shared/repo-types'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type {
-  ExternalAutomationScope,
-  ScopedExternalAutomationManager
-} from './external/external-automation-scope-client'
 import {
   automationListRowKey,
   type AutomationListRow
 } from './listing/automation-list-row-identity'
-import { ALL_AUTOMATION_HOSTS_FILTER } from '../../../../shared/automations/ownership/automation-host-filter'
-import { getDefaultSettings } from '../../../../shared/constants'
 
 export const REPO_ID = 'repo-1'
-export const WORKSPACE_ID = 'workspace-1'
 
 export function makeAutomation(overrides: Partial<Automation> = {}): Automation {
   return {
@@ -114,186 +99,3 @@ export function makeRunUsage(overrides: Partial<AutomationRunUsage> = {}): Autom
     ...overrides
   }
 }
-
-export function makeExternalManager(
-  overrides: Partial<ExternalAutomationManager> = {}
-): ExternalAutomationManager {
-  return {
-    id: 'openclaw:local',
-    provider: 'openclaw',
-    label: 'OpenClaw',
-    targetLabel: 'This computer',
-    target: { type: 'local' },
-    status: 'available',
-    error: null,
-    canManage: true,
-    jobs: [
-      {
-        id: 'job-1',
-        managerId: 'openclaw:local',
-        provider: 'openclaw',
-        name: 'OpenClaw job',
-        schedule: 'Daily at 09:00',
-        rawSchedule: '0 9 * * *',
-        enabled: true,
-        state: 'active',
-        prompt: null,
-        promptPreview: 'Sweep',
-        nextRunAt: null,
-        lastRunAt: null,
-        lastStatus: null,
-        lastError: null,
-        workdir: null,
-        runCount: 0,
-        runs: []
-      }
-    ],
-    ...overrides
-  }
-}
-
-/** The desktop-self scope every manager fixture is discovered under by default. */
-export function makeExternalAutomationScope(
-  overrides: Partial<ExternalAutomationScope> = {}
-): ExternalAutomationScope {
-  return {
-    owner: {
-      authority: { kind: 'desktop' },
-      selector: { kind: 'self' }
-    },
-    provider: 'openclaw',
-    ...overrides
-  }
-}
-
-export function makeScopedExternalManager(
-  overrides: Partial<ExternalAutomationManager> = {},
-  scope: ExternalAutomationScope = makeExternalAutomationScope()
-): ScopedExternalAutomationManager {
-  return { scope, manager: makeExternalManager(overrides) }
-}
-
-function makeRepo(): Repo {
-  return {
-    id: REPO_ID,
-    displayName: 'orca',
-    path: '/repos/orca',
-    badgeColor: '#000000',
-    addedAt: 1,
-    worktreeBaseRef: 'main'
-  }
-}
-
-/** Ready and local, so the editor can build a run context and state a Self destination. */
-function makeProjectHostSetup(): ProjectHostSetup {
-  return {
-    id: 'setup-1',
-    projectId: 'project-1',
-    hostId: 'local',
-    repoId: REPO_ID,
-    path: '/repos/orca',
-    displayName: 'orca',
-    setupState: 'ready',
-    setupMethod: 'legacy-repo',
-    createdAt: 1,
-    updatedAt: 1
-  }
-}
-
-export function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
-  return {
-    id: WORKSPACE_ID,
-    repoId: REPO_ID,
-    displayName: 'main',
-    path: '/repos/orca',
-    branch: 'main',
-    head: 'abc123',
-    isBare: false,
-    isMainWorktree: true,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    ...overrides
-  }
-}
-
-export type AutomationsPageFixtureState = Record<string, unknown> &
-  Pick<AppState, 'repos' | 'projectHostSetups' | 'worktreesByRepo'>
-
-export type AutomationsPageStoreFixtures = {
-  state: AutomationsPageFixtureState
-  repoMap: Map<string, Repo>
-  worktreeMap: Map<string, Worktree>
-}
-
-/** A store shaped like the page's reads; actions are spies so nothing escapes the test. */
-export function makeStoreState(): AutomationsPageStoreFixtures {
-  const repo = makeRepo()
-  const worktree = makeWorktree()
-  const noop = (): void => undefined
-  return {
-    state: {
-      repos: [repo],
-      projectHostSetups: [makeProjectHostSetup()],
-      worktreesByRepo: { [REPO_ID]: [worktree] },
-      unifiedTabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      ptyIdsByTabId: {},
-      activeWorktreeId: null,
-      fetchWorktrees: noop,
-      fetchAllWorktrees: noop,
-      fetchRuntimeEnvironmentRepos: async () => [],
-      startupWorktreeRefreshCompleted: true,
-      updateSettings: noop,
-      openSettingsPage: noop,
-      openSettingsTarget: noop,
-      closeAutomationsPage: noop,
-      activeModal: 'none',
-      sshConnectionStates: new Map(),
-      sshTargetLabels: new Map(),
-      removedSshTargetLabels: new Map(),
-      // Hydrated absence proves no desktop SSH targets; the catalog should project only Self.
-      sshTargetsHydrated: true,
-      sshStateByEnvironment: new Map(),
-      runtimeEnvironments: [],
-      runtimeEnvironmentCatalogSettled: true,
-      runtimeStatusByEnvironmentId: new Map(),
-      automationHostFilter: ALL_AUTOMATION_HOSTS_FILTER,
-      setAutomationHostFilter: noop,
-      settings: getDefaultSettings('/tmp'),
-      preflightStatus: null,
-      preflightStatusChecked: true,
-      preflightStatusContextKey: null,
-      refreshPreflightStatus: noop,
-      selectedAutomationId: null,
-      setSelectedAutomationId: noop,
-      pendingAutomationRunNavigation: null,
-      setPendingAutomationRunNavigation: noop,
-      hydratePersistedUI: noop,
-      recordFeatureInteraction: noop,
-      allWorktrees: () => [worktree],
-      getKnownWorktreeById: () => worktree
-    },
-    repoMap: new Map([[REPO_ID, repo]]),
-    worktreeMap: new Map([[WORKSPACE_ID, worktree]])
-  }
-}
-
-export type DetailPaneProps = {
-  selected: Automation | null
-  selectedHostEntry: AutomationHostCatalogEntry | null
-  selectedRuns: AutomationRun[]
-  selectedRunsNotice: { message: string } | null
-  runNow: (automation: Automation) => void
-  toggleAutomation: (automation: Automation) => void
-  requestDeleteAutomation: (automation: Automation) => void
-  openEditDialog: (automation: Automation) => void
-  openAutomationRunPage: (run: AutomationRun) => void
-  recoverSelectedRuns: (action: 'retry') => void
-}
diff --git a/src/renderer/src/components/automations/automations-page-listed-items.ts b/src/renderer/src/components/automations/automations-page-listed-items.ts
deleted file mode 100644
index 2f64eff3037..00000000000
--- a/src/renderer/src/components/automations/automations-page-listed-items.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/** Read authority-qualified row keys and render order from the mocked list panel, matching real clicks rather than synthesizing identity. */
-
-import type { AutomationListRow } from './listing/automation-list-row-identity'
-import type { ExternalAutomationListEntry } from './external/external-automation-list-entries'
-import { mocks } from './automations-page-test-harness'
-
-function listedItems() {
-  return mocks.listPanel?.sortedListItems ?? []
-}
-
-/** Local rows the page listed, in render order. */
-export function listedRows(): readonly AutomationListRow[] {
-  return listedItems().flatMap((item) => (item.kind === 'local' ? [item.row] : []))
-}
-
-/** External entries the page listed, in render order. */
-export function listedExternalEntries(): readonly ExternalAutomationListEntry[] {
-  return listedItems().flatMap((item) => (item.kind === 'external' ? [item.entry] : []))
-}
-
-export function listedRow(automationId: string): AutomationListRow {
-  const row = listedRows().find((entry) => entry.automation.id === automationId)
-  if (!row) {
-    throw new Error(`no listed row for ${automationId}`)
-  }
-  return row
-}
diff --git a/src/renderer/src/components/automations/automations-page-runtime-fixtures.ts b/src/renderer/src/components/automations/automations-page-runtime-fixtures.ts
deleted file mode 100644
index f35be180c75..00000000000
--- a/src/renderer/src/components/automations/automations-page-runtime-fixtures.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import type { AutomationsPageFixtureState } from './automations-page-fixtures'
-import type { Automation } from '../../../../shared/automations/automation-definition'
-import type { ProjectHostSetup } from '../../../../shared/project-types'
-import type { Repo } from '../../../../shared/repo-types'
-import type { Worktree } from '../../../../shared/worktree/types'
-
-export const RUNTIME_REPO_ID = 'repo-2'
-export const RUNTIME_WORKSPACE_ID = 'workspace-2'
-
-/** Builds the host-scoped response used by the page harness. */
-export function selfScopedList(automations: Automation[]): Record<string, unknown> {
-  return {
-    automations,
-    items: automations.map((automation) => ({
-      automationId: automation.id,
-      selector: { kind: 'self' }
-    })),
-    orphanCount: 0
-  }
-}
-
-type RuntimeFixtureMocks = {
-  state: AutomationsPageFixtureState
-  repoMap: Map<string, unknown>
-  worktreeMap: Map<string, unknown>
-}
-
-/** Adds a runtime-owned project whose id is ambiguous in a flat repo lookup. */
-export function addRuntimeProject(mocks: RuntimeFixtureMocks, runtimeId: string): void {
-  const repo = {
-    id: RUNTIME_REPO_ID,
-    displayName: 'gpu-orca',
-    path: '/repos/gpu-orca',
-    badgeColor: '#111111',
-    addedAt: 1,
-    worktreeBaseRef: 'main',
-    executionHostId: `runtime:${runtimeId}`
-  } as Repo
-  const worktree = {
-    id: RUNTIME_WORKSPACE_ID,
-    repoId: RUNTIME_REPO_ID,
-    displayName: 'main',
-    path: '/repos/gpu-orca',
-    branch: 'main'
-  } as Worktree
-  const setup: ProjectHostSetup = {
-    id: 'setup-2',
-    projectId: 'project-2',
-    hostId: `runtime:${runtimeId}`,
-    repoId: RUNTIME_REPO_ID,
-    path: '/repos/gpu-orca',
-    displayName: 'gpu-orca',
-    setupState: 'ready',
-    setupMethod: 'legacy-repo',
-    createdAt: 1,
-    updatedAt: 1
-  }
-  const repos = mocks.state.repos as Repo[]
-  const setups = mocks.state.projectHostSetups
-  const worktreesByRepo = mocks.state.worktreesByRepo as Record<string, Worktree[]>
-  mocks.state.repos = [...repos, repo]
-  mocks.state.projectHostSetups = [...setups, setup]
-  mocks.state.worktreesByRepo = { ...worktreesByRepo, [RUNTIME_REPO_ID]: [worktree] }
-  mocks.repoMap.set(RUNTIME_REPO_ID, repo)
-  mocks.worktreeMap.set(RUNTIME_WORKSPACE_ID, worktree)
-}
diff --git a/src/renderer/src/components/automations/automations-page-test-harness.tsx b/src/renderer/src/components/automations/automations-page-test-harness.tsx
deleted file mode 100644
index 1dbb50644f4..00000000000
--- a/src/renderer/src/components/automations/automations-page-test-harness.tsx
+++ /dev/null
@@ -1,399 +0,0 @@
-import type {
-  ListPanelProps,
-  EditorDialogProps,
-  DeleteDialogProps
-} from './automations-page-child-props.test-fixture'
-import { resetHostStructuredAgentsForTests } from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
-import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
-/** Record child props to test page orchestration rather than presentation. Import this harness first so shared vi.mock registrations precede AutomationsPage loading. */
-
-import { act, createElement, StrictMode, type ReactNode } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, type Mock, vi } from 'vitest'
-
-import type { Automation } from '../../../../shared/automations/automation-definition'
-import type { AutomationRun } from '../../../../shared/automations/history/automation-run'
-
-import {
-  AUTOMATION_LIST_HOST_SCOPE_RUNTIME_CAPABILITY as LIST_HOST_SCOPE,
-  AUTOMATION_OWNER_FENCING_RUNTIME_CAPABILITY as OWNER_FENCING,
-  AUTOMATION_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY as CREATE_IDEMPOTENCY
-} from '../../../../shared/automations/automation-runtime-capabilities'
-import type { AppState } from '@/store/types'
-
-import { AutomationDestinationField } from './authoring/AutomationDestinationField'
-import { TooltipProvider } from '@/components/ui/tooltip'
-
-import { resetAutomationCapabilityProbes } from './hosts/automation-capability-probe'
-import {
-  addRuntimeProject as addRuntimeProjectFixture,
-  selfScopedList
-} from './automations-page-runtime-fixtures'
-
-type AutomationsPageMocks = {
-  state: AutomationsPageFixtureState
-  repoMap: Map<string, unknown>
-  worktreeMap: Map<string, unknown>
-  listPanel: ListPanelProps | null
-  detailPane: DetailPaneProps | null
-  editorDialog: EditorDialogProps | null
-  deleteDialog: DeleteDialogProps | null
-  callRuntimeRpc: Mock
-  getRuntimeEnvironmentStatus: Mock
-  setAutomationHostFilter: Mock
-  toastError: Mock
-  toastSuccess: Mock
-  toastMessage: Mock
-  setPendingRunNavigation: Mock
-}
-
-// Mock factories only close over this exported binding; vi.hoisted bindings cannot be exported.
-export const mocks: AutomationsPageMocks = {
-  state: { repos: [], projectHostSetups: [], worktreesByRepo: {} },
-  repoMap: new Map<string, unknown>(),
-  worktreeMap: new Map<string, unknown>(),
-  listPanel: null,
-  detailPane: null,
-  editorDialog: null,
-  deleteDialog: null,
-  callRuntimeRpc: vi.fn(),
-  getRuntimeEnvironmentStatus: vi.fn(),
-  setAutomationHostFilter: vi.fn(),
-  toastError: vi.fn(),
-  toastSuccess: vi.fn(),
-  toastMessage: vi.fn(),
-  setPendingRunNavigation: vi.fn()
-}
-
-vi.mock('@/store/index', () => {
-  const useAppStore = (selector: (state: Partial<AppState>) => unknown): unknown =>
-    selector(mocks.state as Partial<AppState>)
-  useAppStore.getState = (): Partial<AppState> => mocks.state as Partial<AppState>
-  return { useAppStore }
-})
-
-vi.mock('@/store/repos/use-repository-catalog', () => ({
-  useRepoMap: () => mocks.repoMap
-}))
-vi.mock('@/store/slices/worktrees/listing/use-worktree-catalog', () => ({
-  useWorktreeMap: () => mocks.worktreeMap
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: (...args: unknown[]) => mocks.callRuntimeRpc(...args)
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  getRuntimeEnvironmentStatus: (...args: unknown[]) => mocks.getRuntimeEnvironmentStatus(...args)
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    error: (...args: unknown[]) => mocks.toastError(...args),
-    success: (...args: unknown[]) => mocks.toastSuccess(...args),
-    message: (...args: unknown[]) => mocks.toastMessage(...args)
-  }
-}))
-
-vi.mock('@/lib/window-activity/window-visibility-interval', () => ({
-  installWindowVisibilityInterval: () => () => undefined
-}))
-
-vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({
-  useContextualTour: () => undefined
-}))
-
-vi.mock('@/components/ui/tooltip', () => ({
-  TooltipProvider: ({ children }: { children: ReactNode }) => <>{children}</>,
-  Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
-  TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
-  TooltipContent: () => null
-}))
-
-vi.mock('@/runtime/repo-hooks/runtime-hooks-client', () => ({
-  checkRuntimeHooks: vi.fn(async () => ({ hooks: null, ok: true }))
-}))
-
-vi.mock('@/runtime/repo-hooks/ensure-hooks-confirmed', () => ({
-  ensureHooksConfirmed: vi.fn(async () => 'inherit'),
-  ensureHooksApproved: vi.fn(async () => ({ decision: 'run' }))
-}))
-
-vi.mock('@/lib/workspace/activation/worktree-activation', () => ({
-  activateAndRevealWorktree: vi.fn()
-}))
-
-vi.mock('./listing/AutomationsListPanel', () => ({
-  AutomationsListPanel: (props: ListPanelProps) => {
-    const selectAutomationRow = (rowKey: string | null): void => {
-      props.selectAutomationRow(rowKey)
-      props.onOpenDetail()
-    }
-    mocks.listPanel = { ...props, selectAutomationRow }
-    return (
-      <div data-testid="list-panel">
-        <button aria-label="Refresh automations" onClick={props.onRefresh} />
-        <button onClick={props.onOpenRuns}>Runs</button>
-        {props.sortedListItems.map((item) =>
-          item.kind === 'local' ? (
-            <button
-              type="button"
-              data-testid="automation-row"
-              key={item.id}
-              onClick={() => selectAutomationRow(item.id)}
-            >
-              {item.row.automation.name}
-            </button>
-          ) : (
-            <button
-              type="button"
-              data-testid="external-row"
-              key={item.id}
-              onClick={() => {
-                props.selectAutomationRow(null)
-                props.selectExternalKey(item.id)
-                props.onOpenDetail()
-              }}
-            >
-              {item.entry.job.name}
-            </button>
-          )
-        )}
-        {props.hasListItems ? null : <div data-testid="empty-state" />}
-      </div>
-    )
-  }
-}))
-
-vi.mock('./details/AutomationsDetailPane', () => ({
-  AutomationsDetailPane: (props: DetailPaneProps) => {
-    mocks.detailPane = props
-    return (
-      <div data-testid="detail-pane">
-        <span data-testid="detail-name">{props.selected?.name ?? 'none'}</span>
-        <span data-testid="detail-run-count">{props.selectedRuns.length}</span>
-      </div>
-    )
-  }
-}))
-
-vi.mock('./authoring/AutomationEditorDialog', () => ({
-  AutomationEditorDialog: (props: EditorDialogProps) => {
-    mocks.editorDialog = props
-    return (
-      <div data-testid="editor-dialog">
-        {props.open ? 'open' : 'closed'}
-        {props.open && props.editDestination ? (
-          <TooltipProvider>
-            <AutomationDestinationField control={props.editDestination} />
-            <button data-testid="editor-save" disabled={!props.canSave} onClick={props.onSave}>
-              Save changes
-            </button>
-          </TooltipProvider>
-        ) : null}
-      </div>
-    )
-  }
-}))
-
-vi.mock('./authoring/AutomationDeleteDialogs', () => ({
-  AutomationDeleteDialog: (props: DeleteDialogProps) => {
-    mocks.deleteDialog = props
-    return null
-  },
-  ExternalAutomationDeleteDialog: () => null
-}))
-
-import AutomationsPage from './AutomationsPage'
-import {
-  makeAutomation,
-  makeRun,
-  makeStoreState,
-  type AutomationsPageFixtureState,
-  type DetailPaneProps
-} from './automations-page-fixtures'
-
-function mockGroup<K extends string>(...names: K[]): Record<K, Mock> {
-  return Object.fromEntries(names.map((name) => [name, vi.fn()])) as Record<K, Mock>
-}
-
-export const api = {
-  automations: mockGroup(
-    'list',
-    'listRuns',
-    'create',
-    'update',
-    'delete',
-    'runNow',
-    'listScoped',
-    'listExternalManagerForOwner',
-    'runExternalActionForOwner',
-    'retainExternalScopes'
-  ),
-  ssh: mockGroup('listTargets', 'connect'),
-  runtimeEnvironments: mockGroup('connect'),
-  ui: mockGroup('get')
-}
-
-/** The precondition a Desktop + Self row captures; every fenced request repeats it. */
-export const SELF_PRECONDITION = { selector: { kind: 'self' } }
-/** The owner the catalog projects for Desktop + Self, which every scoped call names. */
-export const DESKTOP_SELF_OWNER = { authority: { kind: 'desktop' }, selector: { kind: 'self' } }
-
-export const RUNTIME_ID = 'gpu'
-/** A runtime that advertises both automation capabilities, so its rows carry owners. */
-const RUNTIME_CAPABILITIES = [LIST_HOST_SCOPE, OWNER_FENCING, CREATE_IDEMPOTENCY]
-export const RUNTIME_SELF_FILTER = {
-  kind: 'host' as const,
-  host: {
-    authority: { kind: 'runtime' as const, environmentId: RUNTIME_ID },
-    selector: { kind: 'self' as const }
-  }
-}
-
-/** Serve desktop-local RPCs from the programmable API mocks and runtime-target RPCs from runtimeHost state. */
-async function answerAutomationRpc(
-  target: unknown,
-  method: string,
-  params?: unknown
-): Promise<unknown> {
-  if ((target as { kind?: string } | null)?.kind === 'environment') {
-    const answers = mocks.state.runtimeAnswers as
-      | { automations: Automation[]; runs: AutomationRun[] }
-      | undefined
-    if (method === 'automation.list') {
-      return selfScopedList(answers?.automations ?? [])
-    }
-    return method === 'automation.runs' ? { runs: answers?.runs ?? [] } : {}
-  }
-  const args = params as Record<string, unknown> | undefined
-  switch (method) {
-    case 'automation.list':
-      return args?.selector
-        ? await api.automations.listScoped({ selector: args.selector })
-        : { automations: await api.automations.list() }
-    case 'automation.runs':
-      return { runs: await api.automations.listRuns(args) }
-    case 'automation.create':
-      return { automation: await api.automations.create(args) }
-    case 'automation.update':
-      return { automation: await api.automations.update(args) }
-    case 'automation.delete':
-      return await api.automations.delete(args).then(() => ({}))
-    case 'automation.runNow':
-      return { run: await api.automations.runNow(args) }
-    default:
-      return {}
-  }
-}
-
-/** Puts a reachable, capable second authority in the catalog and answers for it. */
-export function runtimeHost(automations: Automation[], runs: AutomationRun[]): void {
-  mocks.state.runtimeEnvironments = [
-    { id: RUNTIME_ID, name: 'GPU box', createdAt: 1, pairingRevision: 4 }
-  ]
-  mocks.state.runtimeStatusByEnvironmentId = new Map([
-    [RUNTIME_ID, { status: { capabilities: RUNTIME_CAPABILITIES } }]
-  ])
-  mocks.getRuntimeEnvironmentStatus.mockResolvedValue({ capabilities: RUNTIME_CAPABILITIES })
-  mocks.state.runtimeAnswers = { automations, runs }
-}
-
-export const addRuntimeProject = (): void => addRuntimeProjectFixture(mocks, RUNTIME_ID)
-
-/** Answers the host-scoped read, which is where the list's rows and owners come from. */
-export function scopedList(automations: Automation[]): void {
-  api.automations.listScoped.mockResolvedValue(selfScopedList(automations))
-}
-
-const roots: Root[] = []
-
-export async function renderPage(options?: { strict?: boolean }): Promise<{
-  container: HTMLDivElement
-  rerender: () => Promise<void>
-}> {
-  const container = document.createElement('div')
-  document.body.appendChild(container)
-  const root = createRoot(container)
-  roots.push(root)
-  const rerender = async (): Promise<void> => {
-    await act(async () => {
-      // StrictMode doubles effects to expose dispose-without-revive controller bugs.
-      const page = options?.strict
-        ? createElement(StrictMode, null, createElement(AutomationsPage))
-        : createElement(AutomationsPage)
-      root.render(page)
-    })
-  }
-  await rerender()
-  return { container, rerender }
-}
-
-/** Lets the per-host queries, their capability probes, and the history read settle. */
-export async function settleHostQueries(): Promise<void> {
-  await act(async () => {
-    await new Promise((resolve) => setTimeout(resolve, 0))
-  })
-}
-
-/** The alt-tab-back trigger: one of the two events bound to the page refresh. */
-export async function refreshOnFocus(): Promise<void> {
-  await act(async () => {
-    window.dispatchEvent(new Event('focus'))
-    await new Promise((resolve) => setTimeout(resolve, 0))
-  })
-}
-
-export function rows(container: HTMLElement, testId: string): string[] {
-  return [...container.querySelectorAll(`[data-testid="${testId}"]`)].map(
-    (node) => node.textContent ?? ''
-  )
-}
-
-/** Registers the per-case store reset and renderer cleanup for the current suite. */
-export function installAutomationsPageHarness(): void {
-  beforeEach(() => {
-    globalThis.IS_REACT_ACT_ENVIRONMENT = true
-    vi.clearAllMocks()
-    setLocalRuntimeCapabilitiesForTests([])
-    // Confirmed capabilities are module-level and must not leak between tests.
-    resetAutomationCapabilityProbes()
-    resetHostStructuredAgentsForTests()
-    // A prior test's wholesale mockImplementation must not leak forward.
-    mocks.callRuntimeRpc.mockReset()
-    mocks.callRuntimeRpc.mockImplementation(answerAutomationRpc)
-    mocks.listPanel = null
-    mocks.detailPane = null
-    mocks.editorDialog = null
-    mocks.deleteDialog = null
-    const fixtures = makeStoreState()
-    mocks.state = fixtures.state
-    mocks.state.folderWorkspaces = []
-    mocks.state.setAutomationHostFilter = mocks.setAutomationHostFilter
-    mocks.repoMap = fixtures.repoMap
-    mocks.worktreeMap = fixtures.worktreeMap
-    api.automations.list.mockResolvedValue([makeAutomation()])
-    api.automations.listRuns.mockResolvedValue([])
-    api.automations.listExternalManagerForOwner.mockResolvedValue({
-      manager: null,
-      error: null,
-      updatedAt: 0
-    })
-    api.automations.retainExternalScopes.mockResolvedValue(undefined)
-    api.automations.listScoped.mockResolvedValue(selfScopedList([makeAutomation()]))
-    api.automations.create.mockResolvedValue(makeAutomation())
-    api.automations.update.mockResolvedValue(makeAutomation())
-    api.automations.delete.mockResolvedValue(undefined)
-    api.automations.runNow.mockResolvedValue(makeRun())
-    api.ui.get.mockResolvedValue({})
-    // @ts-expect-error test window mock
-    globalThis.window.api = api
-  })
-
-  afterEach(async () => {
-    await act(async () => {
-      roots.splice(0).forEach((root) => root.unmount())
-    })
-    document.body.innerHTML = ''
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-}
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu-items.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu-items.tsx
index b21bd45cf55..2bba0b7c047 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu-items.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu-items.tsx
@@ -4,7 +4,7 @@ import { useAppStore } from '@/store'
 import { isMac } from '@/app-shell/app-window-chrome'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
-import { openUrlInTabBesideBrowserPage } from '@/lib/browser/palette/browser-page-tab-opening'
+import { openLinkInNewBrowserTab } from '@/lib/browser/palette/open-client-hosted-link-beside-page'
 import {
   buildSearchUrl,
   DEFAULT_SEARCH_ENGINE,
@@ -80,7 +80,7 @@ function buildMenuSections(
     }
   })
   const openInNewTab = (url: string, activate: boolean): void => {
-    openUrlInTabBesideBrowserPage({ sourcePageId: browserPageId, worktreeId, url, activate })
+    openLinkInNewBrowserTab({ sourcePageId: browserPageId, worktreeId, url, activate })
   }
   const openExternally = (url: string): void => {
     const targetUrl = normalizeExternalBrowserUrl(url)
diff --git a/src/renderer/src/components/browser-pane/browser-client-page-retained-elements.ts b/src/renderer/src/components/browser-pane/browser-client-page-retained-elements.ts
index 059c739d1e0..2b1d9db25f5 100644
--- a/src/renderer/src/components/browser-pane/browser-client-page-retained-elements.ts
+++ b/src/renderer/src/components/browser-pane/browser-client-page-retained-elements.ts
@@ -66,6 +66,7 @@ export function createBrowserClientPageWebview(options: {
   const webview =
     options.createWebview?.() ?? (options.document.createElement('webview') as Electron.WebviewTag)
   webview.setAttribute('partition', options.identity.partition)
+  webview.setAttribute('allowpopups', '')
   webview.setAttribute('webpreferences', ORCA_BROWSER_PAGE_GUEST_WEB_PREFERENCES_ATTRIBUTE)
   webview.setAttribute('src', 'about:blank')
   Object.assign(webview.style, { display: 'flex', width: '100%', height: '100%' })
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-javascript-dialog.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-javascript-dialog.ts
new file mode 100644
index 00000000000..ac97374e354
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-javascript-dialog.ts
@@ -0,0 +1,81 @@
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type {
+  BrowserJavaScriptDialog,
+  BrowserJavaScriptDialogAnswer,
+  BrowserJavaScriptDialogPrompt
+} from '../../../../../shared/browser/prompts/browser-javascript-dialog'
+import type { BrowserScreencastDialogResult } from '../../../../../shared/browser/runtime/runtime-browser-contracts'
+import type { RemoteBrowserRpcCall } from './remote-browser-page-session'
+
+export type RemoteBrowserJavaScriptDialogAsk = (
+  dialog: BrowserJavaScriptDialogPrompt,
+  signal: AbortSignal
+) => Promise<BrowserJavaScriptDialogAnswer | null>
+
+export type RemoteBrowserDialogPage = {
+  target: RuntimeClientTarget
+  worktree: string
+  pageId: string
+}
+
+function toJavaScriptDialog(event: BrowserScreencastDialogResult): BrowserJavaScriptDialog | null {
+  const type = event.dialogType
+  // The host holds only these; asking about any other kind would offer an answer it refuses.
+  if (type !== 'alert' && type !== 'confirm' && type !== 'prompt') {
+    return null
+  }
+  return { type, message: event.message, defaultPromptText: '' }
+}
+
+/** Asks the person about the streamed page's open dialog and answers it on the host. */
+export class RemoteBrowserJavaScriptDialog {
+  private open: AbortController | null = null
+
+  constructor(
+    private readonly deps: {
+      askJavaScriptDialog: RemoteBrowserJavaScriptDialogAsk
+      callRpc: RemoteBrowserRpcCall
+    }
+  ) {}
+
+  show(event: BrowserScreencastDialogResult, page: RemoteBrowserDialogPage): void {
+    const dialog = toJavaScriptDialog(event)
+    // The host repeats the dialog it still holds when a turned-away nested one closes.
+    if (!dialog || this.open) {
+      return
+    }
+    const open = new AbortController()
+    this.open = open
+    // The stream reports no frame origin, so the title can't name one.
+    void this.deps.askJavaScriptDialog({ ...dialog, origin: null }, open.signal).then((answer) => {
+      if (!open.signal.aborted) {
+        void this.answerOnHost(page, answer, open.signal).catch(() => {})
+      }
+    })
+  }
+
+  /** The host closed it (answered here, by an agent or a phone, or by the page), or the stream ended. */
+  close(): void {
+    this.open?.abort()
+    this.open = null
+  }
+
+  // A failed answer leaves the dialog to the host, which dismisses it when this stream stops.
+  private answerOnHost(
+    { target, worktree, pageId }: RemoteBrowserDialogPage,
+    answer: BrowserJavaScriptDialogAnswer | null,
+    // Closing it elsewhere first must not let this answer reach the page's next dialog.
+    signal: AbortSignal
+  ): Promise<unknown> {
+    const params = { worktree, page: pageId }
+    const options = { timeoutMs: 15_000, suppressFeatureInteraction: true, signal }
+    return answer?.accept
+      ? this.deps.callRpc(
+          target,
+          'browser.dialogAccept',
+          { ...params, text: answer.promptText },
+          options
+        )
+      : this.deps.callRpc(target, 'browser.dialogDismiss', params, options)
+  }
+}
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-context-menu.tsx b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-context-menu.tsx
index 0c35b2407ea..ee5b265cdcb 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-context-menu.tsx
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-context-menu.tsx
@@ -3,8 +3,8 @@ import { createPortal } from 'react-dom'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { useTranslate } from '@/i18n/use-translate'
 import {
-  normalizeExternalBrowserUrl,
-  redactKagiSessionToken
+  redactKagiSessionToken,
+  resolveRemoteFailureExternalUrl
 } from '../../../../../shared/browser-url'
 import { isRemoteBrowserPageMissingError } from './remote-browser-stream-errors'
 import type { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle'
@@ -171,6 +171,12 @@ export function RemoteBrowserPageContextMenu({
     el.style.top = `${Math.max(0, renderY) + offsetY}px`
   }, [contextMenu])
 
+  // The server's loopback address would open this machine's, not the page's.
+  const linkExternalUrl = contextMenu.linkUrl
+    ? resolveRemoteFailureExternalUrl(contextMenu.linkUrl)
+    : null
+  const pageExternalUrl = resolveRemoteFailureExternalUrl(contextMenu.pageUrl)
+
   return createPortal(
     <>
       <div className="fixed inset-0 z-50" onPointerDown={onDismiss} />
@@ -193,22 +199,21 @@ export function RemoteBrowserPageContextMenu({
                 'Open Link In Orca Browser'
               )}
             </button>
-            <button
-              role="menuitem"
-              className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
-              onClick={() => {
-                const targetUrl = normalizeExternalBrowserUrl(contextMenu.linkUrl!)
-                if (targetUrl) {
-                  void window.api.shell.openUrl(targetUrl)
-                }
-                onDismiss()
-              }}
-            >
-              {t(
-                'auto.components.browser.pane.BrowserPane.8ce4f6b12e',
-                'Open Link In Default Browser'
-              )}
-            </button>
+            {linkExternalUrl ? (
+              <button
+                role="menuitem"
+                className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
+                onClick={() => {
+                  void window.api.shell.openUrl(linkExternalUrl)
+                  onDismiss()
+                }}
+              >
+                {t(
+                  'auto.components.browser.pane.BrowserPane.8ce4f6b12e',
+                  'Open Link In Default Browser'
+                )}
+              </button>
+            ) : null}
             <button
               role="menuitem"
               className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
@@ -259,19 +264,21 @@ export function RemoteBrowserPageContextMenu({
           {t('auto.components.browser.pane.BrowserPane.0e080d820e', 'Reload')}
         </button>
         <div className="my-1 h-px bg-border/70" />
-        <button
-          role="menuitem"
-          className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
-          onClick={() => {
-            const targetUrl = normalizeExternalBrowserUrl(contextMenu.pageUrl)
-            if (targetUrl) {
-              void window.api.shell.openUrl(targetUrl)
-            }
-            onDismiss()
-          }}
-        >
-          {t('auto.components.browser.pane.BrowserPane.f7ab83f7ed', 'Open Page In Default Browser')}
-        </button>
+        {pageExternalUrl ? (
+          <button
+            role="menuitem"
+            className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
+            onClick={() => {
+              void window.api.shell.openUrl(pageExternalUrl)
+              onDismiss()
+            }}
+          >
+            {t(
+              'auto.components.browser.pane.BrowserPane.f7ab83f7ed',
+              'Open Page In Default Browser'
+            )}
+          </button>
+        ) : null}
         <button
           role="menuitem"
           className="relative flex w-full cursor-default items-center gap-2 rounded-[7px] px-2 py-0.5 text-[12px] leading-5 font-medium outline-none select-none hover:bg-black/8 dark:hover:bg-white/14"
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts
index 41d62402a4c..d4e9b579c57 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-page-session.ts
@@ -13,7 +13,7 @@ export type RemoteBrowserRpcCall = <TResult>(
   target: RuntimeClientTarget,
   method: string,
   params?: unknown,
-  options?: { timeoutMs?: number; suppressFeatureInteraction?: boolean }
+  options?: { timeoutMs?: number; suppressFeatureInteraction?: boolean; signal?: AbortSignal }
 ) => Promise<TResult>
 
 export type RemoteBrowserPageHandle = {
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-screencast-subscription.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-screencast-subscription.ts
index 1611e8172dd..af6c78f38de 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-screencast-subscription.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-screencast-subscription.ts
@@ -6,6 +6,10 @@ import type {
 import { withBrowserPaneUiRuntimeRpcSource } from '../../../../../shared/runtime-rpc-feature-interaction-source'
 import { e2eConfig } from '@/app-shell/startup/e2e-config'
 import { isRemoteBrowserPageMissingCode } from './remote-browser-stream-errors'
+import type {
+  RemoteBrowserDialogPage,
+  RemoteBrowserJavaScriptDialog
+} from './remote-browser-javascript-dialog'
 import type { RemoteBrowserViewportSize } from './remote-browser-stream-tokens'
 
 export type RemoteBrowserScreencastSubscribe = (
@@ -54,6 +58,8 @@ export type RemoteBrowserScreencastEvents = {
   onPageMissing: () => void
   onFrame: (bytes: Uint8Array<ArrayBufferLike>) => void
   onClosed: () => void
+  /** This stream's page dialog; a stopped stream's host dismisses it, so it closes with the stream. */
+  javaScriptDialog: RemoteBrowserJavaScriptDialog
 }
 
 export async function openRemoteBrowserScreencastStream(
@@ -62,7 +68,12 @@ export async function openRemoteBrowserScreencastStream(
   events: RemoteBrowserScreencastEvents
 ): Promise<{ unsubscribe: () => void }> {
   recordE2eScreencastSubscribe()
-  return subscribe(
+  const dialogPage: RemoteBrowserDialogPage = {
+    target: { kind: 'environment', environmentId: request.environmentId },
+    worktree: request.worktree,
+    pageId: request.pageId
+  }
+  const subscription = await subscribe(
     {
       selector: request.environmentId,
       method: 'browser.screencast',
@@ -81,7 +92,7 @@ export async function openRemoteBrowserScreencastStream(
       timeoutMs: 15_000
     },
     {
-      onResponse: (response) => dispatchScreencastResponse(response, events),
+      onResponse: (response) => dispatchScreencastResponse(response, events, dialogPage),
       onBinary: (bytes) => events.onFrame(bytes),
       onError: (error) => {
         if (!events.isCurrent()) {
@@ -93,14 +104,24 @@ export async function openRemoteBrowserScreencastStream(
         }
         events.onTransportError(error.message)
       },
-      onClose: () => events.onClosed()
+      onClose: () => {
+        events.javaScriptDialog.close()
+        events.onClosed()
+      }
     }
   )
+  return {
+    unsubscribe: () => {
+      events.javaScriptDialog.close()
+      subscription.unsubscribe()
+    }
+  }
 }
 
 function dispatchScreencastResponse(
   response: RuntimeRpcResponse<unknown>,
-  events: RemoteBrowserScreencastEvents
+  events: RemoteBrowserScreencastEvents,
+  dialogPage: RemoteBrowserDialogPage
 ): void {
   if (!events.isCurrent()) {
     return
@@ -121,6 +142,10 @@ function dispatchScreencastResponse(
     events.onReady(event)
   } else if (event.type === 'end') {
     events.onEnded()
+  } else if (event.type === 'dialog') {
+    events.javaScriptDialog.show(event, dialogPage)
+  } else if (event.type === 'dialogClosed') {
+    events.javaScriptDialog.close()
   } else if (event.type === 'error') {
     events.onFailed(event.message)
   }
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.ts
index 8e51b28308e..1df9dda1d1a 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-errors.ts
@@ -49,6 +49,11 @@ export function isRemoteBrowserPageMissingError(error: unknown): boolean {
   return isRemoteBrowserPageMissingCode(readErrorCode(error))
 }
 
+// The input landed and opened a page dialog, which the stream shows; its agent instructions are not for a person.
+export function isRemoteBrowserInputOpenedDialogError(error: unknown): boolean {
+  return readErrorCode(error) === 'browser_dialog_opened'
+}
+
 // Stop automatic retry only for proven permanent failures; unclassified failures retain bounded recovery.
 export function isPermanentRemoteBrowserStreamFailure(error: unknown): boolean {
   const code = readErrorCode(error)
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-deps.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-deps.ts
index 85309a0e85f..5b3fea412c6 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-deps.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-deps.ts
@@ -1,3 +1,4 @@
+import type { RemoteBrowserJavaScriptDialogAsk } from './remote-browser-javascript-dialog'
 import type { RemoteBrowserPageSessionDeps } from './remote-browser-page-session'
 import type { RemoteBrowserScreencastSubscribe } from './remote-browser-screencast-subscription'
 import type { RemoteBrowserStreamStatus } from './remote-browser-stream-status'
@@ -18,4 +19,5 @@ export type RemoteBrowserStreamLifecycleDeps = Omit<RemoteBrowserPageSessionDeps
   setStatus: (status: RemoteBrowserStreamStatus) => void
   clearFrame: () => void
   handleFrameBytes: (token: RemoteBrowserStreamToken, bytes: Uint8Array<ArrayBufferLike>) => void
+  askJavaScriptDialog: RemoteBrowserJavaScriptDialogAsk
 }
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-test-harness.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-test-harness.ts
index bcbec3ba39b..c2052eb4fa9 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-test-harness.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle-test-harness.ts
@@ -3,6 +3,10 @@ import { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle'
 import type { RemoteBrowserPageHandle, RemoteBrowserRpcCall } from './remote-browser-page-session'
 import type { RemoteBrowserScreencastSubscribe } from './remote-browser-screencast-subscription'
 import type { RemoteBrowserViewportSize } from './remote-browser-stream-tokens'
+import type {
+  BrowserJavaScriptDialogAnswer,
+  BrowserJavaScriptDialogPrompt
+} from '../../../../../shared/browser/prompts/browser-javascript-dialog'
 import {
   canReconnectRemoteBrowserStream,
   isRemoteBrowserStreamBusy,
@@ -40,6 +44,14 @@ export type FakeScreencastStream = {
   emitResponseFailure: (code: string, message: string) => void
   emitTransportError: (code: string, message: string) => void
   emitClose: () => void
+  emitDialog: (dialogType: string, message: string) => void
+  emitDialogClosed: () => void
+}
+
+export type DialogAsk = {
+  dialog: BrowserJavaScriptDialogPrompt
+  signal: AbortSignal
+  answer: (answer: BrowserJavaScriptDialogAnswer | null) => void
 }
 
 export function rpcError(code: string, message: string): Error {
@@ -59,6 +71,8 @@ export function createHarness() {
   const closedPages: (string | null)[] = []
   const streams: FakeScreencastStream[] = []
   const rpcLog: string[] = []
+  const rpcParams = new Map<string, unknown>()
+  const dialogAsks: DialogAsk[] = []
 
   let capabilities: string[] = ['browser.screencast.v1']
   let storedHandle: RemoteBrowserPageHandle | null = null
@@ -75,6 +89,7 @@ export function createHarness() {
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fake answers each method with the reply shape its caller reads.
   const callRpc = (async (_target: unknown, method: string, params?: { page?: string }) => {
     rpcLog.push(method)
+    rpcParams.set(method, params)
     if (method === 'status.get') {
       if (statusGate) {
         const gate = statusGate
@@ -152,7 +167,9 @@ export function createHarness() {
           _meta: { runtimeId: 'runtime-1' }
         }),
       emitTransportError: (code, message) => callbacks.onError?.({ code, message }),
-      emitClose: () => callbacks.onClose?.()
+      emitClose: () => callbacks.onClose?.(),
+      emitDialog: (dialogType, message) => respond({ type: 'dialog', dialogType, message }),
+      emitDialogClosed: () => respond({ type: 'dialogClosed' })
     }
     streams.push(stream)
     return {
@@ -193,6 +210,8 @@ export function createHarness() {
     },
     readViewportSize: () => viewportSize,
     syncViewport: async () => {},
+    askJavaScriptDialog: (dialog, signal) =>
+      new Promise((answer) => dialogAsks.push({ dialog, signal, answer })),
     getDeviceScaleFactor: () => 1,
     setStatus: (status) => statusLog.push(status),
     clearFrame: () => {},
@@ -207,6 +226,8 @@ export function createHarness() {
     closedPages,
     streams,
     rpcLog,
+    dialogAsks,
+    rpcParams: (method: string): unknown => rpcParams.get(method),
     get subscribeAttempts(): number {
       return subscribeAttempts
     },
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts
index 3265d28661d..499a965110b 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.test.ts
@@ -15,6 +15,48 @@ describe('RemoteBrowserStreamLifecycle', () => {
     vi.useRealTimers()
   })
 
+  it("asks once about the streamed page's dialog and answers it on the host", async () => {
+    const harness = createHarness()
+    await openStreamAndConfirmReady(harness)
+    const stream = harness.streams[0]
+
+    stream.emitDialog('confirm', 'Proceed?')
+    // The host repeats the dialog it still holds when a turned-away nested one closes.
+    stream.emitDialog('confirm', 'Proceed?')
+    expect(harness.dialogAsks).toHaveLength(1)
+    expect(harness.dialogAsks[0].dialog).toEqual({
+      type: 'confirm',
+      message: 'Proceed?',
+      defaultPromptText: '',
+      origin: null
+    })
+
+    harness.dialogAsks[0].answer({ accept: true, promptText: '' })
+    await settle()
+    expect(harness.rpcParams('browser.dialogAccept')).toEqual({
+      worktree: 'worktree:wt-1',
+      page: 'page-1',
+      text: ''
+    })
+  })
+
+  it('drops the ask when the host closes the dialog some other way', async () => {
+    const harness = createHarness()
+    await openStreamAndConfirmReady(harness)
+    const stream = harness.streams[0]
+
+    stream.emitDialog('alert', 'Saved')
+    stream.emitDialogClosed()
+    expect(harness.dialogAsks[0].signal.aborted).toBe(true)
+
+    // The next dialog gets its own ask.
+    stream.emitDialog('alert', 'Again')
+    expect(harness.dialogAsks).toHaveLength(2)
+    harness.dialogAsks[1].answer(null)
+    await settle()
+    expect(harness.rpcLog).toContain('browser.dialogDismiss')
+  })
+
   // Parked unmount has no effect cleanup left; parking must already have unsubscribed.
   it('leaves nothing subscribed when the pane unmounts while its stream is parked', async () => {
     const harness = createHarness()
diff --git a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.ts b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.ts
index 623c7728272..fb3c40ce406 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/remote-browser-stream-lifecycle.ts
@@ -1,6 +1,7 @@
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import type { RuntimeStatus } from '../../../../../shared/runtime-types'
 import { RemoteBrowserPageSession } from './remote-browser-page-session'
+import { RemoteBrowserJavaScriptDialog } from './remote-browser-javascript-dialog'
 import { openRemoteBrowserScreencastStream } from './remote-browser-screencast-subscription'
 import { RemoteBrowserStreamRestartScheduler } from './remote-browser-stream-restart-scheduler'
 import { RemoteBrowserStreamLiveness } from './remote-browser-stream-liveness'
@@ -273,7 +274,8 @@ export class RemoteBrowserStreamLifecycle {
           },
           onPageMissing: () => deps.closeMissingRemotePage(pageId),
           onFrame: (bytes) => deps.handleFrameBytes(token, bytes),
-          onClosed: () => this.handleStreamClosed(token, true)
+          onClosed: () => this.handleStreamClosed(token, true),
+          javaScriptDialog: new RemoteBrowserJavaScriptDialog(deps)
         }
       )
       return { token, unsubscribe: subscription.unsubscribe }
diff --git a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-input.ts b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-input.ts
index e01a458bc49..3431469c0a5 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-input.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-input.ts
@@ -1,6 +1,9 @@
 import { useCallback, useRef } from 'react'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import { isRemoteBrowserPageMissingError } from './remote-browser-stream-errors'
+import {
+  isRemoteBrowserInputOpenedDialogError,
+  isRemoteBrowserPageMissingError
+} from './remote-browser-stream-errors'
 import { useRemoteBrowserPageKeyboard } from './use-remote-browser-page-keyboard'
 import type { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle'
 import type {
@@ -175,6 +178,9 @@ export function useRemoteBrowserPageInput({
             closeMissingRemotePage(pageId)
             return
           }
+          if (isRemoteBrowserInputOpenedDialogError(error)) {
+            return
+          }
           setPaneNotice({
             kind: 'consequence',
             text: error instanceof Error ? error.message : 'Remote mouse input failed.'
@@ -226,6 +232,9 @@ export function useRemoteBrowserPageInput({
             closeMissingRemotePage(pageId)
             return
           }
+          if (isRemoteBrowserInputOpenedDialogError(error)) {
+            return
+          }
           setPaneNotice({
             kind: 'consequence',
             text: error instanceof Error ? error.message : 'Remote mouse input failed.'
diff --git a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-keyboard.ts b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-keyboard.ts
index c20574aa963..536f0fdf723 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-keyboard.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-keyboard.ts
@@ -14,7 +14,10 @@ import {
   getRemoteBrowserKeyboardShortcut,
   getRemoteBrowserKeypressKey
 } from './remote-browser-keyboard'
-import { isRemoteBrowserPageMissingError } from './remote-browser-stream-errors'
+import {
+  isRemoteBrowserInputOpenedDialogError,
+  isRemoteBrowserPageMissingError
+} from './remote-browser-stream-errors'
 import type { RemoteBrowserStreamLifecycle } from './remote-browser-stream-lifecycle'
 import type { RemoteBrowserOperationToken } from './remote-browser-stream-tokens'
 import {
@@ -178,6 +181,9 @@ export function useRemoteBrowserPageKeyboard({
             closeMissingRemotePage(pageId)
             return
           }
+          if (isRemoteBrowserInputOpenedDialogError(error)) {
+            return
+          }
           setPaneNotice({
             kind: 'consequence',
             text: error instanceof Error ? error.message : 'Remote keyboard input failed.'
diff --git a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts
index 5870a9ccb9b..0f4f6a42ca5 100644
--- a/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts
+++ b/src/renderer/src/components/browser-pane/stream-remote/use-remote-browser-page-lifecycle.ts
@@ -23,6 +23,8 @@ import {
   type RemoteBrowserStreamBridge
 } from './remote-browser-page-input-model'
 import { subscribeRuntimeEnvironment } from '@/runtime/rpc/environment-revisions/runtime-environment-pairing-refresh'
+import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
+import { javaScriptDialogPrompt } from '../browser-javascript-dialog-prompt'
 
 export function useRemoteBrowserPageLifecycle({
   browserTab,
@@ -68,6 +70,8 @@ export function useRemoteBrowserPageLifecycle({
   const lifecycleRef = useRef<RemoteBrowserStreamLifecycle | null>(null)
   const closeBrowserPage = useAppStore((s) => s.closeBrowserPage)
   const closeBrowserTab = useAppStore((s) => s.closeBrowserTab)
+  // Stable for the provider's life, so the once-built lifecycle may hold it.
+  const confirm = useConfirmationDialog()
 
   useLayoutEffect(() => {
     currentBrowserTabIdRef.current = browserTab.id
@@ -113,7 +117,8 @@ export function useRemoteBrowserPageLifecycle({
         streamBridgeRef.current.closeMissingRemotePage(remotePageId),
       waitForViewportSize: () => streamBridgeRef.current.waitForViewportSize(),
       readViewportSize: () => remoteViewportSizeRef.current,
-      syncViewport: (pageId) => streamBridgeRef.current.syncViewport(pageId)
+      syncViewport: (pageId) => streamBridgeRef.current.syncViewport(pageId),
+      askJavaScriptDialog: (dialog, signal) => javaScriptDialogPrompt.ask(confirm, dialog, signal)
     })
   }
   const lifecycle = lifecycleRef.current
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx
index 89c94804f5b..9d51871715b 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx
@@ -3,7 +3,7 @@ import {
   getConnectionExecutionHostId,
   toRuntimeExecutionHostId
 } from '../../../../../shared/execution-host'
-import type { DocPreviewGrantOwner } from '../../../../../preload/api/doc-preview-api'
+import type { DocPreviewGrantOwner } from '../../../../../preload/api/document-preview/doc-preview-api'
 import { ArtifactPublishButton } from '@/components/artifacts/ArtifactPublishButton'
 import { ArtifactPublishPreparationError } from '@/components/artifacts/artifact-publish-flow'
 import { isShareableHtmlPath } from '@/components/editor/editor-artifact-upload'
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
index a62c90e921d..f685ab4645c 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
 import type { DocPreviewExternalLink } from '../../../../../shared/document-preview/doc-preview-scheme'
-import type { DocPreviewGrantOwner } from '../../../../../preload/api/doc-preview-api'
+import type { DocPreviewGrantOwner } from '../../../../../preload/api/document-preview/doc-preview-api'
 import {
   registerHttpLinkStoreAccessor,
   registerWorkspaceHttpLinkBrowserOpener
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.tsx
index b333ac60ec5..0f340344637 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.tsx
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.tsx
@@ -1,5 +1,5 @@
 import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
-import type { DocPreviewGrantOwner } from '../../../../../preload/api/doc-preview-api'
+import type { DocPreviewGrantOwner } from '../../../../../preload/api/document-preview/doc-preview-api'
 import {
   captureHttpLinkIntent,
   openOwnedHttpLink
diff --git a/src/renderer/src/components/dictation/DictationIndicator.tsx b/src/renderer/src/components/dictation/DictationIndicator.tsx
index a243ecdbf4d..34821c85a35 100644
--- a/src/renderer/src/components/dictation/DictationIndicator.tsx
+++ b/src/renderer/src/components/dictation/DictationIndicator.tsx
@@ -10,7 +10,7 @@ import { useAppStore } from '@/store/index'
 import { ArrowUp, Check, CornerDownLeft, Loader2 } from 'lucide-react'
 import { isDictationPillShown } from '../../../../shared/dictation-session-machine'
 import { dictationSeparators } from '../../../../shared/dictation-transcript-spacing'
-import { CLOUD_DICTATION_MAX_SECONDS } from '../../../../shared/rpc-contract/speech-params'
+import { CLOUD_DICTATION_MAX_SECONDS } from '../../../../shared/rpc-contract/speech/speech-params'
 import { dispatchDictationControl } from './dictation-control-events'
 import { DictationGrapes } from './DictationGrapes'
 import { useDictationMeter } from './dictation-meter-store'
diff --git a/src/renderer/src/components/dictation/dictation-kept-recording.ts b/src/renderer/src/components/dictation/dictation-kept-recording.ts
index 7981c21c90f..30e8828464c 100644
--- a/src/renderer/src/components/dictation/dictation-kept-recording.ts
+++ b/src/renderer/src/components/dictation/dictation-kept-recording.ts
@@ -1,7 +1,7 @@
 import {
   CLOUD_DICTATION_MAX_SECONDS,
   DICTATION_SAMPLE_RATE
-} from '../../../../shared/rpc-contract/speech-params'
+} from '../../../../shared/rpc-contract/speech/speech-params'
 import type { DictationContext } from '../../../../shared/speech-types'
 import type { DictationInsertionTarget } from './dictation-insertion-target'
 import type { DictationTranscriptDelivery } from './dictation-transcript-delivery'
diff --git a/src/renderer/src/components/editor/PluginFileTypeSuggestion.tsx b/src/renderer/src/components/editor/PluginFileTypeSuggestion.tsx
index c11486132d0..8c0e6feea27 100644
--- a/src/renderer/src/components/editor/PluginFileTypeSuggestion.tsx
+++ b/src/renderer/src/components/editor/PluginFileTypeSuggestion.tsx
@@ -1,7 +1,7 @@
 // @protected-copy: plugin catalog suggestion banner.
 import { useEffect, useState } from 'react'
 import { Puzzle } from 'lucide-react'
-import type { PluginFileTypeHostSuggestion } from '../../../../preload/api/plugin-host-api'
+import type { PluginFileTypeHostSuggestion } from '../../../../preload/api/plugins/plugin-host-api'
 import { fileTypeOfPath } from '../../../../shared/plugins/contributions/plugin-file-type'
 import { useTranslate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store'
diff --git a/src/renderer/src/components/emulator-pane/emulator-device-frame-layout.ts b/src/renderer/src/components/emulator-pane/emulator-device-frame-layout.ts
index 0cb6e058c1c..d10b432ffed 100644
--- a/src/renderer/src/components/emulator-pane/emulator-device-frame-layout.ts
+++ b/src/renderer/src/components/emulator-pane/emulator-device-frame-layout.ts
@@ -1,5 +1,5 @@
 import type { z } from 'zod'
-import type { RotateOrientation } from '../../../../shared/rpc-contract/emulator-params'
+import type { RotateOrientation } from '../../../../shared/rpc-contract/emulator/emulator-params'
 
 export type DeviceFrameKind = 'phone' | 'tablet'
 
diff --git a/src/renderer/src/components/emulator-pane/use-emulator-control-stream.ts b/src/renderer/src/components/emulator-pane/use-emulator-control-stream.ts
index fb0aa73f1e7..08a591fc01b 100644
--- a/src/renderer/src/components/emulator-pane/use-emulator-control-stream.ts
+++ b/src/renderer/src/components/emulator-pane/use-emulator-control-stream.ts
@@ -7,7 +7,7 @@ import {
   encodeServeSimTouchFrame,
   type ServeSimTouchFrame
 } from '../../../../shared/emulator-touch-frame'
-import { RotateOrientation } from '../../../../shared/rpc-contract/emulator-params'
+import { RotateOrientation } from '../../../../shared/rpc-contract/emulator/emulator-params'
 import type { EmulatorStreamOrientation } from './emulator-device-frame-layout'
 
 const RECONNECT_DELAY_MS = 750
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-close-as-duplicate.ts b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-close-as-duplicate.ts
index 5a1ff81006b..011be2c853b 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-close-as-duplicate.ts
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-close-as-duplicate.ts
@@ -2,7 +2,7 @@ import {
   getTaskPageGitHubDuplicateTargetErrorMessage,
   validateTaskPageGitHubDuplicateTarget,
   type TaskPageGitHubCloseAction
-} from '@/components/task-page/github/task-page-github-status-actions'
+} from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { translate } from '@/i18n/i18n'
 
 export function closeGHEditAsDuplicate({
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-horizontal.tsx b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-horizontal.tsx
index 644262111fa..a9a543cf62d 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-horizontal.tsx
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-horizontal.tsx
@@ -10,7 +10,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/task-page-github-status-actions'
+import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import { GHEditSectionStatusPopover } from './gh-edit-section-status-popover'
 import { GHEditSectionAssigneesPill } from './gh-edit-section-assignees'
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts
index a1ac4285b77..d2cf514ad78 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-mutations.ts
@@ -4,9 +4,9 @@ import type { useImmediateMutation } from '@/hooks/useIssueMetadata'
 import {
   buildTaskPageGitHubCloseUpdate,
   type TaskPageGitHubCloseAction
-} from '@/components/task-page/github/task-page-github-status-actions'
+} from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { beginEdit, isTrackedEdit } from './gh-edit-task-record'
-import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/task-page-github-dialog-state-authority'
+import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/mutations/task-page-github-dialog-state-authority'
 import { runIssueUpdate } from '@/components/github/github-work-item-edit-mutations'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
 import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-status-popover.tsx b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-status-popover.tsx
index 99e9fbf6c70..570788962a0 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-status-popover.tsx
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-status-popover.tsx
@@ -15,7 +15,7 @@ import { Input } from '@/components/ui/input'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { cn } from '@/lib/class-names'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/task-page-github-status-actions'
+import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { getStateLabel } from '@/components/github/work-item-state-presentation'
 import { useTranslate } from '@/i18n/use-translate'
 import { getStateTone } from '../load-item-details/work-item-state-badge'
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-top-columns.tsx b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-top-columns.tsx
index eec2c5c370e..dc99bddc5af 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-top-columns.tsx
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section-top-columns.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { FolderKanban } from 'lucide-react'
 import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/task-page-github-status-actions'
+import type { TaskPageGitHubCloseAction } from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import { GHEditSectionStatusPopover } from './gh-edit-section-status-popover'
 import { GHEditSectionAssigneesColumn } from './gh-edit-section-assignees'
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.assignee-identity.test.tsx b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.assignee-identity.test.tsx
deleted file mode 100644
index 3dcd00abfeb..00000000000
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.assignee-identity.test.tsx
+++ /dev/null
@@ -1,304 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, useState } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubItemDialogProjectOrigin } from '../load-item-details/github-item-dialog-types'
-import { GHEditSection } from './gh-edit-section'
-import { resetTaskPageGitHubMutationRegistryForTests } from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
-
-const mocks = vi.hoisted(() => ({
-  update: vi.fn(),
-  patchWorkItem: vi.fn(),
-  patchProjectRowContent: vi.fn(),
-  recordFeatureInteraction: vi.fn(),
-  onMutated: vi.fn()
-}))
-
-vi.mock('@/store', () => {
-  const state = {
-    patchWorkItem: mocks.patchWorkItem,
-    patchProjectRowContent: mocks.patchProjectRowContent,
-    recordFeatureInteraction: mocks.recordFeatureInteraction,
-    repos: [],
-    settings: null
-  }
-  return {
-    useAppStore: Object.assign((selector: (value: typeof state) => unknown) => selector(state), {
-      getState: () => state
-    })
-  }
-})
-
-vi.mock('@/hooks/useIssueMetadata', async () => {
-  const { useImmediateMutation } = await import('@/hooks/useImmediateMutation')
-  return { useImmediateMutation }
-})
-vi.mock('@/hooks/useGitHubRepoMetadata', () => ({
-  useRepoLabels: () => ({ data: [] }),
-  useRepoAssignees: () => ({ data: [] })
-}))
-vi.mock('@/hooks/useGitHubSlugMetadata', () => ({
-  useRepoLabelsBySlug: () => ({ data: [] }),
-  useRepoAssigneesBySlug: () => ({ data: [] })
-}))
-vi.mock('@/components/github/github-duplicate-issue-candidates', () => ({
-  useGitHubDuplicateIssueCandidates: () => []
-}))
-vi.mock('@/components/github/github-work-item-edit-mutations', () => ({
-  runIssueUpdate: mocks.update
-}))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
-vi.mock('./gh-edit-section-horizontal', () => ({ GHEditSectionHorizontal: () => null }))
-vi.mock('./gh-edit-section-top-columns', () => ({
-  GHEditSectionTopColumns: ({
-    localAssignees,
-    onAssigneeToggle,
-    localState,
-    localLabels,
-    onStateChange,
-    onLabelToggle
-  }: {
-    localAssignees: string[]
-    onAssigneeToggle: (login: string) => void
-    localState: GitHubWorkItem['state']
-    localLabels: string[]
-    onStateChange: (state: 'open' | 'closed') => void
-    onLabelToggle: (label: string) => void
-  }) => (
-    <>
-      <output data-field="assignees">{localAssignees.join(',')}</output>
-      <output data-field="state">{localState}</output>
-      <output data-field="labels">{localLabels.join(',')}</output>
-      <button onClick={() => onAssigneeToggle('candidate-user')}>Assign candidate</button>
-      <button onClick={() => onAssigneeToggle('original-user')}>Toggle original</button>
-      <button onClick={() => onStateChange('closed')}>Close issue</button>
-      <button onClick={() => onLabelToggle('candidate-label')}>Toggle label</button>
-    </>
-  )
-}))
-
-const item: GitHubWorkItem = {
-  id: 'issue:5',
-  repoId: 'registered-repo',
-  type: 'issue',
-  number: 5,
-  title: 'Issue five',
-  state: 'open',
-  url: 'https://github.com/upstream/widgets/issues/5',
-  labels: [],
-  updatedAt: '',
-  author: null
-}
-let root: Root
-let container: HTMLDivElement
-
-async function render(
-  nextItem = item,
-  assignees: string[] = [],
-  projectOrigin?: GitHubItemDialogProjectOrigin
-): Promise<void> {
-  await act(async () => {
-    root.render(
-      <GHEditSection
-        item={nextItem}
-        repoPath={null}
-        repoId={nextItem.repoId}
-        projectOrigin={projectOrigin}
-        localState="open"
-        localLabels={[]}
-        onStateChange={() => {}}
-        onLabelsChange={() => {}}
-        onMutated={mocks.onMutated}
-        assignees={assignees}
-        onUse={() => {}}
-        layout="top-columns"
-      />
-    )
-  })
-}
-
-async function click(label = 'Assign candidate'): Promise<void> {
-  const button = [...container.querySelectorAll('button')].find(
-    (candidate) => candidate.textContent === label
-  )
-  expect(button).toBeDefined()
-  await act(async () => button?.click())
-}
-
-function selected(): string | null {
-  return container.querySelector('[data-field="assignees"]')?.textContent ?? null
-}
-
-let updateParentSelection: (nextItem: GitHubWorkItem) => void = () => {}
-
-function ParentSelection({ item }: { item: GitHubWorkItem }): React.JSX.Element {
-  const [localState, setLocalState] = useState(item.state)
-  const [localLabels, setLocalLabels] = useState(item.labels)
-  updateParentSelection = (nextItem) => {
-    setLocalState(nextItem.state)
-    setLocalLabels(nextItem.labels)
-  }
-  return (
-    <GHEditSection
-      item={item}
-      repoPath={null}
-      repoId={item.repoId}
-      projectOrigin={undefined}
-      localState={localState}
-      localLabels={localLabels}
-      onStateChange={setLocalState}
-      onLabelsChange={setLocalLabels}
-      onMutated={mocks.onMutated}
-      assignees={[]}
-      onUse={() => {}}
-      layout="top-columns"
-    />
-  )
-}
-
-async function renderParent(nextItem: GitHubWorkItem): Promise<void> {
-  await act(async () => {
-    updateParentSelection(nextItem)
-    root.render(<ParentSelection item={nextItem} />)
-  })
-}
-
-describe('opened issue assignee ownership', () => {
-  beforeEach(() => {
-    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
-    vi.clearAllMocks()
-    resetTaskPageGitHubMutationRegistryForTests()
-    updateParentSelection = () => {}
-    mocks.update.mockResolvedValue({ ok: true })
-    container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-  })
-
-  afterEach(() => {
-    act(() => root.unmount())
-    container.remove()
-    vi.unstubAllGlobals()
-    resetTaskPageGitHubMutationRegistryForTests()
-  })
-
-  it('retires an optimistic selection across fork and return navigation', async () => {
-    await render()
-    await click()
-    expect(selected()).toBe('candidate-user')
-    await render(item, [])
-    expect(selected()).toBe('candidate-user')
-
-    await render({ ...item, url: 'https://github.com/fork/widgets/issues/5' }, ['fork-user'])
-    expect(selected()).toBe('fork-user')
-    await render(item, ['authoritative-upstream-user'])
-    expect(selected()).toBe('authoritative-upstream-user')
-  })
-
-  it.each(['Assign candidate', 'Toggle original'])(
-    'does not roll a late failed %s edit into another opened issue',
-    async (button) => {
-      let rejectUpdate: (reason: Error) => void = () => {}
-      mocks.update.mockImplementation(
-        () =>
-          new Promise((_resolve, reject) => {
-            rejectUpdate = reject
-          })
-      )
-      await render(item, ['original-user'])
-      await click(button)
-      await render({ ...item, id: 'issue:6', number: 6 }, ['other-issue-user'])
-      expect(selected()).toBe('other-issue-user')
-      await act(async () => rejectUpdate(new Error('held edit failed')))
-      expect(selected()).toBe('other-issue-user')
-    }
-  )
-
-  it('still rolls back a failed edit while its issue remains open', async () => {
-    mocks.update.mockRejectedValue(new Error('edit failed'))
-    await render(item, ['original-user'])
-    await click()
-    expect(selected()).toBe('original-user')
-    await render(item, ['refetched-user'])
-    expect(selected()).toBe('refetched-user')
-  })
-
-  it('keeps a late Project-row rollback scoped to the captured row', async () => {
-    const projectOrigin: GitHubItemDialogProjectOrigin = {
-      owner: 'upstream',
-      repo: 'widgets',
-      number: 5,
-      type: 'issue',
-      projectId: 'project',
-      projectItemId: 'upstream-row',
-      cacheKey: 'upstream-cache'
-    }
-    let rejectUpdate: (reason: Error) => void = () => {}
-    mocks.update.mockImplementation(
-      () =>
-        new Promise((_resolve, reject) => {
-          rejectUpdate = reject
-        })
-    )
-    await render(item, ['original-user'], projectOrigin)
-    await click()
-    await render(item, ['fork-user'], {
-      ...projectOrigin,
-      owner: 'fork',
-      projectItemId: 'fork-row',
-      cacheKey: 'fork-cache'
-    })
-    expect(selected()).toBe('fork-user')
-    await act(async () => rejectUpdate(new Error('held Project edit failed')))
-    expect(selected()).toBe('fork-user')
-    expect(mocks.patchProjectRowContent).toHaveBeenLastCalledWith(
-      'upstream-cache',
-      'upstream-row',
-      { assignees: ['original-user'] }
-    )
-  })
-
-  it.each([
-    { button: 'Toggle label', field: 'labels', expected: 'fork-only-label' },
-    { button: 'Close issue', field: 'state', expected: 'closed' }
-  ])(
-    'a late failed $field edit cannot overwrite the new parent selection',
-    async ({ button, field, expected }) => {
-      let rejectUpdate: (reason: Error) => void = () => {}
-      mocks.update.mockImplementation(
-        () =>
-          new Promise((_resolve, reject) => {
-            rejectUpdate = reject
-          })
-      )
-      await renderParent({ ...item, labels: ['upstream-original-label'] })
-      await click(button)
-      await renderParent({
-        ...item,
-        state: 'closed',
-        url: 'https://github.com/fork/widgets/issues/5',
-        labels: ['fork-only-label']
-      })
-      expect(container.querySelector(`[data-field="${field}"]`)?.textContent).toBe(expected)
-      await act(async () => rejectUpdate(new Error('held edit failed')))
-      expect(container.querySelector(`[data-field="${field}"]`)?.textContent).toBe(expected)
-      // A failed edit without a tracked owner never touched other copies, so it has nothing to undo there.
-      expect(mocks.patchWorkItem).not.toHaveBeenCalled()
-    }
-  )
-
-  it.each([
-    { button: 'Toggle label', field: 'labels', expected: 'upstream-original-label' },
-    { button: 'Close issue', field: 'state', expected: 'open' }
-  ])(
-    'a same-item failed $field edit still restores its prior parent value',
-    async ({ button, field, expected }) => {
-      mocks.update.mockRejectedValue(new Error('same issue edit failed'))
-      await renderParent({ ...item, labels: ['upstream-original-label'] })
-      await click(button)
-      expect(container.querySelector(`[data-field="${field}"]`)?.textContent).toBe(expected)
-    }
-  )
-})
diff --git a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.tsx b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.tsx
index 605f411c3c2..5705223ec65 100644
--- a/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.tsx
+++ b/src/renderer/src/components/github-item-dialog/edit-item-fields/gh-edit-section.tsx
@@ -11,7 +11,7 @@ import {
   getTaskPageGitHubDuplicateTargetErrorMessage,
   validateTaskPageGitHubDuplicateTarget,
   type TaskPageGitHubCloseAction
-} from '@/components/task-page/github/task-page-github-status-actions'
+} from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { parseGitHubItemRepository as parseOwnerRepoFromItemUrl } from '../../../../../shared/github/work-items/work-item-target'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx b/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx
index 25b2f8e94ea..10964d3108d 100644
--- a/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx
+++ b/src/renderer/src/components/github-item-dialog/land-pull-request/pr-actions-panel.tsx
@@ -22,7 +22,7 @@ import {
   getPullRequestMergeMethodLabel,
   getPullRequestStateConfirmationTitle
 } from '@/components/github/pull-request-confirmation-copy'
-import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/task-page-github-dialog-state-authority'
+import { assertTaskPageGitHubDialogStateAuthority } from '@/components/task-page/github/mutations/task-page-github-dialog-state-authority'
 import { resolvePullRequestRepo } from '@/components/github/github-work-item-identity'
 import { notifyWorkItemDetailsMutation } from '@/components/github/github-work-item-comment-mutations'
 import { runPullRequestStateUpdate } from '@/components/github/github-work-item-edit-mutations'
diff --git a/src/renderer/src/components/github/github-image-upload.ts b/src/renderer/src/components/github/github-image-upload.ts
index 7e615d7363d..58566c2ce90 100644
--- a/src/renderer/src/components/github/github-image-upload.ts
+++ b/src/renderer/src/components/github/github-image-upload.ts
@@ -1,11 +1,11 @@
-import type { GitHubAttachmentTarget } from '../../../../shared/rpc-contract/github-attachment-params'
+import type { GitHubAttachmentTarget } from '../../../../shared/rpc-contract/github/github-attachment-params'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type { RuntimeStatus } from '../../../../shared/runtime-types'
 import {
   assertGitHubImage,
   GITHUB_IMAGE_ATTACHMENT_CAPABILITY
 } from '../../../../shared/github/attachments/image-attachment'
-import { CLIPBOARD_IMAGE_UPLOAD_CHUNK_BASE64_CHARS } from '../../../../shared/rpc-contract/clipboard-params'
+import { CLIPBOARD_IMAGE_UPLOAD_CHUNK_BASE64_CHARS } from '../../../../shared/rpc-contract/clipboard/clipboard-params'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
diff --git a/src/renderer/src/components/github/work-item-state-presentation.tsx b/src/renderer/src/components/github/work-item-state-presentation.tsx
index 425312e3c59..2174d933430 100644
--- a/src/renderer/src/components/github/work-item-state-presentation.tsx
+++ b/src/renderer/src/components/github/work-item-state-presentation.tsx
@@ -3,7 +3,7 @@ import { GitHubUserAvatar } from '@/components/github/github-user-avatar'
 import type { GitHubAssignableUser } from '../../../../shared/github/pull-requests/pull-request-types'
 import type { GitHubWorkItem } from '../../../../shared/github/work-items/work-item-types'
 import { formatUiRelativeTimeFromDate } from '@/i18n/relative-time-format'
-import { getTaskPageGitHubWorkItemStateLabel } from '@/components/task-page/github/task-page-github-work-item-status'
+import { getTaskPageGitHubWorkItemStateLabel } from '@/components/task-page/github/listing/task-page-github-work-item-status'
 import type { Translate } from '@/i18n/use-translate'
 
 export function formatRelativeTime(input: string, intlLocale?: string): string {
diff --git a/src/renderer/src/components/integrations/source-control/integrations-pane-status.ts b/src/renderer/src/components/integrations/source-control/integrations-pane-status.ts
index 6938721287f..f1fd9fafee5 100644
--- a/src/renderer/src/components/integrations/source-control/integrations-pane-status.ts
+++ b/src/renderer/src/components/integrations/source-control/integrations-pane-status.ts
@@ -1,4 +1,4 @@
-import type { PreflightStatus } from '../../../../../preload/api/preflight-api'
+import type { PreflightStatus } from '../../../../../preload/api/preflight/preflight-api'
 
 export type GhStatus = 'checking' | 'connected' | 'not-installed' | 'not-authenticated'
 export type GlabStatus = GhStatus
diff --git a/src/renderer/src/components/jira-key-or-text-search.ts b/src/renderer/src/components/jira-key-or-text-search.ts
index 9d5950ed62d..df6e586bad1 100644
--- a/src/renderer/src/components/jira-key-or-text-search.ts
+++ b/src/renderer/src/components/jira-key-or-text-search.ts
@@ -3,7 +3,7 @@ import {
   buildJiraIssueKeyJql,
   buildJiraTextMatchJql
 } from '../../../shared/jira/jira-search-input-jql'
-import { getJiraBadRequestReason } from './task-page/jira/task-page-jira-load-state'
+import { getJiraBadRequestReason } from './task-page/jira/listing/task-page-jira-load-state'
 
 export async function searchJiraIssuesByKeyOrText(
   input: string,
diff --git a/src/renderer/src/components/native-chat/composer/submit/native-chat-structured-composer-dispatch.ts b/src/renderer/src/components/native-chat/composer/submit/native-chat-structured-composer-dispatch.ts
index cdba41b1d87..db9fbec3e35 100644
--- a/src/renderer/src/components/native-chat/composer/submit/native-chat-structured-composer-dispatch.ts
+++ b/src/renderer/src/components/native-chat/composer/submit/native-chat-structured-composer-dispatch.ts
@@ -1,6 +1,6 @@
 import { agentSessionInteractionCommand } from '../../../../../../shared/agent-session/options/agent-session-interaction-mode'
 import type { AgentJournalSkillRef } from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import { structuredAgentSessionBlocksTooLarge } from '../../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksTooLarge } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { structuredAgentSessionSendBody } from '../../../../../../shared/agent-session/requests/structured-agent-session-send-mutation'
 import { AGENT_SESSION_MESSAGE_TOO_LARGE_PARTS } from '../../../../../../shared/agent-session/failures/agent-session-refusal-notice'
 import { agentSessionWriteNoticeText } from '../../messages/notices/agent-session-write-notice-text'
diff --git a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts
index da38e3036ca..c0fbb53d8d1 100644
--- a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts
+++ b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-send.ts
@@ -7,7 +7,7 @@ import { mayHoldAgentReferences } from '../../../../../../shared/orchestration/m
 import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog'
 import { formatAgentTypeLabel } from '../../../../../../shared/agent-status/presentation/agent-type-label'
 import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config'
-import { MAX_SKILL_REFS } from '../../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { MAX_SKILL_REFS } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { SkillRefLimitError } from '../../../../../../shared/agent-session/requests/structured-agent-session-send-mutation'
 import {
   promptHasInteractionModeSkill,
diff --git a/src/renderer/src/components/native-chat/media/visuals/native-chat-visual-read-client.ts b/src/renderer/src/components/native-chat/media/visuals/native-chat-visual-read-client.ts
index e0f0a85716e..5e7c0d36697 100644
--- a/src/renderer/src/components/native-chat/media/visuals/native-chat-visual-read-client.ts
+++ b/src/renderer/src/components/native-chat/media/visuals/native-chat-visual-read-client.ts
@@ -6,7 +6,7 @@ import {
   AGENT_SESSION_VISUAL_READ_ERRORS,
   type AgentSessionReadVisualResult,
   type AgentSessionVisualReadError
-} from '../../../../../../shared/rpc-contract/agent-session-visual-params'
+} from '../../../../../../shared/rpc-contract/structured-agent-session/agent-session-visual-params'
 
 export type NativeChatVisualIdentity = {
   target: RuntimeClientTarget
diff --git a/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.ts b/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.ts
index e45fd4d8aa3..0ce061a9c15 100644
--- a/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.ts
+++ b/src/renderer/src/components/native-chat/paste/use-native-chat-pasted-text-file.ts
@@ -11,7 +11,7 @@ import { useCallback } from 'react'
 import { translate } from '@/i18n/i18n'
 import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
 import { isNativeChatLongPaste } from '../../../../../shared/native-chat/input/native-chat-long-paste'
-import { structuredAgentSessionBlocksTooLarge } from '../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksTooLarge } from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { structuredAgentSessionSendBody } from '../../../../../shared/agent-session/requests/structured-agent-session-send-mutation'
 import { imageReferencesToPromptMarkers } from '../../../../../shared/native-chat/transcript/native-chat-image-transcript-markers'
 import {
diff --git a/src/renderer/src/components/native-chat/queue/editing/structured-queued-edit.test-fixture.tsx b/src/renderer/src/components/native-chat/queue/editing/structured-queued-edit.test-fixture.tsx
index edf33049293..ed4f6bd5aeb 100644
--- a/src/renderer/src/components/native-chat/queue/editing/structured-queued-edit.test-fixture.tsx
+++ b/src/renderer/src/components/native-chat/queue/editing/structured-queued-edit.test-fixture.tsx
@@ -1,5 +1,5 @@
 import type * as StructuredAgentSessionCall from '@/runtime/native-chat/requests/structured-agent-session-call'
-import { QueuedMessageUpdateParams } from '../../../../../../shared/rpc-contract/structured-agent-session-queued-edit-params'
+import { QueuedMessageUpdateParams } from '../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params'
 import { queuedMessageWithEdit } from '../../../../../../shared/queued-message-edit'
 // @vitest-environment happy-dom
 
diff --git a/src/renderer/src/components/native-chat/session/structured/delivery/structured-agent-session-send-attempt.ts b/src/renderer/src/components/native-chat/session/structured/delivery/structured-agent-session-send-attempt.ts
index d5032658c90..d699e673151 100644
--- a/src/renderer/src/components/native-chat/session/structured/delivery/structured-agent-session-send-attempt.ts
+++ b/src/renderer/src/components/native-chat/session/structured/delivery/structured-agent-session-send-attempt.ts
@@ -12,7 +12,7 @@ import {
 } from '../../../../../../../shared/agent-session/failures/agent-session-refusal-notice'
 import type { AgentSessionWriteNoticePart } from '../../../../../../../shared/agent-session/failures/agent-session-write-notice-copy'
 import { structuredAgentSessionMessageSendMutation } from '../../../../../../../shared/agent-session/requests/structured-agent-session-send-mutation'
-import { structuredAgentSessionBlocksTooLarge } from '../../../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksTooLarge } from '../../../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { AGENT_SESSION_SEND_SKILLS_RUNTIME_CAPABILITY } from '../../../../../../../shared/agent-session/agent-session-create-capabilities'
 import {
   structuredAgentSessionSendEvidence,
diff --git a/src/renderer/src/components/native-chat/session/structured/writes/structured-conversation-command-send.ts b/src/renderer/src/components/native-chat/session/structured/writes/structured-conversation-command-send.ts
index a9ea1043cf3..47393d78008 100644
--- a/src/renderer/src/components/native-chat/session/structured/writes/structured-conversation-command-send.ts
+++ b/src/renderer/src/components/native-chat/session/structured/writes/structured-conversation-command-send.ts
@@ -24,6 +24,7 @@ import {
   type StructuredConversationCommandHold
 } from '../../../../../../../shared/structured-conversation-command-hold'
 import type { StructuredAgentSessionWriteOutcome } from './use-structured-agent-session-mutate'
+import { structuredAgentSessionCommandWriteRefusalCause } from '../../../../../../../shared/agent-session/failures/structured-agent-session-command-refusal-cause'
 
 type CommandOutcome = Omit<StructuredAgentSessionCommandOutcome, 'handled'>
 
@@ -81,7 +82,10 @@ export async function sendStructuredConversationCommand(input: {
     input.onSent?.()
     const outcome = await sending
     if (outcome.kind === 'not-done') {
-      return { accepted: false, error: outcome.notice }
+      return refused(
+        outcome.notice,
+        structuredAgentSessionCommandWriteRefusalCause(outcome.failure)
+      )
     }
     // The pane stopped waiting on this reply (closed, left the chat, or sent a newer command).
     if (outcome.kind === 'dropped') {
@@ -160,12 +164,12 @@ export function structuredConversationCommandRunner(args: {
       agentName: args.agentName,
       pending: args.pending,
       hold: structuredConversationCommandHold({
+        command,
         waitsInLine,
         agentWorking,
         promptPending,
-        // A rewind on its way holds a command as background work does, in the same words.
-        backgroundTasksRunning:
-          args.chat.backgroundTasks.isMonitoring || args.rewindInFlight.current,
+        backgroundTasksRunning: args.chat.backgroundTasks.isMonitoring,
+        rewindInFlight: args.rewindInFlight.current,
         sendPending
       }),
       causes,
diff --git a/src/renderer/src/components/native-chat/session/terminal/read/native-chat-runtime-contract.ts b/src/renderer/src/components/native-chat/session/terminal/read/native-chat-runtime-contract.ts
index aba4d65b7bf..97b5b9c50a3 100644
--- a/src/renderer/src/components/native-chat/session/terminal/read/native-chat-runtime-contract.ts
+++ b/src/renderer/src/components/native-chat/session/terminal/read/native-chat-runtime-contract.ts
@@ -1,7 +1,7 @@
 import type {
   NativeChatAppendedMessages,
   NativeChatReadSessionResult
-} from '../../../../../../../preload/api/native-chat-api'
+} from '../../../../../../../preload/api/native-chat/native-chat-api'
 import type { NativeChatTurnLifecycle } from '../../../../../../../shared/native-chat/native-chat-types'
 import { translate } from '@/i18n/i18n'
 
diff --git a/src/renderer/src/components/native-chat/session/terminal/read/native-chat-session-transport.ts b/src/renderer/src/components/native-chat/session/terminal/read/native-chat-session-transport.ts
index e9d174b708c..f8752980d5e 100644
--- a/src/renderer/src/components/native-chat/session/terminal/read/native-chat-session-transport.ts
+++ b/src/renderer/src/components/native-chat/session/terminal/read/native-chat-session-transport.ts
@@ -1,7 +1,7 @@
 import type {
   NativeChatApi,
   NativeChatAppendedMessages
-} from '../../../../../../../preload/api/native-chat-api'
+} from '../../../../../../../preload/api/native-chat/native-chat-api'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
diff --git a/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx b/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx
index 1c53ea2a44b..8fb6f802a35 100644
--- a/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx
+++ b/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx
@@ -1,10 +1,12 @@
 import { useEffect, useState, useSyncExternalStore } from 'react'
+import { toast } from 'sonner'
 import { BrowserFavicon } from '@/components/browser-favicon'
 import { useTranslate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store'
 import { findPage } from '@/store/slices/browser/pages/browser-page-records'
 import { findBrowserWorkspaceForRemotePage } from '@/runtime/web-session-tabs-sync/mirrored-browser-tabs'
 import { activateBrowserPagePaletteResult } from '@/lib/browser/palette/browser-page-palette-activation'
+import { browserPageActivationFailureMessage } from '@/components/tab-bar/open-tab-selection-routing'
 import { useLastBrowserAgentPageId } from '../../../browser-pane/agent-cursor/browser-agent-activity-state'
 import {
   useNativeChatVisualOwner,
@@ -160,13 +162,18 @@ function BrowserPageButton({
       aria-label={t('components.native-chat.tool.showBrowserPageLabel', 'Show {{value0}}', {
         value0: title
       })}
-      onClick={() =>
-        activateBrowserPagePaletteResult({
+      onClick={() => {
+        const activation = activateBrowserPagePaletteResult({
           pageId: page.id,
           workspaceId: page.workspaceId,
           worktreeId: page.worktreeId
         })
-      }
+        // A blocked activation already told the user why.
+        if (activation.status !== 'failed') {
+          return
+        }
+        toast.error(browserPageActivationFailureMessage(activation.reason))
+      }}
     >
       <BrowserFavicon faviconUrl={page.faviconUrl} className="size-3.5" />
       {t('components.native-chat.tool.showBrowserPage', 'Show')}
diff --git a/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx b/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
index 11e7d89a4a4..bd3c616b632 100644
--- a/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
+++ b/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
@@ -1,5 +1,5 @@
 import { AlertTriangle, CircleAlert } from 'lucide-react'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
diff --git a/src/renderer/src/components/plugins/catalog/PluginCatalogHighlights.fixture.tsx b/src/renderer/src/components/plugins/catalog/PluginCatalogHighlights.fixture.tsx
index e63598b1df8..43aa8fda3ae 100644
--- a/src/renderer/src/components/plugins/catalog/PluginCatalogHighlights.fixture.tsx
+++ b/src/renderer/src/components/plugins/catalog/PluginCatalogHighlights.fixture.tsx
@@ -1,4 +1,4 @@
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import { defineFixture } from '../../../component-fixtures/component-fixture'
 import { usePluginInstallCountsStore } from '@/store/plugins/installation/plugin-install-counts'
 import { PluginListGroup } from '../list/PluginListGroup'
diff --git a/src/renderer/src/components/plugins/catalog/plugin-catalog-highlights.test.ts b/src/renderer/src/components/plugins/catalog/plugin-catalog-highlights.test.ts
index afdf2bfdd33..5632caadd67 100644
--- a/src/renderer/src/components/plugins/catalog/plugin-catalog-highlights.test.ts
+++ b/src/renderer/src/components/plugins/catalog/plugin-catalog-highlights.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginListEntryFromListing, type PluginListEntry } from '../list/plugin-list-entries'
 import { pickFeaturedPlugins, pickNewlyAddedPlugins } from './plugin-catalog-highlights'
 
diff --git a/src/renderer/src/components/plugins/dialogs/PluginInstallDialog.tsx b/src/renderer/src/components/plugins/dialogs/PluginInstallDialog.tsx
index 5f1351a7df2..fbb5ce01d37 100644
--- a/src/renderer/src/components/plugins/dialogs/PluginInstallDialog.tsx
+++ b/src/renderer/src/components/plugins/dialogs/PluginInstallDialog.tsx
@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react'
 import { Loader2 } from 'lucide-react'
-import type { PluginHostInstallSource } from '../../../../../preload/api/plugin-host-api'
+import type { PluginHostInstallSource } from '../../../../../preload/api/plugins/plugin-host-api'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { Button } from '../../ui/button'
diff --git a/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx b/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx
index 8362ba2779d..81ce475a16c 100644
--- a/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx
+++ b/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx
@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react'
 import { Loader2, RefreshCw, Trash2 } from 'lucide-react'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '../../ui/button'
 import { Badge } from '../../ui/badge'
diff --git a/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.test.tsx b/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.test.tsx
index 70a637a0e83..d1b6f56fd68 100644
--- a/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.test.tsx
+++ b/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.test.tsx
@@ -4,7 +4,7 @@ import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
-import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginManifestSchema } from '../../../../../shared/plugins/manifest/plugin-manifest'
 import type { PluginCapabilityKind } from '../../../../../shared/plugins/capabilities/plugin-capabilities'
 import type { PluginListEntry } from '../list/plugin-list-entries'
diff --git a/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.tsx b/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.tsx
index 699f1c7a3d9..b764881d611 100644
--- a/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.tsx
+++ b/src/renderer/src/components/plugins/dialogs/PluginUpdateAllDialog.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useLayoutEffect, useRef, useState } from 'react'
 import { Loader2 } from 'lucide-react'
-import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugins/plugin-host-api'
 import { satisfiesOrcaEngineRange } from '../../../../../shared/plugins/manifest/plugin-manifest'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx b/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
index 81ace9ed222..eb196b82757 100644
--- a/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
+++ b/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
@@ -1,5 +1,5 @@
 import { ListFilter } from 'lucide-react'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '../../ui/button'
 import { Checkbox } from '../../ui/checkbox'
diff --git a/src/renderer/src/components/plugins/list/PluginListToolbar.tsx b/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
index 30e7b9ddda9..d8d566d3390 100644
--- a/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
+++ b/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
@@ -1,5 +1,5 @@
 import { RefreshCw } from 'lucide-react'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '../../ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '../../ui/tooltip'
diff --git a/src/renderer/src/components/plugins/list/PluginsSettingsSection.tsx b/src/renderer/src/components/plugins/list/PluginsSettingsSection.tsx
index c5714fc090c..8e7994de97e 100644
--- a/src/renderer/src/components/plugins/list/PluginsSettingsSection.tsx
+++ b/src/renderer/src/components/plugins/list/PluginsSettingsSection.tsx
@@ -1,7 +1,7 @@
 import { isPluginAutoUpdateOn } from '../../../../../shared/plugins/catalog/plugin-update-policy'
 import { useEffect, useEffectEvent, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import type { PluginHostInstallSource } from '../../../../../preload/api/plugin-host-api'
+import type { PluginHostInstallSource } from '../../../../../preload/api/plugins/plugin-host-api'
 import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
 import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/plugins/list/plugin-list-entries.test.ts b/src/renderer/src/components/plugins/list/plugin-list-entries.test.ts
index ae129d7ac73..f42ffa98a9e 100644
--- a/src/renderer/src/components/plugins/list/plugin-list-entries.test.ts
+++ b/src/renderer/src/components/plugins/list/plugin-list-entries.test.ts
@@ -3,7 +3,7 @@ import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-l
 import type {
   PluginMarketplaceHostListing,
   PluginMarketplaceHostSourceState
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { buildPluginListEntries } from './plugin-list-entries'
 
 function listing(pluginKey: string, extra: Partial<PluginMarketplaceHostListing> = {}) {
diff --git a/src/renderer/src/components/plugins/list/plugin-list-entries.ts b/src/renderer/src/components/plugins/list/plugin-list-entries.ts
index 355d7fdacb1..764aa305102 100644
--- a/src/renderer/src/components/plugins/list/plugin-list-entries.ts
+++ b/src/renderer/src/components/plugins/list/plugin-list-entries.ts
@@ -2,7 +2,7 @@ import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-l
 import type {
   PluginMarketplaceHostListing,
   PluginMarketplaceHostSourceState
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { satisfiesOrcaEngineRange } from '../../../../../shared/plugins/manifest/plugin-manifest'
 import {
   pluginCatalogReleaseTypes,
diff --git a/src/renderer/src/components/plugins/list/plugin-public-catalog.ts b/src/renderer/src/components/plugins/list/plugin-public-catalog.ts
index 295cd45bf11..e8adea073ff 100644
--- a/src/renderer/src/components/plugins/list/plugin-public-catalog.ts
+++ b/src/renderer/src/components/plugins/list/plugin-public-catalog.ts
@@ -1,7 +1,7 @@
 import type {
   PluginMarketplaceHostListing,
   PluginMarketplaceHostSourceState
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import {
   isOfficialMarketplaceGitSource,
   isSameGitRepository
diff --git a/src/renderer/src/components/plugins/page/PluginAddsSection.tsx b/src/renderer/src/components/plugins/page/PluginAddsSection.tsx
index df3ee47e8ec..425d8c7543b 100644
--- a/src/renderer/src/components/plugins/page/PluginAddsSection.tsx
+++ b/src/renderer/src/components/plugins/page/PluginAddsSection.tsx
@@ -16,7 +16,7 @@ import {
   Type
 } from 'lucide-react'
 import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
-import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugins/plugin-host-api'
 import { formatKeybinding } from '../../../../../shared/keybindings/formatting'
 import type { PluginCatalogType } from '../../../../../shared/plugins/catalog/plugin-catalog-release'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/plugins/page/PluginDetailPage.fixture.tsx b/src/renderer/src/components/plugins/page/PluginDetailPage.fixture.tsx
index af29f4412fa..3bdd94643fe 100644
--- a/src/renderer/src/components/plugins/page/PluginDetailPage.fixture.tsx
+++ b/src/renderer/src/components/plugins/page/PluginDetailPage.fixture.tsx
@@ -1,4 +1,4 @@
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import { defineFixture } from '../../../component-fixtures/component-fixture'
 import { usePluginInstallCountsStore } from '@/store/plugins/installation/plugin-install-counts'
 import {
diff --git a/src/renderer/src/components/plugins/page/PluginDetailPage.test.tsx b/src/renderer/src/components/plugins/page/PluginDetailPage.test.tsx
index 3ecc8c94bcd..4a312c6bab9 100644
--- a/src/renderer/src/components/plugins/page/PluginDetailPage.test.tsx
+++ b/src/renderer/src/components/plugins/page/PluginDetailPage.test.tsx
@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
   PluginMarketplaceHostInstallPreview,
   PluginMarketplaceHostListing
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { usePluginSyntaxFailureStore } from '@/store/plugins/syntax/plugin-syntax-failures'
 import { usePluginSyntaxStore } from '@/store/plugins/syntax/plugin-syntax-packs'
 import { usePluginThemeStore } from '@/store/plugins/appearance/plugin-themes'
diff --git a/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts b/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
index a6a2b2f6ba1..84943b8e1db 100644
--- a/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
+++ b/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
@@ -1,5 +1,5 @@
 import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import {
   pluginExecutionProfile,
   type PluginExecutionProfile
diff --git a/src/renderer/src/components/plugins/presentation/plugin-install-trust.ts b/src/renderer/src/components/plugins/presentation/plugin-install-trust.ts
index b17c458acd1..a18a49ac9fa 100644
--- a/src/renderer/src/components/plugins/presentation/plugin-install-trust.ts
+++ b/src/renderer/src/components/plugins/presentation/plugin-install-trust.ts
@@ -2,7 +2,7 @@ import type {
   PluginHostInstallSource,
   PluginMarketplaceHostInstallPreview,
   PluginMarketplaceHostListing
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginExecutionProfile } from '../../../../../shared/plugins/contributions/plugin-execution-profile'
 import { splitQualifiedPluginKey } from '../../../../../shared/plugins/catalog/plugin-marketplace'
 import { pluginRepositoryOrigin } from '../../../../../shared/plugins/catalog/plugin-repository-link'
diff --git a/src/renderer/src/components/plugins/review/PluginUpdateCandidate.tsx b/src/renderer/src/components/plugins/review/PluginUpdateCandidate.tsx
index 371aac0478e..9231f48b408 100644
--- a/src/renderer/src/components/plugins/review/PluginUpdateCandidate.tsx
+++ b/src/renderer/src/components/plugins/review/PluginUpdateCandidate.tsx
@@ -1,5 +1,5 @@
 import { Check, ChevronDown } from 'lucide-react'
-import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginExecutionProfile } from '../../../../../shared/plugins/contributions/plugin-execution-profile'
 import {
   pluginCapabilityReachable,
diff --git a/src/renderer/src/components/plugins/review/PluginUpdateReview.tsx b/src/renderer/src/components/plugins/review/PluginUpdateReview.tsx
index 4dd43a8f758..b2180a6c6e9 100644
--- a/src/renderer/src/components/plugins/review/PluginUpdateReview.tsx
+++ b/src/renderer/src/components/plugins/review/PluginUpdateReview.tsx
@@ -1,5 +1,5 @@
 import { ArrowRight } from 'lucide-react'
-import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostInstallPreview } from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginExecutionProfile } from '../../../../../shared/plugins/contributions/plugin-execution-profile'
 import { reachablePluginCapabilities } from '../../../../../shared/plugins/capabilities/plugin-capability-reach'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/plugins/state/plugin-preview-cache.ts b/src/renderer/src/components/plugins/state/plugin-preview-cache.ts
index 43f5401e0cd..75da3e3b177 100644
--- a/src/renderer/src/components/plugins/state/plugin-preview-cache.ts
+++ b/src/renderer/src/components/plugins/state/plugin-preview-cache.ts
@@ -1,4 +1,4 @@
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import type { PluginPagePreview } from './use-plugin-catalog'
 
 /** Plugins whose preview one Settings visit keeps; each holds a parsed manifest. */
diff --git a/src/renderer/src/components/plugins/state/use-plugin-art-palettes.ts b/src/renderer/src/components/plugins/state/use-plugin-art-palettes.ts
index 1653258bd2e..e1d32b15566 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-art-palettes.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-art-palettes.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import { usePluginTerminalThemes, usePluginThemes } from '@/store/plugins/appearance/plugin-themes'
 import type { PluginArtPalette } from '../list/PluginCardArt'
 
diff --git a/src/renderer/src/components/plugins/state/use-plugin-catalog.ts b/src/renderer/src/components/plugins/state/use-plugin-catalog.ts
index 139c996ba5f..7f2976dbf84 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-catalog.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-catalog.ts
@@ -3,7 +3,7 @@ import type {
   PluginMarketplaceHostInstallPreview,
   PluginMarketplaceHostListing,
   PluginMarketplaceHostSourceState
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { usePluginPreviewRequestStore } from '@/store/plugins/navigation/plugin-preview-request'
diff --git a/src/renderer/src/components/plugins/state/use-plugin-hover-prefetch.ts b/src/renderer/src/components/plugins/state/use-plugin-hover-prefetch.ts
index 035ccb780de..5b966daf67d 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-hover-prefetch.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-hover-prefetch.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef } from 'react'
-import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../preload/api/plugins/plugin-host-api'
 import type { PluginPagePreview } from './use-plugin-catalog'
 
 /** Pointer rest before a hover counts as intent. */
diff --git a/src/renderer/src/components/plugins/state/use-plugin-install-action.ts b/src/renderer/src/components/plugins/state/use-plugin-install-action.ts
index 7aa390a7ad0..83864da1311 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-install-action.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-install-action.ts
@@ -3,7 +3,7 @@ import { toast } from 'sonner'
 import type {
   PluginMarketplaceHostInstallPreview,
   PluginMarketplaceHostListing
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginExecutionProfile } from '../../../../../shared/plugins/contributions/plugin-execution-profile'
 import { translate } from '@/i18n/i18n'
 import { pluginInstallErrorMessage } from '../presentation/plugin-error-presentation'
diff --git a/src/renderer/src/components/plugins/state/use-plugin-install-link.test.tsx b/src/renderer/src/components/plugins/state/use-plugin-install-link.test.tsx
index 10f6017c80a..5f14f142593 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-install-link.test.tsx
+++ b/src/renderer/src/components/plugins/state/use-plugin-install-link.test.tsx
@@ -3,7 +3,7 @@
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { parsePluginInstallLink } from '../../../../../shared/plugins/catalog/plugin-install-link'
 import { usePluginPreviewRequestStore } from '@/store/plugins/navigation/plugin-preview-request'
 import { usePluginInstallLink } from './use-plugin-install-link'
diff --git a/src/renderer/src/components/plugins/state/use-plugin-install-link.ts b/src/renderer/src/components/plugins/state/use-plugin-install-link.ts
index 6e30f077d07..46a3a8a5707 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-install-link.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-install-link.ts
@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect, useRef } from 'react'
-import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api/plugins/plugin-host-api'
 import { isSameGitRepository } from '../../../../../shared/plugins/catalog/plugin-marketplace'
 import type { PluginInstallLinkCatalog } from '../../../../../shared/plugins/catalog/plugin-install-link'
 import { usePluginPreviewRequestStore } from '@/store/plugins/navigation/plugin-preview-request'
diff --git a/src/renderer/src/components/plugins/state/use-plugin-logs.ts b/src/renderer/src/components/plugins/state/use-plugin-logs.ts
index 79856bf4b20..ff9cf9033c9 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-logs.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-logs.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState, type MutableRefObject } from 'react'
 import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
-import type { PluginHostLogLine } from '../../../../../preload/api/plugin-host-api'
+import type { PluginHostLogLine } from '../../../../../preload/api/plugins/plugin-host-api'
 import { useTranslate } from '@/i18n/use-translate'
 
 export type PluginLogsState = {
diff --git a/src/renderer/src/components/plugins/state/use-plugin-page-model.ts b/src/renderer/src/components/plugins/state/use-plugin-page-model.ts
index d16846e4ce4..960c565398b 100644
--- a/src/renderer/src/components/plugins/state/use-plugin-page-model.ts
+++ b/src/renderer/src/components/plugins/state/use-plugin-page-model.ts
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import type {
   PluginMarketplaceHostInstallPreview,
   PluginMarketplaceHostListing
-} from '../../../../../preload/api/plugin-host-api'
+} from '../../../../../preload/api/plugins/plugin-host-api'
 import { pluginExecutionProfile } from '../../../../../shared/plugins/contributions/plugin-execution-profile'
 import { PLUGIN_CONTRIBUTION_SUMMARY_LIMIT } from '../../../../../shared/plugins/contributions/plugin-contribution-summary'
 import {
diff --git a/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.test.ts b/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.test.ts
index e280dc42517..204fe76a2e6 100644
--- a/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.test.ts
+++ b/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { PluginMarketplaceHostListing } from '../../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../../preload/api/plugins/plugin-host-api'
 import { catalogAppThemes } from './use-catalog-app-themes'
 
 function themeListing(
diff --git a/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.ts b/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.ts
index de88637b39c..f0c29ff920e 100644
--- a/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.ts
+++ b/src/renderer/src/components/settings/appearance/themes/use-catalog-app-themes.ts
@@ -1,6 +1,6 @@
 import { useCallback, useMemo, useRef, useState } from 'react'
 import type { PluginHostListEntry } from '../../../../../../shared/plugins/plugin-list-entry'
-import type { PluginMarketplaceHostListing } from '../../../../../../preload/api/plugin-host-api'
+import type { PluginMarketplaceHostListing } from '../../../../../../preload/api/plugins/plugin-host-api'
 import type { PluginThemeRegistration } from '../../../../../../shared/plugins/artifacts/plugin-theme-artifact'
 import { pluginHostVersion } from '../../../../../../shared/plugins/installation/plugin-host-version'
 import { buildPluginListEntries, needsNewerOrca } from '../../../plugins/list/plugin-list-entries'
diff --git a/src/renderer/src/components/settings/privacy/PrivacyDiagnosticBundleControls.tsx b/src/renderer/src/components/settings/privacy/PrivacyDiagnosticBundleControls.tsx
index 0ef4ba2ddb9..90a1512e2e5 100644
--- a/src/renderer/src/components/settings/privacy/PrivacyDiagnosticBundleControls.tsx
+++ b/src/renderer/src/components/settings/privacy/PrivacyDiagnosticBundleControls.tsx
@@ -2,7 +2,7 @@ import { Check, Clipboard, Eye, FileText, Loader2, Trash2, UploadCloud, X } from
 import type {
   DiagnosticsBundlePayload,
   DiagnosticsStatusPayload
-} from '../../../../../preload/api/telemetry-api'
+} from '../../../../../preload/api/diagnostics/telemetry-api'
 import { Button } from '../../ui/button'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/settings/privacy/PrivacyDiagnosticsSection.tsx b/src/renderer/src/components/settings/privacy/PrivacyDiagnosticsSection.tsx
index 9aaba9f0165..bb888711409 100644
--- a/src/renderer/src/components/settings/privacy/PrivacyDiagnosticsSection.tsx
+++ b/src/renderer/src/components/settings/privacy/PrivacyDiagnosticsSection.tsx
@@ -4,7 +4,7 @@ import { FileText } from 'lucide-react'
 import type {
   DiagnosticsBundlePayload,
   DiagnosticsStatusPayload
-} from '../../../../../preload/api/telemetry-api'
+} from '../../../../../preload/api/diagnostics/telemetry-api'
 import { Label } from '../../ui/label'
 import {
   getDiagnosticBundleDescription,
diff --git a/src/renderer/src/components/settings/runtime-environments/managed-servers/runtime-install-server-dialog.tsx b/src/renderer/src/components/settings/runtime-environments/managed-servers/runtime-install-server-dialog.tsx
index 755381861bb..8859b64d041 100644
--- a/src/renderer/src/components/settings/runtime-environments/managed-servers/runtime-install-server-dialog.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/managed-servers/runtime-install-server-dialog.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useId, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-catalog.ts b/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-catalog.ts
index 0756cb41c0a..f037e1bc6f7 100644
--- a/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-catalog.ts
+++ b/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-catalog.ts
@@ -6,7 +6,7 @@ import {
   type PublicKnownRuntimeEnvironment
 } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { getManagedOrcadApi } from '@/runtime/hosts/installation/managed-orcad-api-availability'
 import { managedServerOutcomeLabel } from './managed-server-copy'
diff --git a/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-lifecycle.ts b/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-lifecycle.ts
index 9b4d9577801..6ed4ed2b1af 100644
--- a/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-lifecycle.ts
+++ b/src/renderer/src/components/settings/runtime-environments/managed-servers/use-managed-server-lifecycle.ts
@@ -8,7 +8,7 @@ import {
   type OrcadManagedRuntimeStatus
 } from '../../../../../../shared/orcad-managed-runtime'
 import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { managedServerOutcomeLabel } from './managed-server-copy'
 
diff --git a/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-list.tsx b/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-list.tsx
index c51da5ddc2e..510da8a1c71 100644
--- a/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-list.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-list.tsx
@@ -4,7 +4,7 @@ import {
   getOrcadSshDeployment,
   type PublicKnownRuntimeEnvironment
 } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import type { RemoteServerUpdateEntry } from '@/runtime/hosts/updates/remote-server-update-coordinator'
 import type { UpdateCheckOptions } from '../../../../../../shared/update-status-types'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-row.tsx b/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-row.tsx
index e9005b1d3db..ebcec1d91c9 100644
--- a/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-row.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/server-rows/runtime-server-row.tsx
@@ -5,7 +5,7 @@ import {
   type PublicKnownRuntimeEnvironment
 } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import type { RemoteServerUpdateEntry } from '@/runtime/hosts/updates/remote-server-update-coordinator'
 import type { UpdateCheckOptions } from '../../../../../../shared/update-status-types'
 import { getRuntimeServerProblemLine, getRuntimeServerRoute } from './runtime-server-row-meta'
diff --git a/src/renderer/src/components/settings/runtime-environments/ssh-access/RuntimeSshAccessControl.tsx b/src/renderer/src/components/settings/runtime-environments/ssh-access/RuntimeSshAccessControl.tsx
index 8c95f3c97d5..4ad765a4ab1 100644
--- a/src/renderer/src/components/settings/runtime-environments/ssh-access/RuntimeSshAccessControl.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/ssh-access/RuntimeSshAccessControl.tsx
@@ -3,7 +3,7 @@ import { useId, useState } from 'react'
 import { toast } from 'sonner'
 import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { useTranslate } from '@/i18n/use-translate'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../../shared/non-secure-context-uuid'
 import { Button } from '../../../ui/button'
diff --git a/src/renderer/src/components/settings/runtime-environments/ssh-access/runtime-ssh-access-dialog.tsx b/src/renderer/src/components/settings/runtime-environments/ssh-access/runtime-ssh-access-dialog.tsx
index 8ec9dc1d63e..04ffef6742c 100644
--- a/src/renderer/src/components/settings/runtime-environments/ssh-access/runtime-ssh-access-dialog.tsx
+++ b/src/renderer/src/components/settings/runtime-environments/ssh-access/runtime-ssh-access-dialog.tsx
@@ -1,6 +1,6 @@
 import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '../../../ui/button'
 import {
diff --git a/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.test.tsx b/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.test.tsx
index 79cc384e923..f7e088ac125 100644
--- a/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.test.tsx
+++ b/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.test.tsx
@@ -7,7 +7,7 @@ import type {
   OrcadDeltaMoveResult
 } from '../../../../../../shared/orcad-managed-runtime'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { SshHostDeltaMoveDialog } from './SshHostDeltaMoveDialog'
 
 vi.mock('../../../ui/dialog', () => ({
diff --git a/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.tsx b/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.tsx
index ef28a7a05fc..0d3e4105ad6 100644
--- a/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.tsx
+++ b/src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.tsx
@@ -2,7 +2,7 @@ import { Loader2 } from 'lucide-react'
 import { useEffect, useState } from 'react'
 import type { OrcadDeltaMovePreview } from '../../../../../../shared/orcad-managed-runtime'
 import type { SshTarget } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '../../../ui/button'
diff --git a/src/renderer/src/components/settings/ssh/server-actions/SshHostRecoverServerAction.tsx b/src/renderer/src/components/settings/ssh/server-actions/SshHostRecoverServerAction.tsx
index 77a5928661a..5283c83abcb 100644
--- a/src/renderer/src/components/settings/ssh/server-actions/SshHostRecoverServerAction.tsx
+++ b/src/renderer/src/components/settings/ssh/server-actions/SshHostRecoverServerAction.tsx
@@ -6,7 +6,7 @@ import {
   type OrcadStaleLockEvidence
 } from '../../../../../../shared/orcad-stale-lock-reclaim'
 import type { SshManagedServerStatus } from '../../../../../../shared/ssh-types'
-import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/runtime/managed-orcad-api'
 import { quotePosixShellUnlessPlain } from '../../../../../../shared/shell/launch/shell-argument-quoting'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { formatUiRelativeTime } from '@/i18n/relative-time-format'
diff --git a/src/renderer/src/components/settings/terminal/session-management/ManageSessionKillDialog.tsx b/src/renderer/src/components/settings/terminal/session-management/ManageSessionKillDialog.tsx
index 7f5d7d3f491..d03959953d7 100644
--- a/src/renderer/src/components/settings/terminal/session-management/ManageSessionKillDialog.tsx
+++ b/src/renderer/src/components/settings/terminal/session-management/ManageSessionKillDialog.tsx
@@ -1,5 +1,5 @@
 import { LoaderCircle } from 'lucide-react'
-import type { PtyManagementSession } from '../../../../../../preload/api/pty-management-api'
+import type { PtyManagementSession } from '../../../../../../preload/api/terminal/pty-management-api'
 import { Button } from '../../../ui/button'
 import {
   Dialog,
diff --git a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx
index a69db7c7ffc..73e5e8d6639 100644
--- a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx
+++ b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsSection.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import type { PtyManagementSession } from '../../../../../../preload/api/pty-management-api'
+import type { PtyManagementSession } from '../../../../../../preload/api/terminal/pty-management-api'
 import { SearchableSetting } from '../../section-layout/SearchableSetting'
 import { SettingsGroup } from '../../section-layout/SettingsGroup'
 import { getManageSessionsSearchEntries } from './manage-sessions-search'
diff --git a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsTable.tsx b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsTable.tsx
index 73eb3e9c06a..4977800e853 100644
--- a/src/renderer/src/components/settings/terminal/session-management/ManageSessionsTable.tsx
+++ b/src/renderer/src/components/settings/terminal/session-management/ManageSessionsTable.tsx
@@ -1,4 +1,4 @@
-import type { PtyManagementSession } from '../../../../../../preload/api/pty-management-api'
+import type { PtyManagementSession } from '../../../../../../preload/api/terminal/pty-management-api'
 import { LoaderCircle, RefreshCw, RotateCw, Trash2, X } from 'lucide-react'
 import { Button } from '../../../ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '../../../ui/tooltip'
diff --git a/src/renderer/src/components/settings/terminal/session-management/manage-sessions-format.ts b/src/renderer/src/components/settings/terminal/session-management/manage-sessions-format.ts
index 064a0cd4013..703af51794a 100644
--- a/src/renderer/src/components/settings/terminal/session-management/manage-sessions-format.ts
+++ b/src/renderer/src/components/settings/terminal/session-management/manage-sessions-format.ts
@@ -1,4 +1,4 @@
-import type { PtyManagementSession } from '../../../../../../preload/api/pty-management-api'
+import type { PtyManagementSession } from '../../../../../../preload/api/terminal/pty-management-api'
 import { splitWorktreeIdForFilesystem } from '../../../../../../shared/worktree/id'
 
 export function shortCwd(cwd: string): string {
diff --git a/src/renderer/src/components/settings/voice/use-voice-microphone-test.ts b/src/renderer/src/components/settings/voice/use-voice-microphone-test.ts
index 42cd4f27fab..908e25979d8 100644
--- a/src/renderer/src/components/settings/voice/use-voice-microphone-test.ts
+++ b/src/renderer/src/components/settings/voice/use-voice-microphone-test.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { DICTATION_SAMPLE_RATE } from '../../../../../shared/rpc-contract/speech-params'
+import { DICTATION_SAMPLE_RATE } from '../../../../../shared/rpc-contract/speech/speech-params'
 import {
   DEFAULT_DICTATION_METER,
   type DictationMeterState
diff --git a/src/renderer/src/components/shared/MacFolderAccessFixDialog.tsx b/src/renderer/src/components/shared/MacFolderAccessFixDialog.tsx
index 02a53a509f1..300d37997b3 100644
--- a/src/renderer/src/components/shared/MacFolderAccessFixDialog.tsx
+++ b/src/renderer/src/components/shared/MacFolderAccessFixDialog.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react'
 import { CircleCheck, CircleDashed, LoaderCircle } from 'lucide-react'
-import type { PtyManagementFolderAccessMismatch } from '../../../../preload/api/pty-management-api'
+import type { PtyManagementFolderAccessMismatch } from '../../../../preload/api/terminal/pty-management-api'
 import { isMacTccFolderClass } from '../../../../shared/daemon-adoption-telemetry'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/sidebar/SeveredTerminalDaemonBanner.tsx b/src/renderer/src/components/sidebar/SeveredTerminalDaemonBanner.tsx
index f0eaf47dcea..04a8dac752e 100644
--- a/src/renderer/src/components/sidebar/SeveredTerminalDaemonBanner.tsx
+++ b/src/renderer/src/components/sidebar/SeveredTerminalDaemonBanner.tsx
@@ -15,7 +15,7 @@ import { useTranslate, type Translate } from '@/i18n/use-translate'
 import type {
   PtyManagementSeveredDaemon,
   PtyManagementSeveredDaemonRestartResult
-} from '../../../../preload/api/pty-management-api'
+} from '../../../../preload/api/terminal/pty-management-api'
 
 const POLL_INTERVAL_MS = 60_000
 const DISMISSED_KEY = 'orca.severedTerminalDaemonBanner.dismissed'
diff --git a/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.test.tsx b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.test.tsx
new file mode 100644
index 00000000000..c5577ad4c87
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.test.tsx
@@ -0,0 +1,62 @@
+// @vitest-environment happy-dom
+import { act, useMemo } from 'react'
+import { cleanup, renderHook } from '@testing-library/react'
+import { afterEach, expect, it } from 'vitest'
+import { createProgrammaticScrollMarks } from '@/hooks/programmatic-scroll-marks'
+import { buildLineageRowProjection } from '../listing/lineage-row-projection'
+import { getRenderRowKey, type RenderRow } from '../listing/render-row'
+import { repo, worktree } from '../grouping/worktree-list-groups-test-fixtures'
+import { useWorktreeListVirtualizer } from './use-virtualizer'
+
+afterEach(() => {
+  cleanup()
+  document.body.replaceChildren()
+})
+
+const rows: RenderRow[] = [
+  { type: 'pending-creation', key: 'pending', creationId: 'pending', repo },
+  {
+    type: 'item',
+    rowKey: 'a',
+    sectionKey: 'all',
+    repo,
+    worktree: { ...worktree, id: 'a' },
+    depth: 0,
+    groupDepth: 0,
+    isLastLineageChild: false,
+    lineageChildCount: 0
+  }
+]
+
+it('keeps a notice row slot stable across repeated remeasures', () => {
+  const scroller = document.createElement('div')
+  Object.defineProperty(scroller, 'clientHeight', { value: 600 })
+  document.body.append(scroller)
+  const notice = document.createElement('div')
+  notice.setAttribute('data-index', '0')
+  notice.setAttribute('data-worktree-virtual-row-key', getRenderRowKey(rows[0]))
+  Object.defineProperty(notice, 'offsetHeight', { value: 32 })
+  scroller.append(notice)
+
+  const { result } = renderHook(() => {
+    const projection = useMemo(() => buildLineageRowProjection(rows, 'none', false), [])
+    const marks = useMemo(() => createProgrammaticScrollMarks(), [])
+    return useWorktreeListVirtualizer({
+      projection,
+      renderRows: rows,
+      firstHeaderIndex: -1,
+      scrollRef: { current: scroller },
+      scrollOffsetRef: { current: 0 },
+      programmaticScrollMarks: marks
+    })
+  })
+  const { virtualizer } = result.current
+  act(() => virtualizer.measureElement(notice))
+  const settledTotal = virtualizer.getTotalSize()
+  for (let i = 0; i < 5; i++) {
+    act(() => virtualizer.measureElement(notice))
+  }
+
+  expect(virtualizer.getTotalSize()).toBe(settledTotal)
+  expect(virtualizer.measurementsCache[0].size).toBe(38)
+})
diff --git a/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
index 14d9e3699dc..05e5cc1e3ad 100644
--- a/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/viewport/use-virtualizer.ts
@@ -97,9 +97,13 @@ export function useWorktreeListVirtualizer(args: {
           activeStickyHeaderIndexRef.current
         )
       }
-      const measured = measureVirtualElementSize(element, entry, instance)
       const row = index === null ? undefined : renderRows[index]
-      return measured + (row?.type === 'item' || row?.type === 'folder-workspace' ? 0 : 6)
+      if (row?.type === 'item' || row?.type === 'folder-workspace') {
+        return measureVirtualElementSize(element, entry, instance)
+      }
+      // Why: TanStack returns the cached slot size for entry-less measures, so the gap must be added to the DOM box or it compounds on every remeasure.
+      const box = entry?.borderBoxSize?.[0]
+      return Math.round(box ? box.blockSize : element.offsetHeight) + 6
     },
     [firstHeaderIndex, isCurrentVirtualRowElement, renderRows]
   )
diff --git a/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts b/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts
index be253e1f4b3..2678380d42a 100644
--- a/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts
+++ b/src/renderer/src/components/tab-bar/open-tab-selection-routing.ts
@@ -2,7 +2,10 @@
 
 import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
 import { translate } from '@/i18n/i18n'
-import { activateBrowserPagePaletteResult } from '@/lib/browser/palette/browser-page-palette-activation'
+import {
+  activateBrowserPagePaletteResult,
+  type BrowserPagePaletteActivationFailure
+} from '@/lib/browser/palette/browser-page-palette-activation'
 import { focusTerminalTabSurface } from '@/components/terminal-pane/input/focus/focus-terminal-tab-surface'
 import { activateSimulatorTabPaletteResult } from '@/lib/simulator/tabs/simulator-tab-palette-activation'
 import { activateWorkspaceTabPaletteResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-activation'
@@ -15,17 +18,30 @@ export type OpenTabSelectionOutcome =
   | { status: 'failed'; message: string }
 
 // Distinguish dead workspaces from stale targets inside live ones across all sources.
+function failureMessage(reason: string, staleMessage: string): string {
+  return reason === 'missing-worktree'
+    ? translate(
+        'auto.components.tab.bar.TabBarCreateEntry.2c38630a01',
+        'Workspace no longer exists'
+      )
+    : staleMessage
+}
+
 function failed(reason: string, staleMessage: string): OpenTabSelectionOutcome {
-  return {
-    status: 'failed',
-    message:
-      reason === 'missing-worktree'
-        ? translate(
-            'auto.components.tab.bar.TabBarCreateEntry.2c38630a01',
-            'Workspace no longer exists'
-          )
-        : staleMessage
-  }
+  return { status: 'failed', message: failureMessage(reason, staleMessage) }
+}
+
+/** Why a browser page could not be shown: a gone workspace, or a gone page or tab. */
+export function browserPageActivationFailureMessage(
+  reason: BrowserPagePaletteActivationFailure
+): string {
+  return failureMessage(
+    reason,
+    translate(
+      'auto.components.tab.bar.TabBarCreateEntry.d7d496a451',
+      'Browser page no longer exists'
+    )
+  )
 }
 
 export function activateOpenTabSearchResult(result: OpenTabSearchResult): OpenTabSelectionOutcome {
@@ -40,13 +56,7 @@ export function activateOpenTabSearchResult(result: OpenTabSearchResult): OpenTa
       return activation
     }
     if (activation.status === 'failed') {
-      return failed(
-        activation.reason,
-        translate(
-          'auto.components.tab.bar.TabBarCreateEntry.d7d496a451',
-          'Browser page no longer exists'
-        )
-      )
+      return { status: 'failed', message: browserPageActivationFailureMessage(activation.reason) }
     }
     return {
       status: 'activated',
diff --git a/src/renderer/src/components/task-page/Content.tsx b/src/renderer/src/components/task-page/Content.tsx
index b9700f80d28..e496b877a95 100644
--- a/src/renderer/src/components/task-page/Content.tsx
+++ b/src/renderer/src/components/task-page/Content.tsx
@@ -3,7 +3,7 @@ import PullRequestPage from '@/components/PullRequestPage'
 import GitHubItemDialog from '@/components/GitHubItemDialog'
 import { useTranslate } from '@/i18n/use-translate'
 import ProjectViewWrapper from '@/components/github-project/ProjectViewWrapper'
-import { TaskPageGitHubList } from './github/List'
+import { TaskPageGitHubList } from './github/listing/List'
 import { TaskPageGitLabTodoList } from './gitlab/TodoList'
 import { TaskPageGitLabItemList } from './gitlab/ItemList'
 import { TaskPageJiraContent } from './jira/Content'
diff --git a/src/renderer/src/components/task-page/ListChrome.tsx b/src/renderer/src/components/task-page/ListChrome.tsx
index 74fd024d47b..5dd58fd1373 100644
--- a/src/renderer/src/components/task-page/ListChrome.tsx
+++ b/src/renderer/src/components/task-page/ListChrome.tsx
@@ -2,7 +2,7 @@ import type { TaskPageComposerActionsModel } from './use-task-page-composer-acti
 import { cn } from '@/lib/class-names'
 import { TaskPageSourceBar } from './SourceBar'
 import { AlertCircle } from 'lucide-react'
-import { TaskPageGitHubModeControls } from './github/ModeControls'
+import { TaskPageGitHubModeControls } from './github/listing/ModeControls'
 import { TaskPageProviderFilters } from './ProviderFilters'
 export function TaskPageListChrome({
   model
diff --git a/src/renderer/src/components/task-page/ProviderFilters.tsx b/src/renderer/src/components/task-page/ProviderFilters.tsx
index 9c21eb8c47d..b2043802b05 100644
--- a/src/renderer/src/components/task-page/ProviderFilters.tsx
+++ b/src/renderer/src/components/task-page/ProviderFilters.tsx
@@ -1,5 +1,5 @@
 import type { TaskPageComposerActionsModel } from './use-task-page-composer-actions'
-import { TaskPageGitHubFilters } from './github/Filters'
+import { TaskPageGitHubFilters } from './github/listing/Filters'
 import { TaskPageLinearFilters } from './linear/Filters'
 import { TaskPageJiraFilters } from './jira/Filters'
 import { TaskPageGitLabFilters } from './gitlab/Filters'
diff --git a/src/renderer/src/components/task-page/Surface.tsx b/src/renderer/src/components/task-page/Surface.tsx
index 2737627ec2c..2e2f2e28cd6 100644
--- a/src/renderer/src/components/task-page/Surface.tsx
+++ b/src/renderer/src/components/task-page/Surface.tsx
@@ -1,9 +1,9 @@
 import type { TaskPageComposerActionsModel } from './use-task-page-composer-actions'
 import { TaskPageFrame } from './Frame'
-import { TaskPageGitHubIssueDialog } from './github/IssueDialog'
-import { TaskPageLinearProjectDialog } from './linear/ProjectDialog'
-import { TaskPageLinearIssueDialog } from './linear/IssueDialog'
-import { TaskPageJiraIssueDialog } from './jira/IssueDialog'
+import { TaskPageGitHubIssueDialog } from './github/issue-creation/IssueDialog'
+import { TaskPageLinearProjectDialog } from './linear/creation/ProjectDialog'
+import { TaskPageLinearIssueDialog } from './linear/creation/IssueDialog'
+import { TaskPageJiraIssueDialog } from './jira/creation/IssueDialog'
 import { TaskPageGitLabDialog } from './gitlab/Dialog'
 import { TaskPageLinearConnectDialog } from './linear/ConnectDialog'
 import { TaskPageJiraConnectDialog } from './jira/ConnectDialog'
diff --git a/src/renderer/src/components/task-page/TaskPage.tsx b/src/renderer/src/components/task-page/TaskPage.tsx
index 783f360c0d6..8f37666a72d 100644
--- a/src/renderer/src/components/task-page/TaskPage.tsx
+++ b/src/renderer/src/components/task-page/TaskPage.tsx
@@ -4,40 +4,40 @@ import { useTaskPageRepoSelection } from './use-task-page-repo-selection'
 import { useTaskPageRuntimeHosts } from './use-task-page-runtime-hosts'
 import { useTaskPageSourceAvailability } from './use-task-page-source-availability'
 import { useTaskPageProviderState } from './use-task-page-provider-state'
-import { useTaskPageGitHubListState } from './github/use-task-page-github-list-state'
+import { useTaskPageGitHubListState } from './github/listing/use-task-page-github-list-state'
 import { useTaskPageGitHubDetail } from './github/use-task-page-github-detail'
-import { useTaskPageGitHubCacheReconciliation } from './github/use-task-page-github-cache-reconciliation'
-import { useTaskPageGitHubIssueDraft } from './github/use-task-page-github-issue-draft'
+import { useTaskPageGitHubCacheReconciliation } from './github/cache/use-task-page-github-cache-reconciliation'
+import { useTaskPageGitHubIssueDraft } from './github/issue-creation/use-task-page-github-issue-draft'
 import { useTaskPageDetailRouting } from './use-task-page-detail-routing'
 import { useTaskPageLinearViewState } from './linear/use-task-page-linear-view-state'
 import { useTaskPageJiraListState } from './jira/use-task-page-jira-list-state'
 import { useTaskPageResumeRestoration } from './use-task-page-resume-restoration'
 import { useTaskPageProviderMetadata } from './use-task-page-provider-metadata'
 import { useTaskPageGitLabLoading } from './gitlab/use-task-page-gitlab-loading'
-import { useTaskPageLinearListSelection } from './linear/use-task-page-linear-list-selection'
-import { useTaskPageLinearListProjection } from './linear/use-task-page-linear-list-projection'
-import { useTaskPageLinearBoard } from './linear/use-task-page-linear-board'
-import { useTaskPageJiraListProjection } from './jira/use-task-page-jira-list-projection'
-import { useTaskPageLinearCreationState } from './linear/use-task-page-linear-creation-state'
-import { useTaskPageGitHubMutationState } from './github/use-task-page-github-mutation-state'
-import { useTaskPageJiraCreationState } from './jira/use-task-page-jira-creation-state'
-import { useTaskPageJiraCreationMetadata } from './jira/use-task-page-jira-creation-metadata'
-import { useTaskPageGitHubListProjection } from './github/use-task-page-github-list-projection'
-import { useTaskPageGitHubSearchPagination } from './github/use-task-page-github-search-pagination'
-import { useTaskPageGitHubLandingRefresh } from './github/use-task-page-github-landing-refresh'
-import { useTaskPageGitHubQuietRefresh } from './github/use-task-page-github-quiet-refresh'
+import { useTaskPageLinearListSelection } from './linear/issues/use-task-page-linear-list-selection'
+import { useTaskPageLinearListProjection } from './linear/issues/use-task-page-linear-list-projection'
+import { useTaskPageLinearBoard } from './linear/issues/use-task-page-linear-board'
+import { useTaskPageJiraListProjection } from './jira/listing/use-task-page-jira-list-projection'
+import { useTaskPageLinearCreationState } from './linear/creation/use-task-page-linear-creation-state'
+import { useTaskPageGitHubMutationState } from './github/mutations/use-task-page-github-mutation-state'
+import { useTaskPageJiraCreationState } from './jira/creation/use-task-page-jira-creation-state'
+import { useTaskPageJiraCreationMetadata } from './jira/creation/use-task-page-jira-creation-metadata'
+import { useTaskPageGitHubListProjection } from './github/listing/use-task-page-github-list-projection'
+import { useTaskPageGitHubSearchPagination } from './github/listing/use-task-page-github-search-pagination'
+import { useTaskPageGitHubLandingRefresh } from './github/refresh/use-task-page-github-landing-refresh'
+import { useTaskPageGitHubQuietRefresh } from './github/refresh/use-task-page-github-quiet-refresh'
 import { useTaskPageSearchActions } from './use-task-page-search-actions'
 import { useTaskPageWorkspaceActions } from './use-task-page-workspace-actions'
-import { useTaskPageGitHubIssueCreation } from './github/use-task-page-github-issue-creation'
-import { useTaskPageLinearProjectCreation } from './linear/use-task-page-linear-project-creation'
-import { useTaskPageLinearIssueCreation } from './linear/use-task-page-linear-issue-creation'
-import { useTaskPageJiraIssueCreation } from './jira/use-task-page-jira-issue-creation'
-import { useTaskPageJiraSummaryGeneration } from './jira/use-task-page-jira-summary-generation'
+import { useTaskPageGitHubIssueCreation } from './github/issue-creation/use-task-page-github-issue-creation'
+import { useTaskPageLinearProjectCreation } from './linear/creation/use-task-page-linear-project-creation'
+import { useTaskPageLinearIssueCreation } from './linear/creation/use-task-page-linear-issue-creation'
+import { useTaskPageJiraIssueCreation } from './jira/creation/use-task-page-jira-issue-creation'
+import { useTaskPageJiraSummaryGeneration } from './jira/creation/use-task-page-jira-summary-generation'
 import { useTaskPageGlobalEffects } from './use-task-page-global-effects'
-import { useTaskPageLinearListEffects } from './linear/use-task-page-linear-list-effects'
-import { useTaskPageLinearInOrcaEffects } from './linear/use-task-page-linear-in-orca-effects'
-import { useTaskPageLinearCollectionEffects } from './linear/use-task-page-linear-collection-effects'
-import { useTaskPageJiraListEffects } from './jira/use-task-page-jira-list-effects'
+import { useTaskPageLinearListEffects } from './linear/issues/use-task-page-linear-list-effects'
+import { useTaskPageLinearInOrcaEffects } from './linear/issues/use-task-page-linear-in-orca-effects'
+import { useTaskPageLinearCollectionEffects } from './linear/projects/use-task-page-linear-collection-effects'
+import { useTaskPageJiraListEffects } from './jira/listing/use-task-page-jira-list-effects'
 import { useTaskPageComposerActions } from './use-task-page-composer-actions'
 import { TaskPageSurface } from './Surface'
 
diff --git a/src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts b/src/renderer/src/components/task-page/github/cache/task-page-github-resume-cache.ts
similarity index 96%
rename from src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts
rename to src/renderer/src/components/task-page/github/cache/task-page-github-resume-cache.ts
index 3306b23b7a6..4a8f2b11eb5 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-resume-cache.ts
+++ b/src/renderer/src/components/task-page/github/cache/task-page-github-resume-cache.ts
@@ -1,4 +1,4 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 
 export const TASK_PAGE_GITHUB_RESUME_CACHE_LIMIT = 5
 export const TASK_PAGE_GITHUB_RESUME_CACHE_TTL_MS = 10 * 60_000
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts b/src/renderer/src/components/task-page/github/cache/use-task-page-github-cache-reconciliation.ts
similarity index 93%
rename from src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts
rename to src/renderer/src/components/task-page/github/cache/use-task-page-github-cache-reconciliation.ts
index 6bdf228e00e..926d11ae214 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-cache-reconciliation.ts
+++ b/src/renderer/src/components/task-page/github/cache/use-task-page-github-cache-reconciliation.ts
@@ -1,11 +1,11 @@
-import type { TaskPageGitHubDetailModel } from './use-task-page-github-detail'
+import type { TaskPageGitHubDetailModel } from '../use-task-page-github-detail'
 import { useCallback, useMemo, useEffect, useRef, useState } from 'react'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
 import {
   patchTaskPageGitHubWorkItemPages,
   overlayPendingOnTaskPagePages
-} from '@/components/task-page/github/task-page-github-work-item-mutation-pages'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-pages'
 import {
   type TaskPageRepoSourceState,
   buildTaskPageRepoSourceState,
diff --git a/src/renderer/src/components/task-page/github/use-task-page-work-items-cache-selection.ts b/src/renderer/src/components/task-page/github/cache/use-task-page-work-items-cache-selection.ts
similarity index 92%
rename from src/renderer/src/components/task-page/github/use-task-page-work-items-cache-selection.ts
rename to src/renderer/src/components/task-page/github/cache/use-task-page-work-items-cache-selection.ts
index 7e432e11be5..9ab4d2dfc1a 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-work-items-cache-selection.ts
+++ b/src/renderer/src/components/task-page/github/cache/use-task-page-work-items-cache-selection.ts
@@ -5,9 +5,9 @@ import {
   getTaskPageRepoCacheRows,
   createTaskPageWorkItemsCacheSelector
 } from '@/components/task-page/task-page-cache-selectors'
-import { isGitHubWorkItemsQueryTooLarge } from '../../../../../shared/github/work-items/work-items-query-bounds'
-import type { Repo } from '../../../../../shared/repo-types'
-import { getTaskPageRepoCacheInput } from '../task-page-source-context'
+import { isGitHubWorkItemsQueryTooLarge } from '../../../../../../shared/github/work-items/work-items-query-bounds'
+import type { Repo } from '../../../../../../shared/repo-types'
+import { getTaskPageRepoCacheInput } from '../../task-page-source-context'
 
 /** Selected rows' current-query cache entries, plus the entries the source displays read (see the selector). */
 export function useTaskPageWorkItemsCacheSelection(
diff --git a/src/renderer/src/components/task-page/github/IssueDialog.tsx b/src/renderer/src/components/task-page/github/issue-creation/IssueDialog.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/github/IssueDialog.tsx
rename to src/renderer/src/components/task-page/github/issue-creation/IssueDialog.tsx
index 5df25094af5..60a86c92cf7 100644
--- a/src/renderer/src/components/task-page/github/IssueDialog.tsx
+++ b/src/renderer/src/components/task-page/github/issue-creation/IssueDialog.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useRef, useState } from 'react'
 import { getGitHubRuntimeRepoId } from '@/lib/work-items/github/github-source-runtime-context'
 import {
@@ -12,7 +12,7 @@ import {
 import { isScreenSubmitShortcut } from '@/lib/keyboard/screen-submit-shortcut'
 import { useTranslate } from '@/i18n/use-translate'
 import { sameGitHubOwnerRepo } from '@/components/github/IssueSourceIndicator'
-import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
+import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
 import { repoMatchesHostIdentity } from '@/store/repos/repo-host-identity'
 import IssueSourceSelector from '@/components/github/IssueSourceSelector'
 import {
diff --git a/src/renderer/src/components/task-page/github/IssueSelectors.tsx b/src/renderer/src/components/task-page/github/issue-creation/IssueSelectors.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/github/IssueSelectors.tsx
rename to src/renderer/src/components/task-page/github/issue-creation/IssueSelectors.tsx
index 3e8f289e0fd..b3327c2fba5 100644
--- a/src/renderer/src/components/task-page/github/IssueSelectors.tsx
+++ b/src/renderer/src/components/task-page/github/issue-creation/IssueSelectors.tsx
@@ -4,8 +4,8 @@ import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover
 import { Button } from '@/components/ui/button'
 import { LoaderCircle, Check } from 'lucide-react'
 import { cn } from '@/lib/class-names'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import { GitHubAssigneeAvatar } from './Avatars'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import { GitHubAssigneeAvatar } from '../listing/Avatars'
 export function GitHubIssueLabelSelector({
   labels,
   selectedLabels,
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts b/src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-creation.ts
similarity index 97%
rename from src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts
rename to src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-creation.ts
index 1c96f6cdba2..36ee1b6a085 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-issue-creation.ts
+++ b/src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-creation.ts
@@ -1,10 +1,10 @@
-import type { TaskPageWorkspaceActionsModel } from '../use-task-page-workspace-actions'
+import type { TaskPageWorkspaceActionsModel } from '../../use-task-page-workspace-actions'
 import { useCallback } from 'react'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { useAppStore } from '@/store/index'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import { codeHostErrorText } from '@/lib/source-control/remote/code-host-error-copy'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 type TaskPageGitHubIssueCreationInput = Pick<
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts b/src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts
similarity index 94%
rename from src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts
rename to src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts
index 86f78ea3bce..cc09af77d7e 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-issue-draft.ts
+++ b/src/renderer/src/components/task-page/github/issue-creation/use-task-page-github-issue-draft.ts
@@ -1,6 +1,6 @@
-import type { TaskPageGitHubCacheReconciliationModel } from './use-task-page-github-cache-reconciliation'
+import type { TaskPageGitHubCacheReconciliationModel } from '../cache/use-task-page-github-cache-reconciliation'
 import { useState, useMemo, useEffect } from 'react'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
 import { useAppStore } from '@/store/index'
 import { getGitHubRepoRoutingTarget } from '@/lib/work-items/github/github-source-runtime-context'
 import { useRepoLabels, useRepoAssignees } from '@/hooks/useGitHubRepoMetadata'
@@ -8,7 +8,7 @@ import {
   resolveVanishedNewIssueRepoReset,
   isNewIssueDraftContentful
 } from '@/components/task-page/task-page-new-issue-draft'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
 export function useTaskPageGitHubIssueDraft(model: TaskPageGitHubCacheReconciliationModel) {
   const { settings, repos, selectedRepos } = model
   const [newIssueOpen, setNewIssueOpen] = useState(false)
diff --git a/src/renderer/src/components/task-page/github/DuplicatePicker.tsx b/src/renderer/src/components/task-page/github/issue-status/DuplicatePicker.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/github/DuplicatePicker.tsx
rename to src/renderer/src/components/task-page/github/issue-status/DuplicatePicker.tsx
index 7d6b03e5b5f..a7c5148069b 100644
--- a/src/renderer/src/components/task-page/github/DuplicatePicker.tsx
+++ b/src/renderer/src/components/task-page/github/issue-status/DuplicatePicker.tsx
@@ -2,7 +2,7 @@ import type React from 'react'
 import { CheckCircle2, ChevronLeft, CircleDot, Copy, Search } from 'lucide-react'
 
 import { useTranslate } from '@/i18n/use-translate'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 
diff --git a/src/renderer/src/components/task-page/github/StatusCell.tsx b/src/renderer/src/components/task-page/github/issue-status/StatusCell.tsx
similarity index 93%
rename from src/renderer/src/components/task-page/github/StatusCell.tsx
rename to src/renderer/src/components/task-page/github/issue-status/StatusCell.tsx
index 5fdb7f29398..715877eb6ae 100644
--- a/src/renderer/src/components/task-page/github/StatusCell.tsx
+++ b/src/renderer/src/components/task-page/github/issue-status/StatusCell.tsx
@@ -1,34 +1,34 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubIssueUpdate } from '../../../../../shared/issue-mutation-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubIssueUpdate } from '../../../../../../shared/issue-mutation-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import React, { useState, useMemo, useCallback } from 'react'
 import {
   createTaskPageGitHubStatusStateDraft,
   resolveTaskPageGitHubStatusStateDraft,
   updateTaskPageGitHubStatusLocalState
-} from '@/components/task-page/github/task-page-github-status-state'
+} from '@/components/task-page/github/issue-status/task-page-github-status-state'
 import { useAppStore } from '@/store/index'
 import { useShallow } from 'zustand/react/shallow'
 import { getGitHubRepoRoutingTarget } from '@/lib/work-items/github/github-source-runtime-context'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
 import {
   getTaskPageGitHubDuplicateCandidates,
   validateTaskPageGitHubDuplicateTarget,
   type TaskPageGitHubCloseAction,
   buildTaskPageGitHubCloseUpdate,
   getTaskPageGitHubDuplicateTargetErrorMessage
-} from '@/components/task-page/github/task-page-github-status-actions'
+} from '@/components/task-page/github/issue-status/task-page-github-status-actions'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { gitHubSlugApiForTarget } from '@/runtime/repository-github/github-slug-owner-api'
-import { githubProjectHost } from '../../../../../shared/github/projects/project-identity'
-import { TaskPageGitHubWorkItemStateBadge } from '@/components/task-page/github/task-page-github-work-item-status-badge'
+import { githubProjectHost } from '../../../../../../shared/github/projects/project-identity'
+import { TaskPageGitHubWorkItemStateBadge } from '@/components/task-page/github/listing/task-page-github-work-item-status-badge'
 import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
 import { cn } from '@/lib/class-names'
 import { CircleDot, ChevronDown, Copy, CheckCircle2, Ban, ChevronRight } from 'lucide-react'
-import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model'
+import type { TaskPageGitHubWorkItemMutationRunner } from '../mutations/task-page-github-work-item-mutation-types'
 import { TaskPageGitHubDuplicatePicker } from './DuplicatePicker'
 import { useGitHubDuplicateIssueCandidates } from '@/components/github/github-duplicate-issue-candidates'
 
diff --git a/src/renderer/src/components/task-page/github/task-page-github-status-actions.ts b/src/renderer/src/components/task-page/github/issue-status/task-page-github-status-actions.ts
similarity index 94%
rename from src/renderer/src/components/task-page/github/task-page-github-status-actions.ts
rename to src/renderer/src/components/task-page/github/issue-status/task-page-github-status-actions.ts
index 01628da6fef..e565281a0c1 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-status-actions.ts
+++ b/src/renderer/src/components/task-page/github/issue-status/task-page-github-status-actions.ts
@@ -1,8 +1,8 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import type {
   GitHubIssueCloseReason,
   GitHubIssueUpdate
-} from '../../../../../shared/issue-mutation-types'
+} from '../../../../../../shared/issue-mutation-types'
 
 export type TaskPageGitHubCloseAction =
   | { stateReason: Exclude<GitHubIssueCloseReason, 'duplicate'> }
diff --git a/src/renderer/src/components/task-page/github/task-page-github-status-state.ts b/src/renderer/src/components/task-page/github/issue-status/task-page-github-status-state.ts
similarity index 91%
rename from src/renderer/src/components/task-page/github/task-page-github-status-state.ts
rename to src/renderer/src/components/task-page/github/issue-status/task-page-github-status-state.ts
index 7ebd889cafd..d69ff9669e3 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-status-state.ts
+++ b/src/renderer/src/components/task-page/github/issue-status/task-page-github-status-state.ts
@@ -1,4 +1,4 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 
 type GitHubStatusItem = Pick<GitHubWorkItem, 'id' | 'state'>
 
diff --git a/src/renderer/src/components/task-page/github/AssigneesCell.tsx b/src/renderer/src/components/task-page/github/listing/AssigneesCell.tsx
similarity index 93%
rename from src/renderer/src/components/task-page/github/AssigneesCell.tsx
rename to src/renderer/src/components/task-page/github/listing/AssigneesCell.tsx
index 6d923beb901..01b9751b7a5 100644
--- a/src/renderer/src/components/task-page/github/AssigneesCell.tsx
+++ b/src/renderer/src/components/task-page/github/listing/AssigneesCell.tsx
@@ -1,22 +1,22 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import React, { useMemo, useState, useCallback } from 'react'
 import { useAppStore } from '@/store/index'
 import { useShallow } from 'zustand/react/shallow'
 import { getGitHubRepoRoutingTarget } from '@/lib/work-items/github/github-source-runtime-context'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
 import { useRepoAssigneesBySlug } from '@/hooks/useGitHubSlugMetadata'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { gitHubSlugApiForTarget } from '@/runtime/repository-github/github-slug-owner-api'
-import { githubProjectHost } from '../../../../../shared/github/projects/project-identity'
+import { githubProjectHost } from '../../../../../../shared/github/projects/project-identity'
 import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
 import { cn } from '@/lib/class-names'
 import { LoaderCircle, ChevronDown, Check } from 'lucide-react'
-import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model'
+import type { TaskPageGitHubWorkItemMutationRunner } from '../mutations/task-page-github-work-item-mutation-types'
 import { GitHubAssigneeAvatar } from './Avatars'
 import { GitHubUserAvatar } from '@/components/github/github-user-avatar'
 import { codeHostErrorText } from '@/lib/source-control/remote/code-host-error-copy'
diff --git a/src/renderer/src/components/task-page/github/Avatars.tsx b/src/renderer/src/components/task-page/github/listing/Avatars.tsx
similarity index 84%
rename from src/renderer/src/components/task-page/github/Avatars.tsx
rename to src/renderer/src/components/task-page/github/listing/Avatars.tsx
index 6305ad6c57e..1719d7267fc 100644
--- a/src/renderer/src/components/task-page/github/Avatars.tsx
+++ b/src/renderer/src/components/task-page/github/listing/Avatars.tsx
@@ -1,8 +1,8 @@
-import type { GitHubPRPrimaryReviewer } from '../../../../../shared/github/pull-requests/pr-reviewer-display'
+import type { GitHubPRPrimaryReviewer } from '../../../../../../shared/github/pull-requests/pr-reviewer-display'
 import React from 'react'
 import { GitHubUserAvatar } from '@/components/github/github-user-avatar'
 import { Users } from 'lucide-react'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
 export function ReviewChipAvatar({
   reviewer,
   avatarHost
diff --git a/src/renderer/src/components/task-page/github/Filters.tsx b/src/renderer/src/components/task-page/github/listing/Filters.tsx
similarity index 99%
rename from src/renderer/src/components/task-page/github/Filters.tsx
rename to src/renderer/src/components/task-page/github/listing/Filters.tsx
index a57878bb346..b64ff20fe0e 100644
--- a/src/renderer/src/components/task-page/github/Filters.tsx
+++ b/src/renderer/src/components/task-page/github/listing/Filters.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import {
   getGitHubPRStateChips,
   getGitHubPRWhoChips,
@@ -15,7 +15,7 @@ import { resolveNewIssueOpenSeed } from '@/components/task-page/task-page-new-is
 import { useAppStore } from '@/store/index'
 import { useShallow } from 'zustand/react/shallow'
 import { getGitHubRepoRoutingTarget } from '@/lib/work-items/github/github-source-runtime-context'
-import { hasUpstreamCandidateDivergence, hasDivergentSources } from '../task-page-draft-storage'
+import { hasUpstreamCandidateDivergence, hasDivergentSources } from '../../task-page-draft-storage'
 import IssueSourceIndicator from '@/components/github/IssueSourceIndicator'
 import IssueSourceSelector, { issueSourceChipClass } from '@/components/github/IssueSourceSelector'
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
diff --git a/src/renderer/src/components/task-page/github/List.tsx b/src/renderer/src/components/task-page/github/listing/List.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/github/List.tsx
rename to src/renderer/src/components/task-page/github/listing/List.tsx
index c90b4e4d7d3..42374fe3136 100644
--- a/src/renderer/src/components/task-page/github/List.tsx
+++ b/src/renderer/src/components/task-page/github/listing/List.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useAppStore } from '@/store/index'
 import { cn } from '@/lib/class-names'
 import {
@@ -7,12 +7,12 @@ import {
   GITHUB_TASK_STICKY_TITLE_HEADER_CLASS,
   GITHUB_TASK_STICKY_ID_CELL_CLASS,
   GITHUB_TASK_STICKY_TITLE_CELL_CLASS
-} from '../task-page-source-context'
+} from '../../task-page-source-context'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '@/components/ui/button'
 import { LoaderCircle } from 'lucide-react'
 import { TaskPageGitHubRows } from './Rows'
-import { PaginationBar } from '../PaginationBar'
+import { PaginationBar } from '../../PaginationBar'
 import { supersedeGitHubListScrollRestore } from './task-page-github-list-scroll-restore'
 export function TaskPageGitHubList({
   model
diff --git a/src/renderer/src/components/task-page/github/ModeControls.tsx b/src/renderer/src/components/task-page/github/listing/ModeControls.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/github/ModeControls.tsx
rename to src/renderer/src/components/task-page/github/listing/ModeControls.tsx
index 5b4d6e83a12..4fe5e971b50 100644
--- a/src/renderer/src/components/task-page/github/ModeControls.tsx
+++ b/src/renderer/src/components/task-page/github/listing/ModeControls.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { cn } from '@/lib/class-names'
 import TaskProjectSourceCombobox from '@/components/task-project-source-combobox'
 import { normalizeTaskRepoSelection } from '@/components/task-page/task-page-default-repo-selection'
diff --git a/src/renderer/src/components/task-page/github/Rows.tsx b/src/renderer/src/components/task-page/github/listing/Rows.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/github/Rows.tsx
rename to src/renderer/src/components/task-page/github/listing/Rows.tsx
index 62de36cb12c..186a5297722 100644
--- a/src/renderer/src/components/task-page/github/Rows.tsx
+++ b/src/renderer/src/components/task-page/github/listing/Rows.tsx
@@ -1,13 +1,13 @@
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { getWorkItemRepo } from '@/lib/work-items/work-item-repo-row'
 import { findGithubWorkItemWorkspaceAttachment } from '@/lib/work-items/github/github-work-item-workspace-attachment'
 import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
-import { formatPRDelta } from '../task-page-pr-delta-summary'
+import { formatPRDelta } from '../../task-page-pr-delta-summary'
 import {
   isTaskPageGitHubDraftPR,
   getTaskPageGitHubPRIconTone
-} from '@/components/task-page/github/task-page-github-work-item-status'
+} from '@/components/task-page/github/listing/task-page-github-work-item-status'
 import {
   GitPullRequestDraft,
   GitPullRequest,
@@ -25,16 +25,16 @@ import {
   GITHUB_TASK_STICKY_ID_CELL_CLASS,
   GITHUB_TASK_STICKY_TITLE_CELL_CLASS,
   formatRelativeTime
-} from '../task-page-source-context'
+} from '../../task-page-source-context'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
-import { TaskPageGitHubWorkItemStateBadge } from '@/components/task-page/github/task-page-github-work-item-status-badge'
+import { TaskPageGitHubWorkItemStateBadge } from '@/components/task-page/github/listing/task-page-github-work-item-status-badge'
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
 import { GHAssigneesCell } from './AssigneesCell'
-import { PRReviewCell } from './ReviewCell'
-import { PRChecksCell } from './ChecksCell'
-import { PRMergeCell } from './MergeCell'
-import { GHStatusCell } from './StatusCell'
+import { PRReviewCell } from '../pull-requests/ReviewCell'
+import { PRChecksCell } from '../pull-requests/ChecksCell'
+import { PRMergeCell } from '../pull-requests/MergeCell'
+import { GHStatusCell } from '../issue-status/StatusCell'
 import {
   DropdownMenu,
   DropdownMenuTrigger,
diff --git a/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.ts b/src/renderer/src/components/task-page/github/listing/task-page-github-list-scroll-restore.ts
similarity index 100%
rename from src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.ts
rename to src/renderer/src/components/task-page/github/listing/task-page-github-list-scroll-restore.ts
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-status-badge.tsx b/src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status-badge.tsx
similarity index 89%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-status-badge.tsx
rename to src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status-badge.tsx
index 5e0319ee08a..ca46349da1c 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-status-badge.tsx
+++ b/src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status-badge.tsx
@@ -4,7 +4,7 @@ import {
   getTaskPageGitHubWorkItemStateLabel,
   getTaskPageGitHubWorkItemStateTone,
   type GitHubWorkItemStatusItem
-} from '@/components/task-page/github/task-page-github-work-item-status'
+} from '@/components/task-page/github/listing/task-page-github-work-item-status'
 import { useTranslate } from '@/i18n/use-translate'
 
 export function TaskPageGitHubWorkItemStateBadge({
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-status.ts b/src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status.ts
similarity index 96%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-status.ts
rename to src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status.ts
index 139ad4c6410..0229ce7eebd 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-status.ts
+++ b/src/renderer/src/components/task-page/github/listing/task-page-github-work-item-status.ts
@@ -1,6 +1,6 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 
 export type GitHubWorkItemStatusItem = Pick<GitHubWorkItem, 'type' | 'state'>
 
diff --git a/src/renderer/src/components/task-page/github/task-page-pr-chips.test.ts b/src/renderer/src/components/task-page/github/listing/task-page-pr-chips.test.ts
similarity index 100%
rename from src/renderer/src/components/task-page/github/task-page-pr-chips.test.ts
rename to src/renderer/src/components/task-page/github/listing/task-page-pr-chips.test.ts
diff --git a/src/renderer/src/components/task-page/github/task-page-pr-chips.ts b/src/renderer/src/components/task-page/github/listing/task-page-pr-chips.ts
similarity index 91%
rename from src/renderer/src/components/task-page/github/task-page-pr-chips.ts
rename to src/renderer/src/components/task-page/github/listing/task-page-pr-chips.ts
index f5102a46bd6..650765e22ea 100644
--- a/src/renderer/src/components/task-page/github/task-page-pr-chips.ts
+++ b/src/renderer/src/components/task-page/github/listing/task-page-pr-chips.ts
@@ -3,10 +3,10 @@ import {
   parseTaskQuery,
   serializeTaskQuery,
   withQualifier
-} from '../../../../../shared/work-items/task-query'
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import { getTaskPresetQuery } from '../../../../../shared/work-items/task-preset-query'
-import type { TaskViewPresetId } from '../../../../../shared/ui-chrome-types'
+} from '../../../../../../shared/work-items/task-query'
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import { getTaskPresetQuery } from '../../../../../../shared/work-items/task-preset-query'
+import type { TaskViewPresetId } from '../../../../../../shared/ui-chrome-types'
 
 export type GitHubPRStateChip = 'open' | 'merged' | 'closed' | 'all'
 export type GitHubPRWhoChip = 'everyone' | 'mine' | 'reviewing'
diff --git a/src/renderer/src/components/task-page/github/task-page-preset-highlight.ts b/src/renderer/src/components/task-page/github/listing/task-page-preset-highlight.ts
similarity index 71%
rename from src/renderer/src/components/task-page/github/task-page-preset-highlight.ts
rename to src/renderer/src/components/task-page/github/listing/task-page-preset-highlight.ts
index 6fc9097da8d..2793368b7b7 100644
--- a/src/renderer/src/components/task-page/github/task-page-preset-highlight.ts
+++ b/src/renderer/src/components/task-page/github/listing/task-page-preset-highlight.ts
@@ -1,6 +1,6 @@
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import type { GitHubTaskKind } from '../../../../../shared/work-items/task-github-search'
-import type { TaskViewPresetId } from '../../../../../shared/ui-chrome-types'
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import type { GitHubTaskKind } from '../../../../../../shared/work-items/task-github-search'
+import type { TaskViewPresetId } from '../../../../../../shared/ui-chrome-types'
 export function deriveGitHubTaskPreset(
   kind: GitHubTaskKind,
   query: ParsedTaskQuery
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-collection-state.ts b/src/renderer/src/components/task-page/github/listing/use-task-page-github-collection-state.ts
similarity index 86%
rename from src/renderer/src/components/task-page/github/use-task-page-github-collection-state.ts
rename to src/renderer/src/components/task-page/github/listing/use-task-page-github-collection-state.ts
index f2792452c49..ee3799e4a1c 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-collection-state.ts
+++ b/src/renderer/src/components/task-page/github/listing/use-task-page-github-collection-state.ts
@@ -1,12 +1,12 @@
 import { useState, useCallback, useMemo, useSyncExternalStore, type SetStateAction } from 'react'
-import type { TaskPageProviderStateModel } from '../use-task-page-provider-state'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { sortWorkItemsByNumber } from '../../../../../shared/work-items/work-item-order'
-import { stripRepoQualifiers } from '../../../../../shared/work-items/task-query'
+import type { TaskPageProviderStateModel } from '../../use-task-page-provider-state'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import { sortWorkItemsByNumber } from '../../../../../../shared/work-items/work-item-order'
+import { stripRepoQualifiers } from '../../../../../../shared/work-items/task-query'
 import type { GitHubSourceCollections } from '@/store/github/sources/source-collections'
 import { githubCollectionScope } from '@/store/github/sources/source-preference-ownership'
-import { getTaskPageRepoSourceContext } from '../task-page-source-context'
-import { buildTaskPageGitHubResumeContextKey } from './task-page-github-resume-cache'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
+import { buildTaskPageGitHubResumeContextKey } from '../cache/task-page-github-resume-cache'
 
 type CollectionInput = Pick<
   TaskPageProviderStateModel,
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-list-pending.ts b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-pending.ts
similarity index 95%
rename from src/renderer/src/components/task-page/github/use-task-page-github-list-pending.ts
rename to src/renderer/src/components/task-page/github/listing/use-task-page-github-list-pending.ts
index 3636d205d42..ff26f96b099 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-list-pending.ts
+++ b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-pending.ts
@@ -1,5 +1,5 @@
 import { useAppStore } from '@/store/index'
-import type { TaskPageJiraCreationMetadataModel } from '../jira/use-task-page-jira-creation-metadata'
+import type { TaskPageJiraCreationMetadataModel } from '../../jira/creation/use-task-page-jira-creation-metadata'
 
 // Why the list projection's input model: the landing run's later-stage model carries these same fields.
 type LandingRequestInput = Pick<
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-projection.ts
similarity index 90%
rename from src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts
rename to src/renderer/src/components/task-page/github/listing/use-task-page-github-list-projection.ts
index 1945976b170..d0760ce4678 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-list-projection.ts
+++ b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-projection.ts
@@ -1,12 +1,12 @@
 import { useCallback, useMemo } from 'react'
 import { useGitHubTaskItems } from '@/hooks/useGitHubTaskItems'
-import type { TaskPageJiraCreationMetadataModel } from '../jira/use-task-page-jira-creation-metadata'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { taskPageGitHubItemKey } from '@/components/task-page/github/task-page-github-work-item-mutation-keys'
-import { deriveAdvertisedTotalPages } from '../../../../../shared/work-items/work-item-empty-page'
-import { GITHUB_PR_TASK_GRID_CLASS, GITHUB_TASK_GRID_CLASS } from '../task-page-source-context'
+import type { TaskPageJiraCreationMetadataModel } from '../../jira/creation/use-task-page-jira-creation-metadata'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import { taskPageGitHubItemKey } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-keys'
+import { deriveAdvertisedTotalPages } from '../../../../../../shared/work-items/work-item-empty-page'
+import { GITHUB_PR_TASK_GRID_CLASS, GITHUB_TASK_GRID_CLASS } from '../../task-page-source-context'
 import { useTaskPageGitHubListPending } from './use-task-page-github-list-pending'
-import { useTaskPagePRCheckHydration } from './use-task-page-pr-check-hydration'
+import { useTaskPagePRCheckHydration } from '../pull-requests/use-task-page-pr-check-hydration'
 export function useTaskPageGitHubListProjection(model: TaskPageJiraCreationMetadataModel) {
   const {
     tasksFiltering,
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-state.ts
similarity index 97%
rename from src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts
rename to src/renderer/src/components/task-page/github/listing/use-task-page-github-list-state.ts
index c014170602d..e443699a30a 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-list-state.ts
+++ b/src/renderer/src/components/task-page/github/listing/use-task-page-github-list-state.ts
@@ -1,13 +1,13 @@
 import { useTaskPageGitHubCollectionState } from './use-task-page-github-collection-state'
-import type { TaskPageProviderStateModel } from '../use-task-page-provider-state'
+import type { TaskPageProviderStateModel } from '../../use-task-page-provider-state'
 import { useState, useRef, useEffect, useLayoutEffect, useSyncExternalStore } from 'react'
-import type { TaskViewPresetId } from '../../../../../shared/ui-chrome-types'
+import type { TaskViewPresetId } from '../../../../../../shared/ui-chrome-types'
 import {
   PER_REPO_FETCH_LIMIT,
   CROSS_REPO_DISPLAY_LIMIT,
   getTaskPagePerRepoLimit
-} from '../../../../../shared/work-items/work-item-pagination'
-import { taskPageGitHubResumeCache } from '@/components/task-page/github/task-page-github-resume-cache'
+} from '../../../../../../shared/work-items/work-item-pagination'
+import { taskPageGitHubResumeCache } from '@/components/task-page/github/cache/task-page-github-resume-cache'
 import { githubTaskBinding } from '@/lib/work-items/github/github-task-observation'
 import { useAppStore } from '@/store/index'
 import type { GitHubListRestoreWrite } from './task-page-github-list-scroll-restore'
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts b/src/renderer/src/components/task-page/github/listing/use-task-page-github-search-pagination.ts
similarity index 93%
rename from src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts
rename to src/renderer/src/components/task-page/github/listing/use-task-page-github-search-pagination.ts
index c122de5c9e1..6b51e915d29 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-search-pagination.ts
+++ b/src/renderer/src/components/task-page/github/listing/use-task-page-github-search-pagination.ts
@@ -1,18 +1,18 @@
 import type { TaskPageGitHubListProjectionModel } from './use-task-page-github-list-projection'
 import { useCallback, useEffect } from 'react'
-import { stripRepoQualifiers } from '../../../../../shared/work-items/task-query'
-import { taskPageToGitHubApiPage } from '../../../../../shared/work-items/work-item-pagination'
+import { stripRepoQualifiers } from '../../../../../../shared/work-items/task-query'
+import { taskPageToGitHubApiPage } from '../../../../../../shared/work-items/work-item-pagination'
 import {
   resolveEmptyPageOutcome,
   applyEmptyPageClamp,
   applyWindowPageLimit
-} from '../../../../../shared/work-items/work-item-empty-page'
+} from '../../../../../../shared/work-items/work-item-empty-page'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import { overlayPendingOnTaskPagePages } from '@/components/task-page/github/task-page-github-work-item-mutation-pages'
-import { scopeGitHubTaskSearch } from '../../../../../shared/work-items/task-github-search'
+import { overlayPendingOnTaskPagePages } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-pages'
+import { scopeGitHubTaskSearch } from '../../../../../../shared/work-items/task-github-search'
 import { useGitHubTaskSearchCommit } from '@/components/use-github-task-search-commit'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
 export function useTaskPageGitHubSearchPagination(model: TaskPageGitHubListProjectionModel) {
   const {
     setTaskResumeState,
diff --git a/src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-confirmed-client-values.ts
similarity index 90%
rename from src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-confirmed-client-values.ts
index 074ecc96171..7c93f208259 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-confirmed-client-values.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-confirmed-client-values.ts
@@ -1,5 +1,5 @@
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
-import { githubRepoIdentityKey } from '../../../../../shared/github/repositories/repository-identity-key'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../../shared/github/repositories/repository-identity'
+import { githubRepoIdentityKey } from '../../../../../../shared/github/repositories/repository-identity-key'
 import { taskPageGitHubLastConfirmedKey } from './task-page-github-work-item-mutation-keys'
 
 const lastConfirmedClientValues = new Map<
diff --git a/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-dialog-state-authority.ts
similarity index 88%
rename from src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-dialog-state-authority.ts
index 3761ec4101d..66a23c18c64 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-dialog-state-authority.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-dialog-state-authority.ts
@@ -1,9 +1,9 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../../shared/github/repositories/repository-identity'
 import {
   getTaskSourceCacheScope,
   type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
+} from '../../../../../../shared/work-items/task-source-context'
 import {
   deleteLastConfirmedClientValue,
   getLastConfirmedClientValue
@@ -13,7 +13,7 @@ import {
   notifyTaskPageGitHubMutationRegistry,
   setLastConfirmedClientValue
 } from './task-page-github-work-item-mutation-registry'
-import { markTaskPageGitHubFamiliesDirty } from './task-page-github-work-item-quiet-state'
+import { markTaskPageGitHubFamiliesDirty } from '../refresh/task-page-github-work-item-quiet-state'
 import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys'
 
 function markStateFamilyDirty(repoId: string, itemId: string): void {
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-filter-membership.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-filter-membership.ts
similarity index 91%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-filter-membership.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-filter-membership.ts
index a234297feed..da4522b0415 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-filter-membership.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-filter-membership.ts
@@ -1,6 +1,6 @@
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import type { StickyHideEntry } from './task-page-github-work-item-registry-types'
 
 function includesLogin(users: readonly GitHubAssignableUser[] | undefined, login: string): boolean {
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-composition.ts
similarity index 94%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-composition.ts
index d35a96e0bc9..5dc0be181cc 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-composition.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-composition.ts
@@ -1,8 +1,8 @@
-import { projectPRCheckOwner } from '../../../../../shared/github/checks/complete-pr-check-owner'
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
+import { projectPRCheckOwner } from '../../../../../../shared/github/checks/complete-pr-check-owner'
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
 import {
   recomputeTaskPageGitHubItemSoftHide,
   shouldSoftHideTaskPageGitHubWorkItem
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-keys.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-keys.ts
similarity index 100%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-keys.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-keys.ts
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-lifecycle.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-lifecycle.ts
similarity index 95%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-lifecycle.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-lifecycle.ts
index 97342909657..199227b5411 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-lifecycle.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-lifecycle.ts
@@ -1,6 +1,6 @@
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import { applyTaskPageGitHubListOps } from './task-page-github-work-item-mutation-patches'
 import {
   familiesFromPendingOp,
@@ -19,7 +19,7 @@ import {
   setLastConfirmedClientValue,
   isTaskPageGitHubMutationQueryKeyCurrent
 } from './task-page-github-work-item-mutation-registry'
-import { markTaskPageGitHubFamiliesDirty } from './task-page-github-work-item-quiet-state'
+import { markTaskPageGitHubFamiliesDirty } from '../refresh/task-page-github-work-item-quiet-state'
 import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys'
 import type { TaskPageGitHubMutationKey } from './task-page-github-work-item-registry-types'
 import type { TaskPageGitHubPatchWorkItem } from './task-page-github-work-item-mutation-types'
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-pages.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-pages.ts
similarity index 93%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-pages.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-pages.ts
index 9e30d7a143b..37da8932dfe 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-pages.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-pages.ts
@@ -1,7 +1,7 @@
-import { projectPRCheckOwner } from '../../../../../shared/github/checks/complete-pr-check-owner'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
+import { projectPRCheckOwner } from '../../../../../../shared/github/checks/complete-pr-check-owner'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
 import { getRegistryMergedTaskPageGitHubWorkItem } from './task-page-github-work-item-mutation-composition'
 import {
   getStickyHideEntry,
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-patches.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-patches.ts
similarity index 95%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-patches.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-patches.ts
index d3a1659df87..b2ef2397e98 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-patches.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-patches.ts
@@ -1,6 +1,6 @@
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageGitHubCloseAction } from './task-page-github-status-actions'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskPageGitHubCloseAction } from '../issue-status/task-page-github-status-actions'
 import { taskPageGitHubListOpKey } from './task-page-github-work-item-mutation-keys'
 import type {
   PendingListOp,
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-registry.ts
similarity index 93%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-registry.ts
index 41472fa4635..7fbad1b3089 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-registry.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-registry.ts
@@ -4,8 +4,8 @@ import {
   getLastConfirmedClientValue,
   setLastConfirmedClientValue as storeLastConfirmedClientValue
 } from './task-page-github-confirmed-client-values'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../../shared/github/repositories/repository-identity'
 import type {
   PendingOp,
   StickyHideEntry,
@@ -17,7 +17,7 @@ import {
   taskPageGitHubItemKey,
   taskPageGitHubSnapshotKey
 } from './task-page-github-work-item-mutation-keys'
-import { clearTaskPageGitHubQuietStates } from './task-page-github-work-item-quiet-state'
+import { clearTaskPageGitHubQuietStates } from '../refresh/task-page-github-work-item-quiet-state'
 type Listener = () => void
 const listeners = new Set<Listener>()
 const pendingByKey = new Map<string, PendingOp>()
@@ -257,15 +257,3 @@ export function gcStickyHidesAbsentFromPages(
     }
   }
 }
-export function resetTaskPageGitHubMutationRegistryForTests(): void {
-  pendingByKey.clear()
-  generations.clear()
-  confirmedSnapshots.clear()
-  clearLastConfirmedClientValues()
-  itemSourceScopeByItemKey.clear()
-  stickyHideByItemKey.clear()
-  softHiddenItemKeys.clear()
-  clearTaskPageGitHubQuietStates()
-  mutationQueryKey = null
-  listeners.clear()
-}
diff --git a/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-types.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-types.ts
new file mode 100644
index 00000000000..0fd7f0622c4
--- /dev/null
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutation-types.ts
@@ -0,0 +1,57 @@
+import type { ParsedTaskQuery } from '../../../../../../shared/work-items/task-query'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import type { GitHubPatchWorkItemOptions } from '../../../../store/github/work-items/work-item-patch-options'
+import type { TaskPageGitHubMutationIntent } from './task-page-github-work-item-mutation-patches'
+import type { TaskPageGitHubMutationKey } from './task-page-github-work-item-registry-types'
+
+export type TaskPageGitHubPatchWorkItem = (
+  itemId: string,
+  patch: Partial<GitHubWorkItem>,
+  repoId?: string,
+  options?: GitHubPatchWorkItemOptions
+) => void
+
+export type BeginTaskPageGitHubWorkItemMutationArgs = {
+  settleAccepted?: (success: boolean) => GitHubWorkItem
+  item: GitHubWorkItem
+  intent: TaskPageGitHubMutationIntent
+  sourceContext?: TaskSourceContext | null
+  query: ParsedTaskQuery
+  queryKey: string
+  viewerLogin: string | null
+  /** Derived inside begin from item sourceContext if omitted. */
+  skipMeQualifiers?: boolean
+  patchWorkItem: TaskPageGitHubPatchWorkItem
+}
+
+export type BeginTaskPageGitHubWorkItemMutationResult = {
+  generation: number
+  opKey: string
+  itemKey: string
+  families: string[]
+  key: TaskPageGitHubMutationKey
+}
+
+export type TaskPageGitHubWorkItemMutationRunner = {
+  run: (input: {
+    item: GitHubWorkItem
+    intent: TaskPageGitHubMutationIntent
+    sourceContext?: TaskSourceContext | null
+    mutate: () => Promise<{
+      ok?: boolean
+      error?:
+        | string
+        | {
+            message?: string
+          }
+    } | void>
+    successToast?: string
+    errorToast: string
+  }) => Promise<'confirmed' | 'rolled_back' | 'stale'>
+  isIntentPending: (input: {
+    item: GitHubWorkItem
+    intent: TaskPageGitHubMutationIntent
+    sourceContext?: TaskSourceContext | null
+  }) => boolean
+}
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutations.ts
similarity index 88%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutations.ts
index ff4f5ec992b..01f552912cc 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutations.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-mutations.ts
@@ -1,8 +1,8 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import {
   getTaskSourceCacheScope,
   type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
+} from '../../../../../../shared/work-items/task-source-context'
 import {
   buildTaskPageGitHubWorkItemMutationPatch,
   type TaskPageGitHubMutationIntent
@@ -11,13 +11,11 @@ import {
   familiesFromPendingOp,
   getRegistryMergedTaskPageGitHubWorkItem,
   recomputeSoftHideForItem,
-  rebuildSoftHiddenKeysFromPendingAndSticky,
   stripFamilyPendingFromList
 } from './task-page-github-work-item-mutation-composition'
 import {
   getConfirmedListSnapshot,
   getPendingTaskPageGitHubOp,
-  getStickyHideEntry,
   listPendingTaskPageGitHubOpsForItem,
   nextTaskPageGitHubMutationGeneration,
   notifyTaskPageGitHubMutationRegistry,
@@ -34,7 +32,6 @@ import type {
   BeginTaskPageGitHubWorkItemMutationArgs,
   BeginTaskPageGitHubWorkItemMutationResult
 } from './task-page-github-work-item-mutation-types'
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
 
 function resolveSourceScope(sourceContext?: TaskSourceContext | null): string | null {
   if (sourceContext?.provider === 'github') {
@@ -163,16 +160,3 @@ export function beginTaskPageGitHubWorkItemMutation(
 export function isTaskPageGitHubMutationPendingKey(key: TaskPageGitHubMutationKey): boolean {
   return getPendingTaskPageGitHubOp(key) !== undefined
 }
-
-export function getTaskPageGitHubStickyHideForTests(itemKey: string) {
-  return getStickyHideEntry(itemKey)
-}
-
-export function rebuildSoftHiddenFromItemsForTests(args: {
-  query: ParsedTaskQuery
-  queryKey: string
-  viewerLogin: string | null
-  items: readonly GitHubWorkItem[]
-}): void {
-  rebuildSoftHiddenKeysFromPendingAndSticky(args)
-}
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-registry-types.ts b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-registry-types.ts
similarity index 78%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-registry-types.ts
rename to src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-registry-types.ts
index 26cbb52c7a7..292caf9ffda 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-registry-types.ts
+++ b/src/renderer/src/components/task-page/github/mutations/task-page-github-work-item-registry-types.ts
@@ -1,5 +1,5 @@
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 
 export type TaskPageGitHubListFamily = 'assignees' | 'reviewRequests'
 export type TaskPageGitHubMutationKey = {
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-mutation-state.ts b/src/renderer/src/components/task-page/github/mutations/use-task-page-github-mutation-state.ts
similarity index 87%
rename from src/renderer/src/components/task-page/github/use-task-page-github-mutation-state.ts
rename to src/renderer/src/components/task-page/github/mutations/use-task-page-github-mutation-state.ts
index d4310cf6cad..7a7d10bfa68 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-mutation-state.ts
+++ b/src/renderer/src/components/task-page/github/mutations/use-task-page-github-mutation-state.ts
@@ -1,18 +1,18 @@
-import type { TaskPageLinearCreationStateModel } from '../linear/use-task-page-linear-creation-state'
-import { getGitHubTaskKind } from '../../../../../shared/work-items/task-github-search'
+import type { TaskPageLinearCreationStateModel } from '../../linear/creation/use-task-page-linear-creation-state'
+import { getGitHubTaskKind } from '../../../../../../shared/work-items/task-github-search'
 import { useMemo, useLayoutEffect, useEffect, useCallback, useRef } from 'react'
-import { parseTaskQuery } from '../../../../../shared/work-items/task-query'
+import { parseTaskQuery } from '../../../../../../shared/work-items/task-query'
 import {
   setTaskPageGitHubMutationQueryKey,
   getTaskPageGitHubConfirmedAuthorityItemKeys
-} from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
-import { getOrCreateQuietRevalidateState } from '@/components/task-page/github/task-page-github-work-item-quiet-state'
-import type { TaskPageGitHubPatchWorkItem } from '@/components/task-page/github/task-page-github-work-item-mutation-types'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-registry'
+import { getOrCreateQuietRevalidateState } from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-state'
+import type { TaskPageGitHubPatchWorkItem } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-types'
 import { useAppStore } from '@/store/index'
 import { useTaskPageGitHubWorkItemMutation } from '@/hooks/useTaskPageGitHubWorkItemMutation'
-import { rebuildSoftHiddenKeysFromPendingAndSticky } from '@/components/task-page/github/task-page-github-work-item-mutation-composition'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
-import { useTaskPageSourceDisplay } from '../use-task-page-source-display'
+import { rebuildSoftHiddenKeysFromPendingAndSticky } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-composition'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
+import { useTaskPageSourceDisplay } from '../../use-task-page-source-display'
 export function useTaskPageGitHubMutationState(model: TaskPageLinearCreationStateModel) {
   const {
     selectedRepos,
diff --git a/src/renderer/src/components/task-page/github/pr-check-hydration.test.tsx b/src/renderer/src/components/task-page/github/pr-check-hydration.test.tsx
deleted file mode 100644
index 7bc7faeedbb..00000000000
--- a/src/renderer/src/components/task-page/github/pr-check-hydration.test.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import { Suspense, startTransition, useState } from 'react'
-// @vitest-environment happy-dom
-import { act, cleanup, render, renderHook, screen } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageJiraCreationMetadataModel } from '../jira/use-task-page-jira-creation-metadata'
-import { GITHUB_COMPLETE_PR_CHECK_OBSERVATION_CAPABILITY as capability } from '../../../../../shared/source-control/runtime/source-control-runtime-capabilities'
-import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
-import { useTaskPageGitHubListProjection } from './use-task-page-github-list-projection'
-
-const { lookup } = vi.hoisted(() => ({ lookup: vi.fn() }))
-vi.mock('@/store', async () => {
-  const { create } = await import('zustand')
-  return { useAppStore: create(() => ({ runtimeStatusByEnvironmentId: new Map() })) }
-})
-vi.mock('@/hooks/useGitHubTaskItems', () => ({
-  useGitHubTaskItems: (items: GitHubWorkItem[]) => items
-}))
-vi.mock('./use-task-page-github-list-pending', () => ({
-  useTaskPageGitHubListPending: () => false
-}))
-vi.mock('@/lib/work-items/github/github-work-item-source-lookup', () => ({
-  lookupGitHubWorkItemByOwnerRepoForSource: lookup
-}))
-const repo = {
-  id: 'repo-1',
-  path: '/repo',
-  displayName: 'Repo',
-  badgeColor: '',
-  addedAt: 1,
-  kind: 'git' as const
-}
-const prRepo = { owner: 'acme', repo: 'widgets', host: 'github.com' }
-function item(number: number): GitHubWorkItem {
-  return {
-    id: `pr-${number}`,
-    repoId: repo.id,
-    number,
-    type: 'pr',
-    title: 'PR',
-    state: 'open',
-    url: `https://github.com/acme/widgets/pull/${number}`,
-    labels: [],
-    author: null,
-    updatedAt: '2026-11-04',
-    headSha: 'head',
-    prRepo
-  }
-}
-function model(items: GitHubWorkItem[], patch = vi.fn()) {
-  const input = {
-    repos: [repo],
-    selectedRepos: [repo],
-    fetchPRChecks: vi.fn().mockResolvedValue([]),
-    taskSource: 'github',
-    githubMode: 'items',
-    tasksFiltering: false,
-    githubPageSize: 100,
-    pages: [items],
-    currentPage: 0,
-    countedTotalPages: 1,
-    provenPageLimit: 1,
-    patchTaskPageWorkItemRows: patch,
-    perRepoSourceState: [],
-    activeGithubTaskKind: 'prs',
-    githubWorkItemMutation: { softHiddenItemKeys: new Set() },
-    selectedReposKey: 'repo',
-    taskRefreshNonce: 0,
-    workItemsInvalidationNonce: 0,
-    appliedTaskSearch: '',
-    paginationGenerationRef: { current: 1 }
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies all fields the projection hook reads.
-  return input as unknown as TaskPageJiraCreationMetadataModel
-}
-beforeEach(() => {
-  lookup.mockReset()
-  setLocalRuntimeCapabilitiesForTests([capability])
-})
-afterEach(() => {
-  cleanup()
-  setLocalRuntimeCapabilitiesForTests(null)
-})
-
-it('publishes exact-owner counts, rejects a newer owner replacement, and retires source changes', async () => {
-  const row = item(42)
-  let current = row
-  const patch = vi.fn((_key, values, accepts: (item: GitHubWorkItem) => boolean) => {
-    if (accepts(current)) {
-      current = { ...current, ...values }
-    }
-  })
-  const input = model([row], patch)
-  const read = Promise.withResolvers<GitHubWorkItem>()
-  lookup.mockReturnValue(read.promise)
-  const view = renderHook(() => useTaskPageGitHubListProjection(input))
-  const summary = {
-    state: 'failure' as const,
-    total: 101,
-    passed: 100,
-    failed: 1,
-    cancelled: 0,
-    pending: 0,
-    neutral: 0
-  }
-  await act(async () => {
-    read.resolve({ ...row, checksSummary: summary })
-    await read.promise
-  })
-  expect(current.checksSummary).toEqual(summary)
-  // A late hydration read cannot replace a newer full observation on the same head.
-  input.taskRefreshNonce++
-  input.paginationGenerationRef.current++
-  const second = Promise.withResolvers<GitHubWorkItem>()
-  lookup.mockReturnValue(second.promise)
-  view.rerender()
-  current = { ...row, checksSummary: { ...summary, failed: 2, total: 102 } }
-  await act(async () => {
-    second.resolve({ ...row, checksSummary: summary })
-    await second.promise
-  })
-  expect(current.checksSummary?.failed).toBe(2)
-  const third = Promise.withResolvers<GitHubWorkItem>()
-  lookup.mockReturnValue(third.promise)
-  input.taskRefreshNonce++
-  view.rerender()
-  view.unmount()
-  const previousCalls = patch.mock.calls.length
-  await act(async () => {
-    third.resolve({ ...row, checksSummary: summary })
-    await third.promise
-  })
-  expect(patch.mock.calls.length).toBe(previousCalls)
-})
-
-it.each([true, false])(
-  'only a committed query replacement retires a pending read (suspend=%s)',
-  async (suspend) => {
-    const row = item(42)
-    let current = row
-    const patch = vi.fn((_key, values, accepts: (item: GitHubWorkItem) => boolean) => {
-      if (accepts(current)) {
-        current = { ...current, ...values }
-      }
-    })
-    const original = Promise.withResolvers<GitHubWorkItem>()
-    const replacement = Promise.withResolvers<GitHubWorkItem>()
-    const blocked = Promise.withResolvers<void>()
-    const summary = {
-      state: 'failure' as const,
-      total: 1,
-      passed: 0,
-      failed: 1,
-      cancelled: 0,
-      pending: 0,
-      neutral: 0
-    }
-    lookup.mockReturnValueOnce(original.promise).mockReturnValueOnce(replacement.promise)
-    const first = model([row], patch)
-    const second = { ...first, appliedTaskSearch: 'replacement' }
-    let navigate!: (next: boolean) => void
-    function Consumer({ next }: { next: boolean }) {
-      useTaskPageGitHubListProjection(next ? second : first)
-      if (next && suspend) {
-        throw blocked.promise
-      }
-      return <span>{next ? 'Replacement query' : 'Original query'}</span>
-    }
-    function Harness() {
-      const [next, setNext] = useState(false)
-      navigate = setNext
-      return (
-        <Suspense fallback={<span>Waiting</span>}>
-          <Consumer next={next} />
-        </Suspense>
-      )
-    }
-    const view = render(<Harness />)
-    await act(async () => {
-      startTransition(() => navigate(true))
-    })
-    expect(screen.getByText(suspend ? 'Original query' : 'Replacement query')).toBeTruthy()
-    await act(async () => {
-      original.resolve({ ...row, checksSummary: summary })
-      await original.promise
-    })
-    expect(current.checksSummary).toEqual(suspend ? summary : undefined)
-    view.unmount()
-    await act(async () => {
-      replacement.resolve({ ...row, checksSummary: summary })
-      blocked.resolve()
-      await replacement.promise
-    })
-  }
-)
diff --git a/src/renderer/src/components/task-page/github/ChecksCell.tsx b/src/renderer/src/components/task-page/github/pull-requests/ChecksCell.tsx
similarity index 89%
rename from src/renderer/src/components/task-page/github/ChecksCell.tsx
rename to src/renderer/src/components/task-page/github/pull-requests/ChecksCell.tsx
index 86b3b6cdb83..5e970953788 100644
--- a/src/renderer/src/components/task-page/github/ChecksCell.tsx
+++ b/src/renderer/src/components/task-page/github/pull-requests/ChecksCell.tsx
@@ -1,11 +1,11 @@
-import { getProviderChecksOutcome } from '../../../../../shared/source-control/checks/provider-check-summary'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import { getProviderChecksOutcome } from '../../../../../../shared/source-control/checks/provider-check-summary'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import React, { useRef, useEffect } from 'react'
 import { useTranslate } from '@/i18n/use-translate'
 import { CheckCircle2, AlertCircle, Clock3, Minus } from 'lucide-react'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
 import { cn } from '@/lib/class-names'
-import { getChecksPillTone, getChecksLabel } from '../task-page-checks-pill'
+import { getChecksPillTone, getChecksLabel } from '../../task-page-checks-pill'
 export function PRChecksCell({
   item,
   onOpen,
diff --git a/src/renderer/src/components/task-page/github/MergeCell.tsx b/src/renderer/src/components/task-page/github/pull-requests/MergeCell.tsx
similarity index 93%
rename from src/renderer/src/components/task-page/github/MergeCell.tsx
rename to src/renderer/src/components/task-page/github/pull-requests/MergeCell.tsx
index 90adc647649..2c66b87a296 100644
--- a/src/renderer/src/components/task-page/github/MergeCell.tsx
+++ b/src/renderer/src/components/task-page/github/pull-requests/MergeCell.tsx
@@ -1,7 +1,7 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubPRMergeMethod } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubPRMergeMethod } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import React, { useState } from 'react'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { useAppStore } from '@/store/index'
@@ -13,7 +13,7 @@ import {
   getPullRequestMergeMethodLabel
 } from '@/components/github/pull-request-confirmation-copy'
 import { presentGitHubPRMergeState } from '@/components/github-pr-merge-state'
-import { resolveGitHubPRMergeMethods } from '../../../../../shared/github/pull-requests/merge/pull-request-merge-methods'
+import { resolveGitHubPRMergeMethods } from '../../../../../../shared/github/pull-requests/merge/pull-request-merge-methods'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import {
   DropdownMenu,
@@ -25,7 +25,7 @@ import {
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
 import { cn } from '@/lib/class-names'
 import { LoaderCircle, GitMerge, ChevronDown, ExternalLink } from 'lucide-react'
-import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model'
+import type { TaskPageGitHubWorkItemMutationRunner } from '../mutations/task-page-github-work-item-mutation-types'
 import { resolveTaskPullRequestRepo } from './task-page-github-review-model'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 export function PRMergeCell({
diff --git a/src/renderer/src/components/task-page/github/ReviewCell.tsx b/src/renderer/src/components/task-page/github/pull-requests/ReviewCell.tsx
similarity index 95%
rename from src/renderer/src/components/task-page/github/ReviewCell.tsx
rename to src/renderer/src/components/task-page/github/pull-requests/ReviewCell.tsx
index 210f99b7647..3798f9603e1 100644
--- a/src/renderer/src/components/task-page/github/ReviewCell.tsx
+++ b/src/renderer/src/components/task-page/github/pull-requests/ReviewCell.tsx
@@ -1,7 +1,7 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import React, { useState, useMemo, useRef, useCallback } from 'react'
 import { useAppStore } from '@/store/index'
 import { useShallow } from 'zustand/react/shallow'
@@ -16,16 +16,16 @@ import {
   getGitHubPRPrimaryReviewer,
   getGitHubPRReviewerRows,
   getGitHubPRReviewLabel
-} from '../../../../../shared/github/pull-requests/pr-reviewer-display'
+} from '../../../../../../shared/github/pull-requests/pr-reviewer-display'
 import { cn } from '@/lib/class-names'
 import { ChevronDown } from 'lucide-react'
 import { Popover, PopoverTrigger } from '@/components/ui/popover'
-import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model'
+import type { TaskPageGitHubWorkItemMutationRunner } from '../mutations/task-page-github-work-item-mutation-types'
 import {
   mergeReviewerSuggestions,
   resolveTaskPullRequestRepo
 } from './task-page-github-review-model'
-import { ReviewChipAvatar } from './Avatars'
+import { ReviewChipAvatar } from '../listing/Avatars'
 import { createTaskPageGitHubReviewerActions } from './task-page-github-reviewer-actions'
 import { TaskPageGitHubReviewerPicker } from './ReviewerPicker'
 export function PRReviewCell({
diff --git a/src/renderer/src/components/task-page/github/ReviewerPicker.tsx b/src/renderer/src/components/task-page/github/pull-requests/ReviewerPicker.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/github/ReviewerPicker.tsx
rename to src/renderer/src/components/task-page/github/pull-requests/ReviewerPicker.tsx
index 1517f28a104..fd256c94948 100644
--- a/src/renderer/src/components/task-page/github/ReviewerPicker.tsx
+++ b/src/renderer/src/components/task-page/github/pull-requests/ReviewerPicker.tsx
@@ -6,8 +6,8 @@ import { cn } from '@/lib/class-names'
 import { Input } from '@/components/ui/input'
 import { PopoverContent } from '@/components/ui/popover'
 
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { Repo } from '../../../../../shared/repo-types'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { Repo } from '../../../../../../shared/repo-types'
 import { GitHubUserAvatar } from '@/components/github/github-user-avatar'
 
 type ReviewerPickerProps = {
diff --git a/src/renderer/src/components/task-page/github/task-page-github-review-model.tsx b/src/renderer/src/components/task-page/github/pull-requests/task-page-github-review-model.tsx
similarity index 83%
rename from src/renderer/src/components/task-page/github/task-page-github-review-model.tsx
rename to src/renderer/src/components/task-page/github/pull-requests/task-page-github-review-model.tsx
index 1b86933b814..7c5b8851f06 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-review-model.tsx
+++ b/src/renderer/src/components/task-page/github/pull-requests/task-page-github-review-model.tsx
@@ -1,9 +1,9 @@
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../../shared/github/repositories/repository-identity'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
 import { sameGitHubOwnerRepo } from '@/components/github/IssueSourceIndicator'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
-import { githubProjectHost } from '../../../../../shared/github/projects/project-identity'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
+import { githubProjectHost } from '../../../../../../shared/github/projects/project-identity'
 export function sameOptionalGitHubOwnerRepo(
   left: GitHubOwnerRepo | null | undefined,
   right: GitHubOwnerRepo | null | undefined
diff --git a/src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts b/src/renderer/src/components/task-page/github/pull-requests/task-page-github-reviewer-actions.ts
similarity index 90%
rename from src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts
rename to src/renderer/src/components/task-page/github/pull-requests/task-page-github-reviewer-actions.ts
index 7a12f17a108..cf1f380fb8e 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-reviewer-actions.ts
+++ b/src/renderer/src/components/task-page/github/pull-requests/task-page-github-reviewer-actions.ts
@@ -2,20 +2,20 @@ import type { Dispatch, SetStateAction } from 'react'
 
 import { translate } from '@/i18n/i18n'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import type { TaskPageGitHubMutationIntent } from '@/components/task-page/github/task-page-github-work-item-mutation-patches'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
+import type { TaskPageGitHubMutationIntent } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-patches'
 import {
   normalizeGitHubReviewerLogins,
   parseGitHubReviewerInputLogins
-} from '../../../../../shared/github/pull-requests/pr-reviewer-display'
+} from '../../../../../../shared/github/pull-requests/pr-reviewer-display'
 import { toast } from 'sonner'
 
-import type { GitHubAssignableUser } from '../../../../../shared/github/pull-requests/pull-request-types'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../shared/github/repositories/repository-identity'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import type { TaskPageGitHubWorkItemMutationRunner } from '../linear/task-page-linear-jira-list-model'
+import type { GitHubAssignableUser } from '../../../../../../shared/github/pull-requests/pull-request-types'
+import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../../../shared/github/repositories/repository-identity'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import type { TaskPageGitHubWorkItemMutationRunner } from '../mutations/task-page-github-work-item-mutation-types'
 import { buildRequestedReviewUsers } from './task-page-github-review-model'
 
 type ReviewerActionsInput = {
diff --git a/src/renderer/src/components/task-page/github/use-task-page-pr-check-hydration.ts b/src/renderer/src/components/task-page/github/pull-requests/use-task-page-pr-check-hydration.ts
similarity index 92%
rename from src/renderer/src/components/task-page/github/use-task-page-pr-check-hydration.ts
rename to src/renderer/src/components/task-page/github/pull-requests/use-task-page-pr-check-hydration.ts
index 5db2fe96aac..e38a5fc6f82 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-pr-check-hydration.ts
+++ b/src/renderer/src/components/task-page/github/pull-requests/use-task-page-pr-check-hydration.ts
@@ -10,7 +10,7 @@ import {
   readLocalRuntimeCapabilityObservation,
   subscribeLocalRuntimeCapabilityObservation
 } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   capturePRCheckContract,
   type PRCheckContract
@@ -22,13 +22,13 @@ import {
   acceptPRCheckObservation,
   projectPRCheckOwner,
   completePRCheckOwnerScope
-} from '../../../../../shared/github/checks/complete-pr-check-owner'
+} from '../../../../../../shared/github/checks/complete-pr-check-owner'
 import { getWorkItemRepo } from '@/lib/work-items/work-item-repo-row'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskPageJiraCreationMetadataModel } from '../jira/use-task-page-jira-creation-metadata'
-import { deriveTaskPagePRCheckSummary } from '../task-page-pr-check-summary'
-import { PR_CHECKS_EAGER_PREFETCH_LIMIT } from '../task-page-source-context'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskPageJiraCreationMetadataModel } from '../../jira/creation/use-task-page-jira-creation-metadata'
+import { deriveTaskPagePRCheckSummary } from '../../task-page-pr-check-summary'
+import { PR_CHECKS_EAGER_PREFETCH_LIMIT } from '../../task-page-source-context'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
 import { sameOptionalGitHubOwnerRepo } from './task-page-github-review-model'
 import { recomputeOn } from '@/lib/recompute-on'
 export function useTaskPagePRCheckHydration(
diff --git a/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-model.ts b/src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-model.ts
similarity index 92%
rename from src/renderer/src/components/task-page/github/task-page-github-landing-refresh-model.ts
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-model.ts
index 2bc528e952a..8c184e8af62 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-model.ts
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-model.ts
@@ -1,4 +1,4 @@
-import type { TaskPageGitHubSearchPaginationModel } from './use-task-page-github-search-pagination'
+import type { TaskPageGitHubSearchPaginationModel } from '../listing/use-task-page-github-search-pagination'
 
 /** The parts of the Tasks page model a landing refresh reads and drives. */
 export type TaskPageGitHubLandingRefreshModel = Pick<
diff --git a/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx b/src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-run.tsx
similarity index 93%
rename from src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-run.tsx
index 4119be279bf..00fa8240564 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-landing-refresh-run.tsx
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-landing-refresh-run.tsx
@@ -1,22 +1,22 @@
 import type { TaskPageGitHubLandingRefreshModel } from './task-page-github-landing-refresh-model'
-import { stripRepoQualifiers } from '../../../../../shared/work-items/task-query'
+import { stripRepoQualifiers } from '../../../../../../shared/work-items/task-query'
 import { useAppStore } from '@/store/index'
 import {
   taskPageGitHubResumeCache,
   TASK_PAGE_GITHUB_RESUME_FRESH_MS
-} from '@/components/task-page/github/task-page-github-resume-cache'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
-import { sortWorkItemsByNumber } from '../../../../../shared/work-items/work-item-order'
-import { taskPageToGitHubApiPage } from '../../../../../shared/work-items/work-item-pagination'
+} from '@/components/task-page/github/cache/task-page-github-resume-cache'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
+import { sortWorkItemsByNumber } from '../../../../../../shared/work-items/work-item-order'
+import { taskPageToGitHubApiPage } from '../../../../../../shared/work-items/work-item-pagination'
 import {
   materializeTaskPageItemList,
   overlayPendingOnTaskPagePages,
   reapplyPendingTaskPageGitHubMutationsToCache
-} from '@/components/task-page/github/task-page-github-work-item-mutation-pages'
-import { clearTaskPageGitHubAuthorityThroughGeneration } from '@/components/task-page/github/task-page-github-work-item-authority-refresh'
-import { getOrCreateQuietRevalidateState } from '@/components/task-page/github/task-page-github-work-item-quiet-state'
-import { resolveEmptyPageOutcome } from '../../../../../shared/work-items/work-item-empty-page'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-pages'
+import { clearTaskPageGitHubAuthorityThroughGeneration } from '@/components/task-page/github/refresh/task-page-github-work-item-authority-refresh'
+import { getOrCreateQuietRevalidateState } from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-state'
+import { resolveEmptyPageOutcome } from '../../../../../../shared/work-items/work-item-empty-page'
 import {
   deriveTaskPageGitHubWorkItemsFetchOptions,
   shouldReplaceTaskPageItemsAfterRefresh,
@@ -24,7 +24,7 @@ import {
   reconcileTaskPagePagesAfterLandingRefresh
 } from '@/components/task-page/task-page-cache-selectors'
 import { translate } from '@/i18n/i18n'
-import { taskPageGitHubLandingRequestKey } from './use-task-page-github-list-pending'
+import { taskPageGitHubLandingRequestKey } from '../listing/use-task-page-github-list-pending'
 export function runTaskPageGitHubLandingRefresh(model: TaskPageGitHubLandingRefreshModel) {
   const {
     fetchWorkItemsAcrossRepos,
diff --git a/src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx b/src/renderer/src/components/task-page/github/refresh/task-page-github-quiet-refresh-run.tsx
similarity index 92%
rename from src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-quiet-refresh-run.tsx
index afd6b0e815b..18065a15548 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-quiet-refresh-run.tsx
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-quiet-refresh-run.tsx
@@ -3,32 +3,32 @@ import {
   getOrCreateQuietRevalidateState,
   beginTaskPageQuietRevalidateRun,
   finishTaskPageQuietRevalidateRun
-} from '@/components/task-page/github/task-page-github-work-item-quiet-state'
-import { taskPageGitHubItemKey } from '@/components/task-page/github/task-page-github-work-item-mutation-keys'
-import { getTaskPageGitHubConfirmedAuthorityItemKeys } from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
+} from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-state'
+import { taskPageGitHubItemKey } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-keys'
+import { getTaskPageGitHubConfirmedAuthorityItemKeys } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-registry'
 import {
   clearTaskPageGitHubAuthorityAbsentFromLoadedItems,
   getTaskPageGitHubRevalidatableAuthorityItemKeys
-} from '@/components/task-page/github/task-page-github-work-item-authority-refresh'
+} from '@/components/task-page/github/refresh/task-page-github-work-item-authority-refresh'
 import {
   isTaskPageQuietRevalidateScopeCurrent,
   isTaskPageQuietRevalidateRunCurrent,
   processTaskPageQuietRevalidateSettle,
   getTaskPageQuietRevalidateBackoffAttempt
-} from '@/components/task-page/github/task-page-github-work-item-quiet-revalidate'
+} from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-revalidate'
 import {
   reapplyPendingTaskPageGitHubMutationsToCache,
   reconcileTaskPagePagesAfterQuietRefresh
-} from '@/components/task-page/github/task-page-github-work-item-mutation-pages'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-pages'
 import {
   LAG_WALL_BUDGET_MS,
   MAX_LAG_TRAILS,
   LAG_BACKOFF_MS
-} from '@/components/task-page/github/task-page-github-work-item-quiet-adopt'
-import { stripRepoQualifiers } from '../../../../../shared/work-items/task-query'
-import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { taskPageToGitHubApiPage } from '../../../../../shared/work-items/work-item-pagination'
+} from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-adopt'
+import { stripRepoQualifiers } from '../../../../../../shared/work-items/task-query'
+import { getTaskPageRepoSourceContext } from '../../../../lib/work-items/task-repo-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import { taskPageToGitHubApiPage } from '../../../../../../shared/work-items/work-item-pagination'
 import { useAppStore } from '@/store/index'
 export function runTaskPageGitHubQuietRefresh(model: TaskPageGitHubQuietRefreshPreludeModel) {
   const {
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-authority-refresh.ts
similarity index 94%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-authority-refresh.ts
index fcde70a7fe9..24223196de1 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-authority-refresh.ts
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-authority-refresh.ts
@@ -1,4 +1,4 @@
-import { taskPageGitHubFamilyDirtyKey } from './task-page-github-work-item-mutation-keys'
+import { taskPageGitHubFamilyDirtyKey } from '../mutations/task-page-github-work-item-mutation-keys'
 import {
   clearConfirmedAuthorityForItem,
   deleteConfirmedListSnapshot,
@@ -11,11 +11,11 @@ import {
   notifyTaskPageGitHubMutationRegistry,
   resolveItemSourceScope,
   updateSoftHiddenItemKey
-} from './task-page-github-work-item-mutation-registry'
+} from '../mutations/task-page-github-work-item-mutation-registry'
 import {
   deleteLastConfirmedClientValue,
   getLastConfirmedClientValue
-} from './task-page-github-confirmed-client-values'
+} from '../mutations/task-page-github-confirmed-client-values'
 import { getQuietRevalidateState } from './task-page-github-work-item-quiet-state'
 import { MAX_LAG_TRAILS } from './task-page-github-work-item-quiet-adopt'
 
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-adopt.ts
similarity index 87%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-adopt.ts
index 418beba587f..8b21d57f6eb 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-adopt.ts
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-adopt.ts
@@ -1,26 +1,29 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { parseGitHubIssueOrPRLink } from '../../../../../shared/github/repositories/links'
-import { loginSetOfUsers, loginSetsEqual } from './task-page-github-work-item-mutation-patches'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import { parseGitHubIssueOrPRLink } from '../../../../../../shared/github/repositories/links'
+import {
+  loginSetOfUsers,
+  loginSetsEqual
+} from '../mutations/task-page-github-work-item-mutation-patches'
 import {
   familiesFromPendingOp,
   freezeTaskPageGitHubUsers
-} from './task-page-github-work-item-mutation-composition'
+} from '../mutations/task-page-github-work-item-mutation-composition'
 import {
   getConfirmedListSnapshot,
   listPendingTaskPageGitHubOpsForItem,
   deleteConfirmedListSnapshot
-} from './task-page-github-work-item-mutation-registry'
+} from '../mutations/task-page-github-work-item-mutation-registry'
 import {
   getLastConfirmedClientValue,
   deleteLastConfirmedClientValue
-} from './task-page-github-confirmed-client-values'
+} from '../mutations/task-page-github-confirmed-client-values'
 import { getOrCreateQuietRevalidateState } from './task-page-github-work-item-quiet-state'
 import {
   taskPageGitHubFamilyDirtyKey,
   taskPageGitHubItemKey
-} from './task-page-github-work-item-mutation-keys'
-import type { TaskPageGitHubPatchWorkItem } from './task-page-github-work-item-mutation-types'
+} from '../mutations/task-page-github-work-item-mutation-keys'
+import type { TaskPageGitHubPatchWorkItem } from '../mutations/task-page-github-work-item-mutation-types'
 
 export const MAX_LAG_TRAILS = 5
 export const LAG_WALL_BUDGET_MS = 90_000
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-revalidate.ts b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-revalidate.ts
similarity index 92%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-revalidate.ts
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-revalidate.ts
index b25c4d16daf..23896a8a183 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-revalidate.ts
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-revalidate.ts
@@ -1,5 +1,5 @@
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-items/work-item-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import {
   adoptQuietSearchFieldsForItem,
   MAX_LAG_TRAILS
@@ -12,10 +12,10 @@ import {
   hasPendingTaskPageGitHubOpsForItem,
   notifyTaskPageGitHubMutationRegistry,
   resolveItemSourceScope
-} from './task-page-github-work-item-mutation-registry'
+} from '../mutations/task-page-github-work-item-mutation-registry'
 import { getOrCreateQuietRevalidateState } from './task-page-github-work-item-quiet-state'
-import { taskPageGitHubItemKey } from './task-page-github-work-item-mutation-keys'
-import type { TaskPageGitHubPatchWorkItem } from './task-page-github-work-item-mutation-types'
+import { taskPageGitHubItemKey } from '../mutations/task-page-github-work-item-mutation-keys'
+import type { TaskPageGitHubPatchWorkItem } from '../mutations/task-page-github-work-item-mutation-types'
 
 export type TaskPageQuietRevalidateScope = { queryKey: string; generation: number }
 
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-state.ts b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-state.ts
similarity index 96%
rename from src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-state.ts
rename to src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-state.ts
index 2d9891020b5..49c9fed0347 100644
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-quiet-state.ts
+++ b/src/renderer/src/components/task-page/github/refresh/task-page-github-work-item-quiet-state.ts
@@ -1,4 +1,4 @@
-import { taskPageGitHubFamilyDirtyKey } from './task-page-github-work-item-mutation-keys'
+import { taskPageGitHubFamilyDirtyKey } from '../mutations/task-page-github-work-item-mutation-keys'
 
 /** Identity token for the caller driving one quiet run; compared by reference, never read. */
 export type QuietRevalidateRunOwner = Record<string, never>
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts b/src/renderer/src/components/task-page/github/refresh/use-task-page-github-landing-refresh.ts
similarity index 90%
rename from src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts
rename to src/renderer/src/components/task-page/github/refresh/use-task-page-github-landing-refresh.ts
index ea8c4cbffd4..238bd8ec870 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-landing-refresh.ts
+++ b/src/renderer/src/components/task-page/github/refresh/use-task-page-github-landing-refresh.ts
@@ -1,4 +1,4 @@
-import type { TaskPageGitHubSearchPaginationModel } from './use-task-page-github-search-pagination'
+import type { TaskPageGitHubSearchPaginationModel } from '../listing/use-task-page-github-search-pagination'
 import { useEffect } from 'react'
 import { runTaskPageGitHubLandingRefresh } from './task-page-github-landing-refresh-run'
 export function useTaskPageGitHubLandingRefresh(model: TaskPageGitHubSearchPaginationModel) {
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh-effect.ts b/src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh-effect.ts
similarity index 100%
rename from src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh-effect.ts
rename to src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh-effect.ts
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts b/src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh.ts
similarity index 94%
rename from src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts
rename to src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh.ts
index 732e11642e5..d9ae71b01f4 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-quiet-refresh.ts
+++ b/src/renderer/src/components/task-page/github/refresh/use-task-page-github-quiet-refresh.ts
@@ -1,8 +1,8 @@
 import type { TaskPageGitHubLandingRefreshModel } from './use-task-page-github-landing-refresh'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useRef } from 'react'
-import type { QuietRevalidateRunOwner } from '@/components/task-page/github/task-page-github-work-item-quiet-state'
-import { advanceTaskPageQuietRevalidateScope } from '@/components/task-page/github/task-page-github-work-item-quiet-revalidate'
+import type { QuietRevalidateRunOwner } from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-state'
+import { advanceTaskPageQuietRevalidateScope } from '@/components/task-page/github/refresh/task-page-github-work-item-quiet-revalidate'
 import { useTaskPageGitHubQuietRefreshEffect } from './use-task-page-github-quiet-refresh-effect'
 export type TaskPageGitHubQuietRefreshPreludeModel = ReturnType<
   typeof useTaskPageGitHubQuietRefreshPrelude
diff --git a/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts b/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts
deleted file mode 100644
index 1985bd0e804..00000000000
--- a/src/renderer/src/components/task-page/github/task-page-github-list-scroll-restore.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import {
-  startGitHubListScrollRestore,
-  supersedeGitHubListScrollRestore,
-  type GitHubListRestoreWrite
-} from './task-page-github-list-scroll-restore'
-
-type FakeResizeObserver = {
-  targets: Set<Element>
-  notify: () => void
-}
-
-const observers: FakeResizeObserver[] = []
-
-/** Notifies every observer watching `target`, mirroring a real content/box resize. */
-function resize(target: Element): void {
-  for (const observer of observers) {
-    if (observer.targets.has(target)) {
-      observer.notify()
-    }
-  }
-}
-
-/** Scroll container whose scrollTop clamps to `maxScrollTop`, like a real overflow box. */
-function createScrollList(maxScrollTop: number): {
-  element: HTMLDivElement
-  rows: HTMLDivElement
-  setMaxScrollTop: (next: number) => void
-} {
-  const element = document.createElement('div')
-  const rows = document.createElement('div')
-  element.append(rows)
-  let max = maxScrollTop
-  let value = 0
-  Object.defineProperty(element, 'scrollTop', {
-    configurable: true,
-    get: () => value,
-    set: (next: number) => {
-      value = Math.max(0, Math.min(next, max))
-    }
-  })
-  return {
-    element,
-    rows,
-    setMaxScrollTop: (next: number) => {
-      max = next
-      value = Math.min(value, next)
-    }
-  }
-}
-
-function ref<T>(current: T): { current: T } {
-  return { current }
-}
-
-describe('GitHub task list scroll restore', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    observers.length = 0
-    vi.stubGlobal(
-      'ResizeObserver',
-      class {
-        private readonly entry: FakeResizeObserver
-        constructor(callback: () => void) {
-          this.entry = { targets: new Set(), notify: callback }
-          observers.push(this.entry)
-        }
-        observe(target: Element): void {
-          this.entry.targets.add(target)
-        }
-        disconnect(): void {
-          this.entry.targets.clear()
-        }
-      }
-    )
-  })
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-  })
-
-  describe('user takeover', () => {
-    it('ends a restore the list can never satisfy when the user scrolls', () => {
-      const list = createScrollList(0)
-      const pendingRestoreRef = ref<number | null>(360)
-      const restoreWriteRef = ref<GitHubListRestoreWrite | null>(null)
-
-      startGitHubListScrollRestore({
-        target: 360,
-        scrollElementRef: ref<HTMLElement | null>(list.element),
-        pendingRestoreRef,
-        restoreWriteRef,
-        onScrollTopApplied: () => {}
-      })
-
-      list.setMaxScrollTop(900)
-      list.element.scrollTop = 120
-      expect(
-        supersedeGitHubListScrollRestore({ scrollTop: 120, pendingRestoreRef, restoreWriteRef })
-      ).toBe(true)
-      expect(pendingRestoreRef.current).toBeNull()
-      expect(restoreWriteRef.current).toBeNull()
-
-      // Without the takeover the next resize would drag the user back to the old offset.
-      resize(list.rows)
-      expect(list.element.scrollTop).toBe(120)
-    })
-  })
-})
diff --git a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-types.ts b/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-types.ts
deleted file mode 100644
index 0d59ae7b9c4..00000000000
--- a/src/renderer/src/components/task-page/github/task-page-github-work-item-mutation-types.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { ParsedTaskQuery } from '../../../../../shared/work-items/task-query'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import type { GitHubPatchWorkItemOptions } from '../../../store/github/work-items/work-item-patch-options'
-import type { TaskPageGitHubMutationIntent } from './task-page-github-work-item-mutation-patches'
-import type { TaskPageGitHubMutationKey } from './task-page-github-work-item-registry-types'
-
-export type TaskPageGitHubPatchWorkItem = (
-  itemId: string,
-  patch: Partial<GitHubWorkItem>,
-  repoId?: string,
-  options?: GitHubPatchWorkItemOptions
-) => void
-
-export type BeginTaskPageGitHubWorkItemMutationArgs = {
-  settleAccepted?: (success: boolean) => GitHubWorkItem
-  item: GitHubWorkItem
-  intent: TaskPageGitHubMutationIntent
-  sourceContext?: TaskSourceContext | null
-  query: ParsedTaskQuery
-  queryKey: string
-  viewerLogin: string | null
-  /** Derived inside begin from item sourceContext if omitted. */
-  skipMeQualifiers?: boolean
-  patchWorkItem: TaskPageGitHubPatchWorkItem
-}
-
-export type BeginTaskPageGitHubWorkItemMutationResult = {
-  generation: number
-  opKey: string
-  itemKey: string
-  families: string[]
-  key: TaskPageGitHubMutationKey
-}
diff --git a/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts b/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts
index da60f83304a..64e273c77ce 100644
--- a/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts
+++ b/src/renderer/src/components/task-page/github/use-task-page-github-detail.ts
@@ -1,4 +1,4 @@
-import type { TaskPageGitHubListStateModel } from './use-task-page-github-list-state'
+import type { TaskPageGitHubListStateModel } from './listing/use-task-page-github-list-state'
 import { useAppStore } from '@/store/index'
 import { getWorkItemRepo } from '@/lib/work-items/work-item-repo-row'
 import { githubTaskBinding } from '@/lib/work-items/github/github-task-observation'
@@ -6,11 +6,11 @@ import { useState, useMemo, useLayoutEffect, useCallback, useEffect } from 'reac
 import type { ItemDialogTab } from '@/components/github/github-work-item-identity'
 import { stripRepoQualifiers } from '../../../../../shared/work-items/task-query'
 import { createTaskPageDialogWorkItemReader } from '@/components/task-page/task-page-dialog-work-item'
-import { useTaskPageWorkItemsCacheSelection } from './use-task-page-work-items-cache-selection'
+import { useTaskPageWorkItemsCacheSelection } from './cache/use-task-page-work-items-cache-selection'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
 import type { GitLabWorkItem } from '../../../../../shared/gitlab-types'
 import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-source-context'
-import { startGitHubListScrollRestore } from './task-page-github-list-scroll-restore'
+import { startGitHubListScrollRestore } from './listing/task-page-github-list-scroll-restore'
 
 function getTaskPageScrollTop(
   scrollRef: React.RefObject<HTMLElement | null>,
diff --git a/src/renderer/src/components/task-page/jira/Content.tsx b/src/renderer/src/components/task-page/jira/Content.tsx
index 4a7ca204a0c..3600962a014 100644
--- a/src/renderer/src/components/task-page/jira/Content.tsx
+++ b/src/renderer/src/components/task-page/jira/Content.tsx
@@ -7,14 +7,14 @@ import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '@/components/ui/button'
 import { jiraListGridStyle } from '../../jira-list-columns'
 import { JiraListColumnsMenu } from '../../jira-list-columns-menu'
-import { TaskPageJiraSortControls } from './task-page-jira-sort-controls'
-import { TaskPageJiraErrorBanner } from '../linear/task-page-linear-jira-list-model'
-import { TaskPageJiraTextFallbackNotice } from './task-page-jira-text-fallback-notice'
-import { TaskPageJiraIssueList } from '@/components/task-page/jira/task-page-jira-issue-list'
-import { TaskPageJiraBoardView } from '@/components/task-page/jira/task-page-jira-board-view'
+import { TaskPageJiraSortControls } from './listing/task-page-jira-sort-controls'
+import { TaskPageJiraErrorBanner } from './listing/task-page-jira-error-banner'
+import { TaskPageJiraTextFallbackNotice } from './listing/task-page-jira-text-fallback-notice'
+import { TaskPageJiraIssueList } from '@/components/task-page/jira/listing/task-page-jira-issue-list'
+import { TaskPageJiraBoardView } from '@/components/task-page/jira/boards/task-page-jira-board-view'
 import { TaskPageJiraViewControls } from '@/components/task-page/jira/task-page-jira-view-controls'
 import { formatRelativeTime } from '../task-page-source-context'
-import { getJiraStatusTone } from '@/components/task-page/jira/task-page-jira-status-tone'
+import { getJiraStatusTone } from '@/components/task-page/jira/listing/task-page-jira-status-tone'
 import JiraIssueWorkspace from '@/components/JiraIssueWorkspace'
 import { TaskPageLinearContent } from '../linear/Content'
 import {
diff --git a/src/renderer/src/components/task-page/jira/Filters.tsx b/src/renderer/src/components/task-page/jira/Filters.tsx
index 94087bc020e..5d999ef3812 100644
--- a/src/renderer/src/components/task-page/jira/Filters.tsx
+++ b/src/renderer/src/components/task-page/jira/Filters.tsx
@@ -1,6 +1,6 @@
-import { TaskPageJiraStatusFilters } from './TaskPageJiraStatusFilters'
-import { TaskPageJiraSavedFilters } from './TaskPageJiraSavedFilters'
-import { TaskPageJiraFavouriteFilters } from './TaskPageJiraFavouriteFilters'
+import { TaskPageJiraStatusFilters } from './filters/TaskPageJiraStatusFilters'
+import { TaskPageJiraSavedFilters } from './filters/TaskPageJiraSavedFilters'
+import { TaskPageJiraFavouriteFilters } from './filters/TaskPageJiraFavouriteFilters'
 import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
 import { cn } from '@/lib/class-names'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
diff --git a/src/renderer/src/components/task-page/jira/IssueAssigneeField.test.tsx b/src/renderer/src/components/task-page/jira/IssueAssigneeField.test.tsx
deleted file mode 100644
index 55a723ed074..00000000000
--- a/src/renderer/src/components/task-page/jira/IssueAssigneeField.test.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-// @vitest-environment happy-dom
-import type { ComponentProps } from 'react'
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-import { TaskPageJiraIssueAssigneeField } from './IssueAssigneeField'
-
-const search = vi.hoisted(() => vi.fn())
-vi.mock('@/runtime/jira/runtime-jira-user-fields-client', () => ({
-  jiraListAssignableUsersForProject: search
-}))
-afterEach(cleanup)
-
-it('drops old provider candidates before another host with identical project IDs can select them', async () => {
-  const onSelect = vi.fn()
-  const model: ComponentProps<typeof TaskPageJiraIssueAssigneeField>['model'] = {
-    settings: null,
-    jiraTaskSourceContext: null,
-    jiraStatusCurrent: true,
-    jiraStatus: {
-      connected: true,
-      activeSiteId: 'same-site',
-      viewer: { accountId: 'local-me', displayName: 'Local me', email: null }
-    },
-    jiraCreateFields: [{ key: 'assignee', name: 'Assignee', required: false }],
-    newJiraIssueTargetProject: { id: '100', key: 'PRJ', name: 'Project', siteId: 'same-site' },
-    newJiraIssueAssignee: null,
-    setNewJiraIssueAssignee: onSelect,
-    newJiraIssueSubmitting: false,
-    providerRuntimeContextKey: 'local'
-  }
-  search.mockResolvedValueOnce([{ accountId: 'local-user', displayName: 'Local user' }])
-  const { rerender } = render(<TaskPageJiraIssueAssigneeField model={model} />)
-  fireEvent.click(screen.getByRole('button', { name: 'Assignee' }))
-  await screen.findByRole('button', { name: 'Local user' })
-  expect(screen.getByRole('button', { name: 'Assign to me (Local me)' })).toBeTruthy()
-  expect(search).toHaveBeenCalledWith(
-    { kind: 'default-scope', settings: null },
-    'PRJ',
-    '',
-    'same-site'
-  )
-
-  search.mockReturnValueOnce(new Promise(() => {}))
-  rerender(
-    <TaskPageJiraIssueAssigneeField
-      model={{ ...model, providerRuntimeContextKey: 'runtime:remote', jiraStatusCurrent: false }}
-    />
-  )
-  expect(screen.queryByRole('button', { name: 'Local user' })).toBeNull()
-  fireEvent.click(screen.getByRole('button', { name: 'Assignee' }))
-  await waitFor(() => expect(search).toHaveBeenCalledTimes(2))
-  expect(screen.queryByRole('button', { name: 'Local user' })).toBeNull()
-  expect(screen.queryByRole('button', { name: 'Assign to me (Local me)' })).toBeNull()
-  rerender(
-    <TaskPageJiraIssueAssigneeField
-      model={{
-        ...model,
-        providerRuntimeContextKey: 'runtime:remote',
-        jiraStatus: {
-          ...model.jiraStatus,
-          viewer: { accountId: 'remote-me', displayName: 'Remote me', email: null }
-        }
-      }}
-    />
-  )
-  fireEvent.click(screen.getByRole('button', { name: 'Assign to me (Remote me)' }))
-  expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ accountId: 'remote-me' }))
-})
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-move-dialog.tsx b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move-dialog.tsx
similarity index 95%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board-move-dialog.tsx
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move-dialog.tsx
index 682e1babaf4..b849151157a 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-move-dialog.tsx
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move-dialog.tsx
@@ -8,13 +8,13 @@ import {
   DialogTitle
 } from '@/components/ui/dialog'
 import { useTranslate } from '@/i18n/use-translate'
-import { JiraTransitionFieldsForm } from '../../jira-transition-fields-form'
-import { classifyTransitionRequirements } from '../../../../../shared/jira/jira-transition-fields'
+import { JiraTransitionFieldsForm } from '../../../jira-transition-fields-form'
+import { classifyTransitionRequirements } from '../../../../../../shared/jira/jira-transition-fields'
 import type {
   JiraIssue,
   JiraIssueUpdate,
   JiraTransition
-} from '../../../../../shared/jira/jira-types'
+} from '../../../../../../shared/jira/jira-types'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 
 export type JiraBoardMovePrompt = {
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-move.ts b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move.ts
similarity index 89%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board-move.ts
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move.ts
index 5bd213a77c9..36569d2c881 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-move.ts
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-move.ts
@@ -3,9 +3,9 @@ import type {
   JiraIssueUpdate,
   JiraMutationResult,
   JiraTransition
-} from '../../../../../shared/jira/jira-types'
+} from '../../../../../../shared/jira/jira-types'
 import type { TaskPageJiraBoardSection } from './task-page-jira-board-sections'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import {
   findJiraBoardSectionTransitions,
   loadTaskPageJiraIssueTransitions
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-sections.ts b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-sections.ts
similarity index 95%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board-sections.ts
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board-sections.ts
index bdc8520dfcf..89d4d026aa0 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-sections.ts
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-sections.ts
@@ -1,5 +1,5 @@
-import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../shared/jira/jira-types'
-import { groupJiraIssuesByStatus } from './task-page-jira-issue-list'
+import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../../shared/jira/jira-types'
+import { groupJiraIssuesByStatus } from '../listing/task-page-jira-issue-list'
 
 export type TaskPageJiraBoardSection = {
   key: string
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.ts b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-transitions.ts
similarity index 92%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.ts
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board-transitions.ts
index 08978ea9e58..645c56e9d86 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.ts
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-transitions.ts
@@ -1,5 +1,5 @@
-import type { JiraIssue, JiraTransition } from '../../../../../shared/jira/jira-types'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { JiraIssue, JiraTransition } from '../../../../../../shared/jira/jira-types'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import { jiraListTransitionsForTarget } from '@/runtime/jira/runtime-jira-detail-client'
 import { getRuntimeTargetHostId } from '@/runtime/rpc/targets/runtime-client-target'
 import { createMetadataRequestStore, loadMetadata } from '@/hooks/metadata-request-cache'
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-view.tsx b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-view.tsx
similarity index 94%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board-view.tsx
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board-view.tsx
index fbe6b20685e..6ea2209f254 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-view.tsx
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board-view.tsx
@@ -3,21 +3,21 @@ import { useAppStore } from '@/store/index'
 import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 import { useTranslate } from '@/i18n/use-translate'
-import { classifyTransitionRequirements } from '../../../../../shared/jira/jira-transition-fields'
+import { classifyTransitionRequirements } from '../../../../../../shared/jira/jira-transition-fields'
 import type {
   JiraIssue,
   JiraIssueUpdate,
   JiraProjectStatusOrder,
   JiraTransition
-} from '../../../../../shared/jira/jira-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+} from '../../../../../../shared/jira/jira-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import { TaskPageJiraBoard, jiraBoardIssueRefKey } from './task-page-jira-board'
 import type { TaskPageJiraBoardSection } from './task-page-jira-board-sections'
 import { JiraBoardMoveDialog, type JiraBoardMovePrompt } from './task-page-jira-board-move-dialog'
 import { applyJiraBoardMove, getJiraBoardMoveTransitions } from './task-page-jira-board-move'
-import { formatRelativeTime } from '../task-page-source-context'
-import { enqueueJiraIssueMutation, jiraIssueRequestScope } from '../../jira-issue-mutation-queue'
+import { formatRelativeTime } from '../../task-page-source-context'
+import { enqueueJiraIssueMutation, jiraIssueRequestScope } from '../../../jira-issue-mutation-queue'
 
 type Props = {
   issues: JiraIssue[]
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board.tsx b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board.tsx
similarity index 99%
rename from src/renderer/src/components/task-page/jira/task-page-jira-board.tsx
rename to src/renderer/src/components/task-page/jira/boards/task-page-jira-board.tsx
index a2e6183a195..f86846a7024 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board.tsx
+++ b/src/renderer/src/components/task-page/jira/boards/task-page-jira-board.tsx
@@ -17,7 +17,7 @@ import {
   writeJiraBoardIssueDragData
 } from '@/lib/work-items/jira/jira-board-drag-payload'
 import type { JiraBoardIssueDragRef } from '@/lib/work-items/jira/jira-board-drag-payload'
-import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../shared/jira/jira-types'
+import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../../shared/jira/jira-types'
 import {
   buildJiraBoardSections,
   type TaskPageJiraBoardSection
diff --git a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx b/src/renderer/src/components/task-page/jira/creation/IssueAssigneeField.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx
rename to src/renderer/src/components/task-page/jira/creation/IssueAssigneeField.tsx
index 051628eab53..1d81be293df 100644
--- a/src/renderer/src/components/task-page/jira/IssueAssigneeField.tsx
+++ b/src/renderer/src/components/task-page/jira/creation/IssueAssigneeField.tsx
@@ -1,8 +1,8 @@
 import { useCallback } from 'react'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { getJiraSelfUser } from '@/components/jira-self-user'
 import { JiraUserPicker, type JiraUserPickerFixedOption } from '@/components/jira-user-picker'
-import { hasJiraAssigneeCreateField } from '@/components/task-page/jira/task-page-jira-create-fields'
+import { hasJiraAssigneeCreateField } from '@/components/task-page/jira/creation/task-page-jira-create-fields'
 import { getJiraProjectSelectionKey } from '@/components/task-page/jira/task-page-jira-project-selection'
 import { jiraListAssignableUsersForProject } from '@/runtime/jira/runtime-jira-user-fields-client'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/task-page/jira/IssueDialog.tsx b/src/renderer/src/components/task-page/jira/creation/IssueDialog.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/jira/IssueDialog.tsx
rename to src/renderer/src/components/task-page/jira/creation/IssueDialog.tsx
index b2d8aa673b2..aa7ad3ab009 100644
--- a/src/renderer/src/components/task-page/jira/IssueDialog.tsx
+++ b/src/renderer/src/components/task-page/jira/creation/IssueDialog.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import {
   Dialog,
   DialogContent,
@@ -34,7 +34,7 @@ import { Input } from '@/components/ui/input'
 import {
   getJiraCreateAllowedValueLabel,
   isJiraScalarUserCreateField
-} from '@/components/task-page/jira/task-page-jira-create-fields'
+} from '@/components/task-page/jira/creation/task-page-jira-create-fields'
 import { TaskPageJiraIssueAssigneeField } from './IssueAssigneeField'
 import { TaskPageJiraIssueUserField } from './IssueUserField'
 export function TaskPageJiraIssueDialog({
diff --git a/src/renderer/src/components/task-page/jira/IssueTitleField.tsx b/src/renderer/src/components/task-page/jira/creation/IssueTitleField.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/jira/IssueTitleField.tsx
rename to src/renderer/src/components/task-page/jira/creation/IssueTitleField.tsx
index e5c99a559c8..1f859e72c24 100644
--- a/src/renderer/src/components/task-page/jira/IssueTitleField.tsx
+++ b/src/renderer/src/components/task-page/jira/creation/IssueTitleField.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { Input } from '@/components/ui/input'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/task-page/jira/IssueUserField.tsx b/src/renderer/src/components/task-page/jira/creation/IssueUserField.tsx
similarity index 92%
rename from src/renderer/src/components/task-page/jira/IssueUserField.tsx
rename to src/renderer/src/components/task-page/jira/creation/IssueUserField.tsx
index 4243aa53873..aaf545134c1 100644
--- a/src/renderer/src/components/task-page/jira/IssueUserField.tsx
+++ b/src/renderer/src/components/task-page/jira/creation/IssueUserField.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { JiraUserPicker } from '@/components/jira-user-picker'
 import type { RowLessSource as RuntimeJiraSettings } from '@/runtime/hosts/selection/default-creation-host'
-import type { JiraUser } from '../../../../../shared/jira/jira-types'
+import type { JiraUser } from '../../../../../../shared/jira/jira-types'
 
 export function TaskPageJiraIssueUserField({
   providerSettings,
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-create-fields.ts b/src/renderer/src/components/task-page/jira/creation/task-page-jira-create-fields.ts
similarity index 98%
rename from src/renderer/src/components/task-page/jira/task-page-jira-create-fields.ts
rename to src/renderer/src/components/task-page/jira/creation/task-page-jira-create-fields.ts
index 75728349eb3..eac52fd8e92 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-create-fields.ts
+++ b/src/renderer/src/components/task-page/jira/creation/task-page-jira-create-fields.ts
@@ -1,5 +1,5 @@
 import { buildJiraCreateTextAdf } from '@/components/jira-create-adf'
-import type { JiraCreateField } from '../../../../../shared/jira/jira-types'
+import type { JiraCreateField } from '../../../../../../shared/jira/jira-types'
 
 // 'assignee' is system here because the dialog renders a dedicated picker for it.
 const JIRA_CREATE_SYSTEM_FIELD_KEYS = new Set([
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-metadata.ts
similarity index 100%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-creation-metadata.ts
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-metadata.ts
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-projects.ts
similarity index 98%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-projects.ts
index 4ef8cb4afd8..6672fd53548 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-projects.ts
+++ b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-projects.ts
@@ -1,9 +1,9 @@
-import { useJiraCreateAssignee } from '../../use-jira-create-assignee'
+import { useJiraCreateAssignee } from '../../../use-jira-create-assignee'
 import React, { useCallback, useEffect, useMemo } from 'react'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 
 import { filterJiraProjectPickerProjects } from '@/components/jira-project-picker-filter'
-import { isVisibleJiraCreateField } from '@/components/task-page/jira/task-page-jira-create-fields'
+import { isVisibleJiraCreateField } from '@/components/task-page/jira/creation/task-page-jira-create-fields'
 import {
   jiraProjectDisplayLabelComparator,
   getJiraProjectSelectionKey
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts
similarity index 97%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts
index 17173609a47..9b01f898f0c 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-creation-state.ts
+++ b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-creation-state.ts
@@ -1,8 +1,8 @@
-import type { TaskPageGitHubMutationStateModel } from '../github/use-task-page-github-mutation-state'
+import type { TaskPageGitHubMutationStateModel } from '../../github/mutations/use-task-page-github-mutation-state'
 import { useState, useRef, useEffect } from 'react'
-import type { JiraIssueType, JiraCreateField } from '../../../../../shared/jira/jira-types'
+import type { JiraIssueType, JiraCreateField } from '../../../../../../shared/jira/jira-types'
 import { useTaskCreationDraftRetention } from '@/components/use-task-creation-draft-retention'
-import { writeNewJiraIssueDraft } from '../task-page-draft-storage'
+import { writeNewJiraIssueDraft } from '../../task-page-draft-storage'
 import { useTaskPageJiraCreationProjects } from './use-task-page-jira-creation-projects'
 export function useTaskPageJiraCreationStatePrelude(model: TaskPageGitHubMutationStateModel) {
   const {
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-issue-creation.ts
similarity index 96%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-issue-creation.ts
index f7ee09e20de..6739ab0c53d 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-issue-creation.ts
+++ b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-issue-creation.ts
@@ -2,12 +2,12 @@ import {
   taskProviderErrorMessage,
   taskProviderErrorText
 } from '@/lib/work-items/task-provider-error-copy'
-import type { TaskPageLinearIssueCreationModel } from '../linear/use-task-page-linear-issue-creation'
+import type { TaskPageLinearIssueCreationModel } from '../../linear/creation/use-task-page-linear-issue-creation'
 import { useCallback } from 'react'
 import {
   buildJiraCreateSubmission,
   hasJiraAssigneeCreateField
-} from '@/components/task-page/jira/task-page-jira-create-fields'
+} from '@/components/task-page/jira/creation/task-page-jira-create-fields'
 import { jiraCreateIssue } from '@/runtime/jira/runtime-jira-user-fields-client'
 import { jiraGetIssue } from '@/runtime/jira/runtime-jira-client'
 import { toast } from 'sonner'
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.test.tsx b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.test.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.test.tsx
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.test.tsx
index 8a78a86819a..f516032f699 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.test.tsx
+++ b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.test.tsx
@@ -2,11 +2,11 @@
 import { act, useState } from 'react'
 import { renderHook, cleanup } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { JiraIssueSummaryGenerationResult } from '../../../../../shared/jira/jira-issue-summary-generation'
+import type { JiraIssueSummaryGenerationResult } from '../../../../../../shared/jira/jira-issue-summary-generation'
 import {
   LOCAL_EXECUTION_HOST_ID,
   toRuntimeExecutionHostId
-} from '../../../../../shared/execution-host'
+} from '../../../../../../shared/execution-host'
 import { useTaskPageJiraSummaryGeneration } from './use-task-page-jira-summary-generation'
 
 const mocks = vi.hoisted(() => ({ generate: vi.fn(), cancel: vi.fn(), error: vi.fn() }))
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.ts b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.ts
similarity index 96%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.ts
rename to src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.ts
index 6193651324f..0a0efcecde8 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-summary-generation.ts
+++ b/src/renderer/src/components/task-page/jira/creation/use-task-page-jira-summary-generation.ts
@@ -3,16 +3,16 @@ import {
   taskProviderErrorText
 } from '@/lib/work-items/task-provider-error-copy'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid'
+import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../../shared/non-secure-context-uuid'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
 import {
   generateRuntimeJiraIssueSummary,
   cancelRuntimeJiraIssueSummary
 } from '@/runtime/jira/runtime-jira-summary-generation-client'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import type { JiraIssueSummaryGenerationRequest } from '../../../../../shared/jira/jira-issue-summary-generation'
-import { getTaskSourceCacheScope } from '../../../../../shared/work-items/task-source-context'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
+import type { JiraIssueSummaryGenerationRequest } from '../../../../../../shared/jira/jira-issue-summary-generation'
+import { getTaskSourceCacheScope } from '../../../../../../shared/work-items/task-source-context'
 import { translate } from '@/i18n/i18n'
 import type { TaskPageJiraIssueCreationModel } from './use-task-page-jira-issue-creation'
 
diff --git a/src/renderer/src/components/task-page/jira/TaskPageJiraFavouriteFilters.tsx b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraFavouriteFilters.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/jira/TaskPageJiraFavouriteFilters.tsx
rename to src/renderer/src/components/task-page/jira/filters/TaskPageJiraFavouriteFilters.tsx
index fd6f6f70b7f..6001a5cde4c 100644
--- a/src/renderer/src/components/task-page/jira/TaskPageJiraFavouriteFilters.tsx
+++ b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraFavouriteFilters.tsx
@@ -10,7 +10,7 @@ import {
   CommandItem,
   CommandEmpty
 } from '@/components/ui/command'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 
 export function TaskPageJiraFavouriteFilters({
   model
diff --git a/src/renderer/src/components/task-page/jira/TaskPageJiraSavedFilters.tsx b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraSavedFilters.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/jira/TaskPageJiraSavedFilters.tsx
rename to src/renderer/src/components/task-page/jira/filters/TaskPageJiraSavedFilters.tsx
index 93ec324453f..1516976151a 100644
--- a/src/renderer/src/components/task-page/jira/TaskPageJiraSavedFilters.tsx
+++ b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraSavedFilters.tsx
@@ -1,4 +1,4 @@
-import { isUtf8ByteLengthWithinLimit } from '../../../../../shared/utf8-byte-limits'
+import { isUtf8ByteLengthWithinLimit } from '../../../../../../shared/utf8-byte-limits'
 import { useState } from 'react'
 import { Check, ListFilter, Pencil, Plus, Trash2 } from 'lucide-react'
 import {
@@ -6,7 +6,7 @@ import {
   MAX_JIRA_SAVED_FILTER_NAME_LENGTH,
   MAX_JIRA_SAVED_FILTERS,
   type JiraSavedFilter
-} from '../../../../../shared/jira/jira-saved-filters'
+} from '../../../../../../shared/jira/jira-saved-filters'
 import { useTranslate } from '@/i18n/use-translate'
 import {
   Command,
diff --git a/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraStatusFilters.tsx
similarity index 94%
rename from src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx
rename to src/renderer/src/components/task-page/jira/filters/TaskPageJiraStatusFilters.tsx
index 90901e76c61..32342f7ba56 100644
--- a/src/renderer/src/components/task-page/jira/TaskPageJiraStatusFilters.tsx
+++ b/src/renderer/src/components/task-page/jira/filters/TaskPageJiraStatusFilters.tsx
@@ -2,13 +2,13 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
 import { useTranslate } from '@/i18n/use-translate'
-import { buildJiraPresetJql } from '../../../../../shared/jira/jira-preset-jql'
+import { buildJiraPresetJql } from '../../../../../../shared/jira/jira-preset-jql'
 import {
   getJiraStatusCatalogScopeKey,
   includeSelectedJiraStatuses
 } from './task-page-jira-status-catalog'
-import { restrictJiraQueryToProject } from '../../../../../shared/jira/jira-project-reference'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import { restrictJiraQueryToProject } from '../../../../../../shared/jira/jira-project-reference'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 
 export function TaskPageJiraStatusFilters({
   model
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-status-catalog.ts b/src/renderer/src/components/task-page/jira/filters/task-page-jira-status-catalog.ts
similarity index 87%
rename from src/renderer/src/components/task-page/jira/task-page-jira-status-catalog.ts
rename to src/renderer/src/components/task-page/jira/filters/task-page-jira-status-catalog.ts
index 79b9eeb958f..3d1b6b9e113 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-status-catalog.ts
+++ b/src/renderer/src/components/task-page/jira/filters/task-page-jira-status-catalog.ts
@@ -1,6 +1,6 @@
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
-import type { JiraProjectReference } from '../../../../../shared/jira/jira-project-reference'
-import { getJiraProjectSelectionKey } from './task-page-jira-project-selection'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
+import type { JiraProjectReference } from '../../../../../../shared/jira/jira-project-reference'
+import { getJiraProjectSelectionKey } from '../task-page-jira-project-selection'
 
 export function getJiraStatusCatalogScopeKey(
   sourceScopeKey: string,
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-favourite-filters.ts b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-favourite-filters.ts
similarity index 96%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-favourite-filters.ts
rename to src/renderer/src/components/task-page/jira/filters/use-task-page-jira-favourite-filters.ts
index bd5ebab979c..24b1f3618ea 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-favourite-filters.ts
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-favourite-filters.ts
@@ -4,8 +4,8 @@ import {
   jiraListFavouriteFiltersForTarget,
   type JiraFavouriteFiltersResult
 } from '@/runtime/jira/runtime-jira-favourite-filters-client'
-import type { JiraFavouriteFilter } from '../../../../../shared/jira/jira-favourite-filters'
-import type { TaskPageLinearViewStateModel } from '../linear/use-task-page-linear-view-state'
+import type { JiraFavouriteFilter } from '../../../../../../shared/jira/jira-favourite-filters'
+import type { TaskPageLinearViewStateModel } from '../../linear/use-task-page-linear-view-state'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.test.tsx b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.test.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.test.tsx
rename to src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.test.tsx
index ad095a2911e..30f03b92a4e 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.test.tsx
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.test.tsx
@@ -3,7 +3,7 @@ import { act, cleanup, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store/index'
 
-import type { Repo } from '../../../../../shared/repo-types'
+import type { Repo } from '../../../../../../shared/repo-types'
 import { useTaskPageJiraProjectScope } from './use-task-page-jira-project-scope'
 
 const { readSavedFilters, mutateSavedFilters, readQuickFilters, writeQuickFilters } = vi.hoisted(
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.ts b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.ts
similarity index 79%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.ts
rename to src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.ts
index 4f562a9d885..152fb3156a0 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-project-scope.ts
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-project-scope.ts
@@ -1,9 +1,12 @@
 import { useCallback, useState } from 'react'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { JiraProjectReference } from '../../../../../shared/jira/jira-project-reference'
-import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
-import { resolveJiraSourceHostId } from '../../../../../shared/jira/jira-source-host'
-import { getRepoHostIdentity } from '../../../../../shared/repo-host-identity'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { JiraProjectReference } from '../../../../../../shared/jira/jira-project-reference'
+import {
+  getRepoExecutionHostId,
+  type ExecutionHostId
+} from '../../../../../../shared/execution-host'
+import { resolveJiraSourceHostId } from '../../../../../../shared/jira/jira-source-host'
+import { getRepoHostIdentity } from '../../../../../../shared/repo-host-identity'
 
 export function useTaskPageJiraProjectScope(
   repos: readonly Repo[],
diff --git a/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.test.tsx b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.test.tsx
new file mode 100644
index 00000000000..22a609c5a82
--- /dev/null
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.test.tsx
@@ -0,0 +1,59 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useTaskPageJiraQuickFilters } from './use-task-page-jira-quick-filters'
+import type { JiraQuickFilterState } from '../../../../../../shared/jira/jira-quick-filters'
+import { toRuntimeExecutionHostId } from '../../../../../../shared/execution-host'
+const { read, write } = vi.hoisted(() => ({ read: vi.fn(), write: vi.fn() }))
+vi.mock('@/runtime/jira/runtime-jira-quick-filter-state', () => ({
+  readJiraQuickFilterState: read,
+  writeJiraQuickFilterState: write
+}))
+beforeEach(() => {
+  vi.resetAllMocks()
+})
+afterEach(cleanup)
+function model(
+  host: string | null,
+  accountHost = 'account-owner'
+): Parameters<typeof useTaskPageJiraQuickFilters>[0] {
+  return {
+    accountBackedTaskSourceHostId: toRuntimeExecutionHostId(accountHost),
+    taskSource: 'jira',
+    taskResumeApplied: true,
+    jiraTaskSourceContext: host
+      ? {
+          kind: 'task-source',
+          provider: 'jira',
+          projectId: 'project',
+          hostId: toRuntimeExecutionHostId(host)
+        }
+      : null
+  }
+}
+it('ignores a late mutation reply after changing Jira execution hosts', async () => {
+  read
+    .mockResolvedValueOnce({ statuses: ['Blocked'] })
+    .mockResolvedValueOnce({ statuses: ['Open'] })
+  let finish: (value: JiraQuickFilterState) => void = () => {}
+  write.mockReturnValue(
+    new Promise((resolve) => {
+      finish = resolve
+    })
+  )
+  const { result, rerender } = renderHook(({ host }) => useTaskPageJiraQuickFilters(model(host)), {
+    initialProps: { host: 'a' }
+  })
+  await waitFor(() => expect(result.current.jiraQuickFiltersLoading).toBe(false))
+  let pending: Promise<void> = Promise.resolve()
+  act(() => {
+    pending = result.current.selectJiraStatuses(['In Progress'])
+  })
+  rerender({ host: 'b' })
+  await waitFor(() => expect(result.current.selectedJiraStatuses).toEqual(['Open']))
+  await act(async () => {
+    finish({ statuses: ['In Progress'] })
+    await pending
+  })
+  expect(result.current.selectedJiraStatuses).toEqual(['Open'])
+})
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.ts
similarity index 96%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
rename to src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.ts
index 643fc68755e..20975f4b884 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.ts
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-quick-filters.ts
@@ -7,8 +7,8 @@ import {
 import {
   normalizeJiraQuickFilterState,
   type JiraQuickFilterState
-} from '../../../../../shared/jira/jira-quick-filters'
-import type { TaskPageLinearViewStateModel } from '../linear/use-task-page-linear-view-state'
+} from '../../../../../../shared/jira/jira-quick-filters'
+import type { TaskPageLinearViewStateModel } from '../../linear/use-task-page-linear-view-state'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.test.tsx b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.test.tsx
new file mode 100644
index 00000000000..9d536b63eb9
--- /dev/null
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.test.tsx
@@ -0,0 +1,58 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+
+import { useTaskPageJiraSavedFilters } from './use-task-page-jira-saved-filters'
+import { toRuntimeExecutionHostId } from '../../../../../../shared/execution-host'
+const { read, mutate } = vi.hoisted(() => ({ read: vi.fn(), mutate: vi.fn() }))
+vi.mock('@/runtime/jira/runtime-jira-saved-filter-state', () => ({
+  readJiraSavedFilterState: read,
+  mutateJiraSavedFilters: mutate
+}))
+afterEach(cleanup)
+beforeEach(() => {
+  vi.resetAllMocks()
+})
+const filter = { id: 'mine', name: 'My work', jql: 'project = APP' }
+const initial = { filters: [filter], activeFilterId: filter.id }
+function model(
+  host: string | null,
+  accountHost = 'account-owner'
+): Parameters<typeof useTaskPageJiraSavedFilters>[0] {
+  return {
+    taskSource: 'jira',
+    taskResumeApplied: true,
+    accountBackedTaskSourceHostId: toRuntimeExecutionHostId(accountHost),
+    jiraTaskSourceContext: host
+      ? {
+          kind: 'task-source',
+          provider: 'jira',
+          projectId: 'project',
+          hostId: toRuntimeExecutionHostId(host)
+        }
+      : null
+  }
+}
+it('ignores an old host read that completes after switching execution hosts', async () => {
+  let resolveOld: (value: typeof initial) => void = () => {}
+  read
+    .mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          resolveOld = resolve
+        })
+    )
+    .mockResolvedValueOnce({ filters: [], activeFilterId: null })
+  const setQuery = vi.fn()
+  const { result, rerender } = renderHook(
+    ({ host }) => useTaskPageJiraSavedFilters(model(host), setQuery),
+    { initialProps: { host: 'host-a' } }
+  )
+  rerender({ host: 'host-b' })
+  await waitFor(() => expect(result.current.jiraSavedFiltersReady).toBe(true))
+  await act(async () => {
+    resolveOld(initial)
+  })
+  expect(result.current.jiraSavedFilters).toEqual([])
+  expect(setQuery).not.toHaveBeenCalledWith(filter.jql)
+})
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.ts b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.ts
similarity index 96%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.ts
rename to src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.ts
index 33a251c9baa..249b7f66ec7 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.ts
+++ b/src/renderer/src/components/task-page/jira/filters/use-task-page-jira-saved-filters.ts
@@ -1,4 +1,4 @@
-import { createNonSecureContextUuid } from '../../../../../shared/non-secure-context-uuid'
+import { createNonSecureContextUuid } from '../../../../../../shared/non-secure-context-uuid'
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
 import {
@@ -9,8 +9,8 @@ import type {
   JiraSavedFilterMutation,
   JiraSavedFilter,
   JiraSavedFilterState
-} from '../../../../../shared/jira/jira-saved-filters'
-import type { TaskPageLinearViewStateModel } from '../linear/use-task-page-linear-view-state'
+} from '../../../../../../shared/jira/jira-saved-filters'
+import type { TaskPageLinearViewStateModel } from '../../linear/use-task-page-linear-view-state'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-cache-selectors.ts
similarity index 91%
rename from src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-cache-selectors.ts
index 3cd7c652cf2..1a82b394c33 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-cache-selectors.ts
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-cache-selectors.ts
@@ -2,8 +2,8 @@ import type { CacheEntry } from '@/store/github/cache/cache-model'
 import {
   getTaskSourceCacheScope,
   type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
+} from '../../../../../../shared/work-items/task-source-context'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
 
 type JiraIssueCache = Record<string, CacheEntry<JiraIssue>>
 type JiraSearchCache = Record<string, CacheEntry<JiraIssue[]>>
diff --git a/src/renderer/src/components/task-page/jira/listing/task-page-jira-error-banner.tsx b/src/renderer/src/components/task-page/jira/listing/task-page-jira-error-banner.tsx
new file mode 100644
index 00000000000..66c7e3348d0
--- /dev/null
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-error-banner.tsx
@@ -0,0 +1,52 @@
+import { useTranslate } from '../../../../i18n/use-translate'
+import type { TaskPageJiraLoadError } from './task-page-jira-load-state'
+import React from 'react'
+import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '../../../ui/collapsible'
+import { AlertCircle, ChevronDown, ChevronRight } from 'lucide-react'
+import { Button } from '../../../ui/button'
+
+export function TaskPageJiraErrorBanner({
+  error,
+  open,
+  onOpenChange
+}: {
+  error: TaskPageJiraLoadError
+  open: boolean
+  onOpenChange: (open: boolean) => void
+}): React.JSX.Element {
+  const t = useTranslate()
+  return (
+    <Collapsible
+      open={open}
+      onOpenChange={onOpenChange}
+      className="border-b border-border bg-destructive/10 px-4 py-3 text-sm text-destructive"
+    >
+      <div className="flex items-start gap-2">
+        <AlertCircle className="mt-0.5 size-4 flex-none" />
+        <div className="min-w-0 flex-1">
+          <div className="font-medium leading-5">{error.title}</div>
+          {error.details ? (
+            <>
+              <CollapsibleTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="xs"
+                  className="-ml-1 mt-1 h-6 px-1.5 text-destructive hover:bg-destructive/10 hover:text-destructive"
+                >
+                  {open ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
+                  {t('auto.components.TaskPage.40eaf2c27c', 'Details')}
+                </Button>
+              </CollapsibleTrigger>
+              <CollapsibleContent>
+                <div className="mt-1 rounded-md border border-destructive/20 bg-background/80 px-2 py-1.5 font-mono text-xs text-foreground">
+                  {error.details}
+                </div>
+              </CollapsibleContent>
+            </>
+          ) : null}
+        </div>
+      </div>
+    </Collapsible>
+  )
+}
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-issue-cells.tsx b/src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-cells.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/jira/task-page-jira-issue-cells.tsx
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-cells.tsx
index 62d2d04066a..9aa443b1006 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-issue-cells.tsx
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-cells.tsx
@@ -4,12 +4,12 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { translate } from '@/i18n/i18n'
 import { useIntlLocale, useTranslate, type Translate } from '@/i18n/use-translate'
 import { cn } from '@/lib/class-names'
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
 import {
   formatJiraEstimate,
   formatJiraStoryPoints,
   type JiraListColumnId
-} from '../../jira-list-columns'
+} from '../../../jira-list-columns'
 import { getJiraPriorityTone } from './task-page-jira-status-tone'
 
 const MUTED_CELL = 'block truncate text-[12px] text-muted-foreground'
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-issue-list.tsx b/src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-list.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/jira/task-page-jira-issue-list.tsx
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-list.tsx
index c54a848b1dc..ff2f91ea43b 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-issue-list.tsx
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-issue-list.tsx
@@ -6,12 +6,12 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/component
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useTranslate } from '@/i18n/use-translate'
 import { cn } from '@/lib/class-names'
-import { JiraIssueRowCopyMenu } from '../../JiraIssueRowCopyMenu'
-import { JiraLinkedWorkspaceAction } from '../../JiraLinkedWorkspaceAction'
-import type { Worktree } from '../../../../../shared/worktree/types'
-import { jiraListColumnVisibility, type JiraListColumn } from '../../jira-list-columns'
+import { JiraIssueRowCopyMenu } from '../../../JiraIssueRowCopyMenu'
+import { JiraLinkedWorkspaceAction } from '../../../JiraLinkedWorkspaceAction'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { jiraListColumnVisibility, type JiraListColumn } from '../../../jira-list-columns'
 import { JiraIssueCell, JiraPriorityText, unassignedLabel } from './task-page-jira-issue-cells'
-import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../shared/jira/jira-types'
+import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../../shared/jira/jira-types'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 
 export type TaskPageJiraIssueSection = {
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-linked-issues.ts
similarity index 89%
rename from src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-linked-issues.ts
index f7dd8ccabf2..7a1b78d8815 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-linked-issues.ts
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-linked-issues.ts
@@ -1,7 +1,7 @@
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
 import type { LinkedJiraIssueRef } from '@/lib/work-items/jira/jira-issue-workspace-attachment'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { readLinkedTaskIssuesWithLimit } from '../../read-linked-task-issues'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import { readLinkedTaskIssuesWithLimit } from '../../../read-linked-task-issues'
 import { createTaskPageJiraLoadFailureState } from './task-page-jira-load-state'
 import { translate } from '@/i18n/i18n'
 
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-load-state.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-load-state.ts
similarity index 95%
rename from src/renderer/src/components/task-page/jira/task-page-jira-load-state.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-load-state.ts
index e5940978fdb..7fe760f476e 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-load-state.ts
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-load-state.ts
@@ -1,5 +1,5 @@
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
-import { parseJiraStatusError } from '../../../../../shared/jira/jira-status-error'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
+import { parseJiraStatusError } from '../../../../../../shared/jira/jira-status-error'
 import { translate } from '@/i18n/i18n'
 
 export type TaskPageJiraLoadError = {
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-search.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-search.ts
similarity index 87%
rename from src/renderer/src/components/task-page/jira/task-page-jira-search.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-search.ts
index 80e3669481c..34b7d68fbe4 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-search.ts
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-search.ts
@@ -1,6 +1,9 @@
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
-import { buildJiraTextMatchJql, mayBeJql } from '../../../../../shared/jira/jira-search-input-jql'
-import { searchJiraIssuesByKeyOrText } from '../../jira-key-or-text-search'
+import type { JiraIssue } from '../../../../../../shared/jira/jira-types'
+import {
+  buildJiraTextMatchJql,
+  mayBeJql
+} from '../../../../../../shared/jira/jira-search-input-jql'
+import { searchJiraIssuesByKeyOrText } from '../../../jira-key-or-text-search'
 import { getJiraBadRequestReason } from './task-page-jira-load-state'
 
 export type TaskPageJiraJqlRejection = {
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-sort-controls.tsx b/src/renderer/src/components/task-page/jira/listing/task-page-jira-sort-controls.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/jira/task-page-jira-sort-controls.tsx
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-sort-controls.tsx
index bbd2312c42f..57babdf9f10 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-sort-controls.tsx
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-sort-controls.tsx
@@ -15,8 +15,8 @@ import {
   getJiraListColumnLabel,
   jiraListColumnVisibility,
   type JiraListColumn
-} from '../../jira-list-columns'
-import type { JiraIssueSortColumn, JiraIssueSortDirection } from '../../jira-issue-sorter'
+} from '../../../jira-list-columns'
+import type { JiraIssueSortColumn, JiraIssueSortDirection } from '../../../jira-issue-sorter'
 
 type TaskPageJiraSortControlsProps = {
   columns: readonly JiraListColumn[]
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-status-order.ts
similarity index 95%
rename from src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-status-order.ts
index adef776958e..48d3bfabb27 100644
--- a/src/renderer/src/components/task-page/jira/task-page-jira-status-order.ts
+++ b/src/renderer/src/components/task-page/jira/listing/task-page-jira-status-order.ts
@@ -1,5 +1,5 @@
-import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../shared/jira/jira-types'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { JiraIssue, JiraProjectStatusOrder } from '../../../../../../shared/jira/jira-types'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { jiraGetProjectStatusOrder } from '@/runtime/jira/runtime-jira-client'
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-status-tone.ts b/src/renderer/src/components/task-page/jira/listing/task-page-jira-status-tone.ts
similarity index 100%
rename from src/renderer/src/components/task-page/jira/task-page-jira-status-tone.ts
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-status-tone.ts
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.tsx b/src/renderer/src/components/task-page/jira/listing/task-page-jira-text-fallback-notice.tsx
similarity index 100%
rename from src/renderer/src/components/task-page/jira/task-page-jira-text-fallback-notice.tsx
rename to src/renderer/src/components/task-page/jira/listing/task-page-jira-text-fallback-notice.tsx
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-effects.ts b/src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-effects.ts
similarity index 92%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-list-effects.ts
rename to src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-effects.ts
index 011c0d589a9..f51132496cc 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-effects.ts
+++ b/src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-effects.ts
@@ -1,26 +1,26 @@
 import { translate } from '@/i18n/i18n'
 import { isRuntimeProviderSearchQueryWithinLimit } from '@/runtime/issue-search/runtime-provider-search-bounds'
-import { withCurrentSprintClause } from '../../../../../shared/jira/jira-jql-predicate'
+import { withCurrentSprintClause } from '../../../../../../shared/jira/jira-jql-predicate'
 import {
   buildJiraStatusCatalog,
   getJiraStatusCatalogScopeKey
-} from './task-page-jira-status-catalog'
-import type { TaskPageLinearCollectionEffectsModel } from '../linear/use-task-page-linear-collection-effects'
+} from '../filters/task-page-jira-status-catalog'
+import type { TaskPageLinearCollectionEffectsModel } from '../../linear/projects/use-task-page-linear-collection-effects'
 import { useEffect, useMemo, useRef } from 'react'
 import {
   getSingleJiraProjectScope,
   getTaskPageJiraStatusOrderScopeKey,
   getTaskPageJiraStatusOrderRuntimeScopeKey,
   loadTaskPageJiraProjectStatusOrder
-} from '@/components/task-page/jira/task-page-jira-status-order'
-import { createTaskPageJiraLoadFailureState } from '@/components/task-page/jira/task-page-jira-load-state'
-import { searchTaskPageJiraIssues } from '@/components/task-page/jira/task-page-jira-search'
-import { JIRA_ITEM_LIMIT } from '../task-page-source-context'
-import { useTaskSearchDebouncedApply } from '../use-task-search-debounced-apply'
+} from '@/components/task-page/jira/listing/task-page-jira-status-order'
+import { createTaskPageJiraLoadFailureState } from '@/components/task-page/jira/listing/task-page-jira-load-state'
+import { searchTaskPageJiraIssues } from '@/components/task-page/jira/listing/task-page-jira-search'
+import { JIRA_ITEM_LIMIT } from '../../task-page-source-context'
+import { useTaskSearchDebouncedApply } from '../../use-task-search-debounced-apply'
 import { readLinkedJiraIssues } from './task-page-jira-linked-issues'
 import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
-import { buildJiraPresetJql } from '../../../../../shared/jira/jira-preset-jql'
-import { restrictJiraQueryToProject } from '../../../../../shared/jira/jira-project-reference'
+import { buildJiraPresetJql } from '../../../../../../shared/jira/jira-preset-jql'
+import { restrictJiraQueryToProject } from '../../../../../../shared/jira/jira-project-reference'
 export function useTaskPageJiraListEffects(model: TaskPageLinearCollectionEffectsModel) {
   const {
     accountBackedTaskSourceHostId,
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-projection.ts b/src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-projection.ts
similarity index 93%
rename from src/renderer/src/components/task-page/jira/use-task-page-jira-list-projection.ts
rename to src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-projection.ts
index 5e5afd56182..82ff87c1ec0 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-projection.ts
+++ b/src/renderer/src/components/task-page/jira/listing/use-task-page-jira-list-projection.ts
@@ -1,11 +1,11 @@
-import type { TaskPageLinearBoardModel } from '../linear/use-task-page-linear-board'
+import type { TaskPageLinearBoardModel } from '../../linear/issues/use-task-page-linear-board'
 import { useMemo, useCallback } from 'react'
-import { findTaskPageJiraIssue } from '@/components/task-page/jira/task-page-jira-cache-selectors'
+import { findTaskPageJiraIssue } from '@/components/task-page/jira/listing/task-page-jira-cache-selectors'
 import {
   getSingleJiraProjectScope,
   getTaskPageJiraStatusOrderScopeKey,
   getTaskPageJiraStatusOrderRuntimeScopeKey
-} from '@/components/task-page/jira/task-page-jira-status-order'
+} from '@/components/task-page/jira/listing/task-page-jira-status-order'
 import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
 import {
   buildJiraIssueWorkspaceAttachmentIndex,
@@ -13,7 +13,7 @@ import {
   findJiraIssueWorkspaceAttachmentsInIndex
 } from '@/lib/work-items/jira/jira-issue-workspace-attachment'
 import { filterLinkedJiraIssues } from './task-page-jira-linked-issues'
-import { sortJiraIssues } from '../../jira-issue-sorter'
+import { sortJiraIssues } from '../../../jira-issue-sorter'
 export function useTaskPageJiraListProjection(model: TaskPageLinearBoardModel) {
   const {
     accountBackedTaskSourceHostId,
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.test.ts
deleted file mode 100644
index 54a512bc239..00000000000
--- a/src/renderer/src/components/task-page/jira/task-page-jira-board-transitions.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { JiraIssue, JiraStatus, JiraTransition } from '../../../../../shared/jira/jira-types'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-
-const mocks = vi.hoisted(() => ({
-  jiraListTransitionsForTarget: vi.fn()
-}))
-
-vi.mock('@/runtime/jira/runtime-jira-detail-client', () => ({
-  jiraListTransitionsForTarget: mocks.jiraListTransitionsForTarget
-}))
-vi.mock('@/runtime/jira/runtime-jira-detail-client', () => ({
-  jiraListTransitionsForTarget: mocks.jiraListTransitionsForTarget
-}))
-
-const { loadTaskPageJiraIssueTransitions } = await import('./task-page-jira-board-transitions')
-const target: RuntimeClientTarget = { kind: 'local' }
-
-function status(id: string, name: string): JiraStatus {
-  return { id, name, categoryKey: 'indeterminate', categoryName: 'In Progress' }
-}
-
-function transition(id: string, to: JiraStatus): JiraTransition {
-  return { id, name: `To ${to.name}`, to }
-}
-
-function issue(key: string, statusValue: JiraStatus, siteId?: string): JiraIssue {
-  return {
-    id: key,
-    key,
-    siteId,
-    title: key,
-    url: `https://example.atlassian.net/browse/${key}`,
-    project: { id: 'p1', key: 'STA', name: 'Stably' },
-    issueType: { id: 't1', name: 'Task' },
-    status: statusValue,
-    labels: [],
-    updatedAt: '2026-08-07T12:00:00.000Z',
-    createdAt: '2026-08-07T12:00:00.000Z'
-  }
-}
-
-describe('loadTaskPageJiraIssueTransitions', () => {
-  beforeEach(() => {
-    mocks.jiraListTransitionsForTarget.mockReset()
-  })
-
-  it('surfaces a failed transitions request and allows an explicit retry', async () => {
-    mocks.jiraListTransitionsForTarget.mockRejectedValue(new Error('offline'))
-    await expect(
-      loadTaskPageJiraIssueTransitions(
-        target,
-        'scope',
-        issue('STA-500', status('2', 'In Progress'))
-      )
-    ).rejects.toThrow('offline')
-    mocks.jiraListTransitionsForTarget.mockResolvedValue([])
-    await expect(
-      loadTaskPageJiraIssueTransitions(
-        target,
-        'scope',
-        issue('STA-500', status('2', 'In Progress')),
-        true
-      )
-    ).resolves.toEqual([])
-    expect(mocks.jiraListTransitionsForTarget).toHaveBeenCalledTimes(2)
-  })
-
-  it('keeps concurrent local and remote metadata apart even with the same scope', async () => {
-    const remote: RuntimeClientTarget = { kind: 'environment', environmentId: 'owner' }
-    const currentIssue = issue('STA-OWNER', status('2', 'In Progress'), 'site-a')
-    const localAction = transition('local-done', status('3', 'Done'))
-    const remoteAction = transition('remote-done', status('3', 'Done'))
-    mocks.jiraListTransitionsForTarget.mockImplementation((owner: RuntimeClientTarget) =>
-      Promise.resolve(owner.kind === 'local' ? [localAction] : [remoteAction])
-    )
-    await expect(
-      Promise.all([
-        loadTaskPageJiraIssueTransitions(target, 'same-scope', currentIssue),
-        loadTaskPageJiraIssueTransitions(remote, 'same-scope', currentIssue)
-      ])
-    ).resolves.toEqual([[localAction], [remoteAction]])
-    await expect(
-      loadTaskPageJiraIssueTransitions(remote, 'same-scope', currentIssue)
-    ).resolves.toEqual([remoteAction])
-    expect(mocks.jiraListTransitionsForTarget).toHaveBeenCalledTimes(2)
-    expect(mocks.jiraListTransitionsForTarget).toHaveBeenCalledWith(
-      remote,
-      currentIssue.key,
-      currentIssue.siteId
-    )
-  })
-})
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-favourite-selection.test.tsx b/src/renderer/src/components/task-page/jira/task-page-jira-favourite-selection.test.tsx
deleted file mode 100644
index 364a38f2b47..00000000000
--- a/src/renderer/src/components/task-page/jira/task-page-jira-favourite-selection.test.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it } from 'vitest'
-
-import {
-  favouriteTransport as transport,
-  favourite,
-  named,
-  emptySaved,
-  resetFavouriteTransport,
-  useFavouriteTaskPage,
-  type FavouriteFixtureProps
-} from '../../__mocks__/task-page-jira-favourite-fixture'
-
-afterEach(cleanup)
-beforeEach(() => {
-  localStorage.clear()
-  resetFavouriteTransport()
-})
-
-async function ready(result: { current: ReturnType<typeof useFavouriteTaskPage> }) {
-  act(() => result.current.loadJiraFavouriteFilters())
-  await waitFor(() => {
-    expect(result.current.jiraSavedFiltersLoading).toBe(false)
-    expect(result.current.jiraFavouriteFiltersLoading).toBe(false)
-    expect(result.current.jiraLoading).toBe(false)
-  })
-}
-
-it('waits for confirmed named deselection before changing query or linked mode', async () => {
-  transport.readSaved.mockResolvedValue({ ...emptySaved, activeFilterId: named.id })
-  const { result } = renderHook(() => useFavouriteTaskPage())
-  await ready(result)
-  act(() => result.current.setJiraHasWorkspace(true))
-  const deferred = Promise.withResolvers<typeof emptySaved>()
-  transport.mutateSaved.mockReturnValueOnce(deferred.promise)
-  let applying = Promise.resolve(false)
-  act(() => {
-    applying = result.current.applyJiraFavouriteFilter(result.current.jiraFavouriteFilters[0])
-  })
-  expect(result.current.jiraFavouriteFilter).toBeNull()
-  expect(result.current.jiraSearchInput).toBe(named.jql)
-  expect(result.current.jiraHasWorkspace).toBe(true)
-  await act(async () => {
-    deferred.resolve(emptySaved)
-    expect(await applying).toBe(true)
-  })
-  expect(result.current.jiraHasWorkspace).toBe(false)
-  expect(result.current.jiraSearchInput).toBe('')
-  expect(result.current.jiraFavouriteFilter?.id).toBe(favourite.id)
-  expect(transport.mutateSaved).toHaveBeenCalledExactlyOnceWith(
-    { kind: 'environment', environmentId: 'owner-a' },
-    { kind: 'select', id: null }
-  )
-})
-
-it.each(['site', 'owner', 'disabled'] as const)(
-  'fences a delayed handoff across %s A→B→A',
-  async (kind) => {
-    transport.readSaved.mockResolvedValue({ ...emptySaved, activeFilterId: named.id })
-    const { result, rerender } = renderHook(
-      (props: FavouriteFixtureProps) => useFavouriteTaskPage(props),
-      {
-        initialProps: {}
-      }
-    )
-    await ready(result)
-    const deferred = Promise.withResolvers<typeof emptySaved>()
-    transport.mutateSaved.mockReturnValueOnce(deferred.promise)
-    let applying = Promise.resolve(false)
-    act(() => {
-      applying = result.current.applyJiraFavouriteFilter(result.current.jiraFavouriteFilters[0])
-    })
-    const other: FavouriteFixtureProps = {
-      hostId: kind === 'owner' ? 'runtime:owner-b' : 'runtime:owner-a',
-      siteId: kind === 'site' ? 'site-b' : 'site-a',
-      enabled: kind !== 'disabled'
-    }
-    rerender(other)
-    rerender({ hostId: 'runtime:owner-a', siteId: 'site-a', enabled: true })
-    await ready(result)
-    await act(async () => {
-      deferred.resolve(emptySaved)
-      expect(await applying).toBe(false)
-    })
-    expect(result.current.jiraFavouriteFilter).toBeNull()
-    expect(result.current.jiraSearchInput).not.toContain('12345')
-  }
-)
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-grouping.test.ts b/src/renderer/src/components/task-page/jira/task-page-jira-grouping.test.ts
deleted file mode 100644
index 4aa765c9cb8..00000000000
--- a/src/renderer/src/components/task-page/jira/task-page-jira-grouping.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { defaultJiraListColumnIds, visibleJiraListColumns } from '../../jira-list-columns'
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import React from 'react'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { cleanup, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-
-import { TooltipProvider } from '@/components/ui/tooltip'
-
-import { TaskPageJiraIssueList } from './task-page-jira-issue-list'
-
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
-
-const { jiraGetProjectStatusOrderMock } = vi.hoisted(() => ({
-  jiraGetProjectStatusOrderMock: vi.fn()
-}))
-
-vi.mock('@/runtime/jira/runtime-jira-client', () => ({
-  jiraGetProjectStatusOrder: (...args: unknown[]) => jiraGetProjectStatusOrderMock(...args)
-}))
-
-afterEach(() => {
-  cleanup()
-  vi.restoreAllMocks()
-  jiraGetProjectStatusOrderMock.mockReset()
-})
-
-function jiraIssue(
-  key: string,
-  title: string,
-  statusId: string,
-  statusName: string,
-  options: { priority?: string; projectKey?: string; siteId?: string } = {}
-): JiraIssue {
-  const siteId = options.siteId ?? 'site-1'
-  const projectKey = options.projectKey ?? 'ALP'
-  return {
-    id: `${siteId}:${key}`,
-    key,
-    title,
-    url: `https://example.atlassian.net/browse/${key}`,
-    siteId,
-    siteName: 'Example Jira',
-    project: { id: projectKey, key: projectKey, name: projectKey, siteId },
-    issueType: { id: '10001', name: 'Bug' },
-    status: { id: statusId, name: statusName, categoryKey: 'new', categoryName: statusName },
-    priority: options.priority ? { id: options.priority, name: options.priority } : undefined,
-    labels: [],
-    createdAt: '2026-01-01T00:00:00.000Z',
-    updatedAt: '2026-01-01T00:00:00.000Z'
-  }
-}
-
-describe('Jira issue status grouping', () => {
-  it('collapses and expands a status group through its accessible trigger', async () => {
-    const user = userEvent.setup()
-    render(
-      React.createElement(
-        TooltipProvider,
-        null,
-        React.createElement(TaskPageJiraIssueList, {
-          columns: visibleJiraListColumns(defaultJiraListColumnIds()),
-          formatUpdatedAt: () => 'today',
-          getStatusTone: () => 'border-border',
-          issues: [
-            jiraIssue('ALP-1', 'First issue', '1', 'To Do'),
-            jiraIssue('ALP-2', 'Second issue', '1', 'To Do')
-          ],
-          onOpenIssue: vi.fn(),
-          onStartWorkspace: vi.fn(),
-          selectedIssue: null,
-          showSiteContext: false,
-          statusOrder: null
-        })
-      )
-    )
-
-    const trigger = screen.getByRole('button', { name: 'To Do 2' })
-    expect(trigger).toHaveAttribute('data-variant', 'ghost')
-    expect(trigger).toHaveAttribute('aria-expanded', 'true')
-    expect(screen.getByText('First issue')).toBeInTheDocument()
-
-    await user.click(trigger)
-    expect(trigger).toHaveAttribute('aria-expanded', 'false')
-    expect(screen.queryByText('First issue')).not.toBeInTheDocument()
-
-    await user.click(trigger)
-    expect(screen.getByText('First issue')).toBeInTheDocument()
-  })
-})
diff --git a/src/renderer/src/components/task-page/jira/task-page-jira-quick-copy.test.tsx b/src/renderer/src/components/task-page/jira/task-page-jira-quick-copy.test.tsx
deleted file mode 100644
index f74d5515a43..00000000000
--- a/src/renderer/src/components/task-page/jira/task-page-jira-quick-copy.test.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-// @vitest-environment happy-dom
-import '@testing-library/jest-dom/vitest'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { TaskPageJiraIssueList } from './task-page-jira-issue-list'
-import { defaultJiraListColumnIds, visibleJiraListColumns } from '../../jira-list-columns'
-import type { JiraIssue } from '../../../../../shared/jira/jira-types'
-const writeClipboardText = vi.fn().mockResolvedValue(undefined)
-const issue: JiraIssue = {
-  id: '1',
-  key: 'APP-1',
-  title: 'Fix login',
-  url: 'https://acme.atlassian.net/browse/APP-1',
-  project: { id: '1', key: 'APP', name: 'App' },
-  issueType: { id: '1', name: 'Bug' },
-  status: { id: '1', name: 'Open', categoryKey: 'new', categoryName: 'Open' },
-  labels: [],
-  createdAt: '2026-10-01',
-  updatedAt: '2026-10-01'
-}
-const onOpenIssue = vi.fn()
-function renderList() {
-  return render(
-    <TooltipProvider>
-      <TaskPageJiraIssueList
-        columns={visibleJiraListColumns(defaultJiraListColumnIds())}
-        issues={[issue]}
-        selectedIssue={null}
-        showSiteContext={false}
-        statusOrder={null}
-        formatUpdatedAt={() => 'Today'}
-        getStatusTone={() => ''}
-        onOpenIssue={onOpenIssue}
-        onStartWorkspace={vi.fn()}
-      />
-    </TooltipProvider>
-  )
-}
-beforeEach(() => {
-  Object.assign(window, { api: { ui: { writeClipboardText } } })
-  vi.clearAllMocks()
-  localStorage.clear()
-})
-afterEach(cleanup)
-describe('Jira row quick copy', () => {
-  it('offers the same copy actions in the row context menu', async () => {
-    renderList()
-    const user = userEvent.setup()
-    await user.pointer({ keys: '[MouseRight]', target: screen.getByText('Fix login') })
-    await user.click(screen.getByRole('menuitem', { name: 'Copy URL' }))
-    expect(writeClipboardText).toHaveBeenCalledWith(issue.url)
-    expect(onOpenIssue).not.toHaveBeenCalled()
-  })
-
-  it('renders a template preview with additional instructions and copies it', async () => {
-    renderList()
-    const user = userEvent.setup()
-    await user.click(screen.getByRole('button', { name: 'Copy context for APP-1' }))
-    await user.click(screen.getByRole('menuitem', { name: 'Copy prompt from template' }))
-    await user.type(
-      screen.getByLabelText('Additional instructions (optional)'),
-      'Cover SSH behavior.'
-    )
-    const preview = screen.getByLabelText('Preview')
-    expect(preview).toBeInstanceOf(HTMLTextAreaElement)
-    if (!(preview instanceof HTMLTextAreaElement)) {
-      throw new Error('Expected a textarea preview')
-    }
-    expect(preview.value).toContain('Cover SSH behavior.')
-    await user.click(screen.getByRole('button', { name: 'Copy prompt' }))
-    expect(writeClipboardText).toHaveBeenCalledWith(expect.stringContaining('APP-1'))
-    expect(writeClipboardText).toHaveBeenCalledWith(expect.stringContaining('Cover SSH behavior.'))
-    expect(
-      screen.queryByRole('dialog', { name: 'Copy prompt from template' })
-    ).not.toBeInTheDocument()
-    await waitFor(() =>
-      expect(screen.getByRole('button', { name: 'Copy context for APP-1' })).toHaveFocus()
-    )
-  })
-
-  it('reuses a custom template after closing and reopening the picker', async () => {
-    renderList()
-    const user = userEvent.setup()
-    async function openCustomTemplate() {
-      await user.click(screen.getByRole('button', { name: 'Copy context for APP-1' }))
-      await user.click(screen.getByRole('menuitem', { name: 'Copy prompt from template' }))
-      await user.click(screen.getByRole('combobox', { name: 'Template' }))
-      await user.click(screen.getByRole('option', { name: 'Custom template' }))
-    }
-    await openCustomTemplate()
-    await user.clear(screen.getByLabelText('Template text'))
-    await user.type(screen.getByLabelText('Template text'), 'Review $jira-issue')
-    await user.click(screen.getByRole('button', { name: 'Cancel' }))
-    await openCustomTemplate()
-    expect(screen.getByLabelText('Template text')).toHaveValue('Review $jira-issue')
-    await user.click(screen.getByRole('button', { name: 'Copy prompt' }))
-    expect(writeClipboardText).toHaveBeenCalledWith(
-      `Review Complete Jira issue APP-1: Fix login\n\n${issue.url}`
-    )
-  })
-
-  it('keeps the template picker open when the clipboard write fails', async () => {
-    writeClipboardText.mockRejectedValueOnce(new Error('Clipboard unavailable'))
-    renderList()
-    const user = userEvent.setup()
-    await user.click(screen.getByRole('button', { name: 'Copy context for APP-1' }))
-    await user.click(screen.getByRole('menuitem', { name: 'Copy prompt from template' }))
-    await user.click(screen.getByRole('button', { name: 'Copy prompt' }))
-    expect(screen.getByRole('dialog', { name: 'Copy prompt from template' })).toBeInTheDocument()
-  })
-
-  it('copies the key from the row without opening the issue', async () => {
-    renderList()
-    const user = userEvent.setup()
-    await user.click(screen.getByRole('button', { name: 'Copy context for APP-1' }))
-    await user.click(screen.getByRole('menuitem', { name: 'Copy key' }))
-    expect(writeClipboardText).toHaveBeenCalledWith('APP-1')
-    expect(onOpenIssue).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-state.ts b/src/renderer/src/components/task-page/jira/use-task-page-jira-list-state.ts
index c41c110238e..c251c470fca 100644
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-list-state.ts
+++ b/src/renderer/src/components/task-page/jira/use-task-page-jira-list-state.ts
@@ -1,7 +1,7 @@
-import { useTaskPageJiraQuickFilters } from './use-task-page-jira-quick-filters'
-import type { JiraStatusCatalogItem } from './task-page-jira-status-catalog'
-import { useTaskPageJiraSavedFilters } from './use-task-page-jira-saved-filters'
-import { useTaskPageJiraFavouriteFilters } from './use-task-page-jira-favourite-filters'
+import { useTaskPageJiraQuickFilters } from './filters/use-task-page-jira-quick-filters'
+import type { JiraStatusCatalogItem } from './filters/task-page-jira-status-catalog'
+import { useTaskPageJiraSavedFilters } from './filters/use-task-page-jira-saved-filters'
+import { useTaskPageJiraFavouriteFilters } from './filters/use-task-page-jira-favourite-filters'
 import type { JiraFavouriteFilter } from '../../../../../shared/jira/jira-favourite-filters'
 import type { JiraSavedFilter } from '../../../../../shared/jira/jira-saved-filters'
 import type { TaskPageLinearViewStateModel } from '../linear/use-task-page-linear-view-state'
@@ -11,8 +11,8 @@ import type {
   JiraProjectStatusOrder,
   JiraPriority
 } from '../../../../../shared/jira/jira-types'
-import type { TaskPageJiraLoadError } from '@/components/task-page/jira/task-page-jira-load-state'
-import type { TaskPageJiraJqlRejection } from '@/components/task-page/jira/task-page-jira-search'
+import type { TaskPageJiraLoadError } from '@/components/task-page/jira/listing/task-page-jira-load-state'
+import type { TaskPageJiraJqlRejection } from '@/components/task-page/jira/listing/task-page-jira-search'
 import type { JiraPresetId } from '@/components/task-page/task-page-localized-options'
 import type {
   JiraIssueSortColumn,
@@ -35,7 +35,7 @@ import {
 } from '@/runtime/rpc/targets/runtime-client-target'
 import { getEnvironmentRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { getTaskSourceCacheScope } from '../../../../../shared/work-items/task-source-context'
-import { useTaskPageJiraProjectScope } from './use-task-page-jira-project-scope'
+import { useTaskPageJiraProjectScope } from './filters/use-task-page-jira-project-scope'
 const EMPTY_JIRA_PRIORITIES: JiraPrioritiesBySite = new Map()
 
 export function useTaskPageJiraListState(model: TaskPageLinearViewStateModel) {
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx b/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx
deleted file mode 100644
index cdcdb449843..00000000000
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-quick-filters.test.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useTaskPageJiraQuickFilters } from './use-task-page-jira-quick-filters'
-import type { JiraQuickFilterState } from '../../../../../shared/jira/jira-quick-filters'
-import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
-const { read, write } = vi.hoisted(() => ({ read: vi.fn(), write: vi.fn() }))
-vi.mock('@/runtime/jira/runtime-jira-quick-filter-state', () => ({
-  readJiraQuickFilterState: read,
-  writeJiraQuickFilterState: write
-}))
-beforeEach(() => {
-  vi.resetAllMocks()
-})
-afterEach(cleanup)
-function model(
-  host: string | null,
-  accountHost = 'account-owner'
-): Parameters<typeof useTaskPageJiraQuickFilters>[0] {
-  return {
-    accountBackedTaskSourceHostId: toRuntimeExecutionHostId(accountHost),
-    taskSource: 'jira',
-    taskResumeApplied: true,
-    jiraTaskSourceContext: host
-      ? {
-          kind: 'task-source',
-          provider: 'jira',
-          projectId: 'project',
-          hostId: toRuntimeExecutionHostId(host)
-        }
-      : null
-  }
-}
-it('ignores a late mutation reply after changing Jira execution hosts', async () => {
-  read
-    .mockResolvedValueOnce({ statuses: ['Blocked'] })
-    .mockResolvedValueOnce({ statuses: ['Open'] })
-  let finish: (value: JiraQuickFilterState) => void = () => {}
-  write.mockReturnValue(
-    new Promise((resolve) => {
-      finish = resolve
-    })
-  )
-  const { result, rerender } = renderHook(({ host }) => useTaskPageJiraQuickFilters(model(host)), {
-    initialProps: { host: 'a' }
-  })
-  await waitFor(() => expect(result.current.jiraQuickFiltersLoading).toBe(false))
-  let pending: Promise<void> = Promise.resolve()
-  act(() => {
-    pending = result.current.selectJiraStatuses(['In Progress'])
-  })
-  rerender({ host: 'b' })
-  await waitFor(() => expect(result.current.selectedJiraStatuses).toEqual(['Open']))
-  await act(async () => {
-    finish({ statuses: ['In Progress'] })
-    await pending
-  })
-  expect(result.current.selectedJiraStatuses).toEqual(['Open'])
-})
-it.each(['success', 'failure'] as const)(
-  'keeps a new owner visit pending after an old %s settlement',
-  async (outcome) => {
-    read.mockResolvedValue({ statuses: ['Open'] })
-    let finishOld: (state: JiraQuickFilterState) => void = () => {}
-    let failOld: (reason: Error) => void = () => {}
-    let finishNew: (state: JiraQuickFilterState) => void = () => {}
-    write
-      .mockReturnValueOnce(
-        new Promise((resolve, reject) => {
-          finishOld = resolve
-          failOld = reject
-        })
-      )
-      .mockReturnValueOnce(
-        new Promise((resolve) => {
-          finishNew = resolve
-        })
-      )
-    const { result, rerender } = renderHook(
-      ({ host }) => useTaskPageJiraQuickFilters(model(host)),
-      { initialProps: { host: 'a' } }
-    )
-    await waitFor(() => expect(result.current.jiraQuickFiltersLoading).toBe(false))
-    let oldWrite = Promise.resolve()
-    act(() => {
-      oldWrite = result.current.selectJiraStatuses(['Closed']).catch(() => {})
-    })
-    rerender({ host: 'b' })
-    await waitFor(() => expect(result.current.jiraQuickFiltersLoading).toBe(false))
-    rerender({ host: 'a' })
-    await waitFor(() => expect(result.current.jiraQuickFiltersLoading).toBe(false))
-    let newWrite = Promise.resolve()
-    act(() => {
-      newWrite = result.current.selectJiraStatuses(['In Progress'])
-    })
-    await act(async () => {
-      if (outcome === 'success') {
-        finishOld({ statuses: ['Closed'] })
-      } else {
-        failOld(new Error('Old request failed'))
-      }
-      await oldWrite
-    })
-    expect(result.current.jiraQuickFiltersPending).toBe(true)
-    expect(result.current.selectedJiraStatuses).toEqual(['Open'])
-    expect(result.current.jiraQuickFiltersError).toBeNull()
-    await act(async () => {
-      finishNew({ statuses: ['In Progress'] })
-      await newWrite
-    })
-    expect(result.current.selectedJiraStatuses).toEqual(['In Progress'])
-    expect(result.current.jiraQuickFiltersPending).toBe(false)
-  }
-)
diff --git a/src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.test.tsx b/src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.test.tsx
deleted file mode 100644
index 8853cfba223..00000000000
--- a/src/renderer/src/components/task-page/jira/use-task-page-jira-saved-filters.test.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { startTransition, Suspense } from 'react'
-import { useTaskPageJiraSavedFilters } from './use-task-page-jira-saved-filters'
-import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
-const { read, mutate } = vi.hoisted(() => ({ read: vi.fn(), mutate: vi.fn() }))
-vi.mock('@/runtime/jira/runtime-jira-saved-filter-state', () => ({
-  readJiraSavedFilterState: read,
-  mutateJiraSavedFilters: mutate
-}))
-afterEach(cleanup)
-beforeEach(() => {
-  vi.resetAllMocks()
-})
-const filter = { id: 'mine', name: 'My work', jql: 'project = APP' }
-const initial = { filters: [filter], activeFilterId: filter.id }
-function model(
-  host: string | null,
-  accountHost = 'account-owner'
-): Parameters<typeof useTaskPageJiraSavedFilters>[0] {
-  return {
-    taskSource: 'jira',
-    taskResumeApplied: true,
-    accountBackedTaskSourceHostId: toRuntimeExecutionHostId(accountHost),
-    jiraTaskSourceContext: host
-      ? {
-          kind: 'task-source',
-          provider: 'jira',
-          projectId: 'project',
-          hostId: toRuntimeExecutionHostId(host)
-        }
-      : null
-  }
-}
-it('ignores an old host read that completes after switching execution hosts', async () => {
-  let resolveOld: (value: typeof initial) => void = () => {}
-  read
-    .mockImplementationOnce(
-      () =>
-        new Promise((resolve) => {
-          resolveOld = resolve
-        })
-    )
-    .mockResolvedValueOnce({ filters: [], activeFilterId: null })
-  const setQuery = vi.fn()
-  const { result, rerender } = renderHook(
-    ({ host }) => useTaskPageJiraSavedFilters(model(host), setQuery),
-    { initialProps: { host: 'host-a' } }
-  )
-  rerender({ host: 'host-b' })
-  await waitFor(() => expect(result.current.jiraSavedFiltersReady).toBe(true))
-  await act(async () => {
-    resolveOld(initial)
-  })
-  expect(result.current.jiraSavedFilters).toEqual([])
-  expect(setQuery).not.toHaveBeenCalledWith(filter.jql)
-})
-it.each(['success', 'failure'] as const)(
-  'keeps a new visit to the owner pending after an old write settles with %s',
-  async (settlement) => {
-    read.mockResolvedValue(initial)
-    let settleOld = () => {}
-    let settleNew = () => {}
-    mutate
-      .mockImplementationOnce(
-        () =>
-          new Promise((resolve, reject) => {
-            settleOld = () =>
-              settlement === 'success'
-                ? resolve({ filters: [], activeFilterId: null })
-                : reject(new Error('Old host disconnected'))
-          })
-      )
-      .mockImplementationOnce(
-        () =>
-          new Promise((resolve) => {
-            settleNew = () => resolve(initial)
-          })
-      )
-    const setQuery = vi.fn()
-    const { result, rerender } = renderHook(
-      ({ host }) => useTaskPageJiraSavedFilters(model(host), setQuery),
-      { initialProps: { host: 'host-a' } }
-    )
-    await waitFor(() => expect(result.current.jiraSavedFiltersReady).toBe(true))
-    let oldWrite = Promise.resolve(false)
-    act(() => {
-      oldWrite = result.current.applyJiraSavedFilter(filter).catch(() => false)
-    })
-    rerender({ host: 'host-b' })
-    await waitFor(() => expect(result.current.jiraSavedFiltersLoading).toBe(false))
-    rerender({ host: 'host-a' })
-    await waitFor(() => expect(read).toHaveBeenCalledTimes(3))
-    await waitFor(() => expect(result.current.jiraSavedFiltersLoading).toBe(false))
-    let newWrite = Promise.resolve(false)
-    act(() => {
-      newWrite = result.current.applyJiraSavedFilter(filter)
-    })
-    expect(result.current.jiraSavedFiltersPending).toBe(true)
-    setQuery.mockClear()
-    await act(async () => {
-      settleOld()
-      await oldWrite
-    })
-    expect(result.current.jiraSavedFilters).toEqual([filter])
-    expect(result.current.jiraSavedFiltersPending).toBe(true)
-    expect(result.current.jiraSavedFiltersError).toBeNull()
-    expect(setQuery).not.toHaveBeenCalled()
-    await act(async () => {
-      settleNew()
-      await newWrite
-    })
-    expect(result.current.jiraSavedFiltersPending).toBe(false)
-    expect(setQuery).toHaveBeenCalledWith(filter.jql)
-  }
-)
-it('applies only the committed owner while another owner render is suspended', async () => {
-  read.mockResolvedValue(initial)
-  mutate.mockResolvedValue(initial)
-  const setQuery = vi.fn()
-  const suspended = new Promise(() => {})
-  const { result, rerender } = renderHook(
-    ({ host, suspend }) => {
-      const filters = useTaskPageJiraSavedFilters(model(host), setQuery)
-      if (suspend) {
-        throw suspended
-      }
-      return filters
-    },
-    {
-      initialProps: { host: 'host-a', suspend: false },
-      wrapper: ({ children }) => <Suspense fallback={null}>{children}</Suspense>
-    }
-  )
-  await waitFor(() => expect(result.current.jiraSavedFiltersReady).toBe(true))
-  const committedAction = result.current.applyJiraSavedFilter
-  act(() => {
-    startTransition(() => rerender({ host: 'host-b', suspend: true }))
-  })
-  await act(async () => {
-    expect(await committedAction(filter)).toBe(true)
-  })
-  expect(mutate).toHaveBeenCalledWith(
-    { kind: 'environment', environmentId: 'host-a' },
-    { kind: 'select', id: filter.id }
-  )
-  expect(read).toHaveBeenCalledTimes(1)
-})
diff --git a/src/renderer/src/components/task-page/linear/Content.tsx b/src/renderer/src/components/task-page/linear/Content.tsx
index a50450d9d5c..f4a8b506b3c 100644
--- a/src/renderer/src/components/task-page/linear/Content.tsx
+++ b/src/renderer/src/components/task-page/linear/Content.tsx
@@ -4,11 +4,11 @@ import { LoaderCircle } from 'lucide-react'
 import { LinearIcon } from '@/components/task-page/task-page-localized-options'
 import { useTranslate } from '@/i18n/use-translate'
 import { Button } from '@/components/ui/button'
-import { TaskPageLinearProjectOverview } from './ProjectOverview'
-import { TaskPageLinearProjectList } from './ProjectList'
-import { TaskPageLinearCustomViewList } from './CustomViewList'
-import { TaskPageLinearCustomViewProjects } from './CustomViewProjects'
-import { TaskPageLinearIssueList } from './IssueList'
+import { TaskPageLinearProjectOverview } from './projects/ProjectOverview'
+import { TaskPageLinearProjectList } from './projects/ProjectList'
+import { TaskPageLinearCustomViewList } from './views/CustomViewList'
+import { TaskPageLinearCustomViewProjects } from './views/CustomViewProjects'
+import { TaskPageLinearIssueList } from './issues/IssueList'
 export function TaskPageLinearContent({
   model
 }: {
diff --git a/src/renderer/src/components/task-page/linear/IssueRows.tsx b/src/renderer/src/components/task-page/linear/IssueRows.tsx
deleted file mode 100644
index ad47fc1d0c1..00000000000
--- a/src/renderer/src/components/task-page/linear/IssueRows.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
-import { TaskPageLinearIssueBoard } from './IssueBoard'
-export function TaskPageLinearIssueRows({
-  model
-}: {
-  model: TaskPageComposerActionsModel
-}): React.JSX.Element | null {
-  return <TaskPageLinearIssueBoard model={model} />
-}
diff --git a/src/renderer/src/components/task-page/linear/IssueTable.test.tsx b/src/renderer/src/components/task-page/linear/IssueTable.test.tsx
deleted file mode 100644
index 806f7f723fa..00000000000
--- a/src/renderer/src/components/task-page/linear/IssueTable.test.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-// @vitest-environment happy-dom
-
-import { cleanup, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { afterEach, expect, it, vi } from 'vitest'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { TaskPageLinearIssueTable } from './IssueTable'
-import type { LinearIssueListRow } from './task-page-linear-issue-model'
-
-vi.mock('./task-page-linear-issue-model', () => ({ LinearStateCell: () => null }))
-
-afterEach(cleanup)
-
-function issue(id: string): LinearIssue {
-  return {
-    id,
-    identifier: `COR-${id}`,
-    title: `Issue ${id}`,
-    url: `https://linear.app/core/issue/COR-${id}`,
-    state: { name: 'Todo', type: 'unstarted', color: '#000' },
-    team: { id: 'core', name: 'Core', key: 'COR' },
-    labels: [],
-    labelIds: [],
-    priority: 0,
-    updatedAt: '2026-10-01T00:00:00Z'
-  }
-}
-
-const first = issue('1')
-const second = issue('2')
-const third = issue('3')
-const rows: LinearIssueListRow[] = [
-  { type: 'section', key: 'status:Todo', label: 'Todo', count: 2 },
-  { type: 'issue', issue: first },
-  { type: 'issue', issue: second },
-  { type: 'section', key: 'status:Done', label: 'Done', count: 1 },
-  { type: 'issue', issue: third }
-]
-
-function table(linearIssueListRows = rows) {
-  const fixture = {
-    selectedLinearWorkspaceId: 'all',
-    linearTaskSourceContext: null,
-    selectedLinearIssueId: null,
-    openLinearDetailPage: vi.fn(),
-    linearIssueAttachmentIndex: new Map(),
-    effectiveLinearDisplayProperties: new Set(),
-    linearIssueGridStyle: {},
-    linearIssueListRows,
-    handleOpenOrUseLinearItem: vi.fn()
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The fixture supplies every model field read by this table.
-  const model = fixture as unknown as TaskPageComposerActionsModel
-  return (
-    <TooltipProvider>
-      <TaskPageLinearIssueTable model={model} />
-    </TooltipProvider>
-  )
-}
-
-it('tracks the group key through refreshed rows and leaves ungrouped issues visible', async () => {
-  const user = userEvent.setup()
-  const view = render(table())
-  await user.click(screen.getByRole('button', { name: 'Todo 2' }))
-  const refreshed: LinearIssueListRow[] = [
-    ...rows.slice(3),
-    { type: 'section', key: 'status:Todo', label: 'Todo', count: 3 },
-    ...rows.slice(1, 3),
-    { type: 'issue', issue: issue('4') }
-  ]
-  view.rerender(table(refreshed))
-  expect(screen.getByRole('button', { name: 'Todo 3', expanded: false })).toBeTruthy()
-  expect(screen.queryByText('Issue 4')).toBeNull()
-  expect(screen.getByText('Issue 3')).toBeTruthy()
-
-  view.rerender(table([{ type: 'issue', issue: first }]))
-  expect(screen.getByText('Issue 1')).toBeTruthy()
-  view.unmount()
-  render(table())
-  expect(screen.getByRole('button', { name: 'Todo 2', expanded: true })).toBeTruthy()
-})
diff --git a/src/renderer/src/components/task-page/linear/IssueAttributes.tsx b/src/renderer/src/components/task-page/linear/creation/IssueAttributes.tsx
similarity index 99%
rename from src/renderer/src/components/task-page/linear/IssueAttributes.tsx
rename to src/renderer/src/components/task-page/linear/creation/IssueAttributes.tsx
index bcceb1610e3..e359edb4f01 100644
--- a/src/renderer/src/components/task-page/linear/IssueAttributes.tsx
+++ b/src/renderer/src/components/task-page/linear/creation/IssueAttributes.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
 import { useTranslate } from '@/i18n/use-translate'
 import { linearLabelCountLabel } from './linear-attribute-count-labels'
diff --git a/src/renderer/src/components/task-page/linear/IssueDialog.tsx b/src/renderer/src/components/task-page/linear/creation/IssueDialog.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/linear/IssueDialog.tsx
rename to src/renderer/src/components/task-page/linear/creation/IssueDialog.tsx
index 02da2829b72..638d9219427 100644
--- a/src/renderer/src/components/task-page/linear/IssueDialog.tsx
+++ b/src/renderer/src/components/task-page/linear/creation/IssueDialog.tsx
@@ -1,5 +1,5 @@
 import { ImeInput } from '@/lib/text-input/ime/ime-text-field'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { Dialog, DialogContent } from '@/components/ui/dialog'
 import { isScreenSubmitShortcut } from '@/lib/keyboard/screen-submit-shortcut'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/task-page/linear/ProjectDialog.tsx b/src/renderer/src/components/task-page/linear/creation/ProjectDialog.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/linear/ProjectDialog.tsx
rename to src/renderer/src/components/task-page/linear/creation/ProjectDialog.tsx
index bed683d4d8b..027429d9668 100644
--- a/src/renderer/src/components/task-page/linear/ProjectDialog.tsx
+++ b/src/renderer/src/components/task-page/linear/creation/ProjectDialog.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import {
   Dialog,
   DialogContent,
diff --git a/src/renderer/src/components/task-page/linear/ProjectFields.tsx b/src/renderer/src/components/task-page/linear/creation/ProjectFields.tsx
similarity index 99%
rename from src/renderer/src/components/task-page/linear/ProjectFields.tsx
rename to src/renderer/src/components/task-page/linear/creation/ProjectFields.tsx
index 95098699104..1304a4ad433 100644
--- a/src/renderer/src/components/task-page/linear/ProjectFields.tsx
+++ b/src/renderer/src/components/task-page/linear/creation/ProjectFields.tsx
@@ -1,5 +1,5 @@
 import { ImeInput } from '@/lib/text-input/ime/ime-text-field'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import { linearLabelCountLabel, linearMemberCountLabel } from './linear-attribute-count-labels'
 import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
diff --git a/src/renderer/src/components/task-page/linear/linear-attribute-count-labels.ts b/src/renderer/src/components/task-page/linear/creation/linear-attribute-count-labels.ts
similarity index 100%
rename from src/renderer/src/components/task-page/linear/linear-attribute-count-labels.ts
rename to src/renderer/src/components/task-page/linear/creation/linear-attribute-count-labels.ts
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-creation-state.ts
similarity index 98%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts
rename to src/renderer/src/components/task-page/linear/creation/use-task-page-linear-creation-state.ts
index 8780dbe2cf9..24882cf576d 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-creation-state.ts
+++ b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-creation-state.ts
@@ -1,4 +1,4 @@
-import type { TaskPageJiraListProjectionModel } from '../jira/use-task-page-jira-list-projection'
+import type { TaskPageJiraListProjectionModel } from '../../jira/listing/use-task-page-jira-list-projection'
 import { useState, useMemo, useEffect, useReducer, type SetStateAction } from 'react'
 import { useTeamMembers, useTeamLabels, useTeamStates } from '@/hooks/useIssueMetadata'
 import {
@@ -10,9 +10,9 @@ import {
   completeLinearIssueForm,
   handoffLinearIssueForm as handoff
 } from '@/components/use-task-creation-draft-retention'
-import { useNewLinearIssueProjects } from '../../use-new-linear-issue-projects'
+import { useNewLinearIssueProjects } from '../../../use-new-linear-issue-projects'
 import { useContextualTour } from '@/components/contextual-tours/use-contextual-tour'
-import { writeNewLinearIssueDraft, writeNewLinearProjectDraft } from '../task-page-draft-storage'
+import { writeNewLinearIssueDraft, writeNewLinearProjectDraft } from '../../task-page-draft-storage'
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
 type FormAction = (value: LinearIssueForm, target: string) => LinearIssueForm
 export function useLinearIssueCreationForm(
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-issue-creation.ts
similarity index 99%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts
rename to src/renderer/src/components/task-page/linear/creation/use-task-page-linear-issue-creation.ts
index b803039c4fd..296540264b8 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-issue-creation.ts
+++ b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-issue-creation.ts
@@ -6,7 +6,7 @@ import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { linearCreateIssue } from '@/runtime/linear/runtime-linear-issue-client'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 export function useTaskPageLinearIssueCreation(model: TaskPageLinearProjectCreationModel) {
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-project-creation.ts
similarity index 97%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts
rename to src/renderer/src/components/task-page/linear/creation/use-task-page-linear-project-creation.ts
index e1b353e3ceb..e988d5f0395 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-project-creation.ts
+++ b/src/renderer/src/components/task-page/linear/creation/use-task-page-linear-project-creation.ts
@@ -2,7 +2,7 @@ import {
   taskProviderErrorMessage,
   taskProviderErrorText
 } from '@/lib/work-items/task-provider-error-copy'
-import type { TaskPageGitHubIssueCreationModel } from '../github/use-task-page-github-issue-creation'
+import type { TaskPageGitHubIssueCreationModel } from '../../github/issue-creation/use-task-page-github-issue-creation'
 import { useCallback } from 'react'
 import { linearCreateProject } from '@/runtime/linear/runtime-linear-project-client'
 import { toast } from 'sonner'
diff --git a/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-lifecycle.test.tsx b/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-lifecycle.test.tsx
new file mode 100644
index 00000000000..a93870f5df4
--- /dev/null
+++ b/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-lifecycle.test.tsx
@@ -0,0 +1,58 @@
+// @vitest-environment happy-dom
+// @vitest-environment happy-dom
+import { reads, task, store } from './task-page-linear-refresh-test-fixtures'
+import '@/store/slices/linear/linear-issue-read'
+
+import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
+
+import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
+import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
+
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { act } from '@testing-library/react'
+import { deferred } from '../../../../store/slices/linear/linear-slice-test-harness'
+
+const cacheTime = Date.parse('2026-01-01T00:00:00Z')
+beforeEach(() => {
+  vi.useFakeTimers({ toFake: ['Date'] })
+  vi.setSystemTime(cacheTime)
+})
+afterEach(() => vi.useRealTimers())
+
+it('captured default runtime cannot seed or patch the focused foreign runtime cache', async () => {
+  const s = store()
+  const pending = deferred<{ ok: boolean }>()
+  const saving = writeLinearIssue(
+    task(),
+    { state: task('Done').state },
+    defaultScopeSource(null),
+    () => pending.promise
+  )
+  // SAFETY: only activeRuntimeEnvironmentId is read by this captured-scope fixture.
+  s.setState({
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
+    settings: { activeRuntimeEnvironmentId: 'remote' } as never,
+    linearIssueCache: { 'w::same-uuid': { data: task('Remote'), fetchedAt: cacheTime } }
+  })
+  const remote = s.getState().fetchLinearIssue(task().id, 'w').acquire()
+  expect(remote.currentView().data?.state.name).toBe('Remote')
+  reads.detail.mockResolvedValue(task('Local observation'))
+  const lease = s
+    .getState()
+    .fetchLinearIssue(task().id, 'w', {
+      scope: getLinearSourceScope({ kind: 'local' }),
+      force: true
+    })
+    .acquire()
+  expect(lease.currentView().data).toBeNull()
+  expect((await lease.waitForCurrentTerminal()).data?.state.name).toBe('Done')
+  await act(async () => {
+    pending.resolve({ ok: false })
+    await saving
+  })
+  expect(s.getState().linearIssueCache['w::same-uuid'].data?.state.name).toBe('Remote')
+  expect(remote.currentView().kind).toBe('data')
+  expect(remote.currentView().data?.state.name).toBe('Remote')
+  remote.release()
+  lease.release()
+})
diff --git a/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-test-fixtures.tsx b/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-test-fixtures.tsx
new file mode 100644
index 00000000000..10f3d9ce9ea
--- /dev/null
+++ b/src/renderer/src/components/task-page/linear/issue-refresh/task-page-linear-refresh-test-fixtures.tsx
@@ -0,0 +1,210 @@
+import type * as ReactModule from 'react'
+import type { LinearEditState } from '../../../linear-item-drawer-types'
+
+import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
+import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
+import { LinearIssueTextEditor } from '../../../LinearIssueTextEditor'
+import { useLinearIssueEditController } from '../../../linear-item-drawer-edit-controller'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import { useStore } from 'zustand'
+
+import { afterEach, beforeEach, vi, type Mock } from 'vitest'
+import { cleanup } from '@testing-library/react'
+import { createTestStore, issue } from '../../../../store/slices/linear/linear-slice-test-harness'
+import { clearLinearRequestMaps } from '../../../../store/slices/linear/linear-slice-request-state'
+
+const deferredIssueSetters = vi.hoisted(() => {
+  const updates: VoidFunction[] = []
+  return { enabled: false, updates }
+})
+vi.mock('react', async (original) => {
+  const actual = await original<typeof ReactModule>()
+  return {
+    ...actual,
+    useReducer<S, A>(reducer: (previous: S, action: A) => S, initial: S) {
+      const [value, dispatch] = actual.useReducer(reducer, initial)
+      const send = actual.useCallback((action: A) => {
+        if (
+          deferredIssueSetters.enabled &&
+          typeof initial === 'object' &&
+          initial !== null &&
+          'whole' in initial
+        ) {
+          deferredIssueSetters.updates.push(() => dispatch(action))
+        } else {
+          dispatch(action)
+        }
+      }, [])
+      return [value, send] as const
+    }
+  }
+})
+export { deferredIssueSetters }
+
+const active = vi.hoisted(() => ({ store: vi.fn<() => Store>() }))
+
+vi.mock('@/store/index', () => ({
+  useAppStore: Object.assign(
+    (selector: (state: ReturnType<Store['getState']>) => unknown) =>
+      useStore(active.store(), selector),
+    {
+      getState: () => active.store().getState(),
+      subscribe: (...args: Parameters<Store['subscribe']>) => active.store().subscribe(...args)
+    }
+  )
+}))
+
+vi.mock('@/i18n/i18n', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  translate: (_key: string, fallback: string, values?: Record<string, string>) =>
+    fallback.replace(/{{(\w+)}}/g, (match, key) => values?.[key] ?? match)
+}))
+
+const reads: {
+  list: Mock
+  search: Mock
+  project: Mock
+  view: Mock
+  detail: Mock
+  update: Mock
+  create: Mock
+  projects: Mock
+  connect: Mock
+  test: Mock
+  select: Mock
+} = vi.hoisted(() => ({
+  list: vi.fn(),
+  search: vi.fn(),
+  project: vi.fn(),
+  view: vi.fn(),
+  detail: vi.fn(),
+  update: vi.fn(),
+  create: vi.fn(),
+  projects: vi.fn(),
+  connect: vi.fn(),
+  test: vi.fn(),
+  select: vi.fn()
+}))
+
+const accountViewer = vi.hoisted(() => ({
+  displayName: 'User',
+  email: null,
+  organizationName: 'Acme'
+}))
+
+vi.mock('@/runtime/linear/runtime-linear-client', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  linearTestConnection: (...args: unknown[]) => reads.test(...args),
+  linearSelectWorkspace: (...args: unknown[]) => reads.select(...args),
+  linearDisconnect: async () => {},
+  linearConnect: (...args: unknown[]) => reads.connect(...args),
+  linearStatus: async () => ({ connected: true, viewer: accountViewer, selectedWorkspaceId: 'w' }),
+  linearListIssues: (...args: unknown[]) => reads.list(...args),
+  linearSearchIssues: (...args: unknown[]) => reads.search(...args)
+}))
+
+vi.mock('@/runtime/linear/runtime-linear-project-client', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  linearListProjects: reads.projects,
+  linearTeamStates: async () => [{ id: 'done', name: 'Done', type: 'completed', color: '#888888' }],
+  linearListProjectIssues: (...args: unknown[]) => reads.project(...args),
+  linearListCustomViewIssues: (...args: unknown[]) => reads.view(...args)
+}))
+
+vi.mock('@/runtime/linear/runtime-linear-issue-client', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  linearGetIssue: reads.detail,
+  linearIssueComments: async () => [],
+  linearUpdateIssue: reads.update,
+  linearCreateIssue: reads.create
+}))
+
+vi.mock('@/hooks/useIssueMetadata', async (original) => ({
+  ...(await original<Record<string, unknown>>()),
+  useTeamLabels: () => ({ data: [{ id: 'bug', name: 'Bug' }], loading: false }),
+  useTeamMembers: () => ({ data: [], loading: false }),
+  clearLinearMetadataCache: vi.fn(),
+  useTeamStates: () => ({
+    data: [{ id: 'done', name: 'Done', type: 'completed', color: '#888888' }],
+    loading: false
+  })
+}))
+
+vi.mock('@/store/slices/worktrees/listing/use-worktree-catalog', async (original) => {
+  const empty: [] = []
+  return { ...(await original<Record<string, unknown>>()), useAllWorktrees: () => empty }
+})
+
+vi.mock('@/store/workspaces/catalog/workspace-record-fields', async (original) => {
+  const empty: [] = []
+  return { ...(await original<Record<string, unknown>>()), selectFolderWorkspaces: () => empty }
+})
+
+vi.mock('@/components/LinearIssueMarkdownDescriptionEditor', () => ({
+  LinearIssueMarkdownDescriptionEditor: () => null
+}))
+
+vi.mock('@/components/linear-item-drawer-sheet', () => ({
+  renderLinearItemDrawerSheet: (props: {
+    displayed: LinearIssue | null
+    editState: LinearEditState | null
+  }) =>
+    props.displayed && props.editState ? (
+      <DrawerFields row={props.displayed} editState={props.editState} />
+    ) : (
+      <div />
+    )
+}))
+
+export function DrawerFields({ row, editState }: { row: LinearIssue; editState: LinearEditState }) {
+  const controller = useLinearIssueEditController({ issue: row, editState })
+  return (
+    <>
+      <output data-testid="drawer">
+        {row.state.name}:{editState.priority}:{editState.labels.join(',')}
+      </output>
+      <button onClick={() => controller.handlePriorityChange('4')}>Priority</button>
+      <button onClick={() => controller.handleLabelToggle('bug')}>Label</button>
+      <LinearIssueTextEditor issue={row} fields="title" />
+    </>
+  )
+}
+
+export function task(state = 'In Review') {
+  return {
+    ...issue('same-uuid'),
+    identifier: 'DAT-124',
+    workspaceId: 'w',
+    state: { name: state, type: state === 'Done' ? 'completed' : 'started', color: '#888888' }
+  }
+}
+
+export function store() {
+  const result = createTestStore()
+  result.setState({
+    linearStatus: { connected: true, viewer: accountViewer, selectedWorkspaceId: 'w' },
+    linearStatusObserved: true,
+    linearStatusChecked: true,
+    linearStatusContextKey: getLinearSourceScope(defaultScopeSource(null)).runtimeContextKey
+  })
+  active.store.mockReturnValue(result)
+  return result
+}
+
+export type Store = ReturnType<typeof store>
+
+beforeEach(() => {
+  deferredIssueSetters.enabled = false
+  deferredIssueSetters.updates.length = 0
+  vi.resetAllMocks()
+  reads.connect.mockResolvedValue({ ok: true, viewer: accountViewer })
+  reads.test.mockResolvedValue({ ok: true, viewer: accountViewer })
+  clearLinearRequestMaps()
+})
+
+afterEach(() => {
+  cleanup()
+  clearLinearRequestMaps()
+})
+
+export { reads }
diff --git a/src/renderer/src/components/task-page/linear/IssueBoard.tsx b/src/renderer/src/components/task-page/linear/issues/IssueBoard.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/linear/IssueBoard.tsx
rename to src/renderer/src/components/task-page/linear/issues/IssueBoard.tsx
index fd58793e71e..00ec7c55584 100644
--- a/src/renderer/src/components/task-page/linear/IssueBoard.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/IssueBoard.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import {
   resolveLinearIssueEmptyKind,
@@ -6,12 +6,12 @@ import {
 } from './task-page-linear-issue-empty-state'
 import { Button } from '@/components/ui/button'
 import { LinearIcon } from '@/components/task-page/task-page-localized-options'
-import { isIntegrationCredentialDecryptionError } from '../../../../../shared/integration-credential-errors'
+import { isIntegrationCredentialDecryptionError } from '../../../../../../shared/integration-credential-errors'
 import {
   clampLinearIssueListLimit,
   LINEAR_ISSUE_LIST_MAX
-} from '../../../../../shared/linear/issue-read-limits'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
+} from '../../../../../../shared/linear/issue-read-limits'
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
 import { TaskPageLinearIssueBoardColumns } from './IssueBoardColumns'
 import { TaskPageLinearIssueTable } from './IssueTable'
 export function TaskPageLinearIssueBoard({
diff --git a/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx b/src/renderer/src/components/task-page/linear/issues/IssueBoardColumns.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx
rename to src/renderer/src/components/task-page/linear/issues/IssueBoardColumns.tsx
index bed498c9813..981dfd2759f 100644
--- a/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/IssueBoardColumns.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { cn } from '@/lib/class-names'
 import { findLinearIssueWorkspaceAttachmentInIndex } from '@/lib/work-items/linear/linear-issue-workspace-attachment'
 import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
@@ -7,8 +7,8 @@ import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
 import { FolderOpen, ArrowRight, ExternalLink } from 'lucide-react'
-import { LinearStateCell } from './task-page-linear-issue-model'
-import { formatRelativeTime } from '../task-page-source-context'
+import { LinearStateCell } from './task-page-linear-state-cell'
+import { formatRelativeTime } from '../../task-page-source-context'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 export function TaskPageLinearIssueBoardColumns({
   model
diff --git a/src/renderer/src/components/task-page/linear/IssueList.tsx b/src/renderer/src/components/task-page/linear/issues/IssueList.tsx
similarity index 95%
rename from src/renderer/src/components/task-page/linear/IssueList.tsx
rename to src/renderer/src/components/task-page/linear/issues/IssueList.tsx
index 7a06ebc962c..0da6ca97b20 100644
--- a/src/renderer/src/components/task-page/linear/IssueList.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/IssueList.tsx
@@ -1,9 +1,9 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { TaskPageLinearIssueToolbar } from './IssueToolbar'
 import { useTranslate } from '@/i18n/use-translate'
-import { TaskPageLinearIssueRows } from './IssueRows'
+import { TaskPageLinearIssueBoard } from './IssueBoard'
 import { LinearCollectionNotice } from '@/components/linear-project-view-surfaces'
-import { PaginationBar } from '../PaginationBar'
+import { PaginationBar } from '../../PaginationBar'
 export function TaskPageLinearIssueList({
   model
 }: {
@@ -62,7 +62,7 @@ export function TaskPageLinearIssueList({
         </div>
       ) : null}
 
-      <TaskPageLinearIssueRows model={model} />
+      <TaskPageLinearIssueBoard model={model} />
       {selectedLinearProject && linearProjectTab === 'issues' ? (
         <>
           <LinearCollectionNotice
diff --git a/src/renderer/src/components/task-page/linear/IssueTable.tsx b/src/renderer/src/components/task-page/linear/issues/IssueTable.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/linear/IssueTable.tsx
rename to src/renderer/src/components/task-page/linear/issues/IssueTable.tsx
index 11bfb810155..97b801a1e7a 100644
--- a/src/renderer/src/components/task-page/linear/IssueTable.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/IssueTable.tsx
@@ -1,14 +1,14 @@
 import { useState } from 'react'
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { ChevronDown, FolderOpen, ArrowRight, ExternalLink } from 'lucide-react'
 import { findLinearIssueWorkspaceAttachmentInIndex } from '@/lib/work-items/linear/linear-issue-workspace-attachment'
 import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { cn } from '@/lib/class-names'
 import { LinearPriorityIcon } from '@/components/linear-priority-icon'
-import { LinearStateCell } from './task-page-linear-issue-model'
+import { LinearStateCell } from './task-page-linear-state-cell'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
-import { formatRelativeTime } from '../task-page-source-context'
+import { formatRelativeTime } from '../../task-page-source-context'
 import { Button } from '@/components/ui/button'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 export function TaskPageLinearIssueTable({
diff --git a/src/renderer/src/components/task-page/linear/IssueToolbar.tsx b/src/renderer/src/components/task-page/linear/issues/IssueToolbar.tsx
similarity index 98%
rename from src/renderer/src/components/task-page/linear/IssueToolbar.tsx
rename to src/renderer/src/components/task-page/linear/issues/IssueToolbar.tsx
index 162f2ada61e..02207aba24e 100644
--- a/src/renderer/src/components/task-page/linear/IssueToolbar.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/IssueToolbar.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
 import { ChevronLeft, SlidersHorizontal, List, ArrowDownUp, Eye } from 'lucide-react'
@@ -18,7 +18,7 @@ import type {
   LinearViewMode,
   LinearGroupBy,
   LinearOrderBy
-} from '../../../../../shared/linear/issue-view-resume-state'
+} from '../../../../../../shared/linear/issue-view-resume-state'
 export function TaskPageLinearIssueToolbar({
   model
 }: {
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-cache-selectors.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-cache-selectors.ts
similarity index 84%
rename from src/renderer/src/components/task-page/linear/task-page-linear-cache-selectors.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-cache-selectors.ts
index 0c6bc543594..e7d9e6fd3b1 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-cache-selectors.ts
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-cache-selectors.ts
@@ -1,6 +1,6 @@
-import type { LinearCollectionResult } from '../../../../../shared/linear/workspace-types'
-import { LINEAR_ISSUE_LIST_MAX } from '../../../../../shared/linear/issue-read-limits'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
+import type { LinearCollectionResult } from '../../../../../../shared/linear/workspace-types'
+import { LINEAR_ISSUE_LIST_MAX } from '../../../../../../shared/linear/issue-read-limits'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
 
 function linearIssueKey(issue: LinearIssue): string {
   return JSON.stringify([issue.workspaceId, issue.id])
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.test.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.test.ts
similarity index 100%
rename from src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.test.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.test.ts
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.ts
similarity index 93%
rename from src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.ts
index 4bdb8649757..cae6c91c60d 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-in-orca-issues.ts
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-in-orca-issues.ts
@@ -1,18 +1,18 @@
-import { readLinkedTaskIssuesWithLimit } from '../../read-linked-task-issues'
+import { readLinkedTaskIssuesWithLimit } from '../../../read-linked-task-issues'
 import type {
   LinearIssueRead,
   LinearIssueLease,
   LinearIssueView
 } from '@/store/slices/linear/linear-issue-read-lifecycle'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import type { LinearWorkspace } from '../../../../../shared/linear/workspace-types'
-import type { Worktree } from '../../../../../shared/worktree/types'
-import { parseLinearIssueInput } from '../../../../../shared/linear/links'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import type { LinearWorkspace } from '../../../../../../shared/linear/workspace-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { parseLinearIssueInput } from '../../../../../../shared/linear/links'
 import {
   getTaskSourceCacheScope,
   type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
-import { normalizeLinearIdentifier } from '../../../lib/work-items/linear/linear-issue-workspace-attachment'
+} from '../../../../../../shared/work-items/task-source-context'
+import { normalizeLinearIdentifier } from '../../../../lib/work-items/linear/linear-issue-workspace-attachment'
 
 export type LinkedLinearIssueRef = {
   identifier: string
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-issue-empty-state.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-empty-state.ts
similarity index 94%
rename from src/renderer/src/components/task-page/linear/task-page-linear-issue-empty-state.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-empty-state.ts
index acff0a50fd1..20366528f97 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-issue-empty-state.ts
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-empty-state.ts
@@ -1,7 +1,7 @@
 import {
   isEmptyLinearIssueAttributeFilter,
   type LinearIssueAttributeFilter
-} from '../../../../../shared/linear/issue-attribute-filter'
+} from '../../../../../../shared/linear/issue-attribute-filter'
 
 export type LinearIssueEmptyKind =
   | 'context'
diff --git a/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-grouping.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-grouping.ts
new file mode 100644
index 00000000000..4b62297b39a
--- /dev/null
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-grouping.ts
@@ -0,0 +1,109 @@
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import type {
+  LinearOrderBy,
+  LinearGroupBy
+} from '../../../../../../shared/linear/issue-view-resume-state'
+import { getLinearPriorityLabel } from '../../task-page-localized-options'
+import { translate } from '../../../../i18n/i18n'
+import { compareNumericLocaleText } from '../../../../../../shared/locale-text-collators'
+import type { Translate } from '../../../../i18n/use-translate'
+
+export type LinearGroupSection = {
+  key: string
+  label: string
+  issues: LinearIssue[]
+}
+
+export function getLinearPriorityRank(priority: number): number {
+  return priority === 0 ? 5 : priority
+}
+
+export function compareLinearIssues(
+  a: LinearIssue,
+  b: LinearIssue,
+  orderBy: LinearOrderBy
+): number {
+  if (orderBy === 'updated') {
+    return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+  }
+  if (orderBy === 'identifier') {
+    return compareNumericLocaleText(a.identifier, b.identifier)
+  }
+  const priorityDelta = getLinearPriorityRank(a.priority) - getLinearPriorityRank(b.priority)
+  if (priorityDelta !== 0) {
+    return priorityDelta
+  }
+  return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+}
+
+export function getLinearIssueGroup(
+  issue: LinearIssue,
+  groupBy: LinearGroupBy,
+  t: Translate = translate
+): {
+  key: string
+  label: string
+} {
+  if (groupBy === 'status') {
+    return {
+      key: `status:${issue.state.name}`,
+      label: issue.state.name
+    }
+  }
+  if (groupBy === 'assignee') {
+    return {
+      key: `assignee:${issue.assignee?.id ?? 'unassigned'}`,
+      label:
+        issue.assignee?.displayName ?? t('auto.components.TaskPage.groupUnassigned', 'Unassigned')
+    }
+  }
+  if (groupBy === 'priority') {
+    return {
+      key: `priority:${issue.priority}`,
+      label: getLinearPriorityLabel(issue.priority)
+    }
+  }
+  if (groupBy === 'team') {
+    return {
+      key: `team:${issue.team.id}`,
+      label: issue.team.name
+    }
+  }
+  return {
+    key: 'all',
+    label: t('auto.components.TaskPage.dfc0c79bd8', 'Issues')
+  }
+}
+
+export function groupLinearIssues(
+  issues: LinearIssue[],
+  groupBy: LinearGroupBy,
+  orderBy: LinearOrderBy,
+  t: Translate = translate
+): LinearGroupSection[] {
+  const sorted = [...issues].sort((a, b) => compareLinearIssues(a, b, orderBy))
+  if (groupBy === 'none') {
+    return [
+      {
+        key: 'all',
+        label: t('auto.components.TaskPage.dfc0c79bd8', 'Issues'),
+        issues: sorted
+      }
+    ]
+  }
+  const sections = new Map<string, LinearGroupSection>()
+  for (const issue of sorted) {
+    const group = getLinearIssueGroup(issue, groupBy, t)
+    const section = sections.get(group.key)
+    if (section) {
+      section.issues.push(issue)
+    } else {
+      sections.set(group.key, {
+        key: group.key,
+        label: group.label,
+        issues: [issue]
+      })
+    }
+  }
+  return [...sections.values()]
+}
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-issue-request.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-request.ts
similarity index 92%
rename from src/renderer/src/components/task-page/linear/task-page-linear-issue-request.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-request.ts
index e94284bb17b..beccb32df3d 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-issue-request.ts
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-issue-request.ts
@@ -2,12 +2,12 @@ import {
   isEmptyLinearIssueAttributeFilter,
   linearIssueAttributeFilterSignature,
   type LinearIssueAttributeFilter
-} from '../../../../../shared/linear/issue-attribute-filter'
+} from '../../../../../../shared/linear/issue-attribute-filter'
 import {
   getTaskSourceCacheScope,
   type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
-import type { LinearIssueListReadArgs } from '../../../store/slices/linear/linear-slice-contract'
+} from '../../../../../../shared/work-items/task-source-context'
+import type { LinearIssueListReadArgs } from '../../../../store/slices/linear/linear-slice-contract'
 
 export function isLinearIssueSearchActive(immediateQuery: string, appliedQuery: string): boolean {
   return immediateQuery.trim().length > 0 || appliedQuery.trim().length > 0
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx b/src/renderer/src/components/task-page/linear/issues/task-page-linear-state-cell.tsx
similarity index 69%
rename from src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-state-cell.tsx
index b309a04b8b6..a1a05c7e9a7 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-issue-model.tsx
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-state-cell.tsx
@@ -1,84 +1,24 @@
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
-import { taskProviderErrorMessage } from '@/lib/work-items/task-provider-error-copy'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import type { LinearCustomViewModel } from '../../../../../shared/linear/project-types'
-import type {
-  LinearCollectionResult,
-  LinearWorkflowState
-} from '../../../../../shared/linear/workspace-types'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
+import { getLinearSourceScope } from '../../../../store/slices/linear/linear-slice-scope'
+import { writeLinearIssue } from '../../../../lib/work-items/linear/linear-issue-write'
+import { taskProviderErrorMessage } from '../../../../lib/work-items/task-provider-error-copy'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
 import React, { useState, useRef, useCallback } from 'react'
-import { useAppStore } from '@/store/index'
-import { useTeamStates } from '@/hooks/useIssueMetadata'
-import { linearUpdateIssue } from '@/runtime/linear/runtime-linear-issue-client'
+import { useAppStore } from '../../../../store/index'
+import { useTeamStates } from '../../../../hooks/useIssueMetadata'
+import { linearUpdateIssue } from '../../../../runtime/linear/runtime-linear-issue-client'
 import { toast } from 'sonner'
-import { translate } from '@/i18n/i18n'
-import { useTranslate } from '@/i18n/use-translate'
-import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover'
-import { cn } from '@/lib/class-names'
+import { translate } from '../../../../i18n/i18n'
+import { useTranslate } from '../../../../i18n/use-translate'
+import { Popover, PopoverTrigger, PopoverContent } from '../../../ui/popover'
+import { cn } from '../../../../lib/class-names'
 import {
   getLinearStatePillStyle,
   getLinearStateMarkerStyle
-} from '@/components/linear-state-pill-style'
+} from '../../../linear-state-pill-style'
 import { LoaderCircle, ChevronDown } from 'lucide-react'
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-export type LinearProjectTab = 'overview' | 'issues'
-export type LinearGroupSection = {
-  key: string
-  label: string
-  issues: LinearIssue[]
-}
-export type LinearIssueListRow =
-  | {
-      type: 'section'
-      key: string
-      label: string
-      count: number
-    }
-  | {
-      type: 'issue'
-      issue: LinearIssue
-    }
-export const LINEAR_CUSTOM_VIEW_MODELS = [
-  'issue',
-  'project'
-] satisfies readonly LinearCustomViewModel[]
-export function mergeLinearCollectionResults<T>(
-  results: LinearCollectionResult<T>[]
-): LinearCollectionResult<T> {
-  const errors = results.flatMap((result) => result.errors ?? [])
-  return {
-    items: results.flatMap((result) => result.items),
-    ...(errors.length > 0
-      ? {
-          errors
-        }
-      : {}),
-    ...(results.some((result) => result.hasMore)
-      ? {
-          hasMore: true
-        }
-      : {})
-  }
-}
-export function getLinearStatusSectionState(
-  section: LinearGroupSection
-): LinearIssue['state'] | null {
-  if (!section.key.startsWith('status:')) {
-    return null
-  }
-  return section.issues[0]?.state ?? null
-}
-export function findLinearWorkflowStateForStatus(
-  states: LinearWorkflowState[],
-  targetState: LinearIssue['state']
-): LinearWorkflowState | undefined {
-  return (
-    states.find((state) => state.name === targetState.name && state.type === targetState.type) ??
-    states.find((state) => state.name === targetState.name)
-  )
-}
+import { defaultScopeSource } from '../../../../runtime/hosts/selection/default-creation-host'
+
 export function LinearStateCell({
   issue,
   className,
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-team-selection.ts b/src/renderer/src/components/task-page/linear/issues/task-page-linear-team-selection.ts
similarity index 91%
rename from src/renderer/src/components/task-page/linear/task-page-linear-team-selection.ts
rename to src/renderer/src/components/task-page/linear/issues/task-page-linear-team-selection.ts
index 27c4b96cc68..93bf864faa4 100644
--- a/src/renderer/src/components/task-page/linear/task-page-linear-team-selection.ts
+++ b/src/renderer/src/components/task-page/linear/issues/task-page-linear-team-selection.ts
@@ -1,4 +1,4 @@
-import type { LinearTeam } from '../../../../../shared/linear/workspace-types'
+import type { LinearTeam } from '../../../../../../shared/linear/workspace-types'
 
 // Treat malformed persisted selections as sticky-all; unvalidated strings previously crashed array filtering.
 export function storedLinearTeamSelection(value: unknown): string[] | null {
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-board.ts
similarity index 88%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-board.ts
index a5abaaf64be..9eeae5753ff 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-board.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-board.ts
@@ -3,7 +3,7 @@ import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
 import { taskProviderErrorMessage } from '@/lib/work-items/task-provider-error-copy'
 import type { TaskPageLinearListProjectionModel } from './use-task-page-linear-list-projection'
 import React, { useMemo, useCallback } from 'react'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
 import {
   writeLinearBoardIssueDragData,
   readLinearBoardIssueDragData
@@ -12,15 +12,14 @@ import { linearTeamStates } from '@/runtime/linear/runtime-linear-project-client
 import { linearUpdateIssue } from '@/runtime/linear/runtime-linear-issue-client'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
-import type { LinearDisplayProperty } from '../../../../../shared/linear/issue-view-resume-state'
-import { groupLinearIssues } from './task-page-linear-jira-list-model'
-import type { LinearGroupSection } from './task-page-linear-issue-model'
-import {
-  findLinearWorkflowStateForStatus,
-  getLinearStatusSectionState
-} from './task-page-linear-issue-model'
+import { useAppStore } from '@/store/index'
+import type { LinearDisplayProperty } from '../../../../../../shared/linear/issue-view-resume-state'
+import { groupLinearIssues } from './task-page-linear-issue-grouping'
+import type { LinearGroupSection } from './task-page-linear-issue-grouping'
+
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
+import type { LinearWorkflowState } from '../../../../../../shared/linear/workspace-types'
+
 export function useTaskPageLinearBoard(model: TaskPageLinearListProjectionModel) {
   const {
     settings,
@@ -209,3 +208,22 @@ export function useTaskPageLinearBoard(model: TaskPageLinearListProjectionModel)
   return nextModel
 }
 export type TaskPageLinearBoardModel = ReturnType<typeof useTaskPageLinearBoard>
+
+export function getLinearStatusSectionState(
+  section: LinearGroupSection
+): LinearIssue['state'] | null {
+  if (!section.key.startsWith('status:')) {
+    return null
+  }
+  return section.issues[0]?.state ?? null
+}
+
+export function findLinearWorkflowStateForStatus(
+  states: LinearWorkflowState[],
+  targetState: LinearIssue['state']
+): LinearWorkflowState | undefined {
+  return (
+    states.find((state) => state.name === targetState.name && state.type === targetState.type) ??
+    states.find((state) => state.name === targetState.name)
+  )
+}
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-filter-selection.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-filter-selection.ts
similarity index 92%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-filter-selection.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-filter-selection.ts
index c2a925b3d20..7f470d59440 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-filter-selection.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-filter-selection.ts
@@ -4,15 +4,15 @@ import { resolveLinearIssueAttributeFilterPrimaryTeam } from '@/components/linea
 import {
   type LinearIssueAttributeFilter,
   linearIssueAttributeFilterSignature
-} from '../../../../../shared/linear/issue-attribute-filter'
-import { setLinearWorkspaceIssueFilter } from '../../../../../shared/linear/issue-view-resume-state'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
+} from '../../../../../../shared/linear/issue-attribute-filter'
+import { setLinearWorkspaceIssueFilter } from '../../../../../../shared/linear/issue-view-resume-state'
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
 import {
   type LinearPrimaryTeamObservation,
   shouldClearTeamDerivedFacets,
   teamDerivedFacetsForPrimaryTeamChange,
   isLinearIssueSearchActive
-} from '@/components/task-page/linear/task-page-linear-issue-request'
+} from '@/components/task-page/linear/issues/task-page-linear-issue-request'
 export function useTaskPageLinearFilterSelection(model: TaskPageLinearListSelectionPreludeModel) {
   const {
     linearMode,
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-in-orca-effects.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-in-orca-effects.ts
similarity index 96%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-in-orca-effects.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-in-orca-effects.ts
index b2d6c6543cd..70cfdc4c0d2 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-in-orca-effects.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-in-orca-effects.ts
@@ -4,8 +4,8 @@ import { useEffect } from 'react'
 import {
   readLinkedLinearIssuesWithLimit,
   filterLinearIssuesForInOrcaWorkspace
-} from '@/components/task-page/linear/task-page-linear-in-orca-issues'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
+} from '@/components/task-page/linear/issues/task-page-linear-in-orca-issues'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
 import { translate } from '@/i18n/i18n'
 
 function isCurrentLinearRequest(
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-effects.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-effects.ts
similarity index 92%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-list-effects.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-effects.ts
index f7365e19ce4..d83f0060065 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-effects.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-effects.ts
@@ -2,29 +2,29 @@ import {
   observeLinearIssueRead,
   type LinearIssueRead
 } from '@/store/slices/linear/linear-issue-read-lifecycle'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import type { LinearCollectionResult } from '../../../../../shared/linear/workspace-types'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import type { LinearCollectionResult } from '../../../../../../shared/linear/workspace-types'
 import { taskProviderErrorText } from '@/lib/work-items/task-provider-error-copy'
-import type { TaskPageGlobalEffectsModel } from '../use-task-page-global-effects'
+import type { TaskPageGlobalEffectsModel } from '../../use-task-page-global-effects'
 import { useEffect } from 'react'
-import { isIntegrationCredentialDecryptionError } from '../../../../../shared/integration-credential-errors'
-import { saveLinearIssueView } from '../../linear-issue-view-storage'
-import { serializeLinearIssueViewResumeState } from '../../../../../shared/linear/issue-view-resume-state'
-import { clampLinearIssueListLimit } from '../../../../../shared/linear/issue-read-limits'
+import { isIntegrationCredentialDecryptionError } from '../../../../../../shared/integration-credential-errors'
+import { saveLinearIssueView } from '../../../linear-issue-view-storage'
+import { serializeLinearIssueViewResumeState } from '../../../../../../shared/linear/issue-view-resume-state'
+import { clampLinearIssueListLimit } from '../../../../../../shared/linear/issue-read-limits'
 import {
   buildLinearIssueListReadArgs,
   type LinearIssueListFilterRead,
   shouldForceLinearIssueListRead,
   buildLinearIssueListRequestSignature
-} from '@/components/task-page/linear/task-page-linear-issue-request'
-import { linearIssueAttributeFilterSignature } from '../../../../../shared/linear/issue-attribute-filter'
+} from '@/components/task-page/linear/issues/task-page-linear-issue-request'
+import { linearIssueAttributeFilterSignature } from '../../../../../../shared/linear/issue-attribute-filter'
 import { linearIssueReadError } from '@/lib/work-items/linear/linear-read-error'
 import {
   taskPageLinearIssuesHaveMore,
   reconcileTaskPageLinearIssuesAfterLandingRefresh
 } from './task-page-linear-cache-selectors'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
-import { useTaskSearchDebouncedApply } from '../use-task-search-debounced-apply'
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
+import { useTaskSearchDebouncedApply } from '../../use-task-search-debounced-apply'
 export function useTaskPageLinearListEffects(model: TaskPageGlobalEffectsModel) {
   const {
     setTaskResumeState,
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-presentation.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-presentation.ts
similarity index 76%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-list-presentation.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-presentation.ts
index 3dc1fa5aaef..2661f3f355c 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-presentation.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-presentation.ts
@@ -1,8 +1,10 @@
 import React, { useMemo } from 'react'
 
-import { getLinearIssueGridTemplate, groupLinearIssues } from './task-page-linear-jira-list-model'
-import type { LinearIssueListRow } from './task-page-linear-issue-model'
+import { groupLinearIssues } from './task-page-linear-issue-grouping'
+
 import type { TaskPageLinearListProjectionPreludeModel } from './use-task-page-linear-list-projection'
+import type { LinearIssue } from '../../../../../../shared/linear/issue-types'
+import type { LinearDisplayProperty } from '../../../../../../shared/linear/issue-view-resume-state'
 
 export function useTaskPageLinearListPresentation(model: TaskPageLinearListProjectionPreludeModel) {
   const {
@@ -98,3 +100,39 @@ export function useTaskPageLinearListPresentation(model: TaskPageLinearListProje
 export type TaskPageLinearListPresentationModel = ReturnType<
   typeof useTaskPageLinearListPresentation
 >
+
+export type LinearIssueListRow =
+  | {
+      type: 'section'
+      key: string
+      label: string
+      count: number
+    }
+  | {
+      type: 'issue'
+      issue: LinearIssue
+    }
+
+export function getLinearIssueGridTemplate(
+  visibleProperties: ReadonlySet<LinearDisplayProperty>
+): string {
+  const columns = ['96px', 'minmax(240px,1.55fr)']
+  if (visibleProperties.has('labels')) {
+    columns.push('minmax(168px,0.9fr)')
+  }
+  if (visibleProperties.has('team')) {
+    columns.push('minmax(172px,0.9fr)')
+  }
+  if (visibleProperties.has('state')) {
+    columns.push('138px')
+  }
+  if (visibleProperties.has('assignee')) {
+    columns.push('64px')
+  }
+  if (visibleProperties.has('updated')) {
+    columns.push('104px')
+  }
+  // Why: Worktrees is icon-only (open vs start); keep it narrow so issue title keeps the room.
+  columns.push('64px')
+  return columns.join(' ')
+}
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-projection.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-projection.ts
similarity index 97%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-list-projection.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-projection.ts
index 26bafb6a469..20f35e45b3f 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-projection.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-projection.ts
@@ -1,12 +1,12 @@
 import type { TaskPageLinearListSelectionModel } from './use-task-page-linear-list-selection'
 import { useMemo, useCallback, useEffect } from 'react'
-import { filterLinearIssuesBySearchQuery } from '@/components/task-page/linear/task-page-linear-in-orca-issues'
+import { filterLinearIssuesBySearchQuery } from '@/components/task-page/linear/issues/task-page-linear-in-orca-issues'
 import {
   clampLinearIssueListLimit,
   LINEAR_ISSUE_LIST_MAX
-} from '../../../../../shared/linear/issue-read-limits'
-import { compareLinearIssues } from './task-page-linear-jira-list-model'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
+} from '../../../../../../shared/linear/issue-read-limits'
+import { compareLinearIssues } from './task-page-linear-issue-grouping'
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
 import { useTaskPageLinearListPresentation } from './use-task-page-linear-list-presentation'
 export function useTaskPageLinearListProjectionPrelude(model: TaskPageLinearListSelectionModel) {
   const {
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-selection.ts b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-selection.ts
similarity index 96%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-list-selection.ts
rename to src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-selection.ts
index 13a01d43e64..6eeb5765abc 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-list-selection.ts
+++ b/src/renderer/src/components/task-page/linear/issues/use-task-page-linear-list-selection.ts
@@ -1,17 +1,17 @@
 import { linearIssueReadError } from '@/lib/work-items/linear/linear-read-error'
-import type { TaskPageProviderMetadataModel } from '../use-task-page-provider-metadata'
+import type { TaskPageProviderMetadataModel } from '../../use-task-page-provider-metadata'
 import { useState, useMemo, useEffect } from 'react'
-import { LINEAR_ISSUE_LIST_MAX } from '../../../../../shared/linear/issue-read-limits'
+import { LINEAR_ISSUE_LIST_MAX } from '../../../../../../shared/linear/issue-read-limits'
 import { useTranslate } from '@/i18n/use-translate'
-import type { LinearTeam } from '../../../../../shared/linear/workspace-types'
+import type { LinearTeam } from '../../../../../../shared/linear/workspace-types'
 import {
   buildLinearTeamUrl,
   getLinearOrganizationUrlKeyFromIssueUrl
-} from '../../../../../shared/linear/links'
+} from '../../../../../../shared/linear/links'
 import {
   reconcileLinearTeamSelection,
   storedLinearTeamSelection
-} from '@/components/task-page/linear/task-page-linear-team-selection'
+} from '@/components/task-page/linear/issues/task-page-linear-team-selection'
 import { useTaskPageLinearFilterSelection } from './use-task-page-linear-filter-selection'
 export type TaskPageLinearListSelectionPreludeModel = ReturnType<
   typeof useTaskPageLinearListSelectionPrelude
diff --git a/src/renderer/src/components/task-page/linear/ProjectList.tsx b/src/renderer/src/components/task-page/linear/projects/ProjectList.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/linear/ProjectList.tsx
rename to src/renderer/src/components/task-page/linear/projects/ProjectList.tsx
index 4855a01b4b9..95f2bddbbab 100644
--- a/src/renderer/src/components/task-page/linear/ProjectList.tsx
+++ b/src/renderer/src/components/task-page/linear/projects/ProjectList.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import {
   LinearProjectTable,
diff --git a/src/renderer/src/components/task-page/linear/ProjectOverview.tsx b/src/renderer/src/components/task-page/linear/projects/ProjectOverview.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/linear/ProjectOverview.tsx
rename to src/renderer/src/components/task-page/linear/projects/ProjectOverview.tsx
index 3d453b0b727..d23ea8d120b 100644
--- a/src/renderer/src/components/task-page/linear/ProjectOverview.tsx
+++ b/src/renderer/src/components/task-page/linear/projects/ProjectOverview.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { LinearProjectOverview } from '@/components/linear-project-view-surfaces'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 export function TaskPageLinearProjectOverview({
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-collection-effects.ts b/src/renderer/src/components/task-page/linear/projects/use-task-page-linear-collection-effects.ts
similarity index 93%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-collection-effects.ts
rename to src/renderer/src/components/task-page/linear/projects/use-task-page-linear-collection-effects.ts
index dcc217fa5f8..395c29f2f3e 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-collection-effects.ts
+++ b/src/renderer/src/components/task-page/linear/projects/use-task-page-linear-collection-effects.ts
@@ -2,12 +2,12 @@ import { observeLinearIssueRead } from '@/store/slices/linear/linear-issue-read-
 import { linearIssueReadError } from '@/lib/work-items/linear/linear-read-error'
 import { taskProviderErrorText } from '@/lib/work-items/task-provider-error-copy'
 import { translate } from '@/i18n/i18n'
-import type { TaskPageLinearInOrcaEffectsModel } from './use-task-page-linear-in-orca-effects'
+import type { TaskPageLinearInOrcaEffectsModel } from '../issues/use-task-page-linear-in-orca-effects'
 import { useEffect } from 'react'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
-import { useTaskSearchDebouncedApply } from '../use-task-search-debounced-apply'
-import { clampLinearIssueListLimit } from '../../../../../shared/linear/issue-read-limits'
-import { useTaskPageLinearCustomViewEffects } from './use-task-page-linear-custom-view-effects'
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
+import { useTaskSearchDebouncedApply } from '../../use-task-search-debounced-apply'
+import { clampLinearIssueListLimit } from '../../../../../../shared/linear/issue-read-limits'
+import { useTaskPageLinearCustomViewEffects } from '../views/use-task-page-linear-custom-view-effects'
 
 export function useTaskPageLinearCollectionEffectsPrelude(model: TaskPageLinearInOrcaEffectsModel) {
   const {
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx
deleted file mode 100644
index 6ead6b39cee..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-committed-publication.test.tsx
+++ /dev/null
@@ -1,361 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  reads,
-  task,
-  store,
-  source,
-  useRoutingFixture
-} from './task-page-linear-refresh-test-fixtures'
-import { reads as issueReadRegistry } from '@/store/slices/linear/linear-issue-read-lifecycle'
-import '@/store/slices/linear/linear-issue-read'
-import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-write-publication'
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import { expect, it } from 'vitest'
-import { act, render, screen } from '@testing-library/react'
-import { deferred } from '../../../store/slices/linear/linear-slice-test-harness'
-
-import { Suspense, startTransition, useState, useLayoutEffect } from 'react'
-import { useLinearIssuePublication } from '@/hooks/useLinearIssuePublication'
-import type { useTaskPageDetailRouting } from '../use-task-page-detail-routing'
-
-it.each([true, false])(
-  'publication speculative B (suspend=%s) preserves committed authority',
-  async (suspend) => {
-    store()
-    const A = source('local'),
-      B = { ...A, accountLabel: 'B' }
-    const blocked = deferred<void>()
-    const pending = deferred<{ ok: boolean }>()
-    const seen: string[] = [],
-      committed: string[] = []
-    let navigate!: (value: boolean) => void
-    function Consumer({ b }: { b: boolean }) {
-      const row = useLinearIssuePublication(task(), b ? B : A).issue!
-      seen.push(b ? 'B' : 'A')
-      useLayoutEffect(() => {
-        committed.push(b ? 'B' : 'A')
-      })
-      if (b && suspend) {
-        throw blocked.promise
-      }
-      return (
-        <output data-testid="publication-scope">
-          {b ? 'B' : 'A'}:{row.priority}
-        </output>
-      )
-    }
-    function Harness() {
-      const [b, setB] = useState(false)
-      navigate = setB
-      return (
-        <Suspense fallback={<span>Blocked</span>}>
-          <Consumer b={b} />
-        </Suspense>
-      )
-    }
-    const mounted = render(<Harness />)
-    await act(async () => {
-      startTransition(() => navigate(true))
-    })
-    expect(seen).toContain('B')
-    expect(committed.includes('B')).toBe(!suspend)
-    expect(screen.getByTestId('publication-scope').textContent).toBe(suspend ? 'A:0' : 'B:0')
-    let saving!: Promise<{ ok: boolean }>
-    act(() => {
-      saving = writeLinearIssue(task(), { priority: 4 }, A, () => pending.promise)
-    })
-    if (suspend) {
-      await act(async () => {
-        navigate(false)
-      })
-    }
-    const visible = screen.getByTestId('publication-scope').textContent
-    try {
-      expect(visible).toBe(suspend ? 'A:4' : 'B:0')
-    } finally {
-      mounted.unmount()
-      pending.resolve({ ok: false })
-      await saving
-      expect(pendingLinearIssueWrites.size).toBe(0)
-      expect(issueReadRegistry.size).toBe(0)
-    }
-  }
-)
-
-it.each([true, false])(
-  'real routing updater discard (suspend=%s) cannot retire a pending field publication',
-  async (suspend) => {
-    const s = store()
-    s.setState({ jiraIssueCache: {}, jiraSearchCache: {} })
-    const context = defaultScopeSource(null)
-    const pendingPriority = deferred<{ ok: boolean }>(),
-      pendingTitle = deferred<{ ok: boolean }>(),
-      pendingEarlierTitle = deferred<{ ok: boolean }>()
-    const hydrated = deferred<LinearIssue | null>(),
-      blocked = deferred<void>()
-    reads.detail.mockReturnValue(hydrated.promise)
-    let route!: ReturnType<typeof useTaskPageDetailRouting>
-    let pulse!: () => void
-    const renders: string[] = [],
-      commits: string[] = []
-    let block = true
-    function Consumer() {
-      const [tick, setTick] = useState(0)
-      const current = useRoutingFixture(null)
-      useLayoutEffect(() => {
-        route = current
-        pulse = () => setTick((n) => n + 1)
-        commits.push(
-          `${current.selectedLinearIssue?.state.name}:${current.selectedLinearIssue?.priority}`
-        )
-      })
-      renders.push(
-        `${current.selectedLinearIssue?.state.name}:${current.selectedLinearIssue?.priority}`
-      )
-      if (suspend && block && current.selectedLinearIssue?.state.name === 'Hydrated') {
-        throw blocked.promise
-      }
-      return (
-        <output data-testid="hydration-scope">
-          {current.selectedLinearIssue?.title}:{current.selectedLinearIssue?.priority}:{tick}
-        </output>
-      )
-    }
-    const mounted = render(
-      <Suspense fallback={<span>Blocked</span>}>
-        <Consumer />
-      </Suspense>
-    )
-    act(() => route.setSelectedLinearIssue(task()))
-    let lease!: ReturnType<ReturnType<typeof s.getState>['fetchLinearIssue']> extends {
-      acquire: () => infer L
-    }
-      ? L
-      : never
-    let prioritySaving!: Promise<{ ok: boolean }>,
-      titleSaving!: Promise<{ ok: boolean }>,
-      earlierTitleSaving!: Promise<{ ok: boolean }>
-    await act(async () => {
-      startTransition(() => {
-        earlierTitleSaving = writeLinearIssue(
-          task(),
-          { title: 'Earlier title' },
-          context,
-          () => pendingEarlierTitle.promise
-        )
-        prioritySaving = writeLinearIssue(
-          task(),
-          { priority: 4 },
-          context,
-          () => pendingPriority.promise
-        )
-        lease = s
-          .getState()
-          .fetchLinearIssue(task().id, 'w', { force: true, seed: task() })
-          .acquire()
-      })
-      hydrated.resolve(task('Hydrated'))
-      await hydrated.promise
-      await Promise.resolve()
-      await Promise.resolve()
-      const view = lease.currentView()
-      expect(view.data?.state.name).toBe('Hydrated')
-      expect(view.data?.priority).toBe(4)
-      startTransition(() =>
-        route.setSelectedLinearIssue(view.data, {
-          expectedSelection: route.linearSelectionRequest,
-          isCurrent: () => lease.commit(view, false, () => true)
-        })
-      )
-    })
-    expect(renders).toContain('Hydrated:4')
-    expect(commits.includes('Hydrated:4')).toBe(!suspend)
-    // A real later field write retires the delivered read but must not erase pending priority.
-    act(() => {
-      titleSaving = writeLinearIssue(
-        task(),
-        { title: 'Current title' },
-        context,
-        () => pendingTitle.promise
-      )
-      pulse()
-    })
-    block = false
-    await act(async () => {
-      pulse()
-    })
-    const visible = screen.getByTestId('hydration-scope').textContent
-    const { projectLinearIssue } =
-      await import('@/store/slices/linear/linear-issue-write-publication')
-    expect(projectLinearIssue(getLinearSourceScope(context), task()).priority).toBe(4)
-    try {
-      expect(visible).toContain('Current title:4:')
-    } finally {
-      mounted.unmount()
-      lease.release()
-      pendingTitle.resolve({ ok: false })
-      pendingPriority.resolve({ ok: false })
-      pendingEarlierTitle.resolve({ ok: false })
-      await Promise.all([prioritySaving, titleSaving, earlierTitleSaving])
-      expect(pendingLinearIssueWrites.size).toBe(0)
-      expect(issueReadRegistry.size).toBe(0)
-    }
-  }
-)
-
-it('committed hydration survives actual skipped-lane replay, force loading and terminal failure', async () => {
-  const s = store()
-  const first = deferred<LinearIssue | null>(),
-    h = deferred<LinearIssue | null>()
-  let rejectReplacement!: (error: Error) => void
-  const replacement = new Promise<LinearIssue | null>((_resolve, reject) => {
-    rejectReplacement = reject
-  })
-  reads.detail
-    .mockReturnValueOnce(first.promise)
-    .mockReturnValueOnce(h.promise)
-    .mockReturnValueOnce(replacement)
-  const pending = deferred<{ ok: boolean }>(),
-    blocked = deferred<void>()
-  let hold = true
-  let enroll!: () => void
-  let saving!: Promise<{ ok: boolean }>
-  const committed: string[] = [],
-    rendered: string[] = []
-  function Detail() {
-    const [low, setLow] = useState(false)
-    const detail = useLinearIssueWorkspaceDetail({
-      issue: task(),
-      providerSettings: defaultScopeSource(null),
-      requestKey: 'H'
-    })
-    const value = `${detail.displayed.priority}:${detail.editState.priority}:${detail.issueLoading}:${low}`
-    rendered.push(value)
-    useLayoutEffect(() => {
-      committed.push(value)
-      enroll = () => setLow(true)
-    })
-    if (low && hold) {
-      throw blocked.promise
-    }
-    return <output data-testid="replay">{value}</output>
-  }
-  const mounted = render(
-    <Suspense fallback={<span>Blocked</span>}>
-      <Detail />
-    </Suspense>
-  )
-  await act(async () => {
-    startTransition(() => {
-      enroll()
-      saving = writeLinearIssue(
-        task(),
-        { priority: 4 },
-        defaultScopeSource(null),
-        () => pending.promise
-      )
-    })
-  })
-  expect(rendered.some((value) => value.startsWith('4:4:') && value.endsWith(':true'))).toBe(true)
-  expect(committed.some((value) => value.startsWith('4:4:'))).toBe(false)
-  await act(async () => {
-    pending.resolve({ ok: false })
-    await saving
-  })
-  expect(pendingLinearIssueWrites.size).toBe(0)
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  await act(async () => {
-    h.resolve({ ...task('H'), priority: 2 })
-    await h.promise
-  })
-  expect(screen.getByTestId('replay').textContent).toBe('2:2:false:false')
-  act(() => {
-    s.getState().fetchLinearIssue(task().id, 'w', { force: true })
-  })
-  expect(reads.detail).toHaveBeenCalledTimes(3)
-  expect(screen.getByTestId('replay').textContent).toBe('2:2:true:false')
-  hold = false
-  await act(async () => {
-    blocked.resolve()
-    await blocked.promise
-  })
-  expect(screen.getByTestId('replay').textContent).toBe('2:2:true:true')
-  await act(async () => {
-    rejectReplacement(new Error('offline'))
-    await replacement.catch(() => {})
-  })
-  expect(screen.getByTestId('replay').textContent).toBe('2:2:false:true')
-  expect(reads.detail).toHaveBeenCalledTimes(3)
-  reads.detail.mockResolvedValueOnce({ ...task('G'), priority: 3 })
-  await act(async () => {
-    s.getState().fetchLinearIssue(task().id, 'w', { force: true })
-  })
-  expect(screen.getByTestId('replay').textContent).toBe('3:3:false:true')
-  mounted.unmount()
-  first.resolve(task('retired'))
-  await first.promise
-  expect(pendingLinearIssueWrites.size).toBe(0)
-  expect(issueReadRegistry.size).toBe(0)
-  act(() => s.getState().patchLinearIssue(task().id, { priority: 4 }))
-  expect(reads.detail).toHaveBeenCalledTimes(4)
-})
-
-it('committed field t reconstructs while newer u is in a genuinely suspended lane', async () => {
-  store()
-  const t = deferred<{ ok: boolean }>(),
-    u = deferred<{ ok: boolean }>(),
-    blocked = deferred<void>()
-  let savingT!: Promise<{ ok: boolean }>, savingU!: Promise<{ ok: boolean }>
-  let enqueue!: () => void, pulse!: () => void
-  let hold = true
-  const commits: string[] = []
-  function Consumer() {
-    const [low, setLow] = useState(false),
-      [tick, setTick] = useState(0)
-    const publication = useLinearIssuePublication(task(), defaultScopeSource(null))
-    const value = `${publication.issue?.priority}:${low}:${tick}`
-    useLayoutEffect(() => {
-      enqueue = () => setLow(true)
-      pulse = () => setTick((n) => n + 1)
-      commits.push(value)
-    })
-    if (low && hold) {
-      throw blocked.promise
-    }
-    return <output data-testid="field-replay">{value}</output>
-  }
-  const mounted = render(
-    <Suspense fallback={<span>Blocked</span>}>
-      <Consumer />
-    </Suspense>
-  )
-  act(() => {
-    savingT = writeLinearIssue(task(), { priority: 4 }, defaultScopeSource(null), () => t.promise)
-  })
-  expect(screen.getByTestId('field-replay').textContent).toBe('4:false:0')
-  await act(async () => {
-    startTransition(() => {
-      enqueue()
-      savingU = writeLinearIssue(task(), { priority: 2 }, defaultScopeSource(null), () => u.promise)
-    })
-  })
-  expect(commits.some((value) => value.startsWith('2:'))).toBe(false)
-  act(() => pulse())
-  expect(screen.getByTestId('field-replay').textContent).toBe('4:false:1')
-  hold = false
-  await act(async () => {
-    blocked.resolve()
-    await blocked.promise
-  })
-  expect(screen.getByTestId('field-replay').textContent).toBe('2:true:1')
-  mounted.unmount()
-  t.resolve({ ok: false })
-  u.resolve({ ok: false })
-  await Promise.all([savingT, savingU])
-  expect(pendingLinearIssueWrites.size).toBe(0)
-  expect(issueReadRegistry.size).toBe(0)
-})
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx
deleted file mode 100644
index 4a8a64338f6..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-detail-query.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-// @vitest-environment happy-dom
-import { reads, task } from './task-page-linear-refresh-test-fixtures'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-
-import { getIssue } from '../../../../../main/linear/issues/linear-issue-lookups'
-import { createLinearClient, loadLinearSdk } from '../../../../../main/linear/requests/linear-sdk'
-import { ISSUE_QUERY } from '../../../../../main/linear/issues/context/issue-context-graphql'
-
-const clients = vi.hoisted(() => ({ get: vi.fn() }))
-vi.mock('../../../../../main/linear/accounts/linear-account-client', () => ({
-  getClients: clients.get,
-  isAuthError: (error: unknown) => error instanceof loadLinearSdk().AuthenticationLinearError
-}))
-vi.mock('../../../../../main/linear/accounts/linear-token-store', () => ({ clearToken: vi.fn() }))
-
-const child = {
-  id: 'child',
-  identifier: 'DAT-125',
-  title: 'Child task',
-  url: 'https://linear.app/acme/issue/DAT-125'
-}
-const project = {
-  id: 'project',
-  name: 'Release',
-  url: 'https://linear.app/acme/project/release',
-  color: '#888888'
-}
-const rawIssue = {
-  ...task('Fresh'),
-  branchName: 'dat-124',
-  description: 'Full description',
-  priority: 2,
-  estimate: 3,
-  dueDate: '2026-11-10',
-  updatedAt: '2026-11-02T10:00:00-08:00',
-  assignee: { id: 'user', displayName: 'Ada', avatarUrl: 'https://example.com/avatar' },
-  project,
-  labels: { nodes: [{ id: 'bug', name: 'Bug' }] },
-  children: { nodes: [child] }
-}
-// The shared query returns the same first label page the drawer previously requested.
-const { labelIds: _labelIds, ...responseIssue } = rawIssue
-const expected = {
-  ...task('Fresh'),
-  branchName: rawIssue.branchName,
-  description: rawIssue.description,
-  priority: 2,
-  estimate: 3,
-  dueDate: rawIssue.dueDate,
-  updatedAt: '2026-11-02T18:00:00.000Z',
-  workspaceName: 'Acme',
-  assignee: rawIssue.assignee,
-  project,
-  labels: ['Bug'],
-  labelIds: ['bug'],
-  subIssues: [child]
-}
-let requests: { query: string; variables: Record<string, unknown> }[]
-
-beforeEach(() => {
-  requests = []
-  vi.spyOn(globalThis, 'fetch').mockImplementation(async (_input, init) => {
-    requests.push(JSON.parse(String(init?.body)))
-    return Response.json({ data: { issue: responseIssue } })
-  })
-  clients.get.mockImplementation((_workspaceId: string, signal: AbortSignal) => [
-    {
-      workspace: { id: 'w', organizationName: 'Acme' },
-      client: createLinearClient({ apiKey: 'test-only', signal })
-    }
-  ])
-  reads.detail.mockImplementation((_source, id: string, workspaceId: string) =>
-    getIssue(id, workspaceId)
-  )
-})
-afterEach(() => vi.restoreAllMocks())
-
-function expectQuery(index: number, id: string) {
-  expect(requests[index]).toEqual({
-    query: ISSUE_QUERY,
-    variables: { id, includeDrawerFields: true }
-  })
-  expect(requests[index].query).toContain('children(first: 25)')
-  expect(clients.get).toHaveBeenLastCalledWith('w', expect.any(AbortSignal))
-}
-
-it('keeps readable core detail when an optional relation returns partial GraphQL errors', async () => {
-  vi.mocked(globalThis.fetch).mockImplementation(async (_input, init) => {
-    requests.push(JSON.parse(String(init?.body)))
-    return Response.json({
-      data: {
-        issue: { ...responseIssue, assignee: { ...responseIssue.assignee, avatarUrl: null } }
-      },
-      errors: [{ message: 'Avatar resolver failed', path: ['issue', 'assignee', 'avatarUrl'] }]
-    })
-  })
-  await expect(getIssue(task().id, 'w')).resolves.toEqual({ ...expected, assignee: undefined })
-  expect(requests).toHaveLength(1)
-  expectQuery(0, task().id)
-})
-
-it.each([
-  { path: ['issue', 'title'], extensions: undefined, auth: false },
-  { path: ['issue', 'assignee'], extensions: { type: 'authentication error' }, auth: true }
-])(
-  'does not accept partial data for a core or authentication failure: $path',
-  async ({ path, extensions, auth }) => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    vi.mocked(globalThis.fetch).mockResolvedValue(
-      Response.json({
-        data: { issue: responseIssue },
-        errors: [{ message: 'Read failed', path, extensions }]
-      })
-    )
-    const read = getIssue(task().id, 'w')
-    await (auth ? expect(read).rejects.toThrow('Linear') : expect(read).resolves.toBeNull())
-  }
-)
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-jira-list-model.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-jira-list-model.tsx
deleted file mode 100644
index 45d7e9d57d0..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-jira-list-model.tsx
+++ /dev/null
@@ -1,199 +0,0 @@
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { getLinearPriorityLabel } from '@/components/task-page/task-page-localized-options'
-import type {
-  LinearOrderBy,
-  LinearGroupBy,
-  LinearDisplayProperty
-} from '../../../../../shared/linear/issue-view-resume-state'
-import { translate } from '@/i18n/i18n'
-import { useTranslate, type Translate } from '@/i18n/use-translate'
-import type { TaskPageJiraLoadError } from '@/components/task-page/jira/task-page-jira-load-state'
-import React from 'react'
-import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible'
-import { AlertCircle, ChevronDown, ChevronRight } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import type { TaskPageGitHubMutationIntent } from '@/components/task-page/github/task-page-github-work-item-mutation-patches'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import type { LinearGroupSection } from './task-page-linear-issue-model'
-import { compareNumericLocaleText } from '../../../../../shared/locale-text-collators'
-export function getLinearPriorityRank(priority: number): number {
-  return priority === 0 ? 5 : priority
-}
-export function compareLinearIssues(
-  a: LinearIssue,
-  b: LinearIssue,
-  orderBy: LinearOrderBy
-): number {
-  if (orderBy === 'updated') {
-    return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
-  }
-  if (orderBy === 'identifier') {
-    return compareNumericLocaleText(a.identifier, b.identifier)
-  }
-  const priorityDelta = getLinearPriorityRank(a.priority) - getLinearPriorityRank(b.priority)
-  if (priorityDelta !== 0) {
-    return priorityDelta
-  }
-  return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
-}
-export function getLinearIssueGroup(
-  issue: LinearIssue,
-  groupBy: LinearGroupBy,
-  t: Translate = translate
-): {
-  key: string
-  label: string
-} {
-  if (groupBy === 'status') {
-    return {
-      key: `status:${issue.state.name}`,
-      label: issue.state.name
-    }
-  }
-  if (groupBy === 'assignee') {
-    return {
-      key: `assignee:${issue.assignee?.id ?? 'unassigned'}`,
-      label:
-        issue.assignee?.displayName ?? t('auto.components.TaskPage.groupUnassigned', 'Unassigned')
-    }
-  }
-  if (groupBy === 'priority') {
-    return {
-      key: `priority:${issue.priority}`,
-      label: getLinearPriorityLabel(issue.priority)
-    }
-  }
-  if (groupBy === 'team') {
-    return {
-      key: `team:${issue.team.id}`,
-      label: issue.team.name
-    }
-  }
-  return {
-    key: 'all',
-    label: t('auto.components.TaskPage.dfc0c79bd8', 'Issues')
-  }
-}
-export function groupLinearIssues(
-  issues: LinearIssue[],
-  groupBy: LinearGroupBy,
-  orderBy: LinearOrderBy,
-  t: Translate = translate
-): LinearGroupSection[] {
-  const sorted = [...issues].sort((a, b) => compareLinearIssues(a, b, orderBy))
-  if (groupBy === 'none') {
-    return [
-      {
-        key: 'all',
-        label: t('auto.components.TaskPage.dfc0c79bd8', 'Issues'),
-        issues: sorted
-      }
-    ]
-  }
-  const sections = new Map<string, LinearGroupSection>()
-  for (const issue of sorted) {
-    const group = getLinearIssueGroup(issue, groupBy, t)
-    const section = sections.get(group.key)
-    if (section) {
-      section.issues.push(issue)
-    } else {
-      sections.set(group.key, {
-        key: group.key,
-        label: group.label,
-        issues: [issue]
-      })
-    }
-  }
-  return [...sections.values()]
-}
-export function TaskPageJiraErrorBanner({
-  error,
-  open,
-  onOpenChange
-}: {
-  error: TaskPageJiraLoadError
-  open: boolean
-  onOpenChange: (open: boolean) => void
-}): React.JSX.Element {
-  const t = useTranslate()
-  return (
-    <Collapsible
-      open={open}
-      onOpenChange={onOpenChange}
-      className="border-b border-border bg-destructive/10 px-4 py-3 text-sm text-destructive"
-    >
-      <div className="flex items-start gap-2">
-        <AlertCircle className="mt-0.5 size-4 flex-none" />
-        <div className="min-w-0 flex-1">
-          <div className="font-medium leading-5">{error.title}</div>
-          {error.details ? (
-            <>
-              <CollapsibleTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="xs"
-                  className="-ml-1 mt-1 h-6 px-1.5 text-destructive hover:bg-destructive/10 hover:text-destructive"
-                >
-                  {open ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
-                  {t('auto.components.TaskPage.40eaf2c27c', 'Details')}
-                </Button>
-              </CollapsibleTrigger>
-              <CollapsibleContent>
-                <div className="mt-1 rounded-md border border-destructive/20 bg-background/80 px-2 py-1.5 font-mono text-xs text-foreground">
-                  {error.details}
-                </div>
-              </CollapsibleContent>
-            </>
-          ) : null}
-        </div>
-      </div>
-    </Collapsible>
-  )
-}
-export function getLinearIssueGridTemplate(
-  visibleProperties: ReadonlySet<LinearDisplayProperty>
-): string {
-  const columns = ['96px', 'minmax(240px,1.55fr)']
-  if (visibleProperties.has('labels')) {
-    columns.push('minmax(168px,0.9fr)')
-  }
-  if (visibleProperties.has('team')) {
-    columns.push('minmax(172px,0.9fr)')
-  }
-  if (visibleProperties.has('state')) {
-    columns.push('138px')
-  }
-  if (visibleProperties.has('assignee')) {
-    columns.push('64px')
-  }
-  if (visibleProperties.has('updated')) {
-    columns.push('104px')
-  }
-  // Why: Worktrees is icon-only (open vs start); keep it narrow so issue title keeps the room.
-  columns.push('64px')
-  return columns.join(' ')
-}
-export type TaskPageGitHubWorkItemMutationRunner = {
-  run: (input: {
-    item: GitHubWorkItem
-    intent: TaskPageGitHubMutationIntent
-    sourceContext?: TaskSourceContext | null
-    mutate: () => Promise<{
-      ok?: boolean
-      error?:
-        | string
-        | {
-            message?: string
-          }
-    } | void>
-    successToast?: string
-    errorToast: string
-  }) => Promise<'confirmed' | 'rolled_back' | 'stale'>
-  isIntentPending: (input: {
-    item: GitHubWorkItem
-    intent: TaskPageGitHubMutationIntent
-    sourceContext?: TaskSourceContext | null
-  }) => boolean
-}
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx
deleted file mode 100644
index b4edb49b54f..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-entry.test.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-// @vitest-environment happy-dom
-import { reads, task, store, source } from './task-page-linear-refresh-test-fixtures'
-
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-
-import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import { expect, it } from 'vitest'
-import { act, renderHook, waitFor } from '@testing-library/react'
-import { deferred } from '../../../store/slices/linear/linear-slice-test-harness'
-
-it('workspace hydration follows a full-source change without a remount or a successor edge', async () => {
-  store()
-  const A = source('local'),
-    B = { ...A, accountLabel: 'B' }
-  const old = deferred<LinearIssue | null>(),
-    current = deferred<LinearIssue | null>()
-  reads.detail
-    .mockReturnValueOnce(old.promise)
-    .mockReturnValueOnce(current.promise)
-    .mockResolvedValue({ ...task('External'), priority: 2 })
-  const detail = renderHook(
-    ({ context }) =>
-      useLinearIssueWorkspaceDetail({
-        issue: task(),
-        providerSettings: context,
-        requestKey: 'unchanged-host-workspace-U'
-      }),
-    { initialProps: { context: A } }
-  )
-  detail.rerender({ context: B })
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  const pending = deferred<{ ok: boolean }>()
-  let saving!: Promise<{ ok: boolean }>
-  act(() => {
-    saving = writeLinearIssue(task(), { priority: 4 }, B, () => pending.promise)
-  })
-  await act(async () => {
-    old.resolve({ ...task('Old A'), priority: 0 })
-    await old.promise
-  })
-  expect(detail.result.current.displayed.priority).toBe(4)
-  expect(detail.result.current.displayed.state.name).not.toBe('Old A')
-  await act(async () => {
-    current.resolve({ ...task('Current B'), priority: 1 })
-    await current.promise
-  })
-  expect(detail.result.current.displayed.priority).toBe(4)
-  await act(async () => {
-    pending.resolve({ ok: false })
-    await saving
-  })
-  await waitFor(() => expect(detail.result.current.displayed.state.name).toBe('External'))
-  expect(detail.result.current.displayed.priority).toBe(2)
-  expect(detail.result.current.issueLoading).toBe(false)
-})
-
-it('actual runtime-status session loss and recovery reacquire hydration and finish loading', async () => {
-  const s = store()
-  const { createRuntimeStatusSlice } =
-    await import('@/store/slices/runtime-status/create-runtime-status-slice')
-  // SAFETY: this fixture installs the production runtime slice over the same Zustand store.
-  const runtime = createRuntimeStatusSlice(
-    s.setState,
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    s.getState as unknown as Parameters<typeof createRuntimeStatusSlice>[1]
-  )
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-  s.setState({ ...runtime, settings: { activeRuntimeEnvironmentId: 'remote' } as never })
-  runtime.setRuntimeEnvironmentStatus(
-    'remote',
-    { status: null, checkedAt: 1 },
-    { suppressDisconnectToast: true }
-  )
-  const old = deferred<LinearIssue | null>(),
-    fresh = deferred<LinearIssue | null>()
-  reads.detail.mockReturnValueOnce(old.promise).mockReturnValueOnce(fresh.promise)
-  const detail = renderHook(() =>
-    useLinearIssueWorkspaceDetail({
-      issue: task(),
-      providerSettings: source('runtime:remote'),
-      requestKey: 'same'
-    })
-  )
-  act(() =>
-    detail.result.current.handleCommentAdded({
-      id: 'local',
-      body: 'Draft comment',
-      createdAt: 'today'
-    })
-  )
-  await act(async () => {
-    // SAFETY: the real transition inspects runtime identity/readiness only; no snapshot or transport is used.
-    runtime.setRuntimeEnvironmentStatus(
-      'remote',
-      {
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-        status: {
-          runtimeId: 'new',
-          graphStatus: 'ready',
-          rendererGraphEpoch: 0,
-          authoritativeWindowId: null,
-          liveTabCount: 0,
-          liveLeafCount: 0,
-          runtimeProtocolVersion: 3,
-          minCompatibleRuntimeClientVersion: 3
-        } as never,
-        checkedAt: 2
-      },
-      { suppressDisconnectToast: true }
-    )
-  })
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  await act(async () => {
-    old.resolve(task('Old session'))
-    fresh.resolve(task('New session'))
-    await Promise.all([old.promise, fresh.promise])
-  })
-  expect(detail.result.current.displayed.state.name).toBe('New session')
-  expect(detail.result.current.issueLoading).toBe(false)
-  expect(detail.result.current.comments.map((comment) => comment.id)).toContain('local')
-  const pending = deferred<{ ok: boolean }>()
-  let saving!: Promise<{ ok: boolean }>
-  act(() => {
-    saving = writeLinearIssue(
-      task(),
-      { priority: 4 },
-      source('runtime:remote'),
-      () => pending.promise
-    )
-  })
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  detail.unmount()
-  await act(async () => {
-    pending.resolve({ ok: false })
-    await saving
-  })
-})
-
-it.each(['probe', 'disconnect'] as const)(
-  'foreign mounted hydration completes after local %s without another render edge',
-  async (edge) => {
-    const s = store()
-    const foreign = source('runtime:foreign')
-    const transport = deferred<LinearIssue | null>()
-    reads.detail.mockReturnValue(transport.promise)
-    const local = renderHook(() =>
-      useLinearIssueWorkspaceDetail({
-        issue: task(),
-        providerSettings: defaultScopeSource(null),
-        requestKey: 'local-U'
-      })
-    )
-    const foreignKey = `${getLinearSourceScope(foreign).cachePrefix}::w::other`
-    const foreignCache = { data: task('Foreign cache'), fetchedAt: 1 }
-    s.setState({ linearIssueCache: { [foreignKey]: foreignCache } })
-    const detail = renderHook(() =>
-      useLinearIssueWorkspaceDetail({
-        issue: task(),
-        providerSettings: foreign,
-        requestKey: 'foreign-U'
-      })
-    )
-    expect(detail.result.current.issueLoading).toBe(true)
-    await act(async () => {
-      await (edge === 'probe'
-        ? s.getState().testLinearConnection('w')
-        : s.getState().disconnectLinear())
-    })
-    await act(async () => {
-      transport.resolve(task('Foreign provider'))
-      await transport.promise
-    })
-    expect(detail.result.current.displayed.state.name).toBe('Foreign provider')
-    expect(detail.result.current.issueLoading).toBe(false)
-    expect(reads.detail).toHaveBeenCalledTimes(2)
-    expect(s.getState().linearIssueCache[foreignKey]).toBe(foreignCache)
-    if (edge === 'disconnect') {
-      expect(local.result.current.issueLoading).toBe(false)
-      expect(local.result.current.displayed.state.name).toBe('In Review')
-    } else {
-      expect(local.result.current.displayed.state.name).toBe('Foreign provider')
-      expect(local.result.current.issueLoading).toBe(false)
-    }
-    local.unmount()
-    detail.unmount()
-  }
-)
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx
deleted file mode 100644
index 56badab631e..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-lifecycle.test.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  reads,
-  task,
-  store,
-  read,
-  loadingHook,
-  source
-} from './task-page-linear-refresh-test-fixtures'
-import '@/store/slices/linear/linear-issue-read'
-import {
-  pendingLinearIssueWrites,
-  registerLinearIssueConsumer
-} from '@/store/slices/linear/linear-issue-write-publication'
-import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
-
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, waitFor } from '@testing-library/react'
-import { deferred } from '../../../store/slices/linear/linear-slice-test-harness'
-
-const cacheTime = Date.parse('2026-01-01T00:00:00Z')
-beforeEach(() => {
-  vi.useFakeTimers({ toFake: ['Date'] })
-  vi.setSystemTime(cacheTime)
-})
-afterEach(() => vi.useRealTimers())
-
-it('keeps only own-query warm omissions, accepts new membership, and releases protection at settlement', async () => {
-  const s = store()
-  const untouched = { ...task(), id: 'untouched', title: 'untouched' }
-  reads.list.mockResolvedValueOnce({ items: [task(), untouched] })
-  await read(s, 'list')
-  const next = { ...task('Server'), id: 'new', title: 'new' }
-  reads.list.mockResolvedValueOnce({ items: [next] })
-  const pending = deferred<{ ok: boolean }>()
-  const hook = loadingHook(s)
-  let saving!: Promise<{ ok: boolean }>
-  act(() => {
-    saving = writeLinearIssue(
-      task(),
-      { state: task('Done').state },
-      defaultScopeSource(null),
-      () => pending.promise
-    )
-  })
-  // A force dispatched during the pending interval may add rows, but cannot remove this query's protected occurrence.
-  reads.list.mockResolvedValueOnce({ items: [next] })
-  hook.rerender({ nonce: 1 })
-  await waitFor(() =>
-    expect(hook.result.current.rows.map((row) => row.id)).toEqual(['same-uuid', 'new'])
-  )
-  expect(hook.result.current.rows[0].state.name).toBe('Done')
-  reads.list.mockResolvedValueOnce({ items: [] })
-  await act(async () => {
-    pending.resolve({ ok: true })
-    await saving
-  })
-  await waitFor(() => expect(hook.result.current.rows).toEqual([]))
-})
-
-it('dispatches despite a broken local subscriber and clears thrown writers independently of mount', async () => {
-  const s = store()
-  const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-  const registration = registerLinearIssueConsumer(
-    getLinearSourceScope(defaultScopeSource(null)),
-    task().id,
-    () => {
-      throw new Error('subscriber bug')
-    }
-  )
-  const mutate = vi.fn(async () => {
-    throw new Error('transport failure')
-  })
-  await act(async () => {
-    await expect(
-      writeLinearIssue(task(), { priority: 4 }, defaultScopeSource(null), mutate)
-    ).rejects.toThrow('transport failure')
-  })
-  expect(mutate).toHaveBeenCalledTimes(1)
-  registration.release()
-  reads.detail.mockResolvedValue({ ...task('External'), priority: 2 })
-  expect((await s.getState().fetchLinearIssue(task().id, 'w', { force: true }))?.priority).toBe(2)
-  warn.mockRestore()
-})
-
-it('captured default runtime cannot seed or patch the focused foreign runtime cache', async () => {
-  const s = store()
-  const pending = deferred<{ ok: boolean }>()
-  const saving = writeLinearIssue(
-    task(),
-    { state: task('Done').state },
-    defaultScopeSource(null),
-    () => pending.promise
-  )
-  // SAFETY: only activeRuntimeEnvironmentId is read by this captured-scope fixture.
-  s.setState({
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    settings: { activeRuntimeEnvironmentId: 'remote' } as never,
-    linearIssueCache: { 'w::same-uuid': { data: task('Remote'), fetchedAt: cacheTime } }
-  })
-  const remote = s.getState().fetchLinearIssue(task().id, 'w').acquire()
-  expect(remote.currentView().data?.state.name).toBe('Remote')
-  reads.detail.mockResolvedValue(task('Local observation'))
-  const lease = s
-    .getState()
-    .fetchLinearIssue(task().id, 'w', {
-      scope: getLinearSourceScope({ kind: 'local' }),
-      force: true
-    })
-    .acquire()
-  expect(lease.currentView().data).toBeNull()
-  expect((await lease.waitForCurrentTerminal()).data?.state.name).toBe('Done')
-  await act(async () => {
-    pending.resolve({ ok: false })
-    await saving
-  })
-  expect(s.getState().linearIssueCache['w::same-uuid'].data?.state.name).toBe('Remote')
-  expect(remote.currentView().kind).toBe('data')
-  expect(remote.currentView().data?.state.name).toBe('Remote')
-  remote.release()
-  lease.release()
-})
-
-it('full disconnect detaches default and every explicit source, preserving another runtime and replacement owner', async () => {
-  const s = store()
-  const contexts = [
-    defaultScopeSource(null),
-    source('local'),
-    { ...source('local'), accountLabel: 'second' },
-    source('runtime:other')
-  ]
-  const pending = contexts.map(() => deferred<{ ok: boolean }>())
-  const saves = contexts.map((context, i) =>
-    writeLinearIssue(task(), { priority: 4 }, context, () => pending[i].promise)
-  )
-  await s.getState().disconnectLinear()
-  const keys = contexts.map((context) => getLinearSourceScope(context).contextKey)
-  expect(keys.map((key) => pendingLinearIssueWrites.has(key))).toEqual([false, false, false, true])
-  expect((await s.getState().connectLinear('fixture-not-a-credential')).ok).toBe(true)
-  reads.detail.mockResolvedValue({ ...task(), priority: 2 })
-  const lease = s
-    .getState()
-    .fetchLinearIssue(task().id, 'w', { scope: getLinearSourceScope(contexts[1]), force: true })
-    .acquire()
-  expect((await lease.waitForCurrentTerminal()).data?.priority).toBe(2)
-  const next = deferred<{ ok: boolean }>()
-  const replacement = writeLinearIssue(
-    { ...task(), priority: 2 },
-    { priority: 3 },
-    contexts[1],
-    () => next.promise
-  )
-  await act(async () => {
-    for (let i = 0; i < 3; i++) {
-      pending[i].resolve({ ok: i === 2 })
-    }
-    await Promise.all(saves.slice(0, 3))
-  })
-  expect(pendingLinearIssueWrites.has(keys[1])).toBe(true)
-  expect(pendingLinearIssueWrites.has(keys[3])).toBe(true)
-  expect(lease.currentView().data?.priority).toBe(3)
-  await act(async () => {
-    next.resolve({ ok: false })
-    pending[3].resolve({ ok: true })
-    await Promise.all([replacement, saves[3]])
-  })
-  expect((await lease.waitForCurrentTerminal()).data?.priority).toBe(2)
-  lease.release()
-  expect(pendingLinearIssueWrites.size).toBe(0)
-})
-
-it('a shared read gives explicit-runtime consumers authority after default focus moves', async () => {
-  const s = store(),
-    pending = deferred<LinearIssue | null>()
-  reads.detail.mockReturnValue(pending.promise)
-  const focused = s.getState().fetchLinearIssue(task().id, 'w').acquire()
-  const pinned = s
-    .getState()
-    .fetchLinearIssue(task().id, 'w', { scope: getLinearSourceScope({ kind: 'local' }) })
-    .acquire()
-  expect(reads.detail).toHaveBeenCalledTimes(1)
-  // SAFETY: the fixture only reads the focused runtime selector from settings.
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-  s.setState({ settings: { activeRuntimeEnvironmentId: 'elsewhere' } as never })
-  await act(async () => {
-    pending.resolve(task('Local'))
-    await pending.promise
-  })
-  expect(focused.currentView().kind).toBe('abandoned')
-  expect(pinned.currentView().data?.state.name).toBe('Local')
-  focused.release()
-  pinned.release()
-})
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx
deleted file mode 100644
index b69852a36fc..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures.tsx
+++ /dev/null
@@ -1,446 +0,0 @@
-import { useTaskPageDetailRouting } from '../use-task-page-detail-routing'
-import type * as ReactModule from 'react'
-import type { LinearEditState } from '../../linear-item-drawer-types'
-import { useCallback } from 'react'
-import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state'
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import { LinearIssueTextEditor } from '../../LinearIssueTextEditor'
-import { useLinearIssueEditController } from '../../linear-item-drawer-edit-controller'
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-import { useStore } from 'zustand'
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { useTaskPageLinearCollectionEffectsPrelude } from './use-task-page-linear-collection-effects'
-import { useTaskPageLinearCustomViewEffects } from './use-task-page-linear-custom-view-effects'
-import { afterEach, beforeEach, vi, type Mock } from 'vitest'
-import { cleanup, renderHook } from '@testing-library/react'
-import { createTestStore, issue } from '../../../store/slices/linear/linear-slice-test-harness'
-import { clearLinearRequestMaps } from '../../../store/slices/linear/linear-slice-request-state'
-import { useTaskPageLinearListSelectionPrelude } from './use-task-page-linear-list-selection'
-import { useTaskPageLinearListEffects } from './use-task-page-linear-list-effects'
-
-const deferredIssueSetters = vi.hoisted(() => {
-  const updates: VoidFunction[] = []
-  return { enabled: false, updates }
-})
-vi.mock('react', async (original) => {
-  const actual = await original<typeof ReactModule>()
-  return {
-    ...actual,
-    useReducer<S, A>(reducer: (previous: S, action: A) => S, initial: S) {
-      const [value, dispatch] = actual.useReducer(reducer, initial)
-      const send = actual.useCallback((action: A) => {
-        if (
-          deferredIssueSetters.enabled &&
-          typeof initial === 'object' &&
-          initial !== null &&
-          'whole' in initial
-        ) {
-          deferredIssueSetters.updates.push(() => dispatch(action))
-        } else {
-          dispatch(action)
-        }
-      }, [])
-      return [value, send] as const
-    }
-  }
-})
-export { deferredIssueSetters }
-
-const active = vi.hoisted(() => ({ store: vi.fn<() => Store>() }))
-
-vi.mock('@/store', () => ({
-  useAppStore: Object.assign(
-    (selector: (state: ReturnType<Store['getState']>) => unknown) =>
-      useStore(active.store(), selector),
-    {
-      getState: () => active.store().getState(),
-      subscribe: (...args: Parameters<Store['subscribe']>) => active.store().subscribe(...args)
-    }
-  )
-}))
-
-vi.mock('@/i18n/i18n', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  translate: (_key: string, fallback: string, values?: Record<string, string>) =>
-    fallback.replace(/{{(\w+)}}/g, (match, key) => values?.[key] ?? match)
-}))
-
-const reads: {
-  list: Mock
-  search: Mock
-  project: Mock
-  view: Mock
-  detail: Mock
-  update: Mock
-  create: Mock
-  projects: Mock
-  connect: Mock
-  test: Mock
-  select: Mock
-} = vi.hoisted(() => ({
-  list: vi.fn(),
-  search: vi.fn(),
-  project: vi.fn(),
-  view: vi.fn(),
-  detail: vi.fn(),
-  update: vi.fn(),
-  create: vi.fn(),
-  projects: vi.fn(),
-  connect: vi.fn(),
-  test: vi.fn(),
-  select: vi.fn()
-}))
-
-const accountViewer = vi.hoisted(() => ({
-  displayName: 'User',
-  email: null,
-  organizationName: 'Acme'
-}))
-
-vi.mock('@/runtime/linear/runtime-linear-client', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  linearTestConnection: (...args: unknown[]) => reads.test(...args),
-  linearSelectWorkspace: (...args: unknown[]) => reads.select(...args),
-  linearDisconnect: async () => {},
-  linearConnect: (...args: unknown[]) => reads.connect(...args),
-  linearStatus: async () => ({ connected: true, viewer: accountViewer, selectedWorkspaceId: 'w' }),
-  linearListIssues: (...args: unknown[]) => reads.list(...args),
-  linearSearchIssues: (...args: unknown[]) => reads.search(...args)
-}))
-
-vi.mock('@/runtime/linear/runtime-linear-project-client', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  linearListProjects: reads.projects,
-  linearTeamStates: async () => [{ id: 'done', name: 'Done', type: 'completed', color: '#888888' }],
-  linearListProjectIssues: (...args: unknown[]) => reads.project(...args),
-  linearListCustomViewIssues: (...args: unknown[]) => reads.view(...args)
-}))
-
-vi.mock('@/runtime/linear/runtime-linear-issue-client', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  linearGetIssue: reads.detail,
-  linearIssueComments: async () => [],
-  linearUpdateIssue: reads.update,
-  linearCreateIssue: reads.create
-}))
-
-vi.mock('@/hooks/useIssueMetadata', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  useTeamLabels: () => ({ data: [{ id: 'bug', name: 'Bug' }], loading: false }),
-  useTeamMembers: () => ({ data: [], loading: false }),
-  clearLinearMetadataCache: vi.fn(),
-  useTeamStates: () => ({
-    data: [{ id: 'done', name: 'Done', type: 'completed', color: '#888888' }],
-    loading: false
-  })
-}))
-
-vi.mock('@/store/slices/worktrees/listing/use-worktree-catalog', async (original) => {
-  const empty: [] = []
-  return { ...(await original<Record<string, unknown>>()), useAllWorktrees: () => empty }
-})
-
-vi.mock('@/store/workspaces/catalog/workspace-record-fields', async (original) => {
-  const empty: [] = []
-  return { ...(await original<Record<string, unknown>>()), selectFolderWorkspaces: () => empty }
-})
-
-vi.mock('@/components/LinearIssueMarkdownDescriptionEditor', () => ({
-  LinearIssueMarkdownDescriptionEditor: () => null
-}))
-
-vi.mock('@/components/linear-item-drawer-sheet', () => ({
-  renderLinearItemDrawerSheet: (props: {
-    displayed: LinearIssue | null
-    editState: LinearEditState | null
-  }) =>
-    props.displayed && props.editState ? (
-      <DrawerFields row={props.displayed} editState={props.editState} />
-    ) : (
-      <div />
-    )
-}))
-
-export function DrawerFields({ row, editState }: { row: LinearIssue; editState: LinearEditState }) {
-  const controller = useLinearIssueEditController({ issue: row, editState })
-  return (
-    <>
-      <output data-testid="drawer">
-        {row.state.name}:{editState.priority}:{editState.labels.join(',')}
-      </output>
-      <button onClick={() => controller.handlePriorityChange('4')}>Priority</button>
-      <button onClick={() => controller.handleLabelToggle('bug')}>Label</button>
-      <LinearIssueTextEditor issue={row} fields="title" />
-    </>
-  )
-}
-
-export function task(state = 'In Review') {
-  return {
-    ...issue('same-uuid'),
-    identifier: 'DAT-124',
-    workspaceId: 'w',
-    state: { name: state, type: state === 'Done' ? 'completed' : 'started', color: '#888888' }
-  }
-}
-
-export function store() {
-  const result = createTestStore()
-  result.setState({
-    linearStatus: { connected: true, viewer: accountViewer, selectedWorkspaceId: 'w' },
-    linearStatusObserved: true,
-    linearStatusChecked: true,
-    linearStatusContextKey: getLinearSourceScope(defaultScopeSource(null)).runtimeContextKey
-  })
-  active.store.mockReturnValue(result)
-  return result
-}
-
-export type Store = ReturnType<typeof store>
-
-export type View = 'list' | 'search' | 'project' | 'custom-view'
-
-export const views: View[] = ['list', 'search', 'project', 'custom-view']
-
-export const listArgs = { kind: 'list', filter: 'all', limit: 36 } as const
-
-export function read(s: Store, view: View, force = true) {
-  const state = s.getState()
-  if (view === 'search') {
-    return state.searchLinearIssues('DAT-124', 36, { force })
-  }
-  if (view === 'project') {
-    return state.listLinearProjectIssues('p', 'w', 36, { force })
-  }
-  if (view === 'custom-view') {
-    return state.listLinearCustomViewIssues('v', 'w', 36, { force })
-  }
-  return state.listLinearIssues(listArgs, { force })
-}
-
-export function wire(view: View): Mock {
-  return view === 'custom-view' ? reads.view : reads[view]
-}
-
-export function response(view: View, state: string) {
-  return view === 'search' ? [task(state)] : { items: [task(state)] }
-}
-
-export function fixture(s: Store, rows: LinearIssue[], view: View = 'list') {
-  return {
-    settings: null,
-    linearStatus: s.getState().linearStatus,
-    selectedLinearWorkspaceId: 'w',
-    linearTaskSourceContext: null,
-    linearMode: 'issues',
-    linearAttributeFilter: { stateIds: [], priorities: [], assignee: null, labelIds: [] },
-    linearAttributeFilterWorkspaceId: 'w',
-    linearIssues: rows,
-    linearIssueLimit: 36,
-    linearIssuePage: 0,
-    linearIssueLoadingTargetPage: null,
-    linearIssuesHasMore: false,
-    linearLoading: false,
-    linearError: null,
-    appliedLinearSearch: view === 'search' ? 'DAT-124' : '',
-    selectedLinearProject:
-      view === 'project' ? { id: 'p', workspaceId: 'w', name: 'Project' } : null,
-    linearProjectTab: view === 'project' ? 'issues' : 'overview',
-    linearProjectIssuesResult: { items: rows },
-    linearProjectIssueLimit: 36,
-    linearProjectIssuePage: 0,
-    linearProjectIssueLoadingTargetPage: null,
-    linearProjectIssuesLoading: false,
-    linearProjectIssuesError: null,
-    selectedLinearCustomView:
-      view === 'custom-view' ? { id: 'v', workspaceId: 'w', model: 'issue', name: 'View' } : null,
-    linearCustomViewIssuesResult: { items: rows },
-    linearCustomViewIssueLimit: 36,
-    linearCustomViewIssuePage: 0,
-    linearCustomViewIssueLoadingTargetPage: null,
-    linearCustomViewContentsLoading: false,
-    linearCustomViewContentsError: null,
-    availableTeams: []
-  }
-}
-
-export function display(
-  s: Store,
-  rows: LinearIssue[],
-  view: View = 'list',
-  context: TaskSourceContext | null = null
-) {
-  const base = { ...fixture(s, rows, view), ...s.getState() }
-  const noop = vi.fn()
-  return renderHook(() => {
-    const scope = getLinearSourceScope(context ?? defaultScopeSource(null))
-    const projectResult = useLinearIssueResult(`${scope.contextKey}project`, { items: rows }, scope)
-    const viewResult = useLinearIssueResult(`${scope.contextKey}view`, { items: rows }, scope)
-    const result = view === 'custom-view' ? viewResult : projectResult
-    const current = view === 'project' || view === 'custom-view' ? result.data.items : rows
-    const model = {
-      ...base,
-      linearTaskSourceContext: context,
-      linearIssues: current,
-      linearProjectIssueResult: projectResult,
-      linearCustomViewIssueResult: viewResult,
-      linearProjectIssuesResult: projectResult.data,
-      linearCustomViewIssuesResult: viewResult.data,
-      taskResumeApplied: true,
-      linearProjectSearchInput: '',
-      setAppliedLinearProjectSearch: noop,
-      filteredLinearIssues: rows,
-      clearSelectedLinearIssue: noop,
-      linearConnected: true,
-      taskSource: 'linear',
-      linearRefreshNonce: 0,
-      fetchLinearProject: async () => ({ id: 'p' }),
-      setSelectedLinearProjectDetail: noop,
-      setLinearProjectDetailLoading: noop,
-      setLinearProjectDetailError: noop,
-      setLinearProjectIssuesLoading: projectResult.setLoading,
-      setLinearProjectIssuesError: projectResult.setError,
-      setLinearCustomViewContentsLoading: viewResult.setLoading,
-      setLinearCustomViewContentsError: viewResult.setError,
-      setLinearCustomViewProjectsResult: noop,
-      setLinearProjectIssuesResult: projectResult.setData,
-      setLinearCustomViewIssuesResult: viewResult.setData
-    }
-    // SAFETY: fixture supplies the selected collection loader's fields; unrelated persistence is disabled.
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    useTaskPageLinearCollectionEffectsPrelude({
-      ...model,
-      selectedLinearProject: view === 'project' ? base.selectedLinearProject : null
-    } as never)
-    // SAFETY: fixture supplies the custom-view loader fields and no view inventory is requested.
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    useTaskPageLinearCustomViewEffects({ ...model, linearMode: 'issues' } as never)
-    // List/search cache notifications are exercised with the real loader in loadingHook.
-    // SAFETY: fixture supplies the selection prelude fields.
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    const selection = useTaskPageLinearListSelectionPrelude(model as never)
-    return { ...selection, loading: result.loading, error: result.error }
-  })
-}
-
-beforeEach(() => {
-  deferredIssueSetters.enabled = false
-  deferredIssueSetters.updates.length = 0
-  vi.resetAllMocks()
-  reads.connect.mockResolvedValue({ ok: true, viewer: accountViewer })
-  reads.test.mockResolvedValue({ ok: true, viewer: accountViewer })
-  clearLinearRequestMaps()
-})
-
-afterEach(() => {
-  cleanup()
-  clearLinearRequestMaps()
-})
-
-export function loadingHook(s: Store, query = '', extra = {}, queued?: VoidFunction[]) {
-  const refs = {
-    linearSearchPersistReadyRef: { current: false },
-    linearViewPersistReadyRef: { current: false },
-    linearAttributeFilterReadRef: { current: null },
-    lastLinearRequestRef: { current: null },
-    landingLinearRefreshKeysRef: { current: new Set<string>() }
-  }
-  const noop = vi.fn()
-  let renderCount = 0
-  const base = {
-    ...fixture(s, [task()]),
-    ...refs,
-    ...s.getState(),
-    taskSource: 'linear',
-    linearConnected: true,
-    taskResumeApplied: true,
-    linearSearchInput: query,
-    appliedLinearSearch: query,
-    setTaskResumeState: noop,
-    setAppliedLinearSearch: noop,
-    setLinearIssueLimit: noop,
-    setLinearIssuePage: noop,
-    setLinearIssueLoadingTargetPage: noop,
-    setLinearIssuesHasMore: noop,
-    setLinearLoading: noop,
-    linearIssueFiltersByWorkspaceId: {},
-    ...extra
-  }
-  return renderHook(
-    ({ nonce }) => {
-      renderCount++
-      const scope = getLinearSourceScope(defaultScopeSource(null))
-      const result = useLinearIssueResult(scope.contextKey + query, [task()], scope)
-      const { data: rows, error, loading, read: consumeLinearRead } = result
-      const deliver = useCallback<typeof consumeLinearRead>(
-        (lease, view, value) => {
-          if (queued && 'data' in value) {
-            queued.push(() => consumeLinearRead(lease, view, value))
-            // Preserve the original delayed-row seam: outcome consumption is immediate.
-            const { data: _rows, ...outcome } = value
-            consumeLinearRead(lease, view, outcome)
-          } else {
-            consumeLinearRead(lease, view, value)
-          }
-        },
-        [consumeLinearRead]
-      )
-      // SAFETY: fixture supplies the loader's dependencies; persistence setters are inert in this hook test.
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-      useTaskPageLinearListEffects({
-        ...base,
-        linearRefreshNonce: nonce,
-        linearIssueResult: { ...result, read: deliver },
-        setLinearIssues: result.setData,
-        setLinearError: result.setError,
-        setLinearLoading: result.setLoading,
-        setLinearIssuesHasMore: result.setHasMore
-      } as never)
-      // SAFETY: the same fixture supplies the rendered selection fields.
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-      const selection = useTaskPageLinearListSelectionPrelude({
-        ...base,
-        linearIssues: rows,
-        linearError: error
-      } as never)
-      return {
-        rows,
-        error,
-        loading,
-        displayed: selection.displayedLinearIssues,
-
-        renders: renderCount
-      }
-    },
-    { initialProps: { nonce: 0 } }
-  )
-}
-
-export function source(hostId: TaskSourceContext['hostId']): TaskSourceContext {
-  return {
-    kind: 'task-source',
-    provider: 'linear',
-    hostId,
-    projectId: 'project',
-    repoId: null,
-    providerIdentity: null,
-    accountLabel: null
-  }
-}
-
-export { reads }
-
-export function useRoutingFixture(
-  context: ReturnType<typeof source> | null,
-  initial: LinearIssue | null = null
-) {
-  const noop = vi.fn()
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-  return useTaskPageDetailRouting({
-    pageData: { openLinearIssue: initial ?? undefined },
-    linearTaskSourceContext: context,
-    setDialogWorkItem: noop,
-    openTaskPage: noop
-  } as never)
-}
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx
deleted file mode 100644
index c9a395096b4..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-refresh-writers.test.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-// @vitest-environment happy-dom
-import { reads, task, store } from './task-page-linear-refresh-test-fixtures'
-import { LinearIssueProjectSelector } from '../../linear-issue-project-selector'
-
-import '@/store/slices/linear/linear-issue-read'
-import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-write-publication'
-import { writeLinearIssue } from '@/lib/work-items/linear/linear-issue-write'
-
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-
-import LinearItemDrawer from '../../LinearItemDrawer'
-
-import type { LinearIssue } from '../../../../../shared/linear/issue-types'
-
-import { useLinearIssueWorkspaceDetail } from '../../linear-issue-workspace-detail-state'
-import { expect, it, vi } from 'vitest'
-import { act, render, fireEvent, screen } from '@testing-library/react'
-import { deferred } from '../../../store/slices/linear/linear-slice-test-harness'
-
-it('real drawer hydration, field controller and text writer compose rollback without permanent masks', async () => {
-  const s = store()
-  s.setState({
-    recordFeatureInteraction: vi.fn(),
-    linearStatus: { connected: true, viewer: null, selectedWorkspaceId: 'B' }
-  })
-  const old = deferred<LinearIssue | null>(),
-    fresh = deferred<LinearIssue | null>()
-  reads.detail.mockReturnValueOnce(old.promise).mockReturnValueOnce(fresh.promise)
-  const priority = deferred<{ ok: boolean }>(),
-    labels = deferred<{ ok: boolean }>(),
-    title = deferred<{ ok: boolean }>()
-  reads.update.mockImplementation((_source, _id, patch) =>
-    'priority' in patch ? priority.promise : 'labelIds' in patch ? labels.promise : title.promise
-  )
-  render(<LinearItemDrawer issue={task()} onUse={vi.fn()} onClose={vi.fn()} />)
-  expect(reads.detail).toHaveBeenCalledTimes(1)
-  fireEvent.click(screen.getByRole('button', { name: 'Priority' }))
-  fireEvent.click(screen.getByRole('button', { name: 'Label' }))
-  fireEvent.change(screen.getByRole('textbox', { name: 'Issue title' }), {
-    target: { value: 'Local title' }
-  })
-  fireEvent.blur(screen.getByRole('textbox', { name: 'Issue title' }))
-  expect(reads.update).toHaveBeenCalledWith(
-    expect.anything(),
-    task().id,
-    { labelIds: ['bug'] },
-    'w'
-  )
-  expect(screen.getByTestId('drawer').textContent).toBe('In Review:4:Bug')
-  await act(async () => {
-    old.resolve(task('Stale'))
-    await old.promise
-    labels.resolve({ ok: true })
-    await labels.promise
-  })
-  expect(screen.getByTestId('drawer').textContent).toBe('In Review:4:Bug')
-  await act(async () => {
-    await writeLinearIssue(
-      task(),
-      { title: 'Sibling title' },
-      defaultScopeSource(null),
-      async () => ({ ok: true })
-    )
-  })
-  await act(async () => {
-    priority.resolve({ ok: false })
-    title.resolve({ ok: false })
-    await Promise.all([priority.promise, title.promise])
-  })
-  expect(screen.getByTestId('drawer').textContent).toBe('In Review:0:Bug')
-  expect(screen.getByRole<HTMLTextAreaElement>('textbox', { name: 'Issue title' }).value).toBe(
-    'Sibling title'
-  )
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  await act(async () => {
-    fresh.resolve({
-      ...task('External'),
-      title: 'Server title',
-      priority: 2,
-      labels: [],
-      labelIds: []
-    })
-    await fresh.promise
-  })
-  expect(screen.getByTestId('drawer').textContent).toBe('External:2:')
-  expect(screen.getByRole<HTMLTextAreaElement>('textbox', { name: 'Issue title' }).value).toBe(
-    'Server title'
-  )
-})
-
-it('confirmed project selection retires old hydration and publishes through the mounted detail consumer', async () => {
-  store()
-  const old = deferred<LinearIssue | null>(),
-    external = deferred<LinearIssue | null>()
-  const pending = deferred<{ ok: boolean }>()
-  reads.detail.mockReturnValueOnce(old.promise).mockReturnValueOnce(external.promise)
-  reads.projects.mockResolvedValue({ items: [{ id: 'chosen', name: 'Chosen' }] })
-  reads.update.mockReturnValueOnce(pending.promise)
-  function Detail() {
-    const detail = useLinearIssueWorkspaceDetail({
-      issue: task(),
-      providerSettings: defaultScopeSource(null),
-      requestKey: 'project'
-    })
-    return (
-      <>
-        <output data-testid="project">{detail.displayed.project?.name ?? 'None'}</output>
-        <LinearIssueProjectSelector issue={detail.displayed} />
-      </>
-    )
-  }
-  render(<Detail />)
-  fireEvent.click(screen.getByRole('button', { name: 'Add to project' }))
-  fireEvent.change(screen.getByPlaceholderText('Search projects'), { target: { value: 'Chosen' } })
-  fireEvent.click(await screen.findByRole('button', { name: 'Chosen' }))
-  expect(screen.getByTestId('project').textContent).toBe('None')
-  expect(reads.update).toHaveBeenCalledWith(
-    defaultScopeSource(null),
-    task().id,
-    { projectId: 'chosen' },
-    'w'
-  )
-  await act(async () => {
-    pending.resolve({ ok: true })
-    await pending.promise
-  })
-  expect(screen.getByTestId('project').textContent).toBe('Chosen')
-  expect(pendingLinearIssueWrites.size).toBe(0)
-  expect(reads.detail).toHaveBeenCalledTimes(2)
-  await act(async () => {
-    old.resolve(task())
-    await old.promise
-  })
-  expect(screen.getByTestId('project').textContent).toBe('Chosen')
-  await act(async () => {
-    external.resolve({ ...task(), project: { id: 'external', name: 'External' } })
-    await external.promise
-  })
-  expect(screen.getByTestId('project').textContent).toBe('External')
-})
diff --git a/src/renderer/src/components/task-page/linear/task-page-linear-selection-decisions.test.tsx b/src/renderer/src/components/task-page/linear/task-page-linear-selection-decisions.test.tsx
deleted file mode 100644
index 504988edbae..00000000000
--- a/src/renderer/src/components/task-page/linear/task-page-linear-selection-decisions.test.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  reads,
-  store,
-  source,
-  task,
-  useRoutingFixture
-} from './task-page-linear-refresh-test-fixtures'
-import { reads as issueReadRegistry } from '@/store/slices/linear/linear-issue-read-lifecycle'
-import '@/store/slices/linear/linear-issue-read'
-import { pendingLinearIssueWrites } from '@/store/slices/linear/linear-issue-write-publication'
-import { deferred } from '@/store/slices/linear/linear-slice-test-harness'
-import type { useTaskPageDetailRouting } from '../use-task-page-detail-routing'
-import { expect, it } from 'vitest'
-import { act, render, renderHook, screen } from '@testing-library/react'
-import { Suspense, startTransition, useLayoutEffect } from 'react'
-
-it('independent urgent clear supersedes an uncommitted nonempty selection', async () => {
-  const s = store(),
-    context = source('local'),
-    blocked = deferred<void>()
-  s.setState({ jiraIssueCache: {}, jiraSearchCache: {} })
-  let route!: ReturnType<typeof useTaskPageDetailRouting>
-  let hold = true
-  const seen: string[] = [],
-    commits: string[] = []
-  function Consumer() {
-    const current = useRoutingFixture(context)
-    const id = current.selectedLinearIssueId ?? 'none'
-    seen.push(id)
-    useLayoutEffect(() => {
-      route = current
-      commits.push(id)
-    })
-    if (id === 'B' && hold) {
-      throw blocked.promise
-    }
-    return <output data-testid="independent-clear">{id}</output>
-  }
-  const mounted = render(
-    <Suspense fallback={<span>Blocked</span>}>
-      <Consumer />
-    </Suspense>
-  )
-  try {
-    await act(async () => {
-      startTransition(() => route.setSelectedLinearIssue({ ...task('B'), id: 'B' }))
-    })
-    expect(seen).toContain('B')
-    expect(commits).not.toContain('B')
-    expect(screen.getByTestId('independent-clear').textContent).toBe('none')
-    const initialRequest = route.linearSelectionRequest
-    act(() => route.clearSelectedLinearIssue())
-    const clearRequest = route.linearSelectionRequest
-    expect(clearRequest).not.toBe(initialRequest)
-    expect(screen.getByTestId('independent-clear').textContent).toBe('none')
-    hold = false
-    await act(async () => {
-      blocked.resolve()
-      await blocked.promise
-    })
-    expect(screen.getByTestId('independent-clear').textContent).toBe('none')
-    expect(route.linearSelectionRequest).toBe(clearRequest)
-  } finally {
-    mounted.unmount()
-    hold = false
-    blocked.resolve()
-    await blocked.promise
-    expect(commits).not.toContain('B')
-    expect(pendingLinearIssueWrites.size).toBe(0)
-    expect(issueReadRegistry.size).toBe(0)
-    expect(reads.detail).toHaveBeenCalledTimes(0)
-  }
-})
-
-it('same-batch explicit Clear wins while an obsolete observed request cannot clear a newer decision', () => {
-  store().setState({ jiraIssueCache: {}, jiraSearchCache: {} })
-  const hook = renderHook(() => useRoutingFixture(source('local')))
-  const request = hook.result.current.linearSelectionRequest
-  act(() => {
-    hook.result.current.setSelectedLinearIssue(task())
-    hook.result.current.clearSelectedLinearIssue()
-  })
-  expect(hook.result.current.selectedLinearIssue).toBeNull()
-  const clearRequest = hook.result.current.linearSelectionRequest
-  expect(clearRequest).not.toBe(request)
-  hook.rerender()
-  expect(hook.result.current.linearSelectionRequest).toBe(clearRequest)
-  act(() => {
-    hook.result.current.setSelectedLinearIssue(task())
-    hook.result.current.setSelectedLinearIssue(null, { expectedSelection: clearRequest })
-  })
-  expect(hook.result.current.selectedLinearIssue?.id).toBe(task().id)
-  hook.unmount()
-  expect(pendingLinearIssueWrites.size).toBe(0)
-  expect(issueReadRegistry.size).toBe(0)
-  expect(reads.detail).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts b/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts
index 20835165110..eaf95a66938 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts
+++ b/src/renderer/src/components/task-page/linear/use-task-page-linear-view-state.ts
@@ -9,7 +9,7 @@ import { buildLinearIssueWorkspaceAttachmentIndex } from '@/lib/work-items/linea
 import {
   collectLinkedLinearIssueRefsFromWorktrees,
   linkedLinearIssueRefsSignature
-} from '@/components/task-page/linear/task-page-linear-in-orca-issues'
+} from '@/components/task-page/linear/issues/task-page-linear-in-orca-issues'
 import type { LinearMode } from '@/components/task-page/task-page-localized-options'
 import {
   type LinearViewMode,
@@ -33,8 +33,8 @@ import type { LinearIssueAttributeFilter } from '../../../../../shared/linear/is
 import type {
   LinearIssueListFilterRead,
   LinearPrimaryTeamObservation
-} from '@/components/task-page/linear/task-page-linear-issue-request'
-import type { LinearProjectTab } from './task-page-linear-issue-model'
+} from '@/components/task-page/linear/issues/task-page-linear-issue-request'
+
 import { useTaskPageLinearContextState } from './use-task-page-linear-context-state'
 export type TaskPageLinearViewStatePreludeModel = ReturnType<
   typeof useTaskPageLinearViewStatePrelude
@@ -255,3 +255,5 @@ export function useTaskPageLinearViewState(model: TaskPageDetailRoutingModel) {
   return useTaskPageLinearContextState(preludeModel)
 }
 export type TaskPageLinearViewStateModel = ReturnType<typeof useTaskPageLinearViewState>
+
+export type LinearProjectTab = 'overview' | 'issues'
diff --git a/src/renderer/src/components/task-page/linear/CustomViewList.tsx b/src/renderer/src/components/task-page/linear/views/CustomViewList.tsx
similarity index 96%
rename from src/renderer/src/components/task-page/linear/CustomViewList.tsx
rename to src/renderer/src/components/task-page/linear/views/CustomViewList.tsx
index 9654c1fcd8a..69f7d035a04 100644
--- a/src/renderer/src/components/task-page/linear/CustomViewList.tsx
+++ b/src/renderer/src/components/task-page/linear/views/CustomViewList.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { useTranslate } from '@/i18n/use-translate'
 import {
   LinearCustomViewTable,
diff --git a/src/renderer/src/components/task-page/linear/CustomViewProjects.tsx b/src/renderer/src/components/task-page/linear/views/CustomViewProjects.tsx
similarity index 97%
rename from src/renderer/src/components/task-page/linear/CustomViewProjects.tsx
rename to src/renderer/src/components/task-page/linear/views/CustomViewProjects.tsx
index c9a0f7ccc8f..12fa0487dcb 100644
--- a/src/renderer/src/components/task-page/linear/CustomViewProjects.tsx
+++ b/src/renderer/src/components/task-page/linear/views/CustomViewProjects.tsx
@@ -1,4 +1,4 @@
-import type { TaskPageComposerActionsModel } from '../use-task-page-composer-actions'
+import type { TaskPageComposerActionsModel } from '../../use-task-page-composer-actions'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
 import { ChevronLeft, ExternalLink } from 'lucide-react'
diff --git a/src/renderer/src/components/task-page/linear/use-task-page-linear-custom-view-effects.ts b/src/renderer/src/components/task-page/linear/views/use-task-page-linear-custom-view-effects.ts
similarity index 86%
rename from src/renderer/src/components/task-page/linear/use-task-page-linear-custom-view-effects.ts
rename to src/renderer/src/components/task-page/linear/views/use-task-page-linear-custom-view-effects.ts
index 097e5fa787d..7141fbc214b 100644
--- a/src/renderer/src/components/task-page/linear/use-task-page-linear-custom-view-effects.ts
+++ b/src/renderer/src/components/task-page/linear/views/use-task-page-linear-custom-view-effects.ts
@@ -1,16 +1,16 @@
 import { observeLinearIssueRead } from '@/store/slices/linear/linear-issue-read-lifecycle'
 import { linearIssueReadError } from '@/lib/work-items/linear/linear-read-error'
 import { taskProviderErrorText } from '@/lib/work-items/task-provider-error-copy'
-import type { TaskPageLinearInOrcaEffectsModel } from './use-task-page-linear-in-orca-effects'
+import type { TaskPageLinearInOrcaEffectsModel } from '../issues/use-task-page-linear-in-orca-effects'
 import { useEffect } from 'react'
-import {
-  LINEAR_CUSTOM_VIEW_MODELS,
-  mergeLinearCollectionResults
-} from './task-page-linear-issue-model'
-import { LINEAR_ITEM_LIMIT } from '../task-page-source-context'
-import type { LinearCollectionResult } from '../../../../../shared/linear/workspace-types'
-import type { LinearCustomViewSummary } from '../../../../../shared/linear/project-types'
-import { clampLinearIssueListLimit } from '../../../../../shared/linear/issue-read-limits'
+
+import { LINEAR_ITEM_LIMIT } from '../../task-page-source-context'
+import type { LinearCollectionResult } from '../../../../../../shared/linear/workspace-types'
+import type {
+  LinearCustomViewSummary,
+  LinearCustomViewModel
+} from '../../../../../../shared/linear/project-types'
+import { clampLinearIssueListLimit } from '../../../../../../shared/linear/issue-read-limits'
 export function useTaskPageLinearCustomViewEffects(model: TaskPageLinearInOrcaEffectsModel) {
   const {
     getCachedLinearCustomViews,
@@ -209,3 +209,27 @@ export function useTaskPageLinearCustomViewEffects(model: TaskPageLinearInOrcaEf
 export type TaskPageLinearCustomViewEffectsModel = ReturnType<
   typeof useTaskPageLinearCustomViewEffects
 >
+
+export const LINEAR_CUSTOM_VIEW_MODELS = [
+  'issue',
+  'project'
+] satisfies readonly LinearCustomViewModel[]
+
+export function mergeLinearCollectionResults<T>(
+  results: LinearCollectionResult<T>[]
+): LinearCollectionResult<T> {
+  const errors = results.flatMap((result) => result.errors ?? [])
+  return {
+    items: results.flatMap((result) => result.items),
+    ...(errors.length > 0
+      ? {
+          errors
+        }
+      : {}),
+    ...(results.some((result) => result.hasMore)
+      ? {
+          hasMore: true
+        }
+      : {})
+  }
+}
diff --git a/src/renderer/src/components/task-page/task-page-github-pr-chips.test.tsx b/src/renderer/src/components/task-page/task-page-github-pr-chips.test.tsx
deleted file mode 100644
index eea0382c4b9..00000000000
--- a/src/renderer/src/components/task-page/task-page-github-pr-chips.test.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// @vitest-environment happy-dom
-import '@testing-library/jest-dom/vitest'
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { GITHUB_TASK_SEARCH_IDLE_MS } from '@/components/use-github-task-search-commit'
-import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
-import {
-  Harness,
-  installSourceDisplayTestLifecycle,
-  repo,
-  view
-} from './use-task-page-source-display.test-fixture'
-
-vi.mock('@/components/github/PRFilterDropdowns', () => ({ default: () => null }))
-
-installSourceDisplayTestLifecycle()
-
-afterEach(() => {
-  vi.useRealTimers()
-})
-
-function chip(name: string) {
-  return screen.getByRole('button', { name })
-}
-
-describe('GitHub PR state × who chips', () => {
-  it('saves Open × Mine as the Mine preset after the persist effect and idle commit', () => {
-    vi.useFakeTimers()
-    useAppStore.setState({
-      repos: [repo],
-      settings: createGlobalSettingsFixture({ defaultRepoSelection: [repo.id] }),
-      taskPageData: { taskSource: 'github' }
-    })
-    render(<Harness />)
-    act(() => {
-      view.setTaskSearchInput('is:pr is:merged')
-      view.setAppliedTaskSearch('is:pr is:merged')
-      view.setTaskResumeApplied(true)
-    })
-    expect(chip('Merged')).toHaveAttribute('aria-pressed', 'true')
-
-    fireEvent.click(chip('Open'))
-    fireEvent.click(chip('Mine'))
-    act(() => {
-      vi.advanceTimersByTime(GITHUB_TASK_SEARCH_IDLE_MS + 1)
-    })
-
-    expect(useAppStore.getState().taskResumeState).toMatchObject({
-      githubItemsPreset: 'my-prs',
-      githubItemsQuery: 'author:@me is:pr is:open'
-    })
-    expect(view.taskSearchInput).toBe('author:@me is:pr is:open')
-    expect(chip('Open')).toHaveAttribute('aria-pressed', 'true')
-    expect(chip('Mine')).toHaveAttribute('aria-pressed', 'true')
-
-    fireEvent.click(chip('Merged'))
-    expect(useAppStore.getState().taskResumeState).toMatchObject({
-      githubItemsPreset: null,
-      githubItemsQuery: 'is:pr is:merged author:@me'
-    })
-  })
-})
diff --git a/src/renderer/src/components/task-page/task-page-localized-options.tsx b/src/renderer/src/components/task-page/task-page-localized-options.tsx
index 87be90c903f..7113f309372 100644
--- a/src/renderer/src/components/task-page/task-page-localized-options.tsx
+++ b/src/renderer/src/components/task-page/task-page-localized-options.tsx
@@ -16,7 +16,7 @@ import {
 } from '../../../../shared/linear/issue-view-resume-state'
 import { getTaskPresetQuery } from '../../../../shared/work-items/task-preset-query'
 import type { GitLabMRInvolvement } from '../../../../shared/gitlab-types'
-import type { GitHubPRStateChip, GitHubPRWhoChip } from './github/task-page-pr-chips'
+import type { GitHubPRStateChip, GitHubPRWhoChip } from './github/listing/task-page-pr-chips'
 import type { TaskProvider } from '../../../../shared/work-items/task-providers'
 import type { TaskViewPresetId } from '../../../../shared/ui-chrome-types'
 
diff --git a/src/renderer/src/components/task-page/use-task-page-composer-actions.ts b/src/renderer/src/components/task-page/use-task-page-composer-actions.ts
index 9379dc5c750..0f5f2c7795d 100644
--- a/src/renderer/src/components/task-page/use-task-page-composer-actions.ts
+++ b/src/renderer/src/components/task-page/use-task-page-composer-actions.ts
@@ -1,4 +1,4 @@
-import type { TaskPageJiraListEffectsModel } from './jira/use-task-page-jira-list-effects'
+import type { TaskPageJiraListEffectsModel } from './jira/listing/use-task-page-jira-list-effects'
 import { useCallback } from 'react'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { LinearWorkspaceSelection } from '../../../../shared/linear/workspace-types'
diff --git a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts
index c54ba66e5a3..991de5e4241 100644
--- a/src/renderer/src/components/task-page/use-task-page-detail-routing.ts
+++ b/src/renderer/src/components/task-page/use-task-page-detail-routing.ts
@@ -5,13 +5,13 @@ import {
   registerLinearIssueConsumer
 } from '@/store/slices/linear/linear-issue-write-publication'
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import type { TaskPageGitHubIssueDraftModel } from './github/use-task-page-github-issue-draft'
+import type { TaskPageGitHubIssueDraftModel } from './github/issue-creation/use-task-page-github-issue-draft'
 import { useState, useMemo, useCallback, useLayoutEffect, useRef } from 'react'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { JiraIssue } from '../../../../shared/jira/jira-types'
 import { useAppStore } from '@/store'
 import { useShallow } from 'zustand/react/shallow'
-import { findTaskPageJiraIssue } from '@/components/task-page/jira/task-page-jira-cache-selectors'
+import { findTaskPageJiraIssue } from '@/components/task-page/jira/listing/task-page-jira-cache-selectors'
 export function useTaskPageDetailRouting(model: TaskPageGitHubIssueDraftModel) {
   const {
     pageData,
diff --git a/src/renderer/src/components/task-page/use-task-page-global-effects.ts b/src/renderer/src/components/task-page/use-task-page-global-effects.ts
index 528bc6108dc..1d12b1b3c37 100644
--- a/src/renderer/src/components/task-page/use-task-page-global-effects.ts
+++ b/src/renderer/src/components/task-page/use-task-page-global-effects.ts
@@ -1,4 +1,4 @@
-import type { TaskPageJiraSummaryGenerationModel } from './jira/use-task-page-jira-summary-generation'
+import type { TaskPageJiraSummaryGenerationModel } from './jira/creation/use-task-page-jira-summary-generation'
 import { useEffect } from 'react'
 import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router'
 export function useTaskPageGlobalEffects(model: TaskPageJiraSummaryGenerationModel) {
diff --git a/src/renderer/src/components/task-page/use-task-page-runtime-hosts.ts b/src/renderer/src/components/task-page/use-task-page-runtime-hosts.ts
index d9ae9219a4e..96adfac612e 100644
--- a/src/renderer/src/components/task-page/use-task-page-runtime-hosts.ts
+++ b/src/renderer/src/components/task-page/use-task-page-runtime-hosts.ts
@@ -15,7 +15,7 @@ import { getHostDisplayLabelOverrides } from '../../../../shared/host-setting-ov
 import { parseExecutionHostId } from '../../../../shared/execution-host'
 import { TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY } from '../../../../shared/work-items/task-source-runtime-capabilities'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import type { PreflightStatus } from '../../../../preload/api/preflight-api'
+import type { PreflightStatus } from '../../../../preload/api/preflight/preflight-api'
 import { getTaskPageRepoSourceContext } from '../../lib/work-items/task-repo-source-context'
 export function useTaskPageRuntimeHosts(model: TaskPageRepoSelectionModel) {
   const t = useTranslate()
diff --git a/src/renderer/src/components/task-page/use-task-page-search-actions.ts b/src/renderer/src/components/task-page/use-task-page-search-actions.ts
index ab1cc14a3df..7f028bf0411 100644
--- a/src/renderer/src/components/task-page/use-task-page-search-actions.ts
+++ b/src/renderer/src/components/task-page/use-task-page-search-actions.ts
@@ -1,11 +1,11 @@
-import type { TaskPageGitHubQuietRefreshModel } from './github/use-task-page-github-quiet-refresh'
+import type { TaskPageGitHubQuietRefreshModel } from './github/refresh/use-task-page-github-quiet-refresh'
 import React, { useCallback, useEffect } from 'react'
 import type { PRFilterChange } from '@/components/github/PRFilterSections'
 import {
   scopeGitHubTaskSearch,
   getDefaultPresetForGitHubTaskKind
 } from '../../../../shared/work-items/task-github-search'
-import { matchGitHubPRPreset, patchGitHubTaskQuery } from './github/task-page-pr-chips'
+import { matchGitHubPRPreset, patchGitHubTaskQuery } from './github/listing/task-page-pr-chips'
 import type { TaskViewPresetId } from '../../../../shared/ui-chrome-types'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/task-page/use-task-page-source-display.test-fixture.tsx b/src/renderer/src/components/task-page/use-task-page-source-display.test-fixture.tsx
deleted file mode 100644
index d576373a064..00000000000
--- a/src/renderer/src/components/task-page/use-task-page-source-display.test-fixture.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { cleanup } from '@testing-library/react'
-import { useLayoutEffect } from 'react'
-import { useTaskPageGitHubSearchPagination } from './github/use-task-page-github-search-pagination'
-import { useTaskPageGitHubLandingRefresh } from './github/use-task-page-github-landing-refresh'
-import { taskPageGitHubResumeCache } from './github/task-page-github-resume-cache'
-import { afterEach, beforeEach, vi, type Mock } from 'vitest'
-import type { AppState } from '@/store/types'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { useAppStore } from '@/store'
-import { i18n } from '@/i18n/i18n'
-import type { WorkItemsCacheSources } from '@/store/github/cache/cache-model'
-import type { GitHubRepositoryIdentity as GitHubOwnerRepo } from '../../../../shared/github/repositories/repository-identity'
-import type { Repo } from '../../../../shared/repo-types'
-import { getGitHubTaskKind } from '../../../../shared/work-items/task-github-search'
-import { parseTaskQuery } from '../../../../shared/work-items/task-query'
-import { useTaskPageStoreBindings } from './use-task-page-store-bindings'
-import { useTaskPageRepoSelection } from './use-task-page-repo-selection'
-import { useTaskPageRuntimeHosts } from './use-task-page-runtime-hosts'
-import { useTaskPageSourceAvailability } from './use-task-page-source-availability'
-import { useTaskPageProviderState } from './use-task-page-provider-state'
-import { useTaskPageGitHubListState } from './github/use-task-page-github-list-state'
-import { useTaskPageGitHubDetail } from './github/use-task-page-github-detail'
-import { useTaskPageGitHubCacheReconciliation } from './github/use-task-page-github-cache-reconciliation'
-import { useTaskPageSourceDisplay } from './use-task-page-source-display'
-import { TaskPageGitHubFilters } from './github/Filters'
-import { useTaskPageSearchActions } from './use-task-page-search-actions'
-import { TaskPageGitHubList } from './github/List'
-import { useTaskPageGitHubListProjection } from './github/use-task-page-github-list-projection'
-import type { TaskPageComposerActionsModel } from './use-task-page-composer-actions'
-
-export const Q1 = 'is:issue is:open'
-export const Q2 = 'is:issue label:bug'
-export const upstream = { owner: 'upstream-owner', repo: 'project' }
-export const fork = { owner: 'fork-owner', repo: 'project', host: 'ghe.example.com' }
-export const sources = (issues: GitHubOwnerRepo | null, prs = issues): WorkItemsCacheSources => ({
-  issues,
-  prs,
-  originCandidate: fork,
-  upstreamCandidate: upstream
-})
-// Saved project identity is the upstream; the list's resolved source can differ.
-export const repo: Repo = {
-  id: 'repo',
-  path: '/repo',
-  displayName: 'Project',
-  badgeColor: '#000',
-  addedAt: 1,
-  executionHostId: 'local',
-  upstream
-}
-export const sshTwin: Repo = {
-  ...repo,
-  path: '/ssh/repo',
-  connectionId: 'box',
-  executionHostId: 'ssh:box'
-}
-
-const initialStore = useAppStore.getState()
-const initialApiDescriptor = Object.getOwnPropertyDescriptor(window, 'api')
-// listWorkItems answers by repo path and query; a missing answer fails the fetch.
-export const listAnswers = new Map<string, WorkItemsCacheSources>()
-export const setIssueSourcePreference: Mock<AppState['setIssueSourcePreference']> =
-  vi.fn<AppState['setIssueSourcePreference']>()
-
-function useMountedSourceDisplay(runRequests = false) {
-  const store = useTaskPageStoreBindings()
-  const selection = useTaskPageRepoSelection(store)
-  const hosts = useTaskPageRuntimeHosts(selection)
-  const availability = useTaskPageSourceAvailability(hosts)
-  const provider = useTaskPageProviderState(availability)
-  const list = useTaskPageGitHubListState(provider)
-  const detail = useTaskPageGitHubDetail(list)
-  const reconciled = useTaskPageGitHubCacheReconciliation(detail)
-  // Stage 21 derives the kind the same way before handing off to the source display.
-  const kindModel = Object.assign(reconciled, {
-    activeGithubTaskKind: getGitHubTaskKind(
-      reconciled.activeTaskPreset,
-      reconciled.appliedTaskSearch
-    )
-  })
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: pagination reads the stage-8 list state, source kind and store bindings present here; intervening provider stages add no GitHub pagination inputs.
-  const paginationInput = kindModel as unknown as typeof kindModel &
-    Parameters<typeof useTaskPageGitHubSearchPagination>[0]
-  const withKind = useTaskPageGitHubSearchPagination(paginationInput)
-  // Stage 26 as mounted in production; without requests its run stays inert, as before the resume step.
-  useTaskPageGitHubLandingRefresh({
-    ...withKind,
-    taskResumeApplied: runRequests && withKind.taskResumeApplied,
-    githubWorkItemMutationQueryKey: 'mounted-source-flow'
-  })
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: every field the source display reads comes from stages 1-8 or the kind above; stages 9-20 add none of them.
-  const sourceDisplayInput = withKind as unknown as typeof withKind &
-    Parameters<typeof useTaskPageSourceDisplay>[0]
-  return useTaskPageSourceDisplay(sourceDisplayInput)
-}
-type MountedSourceDisplay = ReturnType<typeof useMountedSourceDisplay>
-export let view: MountedSourceDisplay
-const NO_ROW_MUTATIONS = { softHiddenItemKeys: new Set<string>() }
-// A child, so the list's own subscriptions never count as Harness renders.
-function MountedList({ model }: { model: MountedSourceDisplay }) {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the projection reads stage 1-8 state and the kind; of stages 9-23 it reads only row mutations, stubbed with none hidden.
-  const listInput = { ...model, githubWorkItemMutation: NO_ROW_MUTATIONS } as unknown as Parameters<
-    typeof useTaskPageGitHubListProjection
-  >[0]
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: List reads stage 1-8 state, refs and the projection; Rows, the only reader of later stages, is stubbed.
-  const listModel = useTaskPageGitHubListProjection(
-    listInput
-  ) as unknown as TaskPageComposerActionsModel
-  return (
-    <>
-      <output data-testid="mounted-pending">{String(listModel.githubListPending)}</output>
-      <TaskPageGitHubList model={listModel} />
-    </>
-  )
-}
-/** Harness renders since the last reset; a test resets it to count one update's renders. */
-export const harnessRenders = { count: 0 }
-export function Harness({
-  runRequests = false,
-  list = false
-}: {
-  runRequests?: boolean
-  list?: boolean
-}) {
-  harnessRenders.count += 1
-  const model = useMountedSourceDisplay(runRequests)
-  // Tests read the committed model between acts.
-  useLayoutEffect(() => {
-    view = model
-  })
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the filter actions read the store bindings, search state and kind mounted here; modal and dialog fields only gate the find shortcut.
-  const searchInput = { ...model } as unknown as Parameters<typeof useTaskPageSearchActions>[0]
-  const searchActions = useTaskPageSearchActions(searchInput)
-  const filtersFields = {
-    ...model,
-    applyPRFilterChange: searchActions.applyPRFilterChange,
-    handleSetDefaultTaskPreset: searchActions.handleSetDefaultTaskPreset,
-    setIssueSourcePreference: runRequests
-      ? useAppStore.getState().setIssueSourcePreference
-      : setIssueSourcePreference,
-    appliedTaskQuery: parseTaskQuery(model.appliedTaskSearch),
-    loadedGitHubAuthorLogins: [],
-    primaryGithubFilterSlug: null,
-    githubTasksBusy: false,
-    newIssueTargetRepo: null
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the mounted stage-8 model plus these stubs cover every field Filters reads; later-stage handlers are never fired here.
-  const filtersModel = filtersFields as unknown as TaskPageComposerActionsModel
-  return (
-    <TooltipProvider>
-      <TaskPageGitHubFilters model={filtersModel} />
-      <output data-testid="mounted-rows">
-        {model.pages[model.currentPage]?.map((row) => row.title).join(',') ?? ''}
-      </output>
-      <output data-testid="mounted-count">{model.countedTotalPages ?? 'unknown'}</output>
-      {list ? <MountedList model={model} /> : null}
-    </TooltipProvider>
-  )
-}
-
-/** Each mounted source-display test starts from a clean store, preload API and resume cache. */
-export function installSourceDisplayTestLifecycle() {
-  beforeEach(() => {
-    taskPageGitHubResumeCache.clear()
-    listAnswers.clear()
-    setIssueSourcePreference.mockReset()
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: {
-        gh: {
-          countWorkItems: vi.fn().mockResolvedValue(0),
-          viewer: vi.fn().mockResolvedValue(null),
-          listWorkItems: vi.fn(async ({ repoPath, query = '' }) => {
-            const answer = listAnswers.get(`${repoPath}\0${query}`)
-            if (!answer) {
-              throw new Error('list failed')
-            }
-            return { items: [], sources: answer }
-          })
-        },
-        repos: { update: vi.fn(async ({ repoId }) => ({ ...repo, id: repoId })) },
-        ui: { set: vi.fn().mockResolvedValue(undefined) }
-      }
-    })
-    useAppStore.setState({ ...initialStore, workItemsCache: {} }, true)
-  })
-  afterEach(async () => {
-    await i18n.changeLanguage('en')
-    cleanup()
-    useAppStore.setState(initialStore, true)
-    if (initialApiDescriptor) {
-      Object.defineProperty(window, 'api', initialApiDescriptor)
-    } else {
-      Reflect.deleteProperty(window, 'api')
-    }
-  })
-}
diff --git a/src/renderer/src/components/task-page/use-task-page-source-display.ts b/src/renderer/src/components/task-page/use-task-page-source-display.ts
index 880a4da8946..77b076b586a 100644
--- a/src/renderer/src/components/task-page/use-task-page-source-display.ts
+++ b/src/renderer/src/components/task-page/use-task-page-source-display.ts
@@ -1,4 +1,4 @@
-import type { TaskPageLinearCreationStateModel } from './linear/use-task-page-linear-creation-state'
+import type { TaskPageLinearCreationStateModel } from './linear/creation/use-task-page-linear-creation-state'
 import { useMemo } from 'react'
 import type { GitHubTaskKind } from '../../../../shared/work-items/task-github-search'
 import { buildGitHubRepoUrl } from '../../../../shared/github/repositories/links'
diff --git a/src/renderer/src/components/task-source-provider-availability.ts b/src/renderer/src/components/task-source-provider-availability.ts
index 296dd5d1e57..181b1f474d2 100644
--- a/src/renderer/src/components/task-source-provider-availability.ts
+++ b/src/renderer/src/components/task-source-provider-availability.ts
@@ -1,6 +1,6 @@
 import { parseExecutionHostId } from '../../../shared/execution-host'
 import type { TaskProvider } from '../../../shared/work-items/task-providers'
-import type { PreflightStatus } from '../../../preload/api/preflight-api'
+import type { PreflightStatus } from '../../../preload/api/preflight/preflight-api'
 import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
 import type { TaskSourceHostAvailability } from './task-source-context-summary'
 
diff --git a/src/renderer/src/components/use-task-creation-draft-retention.test.ts b/src/renderer/src/components/use-task-creation-draft-retention.test.ts
index 6d6ecfc4fda..b3af1723f8e 100644
--- a/src/renderer/src/components/use-task-creation-draft-retention.test.ts
+++ b/src/renderer/src/components/use-task-creation-draft-retention.test.ts
@@ -1,407 +1,16 @@
 // @vitest-environment happy-dom
 
-import { act, renderHook, render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+// @vitest-environment happy-dom
+import { act, renderHook } from '@testing-library/react'
+import { expect, it } from 'vitest'
 import { useTaskCreationDraftRetention } from './use-task-creation-draft-retention'
 
-import { store, reads } from './task-page/linear/task-page-linear-refresh-test-fixtures'
-import {
-  useLinearIssueCreationForm,
-  useTaskPageLinearCreationState
-} from './task-page/linear/use-task-page-linear-creation-state'
-import { useTaskPageJiraCreationStatePrelude } from './task-page/jira/use-task-page-jira-creation-state'
+import { store } from './task-page/linear/issue-refresh/task-page-linear-refresh-test-fixtures'
+
 import {
   writeNewLinearProjectDraft,
   writeNewJiraIssueDraft
 } from './task-page/task-page-draft-storage'
-import { deferred } from '../store/slices/linear/linear-slice-test-harness'
-import {
-  createElement,
-  Suspense,
-  startTransition,
-  useLayoutEffect,
-  useCallback,
-  useEffect,
-  useState
-} from 'react'
-
-type Draft = { title: string; body: string }
-
-const emptyDraft = (): Draft => ({ title: '', body: '' })
-
-describe('useTaskCreationDraftRetention', () => {
-  it('does not fan out writes while typing and saves the latest text on dismissal', () => {
-    const writeDraft = vi.fn()
-    const view = renderHook(
-      ({ open, draft }) => useTaskCreationDraftRetention({ open, draft, writeDraft }),
-      { initialProps: { open: true, draft: emptyDraft() } }
-    )
-
-    view.rerender({ open: true, draft: { title: 'Bug', body: '' } })
-    view.rerender({ open: true, draft: { title: 'Bug', body: 'Latest details' } })
-
-    expect(writeDraft).not.toHaveBeenCalled()
-
-    view.rerender({ open: false, draft: emptyDraft() })
-
-    expect(writeDraft).toHaveBeenCalledOnce()
-    expect(writeDraft).toHaveBeenCalledWith({ title: 'Bug', body: 'Latest details' })
-  })
-
-  it('saves the latest text when an open composer unmounts', () => {
-    const writeDraft = vi.fn()
-    const view = renderHook(
-      ({ draft }) => useTaskCreationDraftRetention({ open: true, draft, writeDraft }),
-      { initialProps: { draft: { title: 'First', body: '' } } }
-    )
-    view.rerender({ draft: { title: 'Latest', body: 'Details' } })
-
-    view.unmount()
-
-    expect(writeDraft).toHaveBeenCalledOnce()
-    expect(writeDraft).toHaveBeenCalledWith({ title: 'Latest', body: 'Details' })
-  })
-})
-
-it.each([false, true])(
-  'real skipped title and replayed body/completion retain the whole successor (close before success=$0)',
-  async (closeBeforeSuccess) => {
-    const s = store(),
-      blocked = deferred<void>()
-    const save = vi.spyOn(s.getState(), 'setNewLinearIssueDraft')
-    const clear = vi.spyOn(s.getState(), 'clearNewLinearIssueDraft')
-    let form!: ReturnType<typeof useLinearIssueCreationForm>, low!: () => void
-    let hold = true
-    const renders: string[] = [],
-      commits: string[] = []
-    function Composer() {
-      const [pending, setPending] = useState(false)
-      const current = useLinearIssueCreationForm('R1', {
-        open: true,
-        title: 'Original',
-        body: 'Body'
-      })
-      const value = `${current.newLinearIssueTitle}/${current.newLinearIssueBody}/${current.newLinearIssueOpen}`
-      renders.push(value)
-      useLayoutEffect(() => {
-        form = current
-        low = () => setPending(true)
-        commits.push(value)
-      })
-      if (pending && hold) {
-        throw blocked.promise
-      }
-      return createElement('output', { 'data-testid': 'draft-queue' }, value)
-    }
-    const view = render(createElement(Suspense, { fallback: 'Held' }, createElement(Composer)))
-    const titleSetter = form.setNewLinearIssueTitle
-    await act(async () => {
-      startTransition(() => {
-        form.setNewLinearIssueTitle('Queued title')
-        low()
-      })
-    })
-    expect(renders).toContain('Queued title/Body/true')
-    expect(commits).not.toContain('Queued title/Body/true')
-    act(() => form.setNewLinearIssueBody('Current body'))
-    const submitted = form.captureNewLinearIssueDraft()
-    expect(save).not.toHaveBeenCalled()
-    expect(clear).not.toHaveBeenCalled()
-    if (closeBeforeSuccess) {
-      act(() => form.setNewLinearIssueOpen(false))
-      expect(s.getState().newLinearIssueDraft).toBe(submitted.draft)
-      expect(s.getState().newLinearIssueDraft).toEqual({ title: 'Original', body: 'Current body' })
-    }
-    act(() => form.completeNewLinearIssueDraft(submitted))
-    expect(s.getState().newLinearIssueDraft).toBeNull()
-    expect(form.newLinearIssueOpen).toBe(false)
-    hold = false
-    await act(async () => {
-      blocked.resolve()
-      await blocked.promise
-    })
-    expect(screen.getByTestId('draft-queue').textContent).toBe(
-      `Queued title/Current body/${!closeBeforeSuccess}`
-    )
-    expect(form.setNewLinearIssueTitle).toBe(titleSetter)
-    if (closeBeforeSuccess) {
-      const saved = s.getState().newLinearIssueDraft
-      expect.soft(saved).toEqual({ title: 'Queued title', body: 'Current body' })
-      act(() => {
-        form.setNewLinearIssueTitle(saved?.title ?? '')
-        form.setNewLinearIssueBody(saved?.body ?? '')
-        form.setNewLinearIssueOpen(true)
-      })
-      expect.soft(form.newLinearIssueTitle).toBe('Queued title')
-      expect.soft(form.newLinearIssueBody).toBe('Current body')
-    } else {
-      expect(s.getState().newLinearIssueDraft).toBeNull()
-    }
-    act(() => {
-      form.setNewLinearIssueTitle((v) => `${v} final`)
-      form.setNewLinearIssueBody((v) => `${v} final`)
-      form.setNewLinearIssueOpen(false)
-    })
-    expect(s.getState().newLinearIssueDraft).toEqual({
-      title: 'Queued title final',
-      body: 'Current body final'
-    })
-    act(() => {
-      const saved = s.getState().newLinearIssueDraft!
-      form.setNewLinearIssueTitle(saved.title)
-      form.setNewLinearIssueBody(saved.body)
-      form.setNewLinearIssueOpen(true)
-    })
-    expect(form).toMatchObject({
-      newLinearIssueTitle: 'Queued title final',
-      newLinearIssueBody: 'Current body final',
-      newLinearIssueOpen: true
-    })
-    view.unmount()
-  }
-)
-
-it.each([
-  { title: 'Old', body: 'Body' },
-  { title: '', body: '' },
-  { title: ' \t', body: '\n ' }
-])(
-  'queued old-runtime text composes before the actual prelude handoff, never after it (initial=$title/$body)',
-  async (initial) => {
-    const s = store(),
-      blocked = deferred<void>()
-    let form!: ReturnType<typeof useLinearIssueCreationForm>,
-      change!: (runtime: string) => void,
-      low!: () => void
-    let hold = true
-    const commits: string[] = [],
-      seen: string[] = []
-    function Composer() {
-      const [runtime, setRuntime] = useState('R1'),
-        [pending, setPending] = useState(false)
-      const enroll = useCallback(() => setPending(true), [])
-      const current = useLinearIssueCreationForm(runtime, { open: true, ...initial })
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real prelude consumes only Linear reset and inert Jira state on this runtime transition.
-      useTaskPageJiraCreationStatePrelude({
-        ...current,
-        providerRuntimeContextKey: runtime,
-        setNewLinearIssueProjects: vi.fn(),
-        setNewLinearIssueProjectsLoading: vi.fn()
-      } as never)
-      const value = `${runtime}/${current.newLinearIssueTitle}/${current.newLinearIssueBody}/${current.newLinearIssueOpen}`
-      seen.push(value)
-      useLayoutEffect(() => {
-        form = current
-        change = setRuntime
-        low = enroll
-        commits.push(value)
-      }, [current, value, enroll])
-      if (pending && hold) {
-        throw blocked.promise
-      }
-      return null
-    }
-    const view = render(createElement(Suspense, { fallback: null }, createElement(Composer)))
-    const old = form
-    await act(async () => {
-      startTransition(() => {
-        old.setNewLinearIssueTitle('Queued old')
-        old.setNewLinearIssueBody('Queued body')
-        low()
-      })
-    })
-    expect(seen).toContain('R1/Queued old/Queued body/true')
-    expect(commits).not.toContain('R1/Queued old/Queued body/true')
-    act(() => change('R2'))
-    expect(commits).toContain('R2///false')
-    expect(commits).not.toContain('R1/Queued old/Queued body/true')
-    expect(s.getState().newLinearIssueDraft).toEqual(initial.title.trim() ? initial : null)
-    hold = false
-    await act(async () => {
-      blocked.resolve()
-      await blocked.promise
-    })
-    expect(form.newLinearIssueOpen).toBe(false)
-    const saved = s.getState().newLinearIssueDraft
-    expect.soft(saved).toEqual({ title: 'Queued old', body: 'Queued body' })
-    act(() => {
-      form.setNewLinearIssueTitle(saved?.title ?? '')
-      form.setNewLinearIssueBody(saved?.body ?? '')
-      form.setNewLinearIssueOpen(true)
-    })
-    act(() => {
-      old.setNewLinearIssueTitle('Late old')
-      old.resetNewLinearIssue()
-    })
-    expect.soft(form.newLinearIssueTitle).toBe('Queued old')
-    expect.soft(form.newLinearIssueBody).toBe('Queued body')
-    expect(form.newLinearIssueOpen).toBe(true)
-    view.unmount()
-  }
-)
-
-it('current-target layout actions precede delayed runtime reset and obsolete queued completion/finally', async () => {
-  const s = store(),
-    blocked = deferred<void>(),
-    oldAttempt = {},
-    replacement = {}
-  let form!: ReturnType<typeof useLinearIssueCreationForm>,
-    change!: (runtime: string) => void,
-    low!: () => void,
-    pulse!: () => void
-  let hold = true,
-    acquired = 0,
-    released = 0
-  const commits: string[] = [],
-    seen: string[] = []
-  s.setState({ persistedUIReady: false })
-  reads.projects.mockResolvedValue({ items: [] })
-  const teams = [{ id: 'team-1', workspaceId: 'w' }]
-  function Composer() {
-    const [runtime, setRuntime] = useState('R1'),
-      [pending, setPending] = useState(false),
-      [tick, setTick] = useState(0)
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: actual creation state consumes these account/team/runtime inputs; tour readiness is disabled.
-    const current = useTaskPageLinearCreationState({
-      providerRuntimeContextKey: runtime,
-      settings: null,
-      activeModal: 'none',
-      linearConnected: true,
-      selectedLinearWorkspaceId: 'w',
-      linearTaskSourceContext: null,
-      availableTeams: teams
-    } as never)
-    const {
-      setNewLinearIssueTitle,
-      setNewLinearIssueBody,
-      setNewLinearIssueOpen,
-      setNewLinearIssueStateId,
-      beginNewLinearIssue
-    } = current
-    const enroll = useCallback(() => setPending(true), [])
-    const advance = useCallback(() => setTick((n) => n + 1), [])
-    useLayoutEffect(() => {
-      if (runtime === 'R1') {
-        setNewLinearIssueTitle('Old')
-        setNewLinearIssueBody('Body')
-        setNewLinearIssueOpen(true)
-      } else {
-        setNewLinearIssueStateId('new-default')
-        setNewLinearIssueTitle('Replacement')
-        setNewLinearIssueBody('Replacement body')
-        setNewLinearIssueOpen(true)
-        beginNewLinearIssue(replacement)
-      }
-    }, [
-      runtime,
-      setNewLinearIssueTitle,
-      setNewLinearIssueBody,
-      setNewLinearIssueOpen,
-      setNewLinearIssueStateId,
-      beginNewLinearIssue
-    ])
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: actual runtime reset owner receives its Linear inputs; Jira is closed and unrelated metadata callbacks are inert.
-    useTaskPageJiraCreationStatePrelude({
-      ...current,
-      providerRuntimeContextKey: runtime
-    } as never)
-    useEffect(() => {
-      acquired++
-      return () => {
-        released++
-      }
-    }, [current.setNewLinearIssueTitle])
-    const value = `${runtime}/${current.newLinearIssueTitle}/${current.newLinearIssueSubmitting}/${tick}`
-    seen.push(value)
-    useLayoutEffect(() => {
-      form = current
-      change = setRuntime
-      low = enroll
-      pulse = advance
-      commits.push(value)
-    }, [current, value, enroll, advance])
-    if (pending && hold) {
-      throw blocked.promise
-    }
-    return null
-  }
-  const view = render(createElement(Suspense, { fallback: null }, createElement(Composer)))
-  act(() => form.beginNewLinearIssue(oldAttempt))
-  const old = form,
-    submitted = old.captureNewLinearIssueDraft()
-  seen.length = 0
-  commits.length = 0
-  await act(async () => {
-    startTransition(() => {
-      old.completeNewLinearIssueDraft(submitted)
-      old.settleNewLinearIssue(oldAttempt)
-      low()
-    })
-  })
-  expect(seen).toContain('R1//false/0')
-  expect(commits).not.toContain('R1//false/0')
-  act(() => change('R2'))
-  expect(form).toMatchObject({
-    newLinearIssueOpen: true,
-    newLinearIssueTitle: 'Replacement',
-    newLinearIssueBody: 'Replacement body',
-    newLinearIssueStateId: 'new-default',
-    newLinearIssueSubmitting: true
-  })
-  hold = false
-  await act(async () => {
-    blocked.resolve()
-    await blocked.promise
-  })
-  act(() => {
-    old.settleNewLinearIssue(oldAttempt)
-    old.setNewLinearIssueTitle('Late')
-    old.resetNewLinearIssue()
-    pulse()
-  })
-  expect(form).toMatchObject({
-    newLinearIssueOpen: true,
-    newLinearIssueTitle: 'Replacement',
-    newLinearIssueSubmitting: true
-  })
-  expect(acquired).toBe(2)
-  expect(released).toBe(1)
-  act(() => form.settleNewLinearIssue(replacement))
-  act(() => form.setNewLinearIssueOpen(false))
-  expect(s.getState().newLinearIssueDraft).toEqual({
-    title: 'Replacement',
-    body: 'Replacement body'
-  })
-  view.unmount()
-  expect(released).toBe(2)
-})
-
-it('unchanged exact issue success stays disarmed through harmless closed renders and unmount', () => {
-  const s = store()
-  const save = vi.spyOn(s.getState(), 'setNewLinearIssueDraft')
-  const clear = vi.spyOn(s.getState(), 'clearNewLinearIssueDraft')
-  const view = renderHook(() =>
-    useLinearIssueCreationForm('R1', { open: true, title: 'Created', body: 'Details' })
-  )
-  const submitted = view.result.current.captureNewLinearIssueDraft()
-  act(() => {
-    view.result.current.setNewLinearIssueTitle((value) => value)
-    view.result.current.setNewLinearIssuePriority(3)
-  })
-  expect(view.result.current.captureNewLinearIssueDraft()).toBe(submitted)
-  expect(save).not.toHaveBeenCalled()
-  expect(clear).not.toHaveBeenCalled()
-  act(() => view.result.current.completeNewLinearIssueDraft(submitted))
-  expect(view.result.current.newLinearIssueOpen).toBe(false)
-  expect(s.getState().newLinearIssueDraft).toBeNull()
-  act(() => view.result.current.setNewLinearIssuePriority(4))
-  view.rerender()
-  expect(view.result.current.captureNewLinearIssueDraft()).toBe(submitted)
-  view.unmount()
-  expect(save).not.toHaveBeenCalled()
-  expect(clear).toHaveBeenCalledOnce()
-  expect(s.getState().newLinearIssueDraft).toBeNull()
-})
 
 it('project and Jira immediate discard keep their actual plain session slots cleared through close', () => {
   const s = store()
diff --git a/src/renderer/src/hooks/client-workspace-view-report.test.ts b/src/renderer/src/hooks/client-workspace-view-report.test.ts
index c1f2e5f2238..2221f1c0b77 100644
--- a/src/renderer/src/hooks/client-workspace-view-report.test.ts
+++ b/src/renderer/src/hooks/client-workspace-view-report.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '@/store/types'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import type { ClientWorkspaceView } from '../../../shared/rpc-contract/client-workspace-view-params'
+import type { ClientWorkspaceView } from '../../../shared/rpc-contract/client-ui/client-workspace-view-params'
 
 const presence = vi.hoisted((): { remaining: number | null } => ({ remaining: 180_000 }))
 
diff --git a/src/renderer/src/hooks/client-workspace-view-report.ts b/src/renderer/src/hooks/client-workspace-view-report.ts
index 0dacf12dd37..17ca75bfa08 100644
--- a/src/renderer/src/hooks/client-workspace-view-report.ts
+++ b/src/renderer/src/hooks/client-workspace-view-report.ts
@@ -1,6 +1,6 @@
 import type { AppState } from '@/store/types'
 import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import type { ClientWorkspaceView } from '../../../shared/rpc-contract/client-workspace-view-params'
+import type { ClientWorkspaceView } from '../../../shared/rpc-contract/client-ui/client-workspace-view-params'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { tryRuntimeTargetForWorktreeOwner } from '@/store/slices/worktrees/listing/worktree-owner-target'
 import { onScreenHostId } from '@/store/slices/workspace-attention/workspace-unread-flag'
diff --git a/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
index f942d6484b5..22fd804142e 100644
--- a/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-state-ipc-bridge.ts
@@ -6,6 +6,10 @@ import { rememberLiveBrowserUrl } from '@/components/browser-pane/describe-page/
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { findVisibleBrowserLinkTarget } from '@/lib/browser/navigation/visible-browser-link-target'
 import { openUrlInTabBesideBrowserPage } from '@/lib/browser/palette/browser-page-tab-opening'
+import {
+  isClientHostedBrowserSourcePage,
+  openClientHostedUrlBesideBrowserPage
+} from '@/lib/browser/palette/open-client-hosted-link-beside-page'
 import { redactKagiSessionToken } from '../../../../shared/browser-url'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import { useAppStore } from '../../store'
@@ -217,7 +221,21 @@ export function registerBrowserStateIpcBridge(
       const sourcePage = Object.values(store.browserPagesByWorkspace)
         .flat()
         .find((page) => page.id === browserPageId)
-      if (!sourcePage || runtimeEnvironmentIdOrLocalUnlessTwin(store, sourcePage.worktreeId)) {
+      if (!sourcePage) {
+        return
+      }
+      // Client-hosted guests live on this desktop, so a paired worktree must not drop their popups.
+      if (isClientHostedBrowserSourcePage(browserPageId)) {
+        openClientHostedUrlBesideBrowserPage({
+          sourcePageId: browserPageId,
+          worktreeId: sourcePage.worktreeId,
+          url,
+          activate: activate ?? true,
+          onOpened: markBrowserPageOpenedByPage
+        })
+        return
+      }
+      if (runtimeEnvironmentIdOrLocalUnlessTwin(store, sourcePage.worktreeId)) {
         return
       }
       const placement = findVisibleBrowserLinkTarget(store, sourcePage.worktreeId)
diff --git a/src/renderer/src/hooks/ipc-events/linear-linked-issue-refresh.test.ts b/src/renderer/src/hooks/ipc-events/linear-linked-issue-refresh.test.ts
index e52609d01e7..89fe43c9140 100644
--- a/src/renderer/src/hooks/ipc-events/linear-linked-issue-refresh.test.ts
+++ b/src/renderer/src/hooks/ipc-events/linear-linked-issue-refresh.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
 import { registerRuntimeClientIpcBridge } from './runtime-client-ipc-bridge'
 import { subscribeRuntimeEnvironmentFromPreload } from '../../../../preload/runtime/runtime-environment-subscriptions'
-import { linearApi } from '../../../../preload/api/linear-bridge'
+import { linearApi } from '../../../../preload/api/work-items/linear-bridge'
 import { createCompatibleRuntimeStatusResponse } from '@/runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { runtimeCompatibilityChecks } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
 import { clearLinearRequestMaps } from '@/store/slices/linear/linear-slice-request-state'
@@ -12,7 +12,7 @@ import { getWorkspaceReferenceRequest } from '@/components/sidebar/workspace-car
 import type { Worktree } from '../../../../shared/worktree/types'
 import type { TaskSourceContext } from '../../../../shared/work-items/task-source-context'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
-import type { LinearLinkedIssueUpdated } from '../../../../preload/api/linear-api'
+import type { LinearLinkedIssueUpdated } from '../../../../preload/api/work-items/linear-api'
 
 const { localIpc } = await vi.hoisted(async () => {
   const { EventEmitter } = await import('node:events')
diff --git a/src/renderer/src/hooks/use-audio-capture.ts b/src/renderer/src/hooks/use-audio-capture.ts
index f6b965ff8c3..59785c94faa 100644
--- a/src/renderer/src/hooks/use-audio-capture.ts
+++ b/src/renderer/src/hooks/use-audio-capture.ts
@@ -6,7 +6,7 @@ import {
   type DictationCaptureWorkletMessage,
   type DictationCaptureWorkletOptions
 } from '@/components/dictation/dictation-capture-worklet-protocol'
-import { DICTATION_SAMPLE_RATE } from '../../../shared/rpc-contract/speech-params'
+import { DICTATION_SAMPLE_RATE } from '../../../shared/rpc-contract/speech/speech-params'
 import { DICTATION_METER_WINDOW_MS } from '../../../shared/dictation-audio-meter'
 import { START_DICTATION_TIMEOUT_MS } from '../../../shared/dictation-finish-deadlines'
 import { useAudioCaptureMeter, type DictationMeterPublisher } from './use-audio-capture-meter'
diff --git a/src/renderer/src/hooks/useMacTccAttributionSeveredNotice.ts b/src/renderer/src/hooks/useMacTccAttributionSeveredNotice.ts
index e0060ab9654..818694c14b0 100644
--- a/src/renderer/src/hooks/useMacTccAttributionSeveredNotice.ts
+++ b/src/renderer/src/hooks/useMacTccAttributionSeveredNotice.ts
@@ -4,7 +4,7 @@ import { toast } from 'sonner'
 import type {
   PtyManagementFolderAccessMismatch,
   PtyManagementMacTccAttributionHealth
-} from '../../../preload/api/pty-management-api'
+} from '../../../preload/api/terminal/pty-management-api'
 import { isPluginUiLanguage } from '../../../shared/ui-language'
 import { useAppStore } from '@/store/index'
 import {
diff --git a/src/renderer/src/hooks/useTaskPageGitHubWorkItemMutation.ts b/src/renderer/src/hooks/useTaskPageGitHubWorkItemMutation.ts
index 3b6d9700e84..cb570e9068c 100644
--- a/src/renderer/src/hooks/useTaskPageGitHubWorkItemMutation.ts
+++ b/src/renderer/src/hooks/useTaskPageGitHubWorkItemMutation.ts
@@ -2,7 +2,7 @@ import { getWorkItemRepo } from '@/lib/work-items/work-item-repo-row'
 import {
   buildTaskPageGitHubWorkItemMutationPatch,
   type TaskPageGitHubMutationIntent
-} from '@/components/task-page/github/task-page-github-work-item-mutation-patches'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-patches'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { toast } from 'sonner'
 import { parseExecutionHostId } from '../../../shared/execution-host'
@@ -14,18 +14,18 @@ import { useAppStore } from '@/store'
 import {
   beginTaskPageGitHubWorkItemMutation,
   canStartTaskPageGitHubWorkItemMutation
-} from '@/components/task-page/github/task-page-github-work-item-mutations'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutations'
 import {
   confirmTaskPageGitHubWorkItemMutation,
   rollbackTaskPageGitHubWorkItemMutation
-} from '@/components/task-page/github/task-page-github-work-item-mutation-lifecycle'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-lifecycle'
 
-import type { TaskPageGitHubPatchWorkItem } from '@/components/task-page/github/task-page-github-work-item-mutation-types'
+import type { TaskPageGitHubPatchWorkItem } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-types'
 import {
   getTaskPageGitHubSoftHiddenItemKeys,
   subscribeTaskPageGitHubMutationRegistry,
   setTaskPageGitHubMutationQueryKey
-} from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
+} from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-registry'
 import { useMountedRef } from './useMountedRef'
 import { codeHostErrorText } from '@/lib/source-control/remote/code-host-error-copy'
 
diff --git a/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts b/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts
index 0e1b3e5c3f8..a5830be064b 100644
--- a/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts
+++ b/src/renderer/src/lib/agent-session/launch/inventory/agent-detection-target-inventory.ts
@@ -3,7 +3,7 @@ import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibilit
 import { ensureLocalRuntimeCapabilities } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
 import '../../../../../../shared/delegated-mobile-device-contract'
 import { PREFLIGHT_PROJECT_LAUNCH_CONTEXT_RUNTIME_CAPABILITY } from '../../../../../../shared/preflight-runtime-capabilities'
-import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params'
+import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight/preflight-params'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { AppState } from '@/store/types'
 import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents'
diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts
index 0fae5c20ccd..3b9c58eff58 100644
--- a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts
+++ b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.ts
@@ -26,7 +26,7 @@ import {
 } from '@/store/workspaces/catalog/workspace-record-fields'
 import { readHostStructuredAgents } from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
 import { lastVerifiedRuntimeStatus } from '../../../../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params'
+import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight/preflight-params'
 import type { AppState } from '@/store/types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test-fixture.ts
index 1161baf4fb4..c9b784286c9 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test-fixture.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test-fixture.ts
@@ -7,7 +7,7 @@ import {
   CreateIntentParams,
   SetOptionParams,
   SendParams
-} from '../../../../../shared/rpc-contract/structured-agent-session-params'
+} from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
 import type { Tab } from '../../../../../shared/tab-types'
 import type { HostCreateSupport } from './structured-agent-session-host-admission'
 import { useAppStore } from '../../../store/index'
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork.test.ts
index 8d4ac8d9da2..87d449a4bea 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork.test.ts
@@ -1,5 +1,5 @@
 // @vitest-environment happy-dom
-import '../../../../../shared/rpc-contract/structured-agent-session-params'
+import '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-params'
 import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.ts
index 8d8cbb310f0..e1085627ea4 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.ts
@@ -1,6 +1,6 @@
 import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { isAgentSessionOptions } from '../../../../../shared/agent-session/lifecycle/agent-session-record'
-import { SendBodyStructure } from '../../../../../shared/rpc-contract/structured-agent-session-message-params'
+import { SendBodyStructure } from '../../../../../shared/rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { parseExecutionHostId } from '../../../../../shared/execution-host'
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
diff --git a/src/renderer/src/lib/browser/documents/doc-preview-grants.ts b/src/renderer/src/lib/browser/documents/doc-preview-grants.ts
index e20899afd22..8416cc7d045 100644
--- a/src/renderer/src/lib/browser/documents/doc-preview-grants.ts
+++ b/src/renderer/src/lib/browser/documents/doc-preview-grants.ts
@@ -1,4 +1,4 @@
-import type { DocPreviewGrantRequest } from '../../../../../preload/api/doc-preview-api'
+import type { DocPreviewGrantRequest } from '../../../../../preload/api/document-preview/doc-preview-api'
 import { basename, dirname, getRelativePathInsideRoot } from '@/lib/path'
 import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
diff --git a/src/renderer/src/lib/browser/palette/open-client-hosted-link-beside-page.ts b/src/renderer/src/lib/browser/palette/open-client-hosted-link-beside-page.ts
new file mode 100644
index 00000000000..7b0a98fa3c3
--- /dev/null
+++ b/src/renderer/src/lib/browser/palette/open-client-hosted-link-beside-page.ts
@@ -0,0 +1,69 @@
+import { showClientCreationActionError } from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
+import { createWebRuntimeSessionBrowserTabOnHost } from '@/runtime/browser/creation/web-runtime-browser-creation'
+import { useAppStore } from '@/store/index'
+import { isClientHostedBrowserPageHandle } from '@/store/slices/browser/hosts/browser-host-state'
+import { findPage, findWorkspace } from '@/store/slices/browser/pages/browser-page-records'
+import { redactKagiSessionToken } from '../../../../../shared/browser-url'
+import { resolveBrowserSourceUnifiedTab } from '../workspace/browser-workspace-source-resolution'
+import { openUrlInTabBesideBrowserPage } from './browser-page-tab-opening'
+
+export function isClientHostedBrowserSourcePage(browserPageId: string): boolean {
+  const handle = useAppStore.getState().remoteBrowserPageHandlesByPageId?.[browserPageId]
+  return handle ? isClientHostedBrowserPageHandle(handle) : false
+}
+
+export function openClientHostedUrlBesideBrowserPage(args: {
+  sourcePageId: string
+  worktreeId: string
+  url: string
+  activate: boolean
+  onOpened?: (pageId: string) => void
+}): void {
+  const store = useAppStore.getState()
+  const sourcePage = findPage(store.browserPagesByWorkspace, args.sourcePageId)
+  const handle = store.remoteBrowserPageHandlesByPageId?.[args.sourcePageId]
+  const environmentId =
+    handle?.environmentId?.trim() || sourcePage?.browserRuntimeEnvironmentId?.trim() || null
+  // A client-hosted row with no named runtime cannot ask the paired host, so keep the local opener.
+  if (!environmentId) {
+    openUrlInTabBesideBrowserPage(args)
+    return
+  }
+  const sourceTab = sourcePage
+    ? findWorkspace(store.browserTabsByWorktree, sourcePage.workspaceId)
+    : null
+  // The host's page snapshot proves the opener's profile; mirrored workspace metadata may not carry it.
+  const profileId = handle?.browserProfileId ?? sourceTab?.sessionProfileId
+  const sourceUnifiedTab = resolveBrowserSourceUnifiedTab(store, args.sourcePageId, args.worktreeId)
+  // Why not createBrowserTab: that lands in the streamed pane, which a headless runtime cannot show.
+  // Omit placementPreference so preparation uses the same auto choice as the new-tab button.
+  void createWebRuntimeSessionBrowserTabOnHost(
+    {
+      worktreeId: args.worktreeId,
+      url: args.url,
+      ...(profileId ? { profileId } : {}),
+      ...(sourceUnifiedTab ? { clientAfterTabId: sourceUnifiedTab.id } : {}),
+      ...(args.onOpened ? { onMaterialized: args.onOpened } : {}),
+      focusOnCreate: args.activate,
+      selectWorktree: false,
+      stagedTitle: redactKagiSessionToken(args.url),
+      stagedFocusAddressBar: false,
+      failureLogMode: 'operation-only'
+    },
+    environmentId
+  ).catch(showClientCreationActionError)
+}
+
+/** Local pages keep createBrowserTab. Client-hosted pages on a paired server follow the new-tab route. */
+export function openLinkInNewBrowserTab(args: {
+  sourcePageId: string
+  worktreeId: string
+  url: string
+  activate: boolean
+}): void {
+  if (isClientHostedBrowserSourcePage(args.sourcePageId)) {
+    openClientHostedUrlBesideBrowserPage(args)
+    return
+  }
+  openUrlInTabBesideBrowserPage(args)
+}
diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts
index 98c7f098060..e6bb04775e1 100644
--- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts
+++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-preflight.ts
@@ -28,7 +28,7 @@ import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-clien
 import '../setup/workspace-setup-preparation'
 import type { AppState } from '@/store/types'
 import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
-import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params'
+import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight/preflight-params'
 
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { Repo } from '../../../../../../shared/repo-types'
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation.ts
index 767c9680917..98e37681f60 100644
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation.ts
+++ b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation.ts
@@ -45,7 +45,15 @@ export async function createWebRuntimeSessionBrowserTab(
     args.environmentId?.trim() ??
     useAppStore.getState().settings?.activeRuntimeEnvironmentId?.trim() ??
     null
-  if (!environmentId || !isWebRuntimeSessionActive(environmentId)) {
+  return environmentId ? createWebRuntimeSessionBrowserTabOnHost(args, environmentId) : false
+}
+
+/** Creates the tab on the named runtime, for callers that already route by the page's owner. */
+export async function createWebRuntimeSessionBrowserTabOnHost(
+  args: CreateWebRuntimeSessionBrowserTabArgs,
+  environmentId: string
+): Promise<boolean> {
+  if (!isWebRuntimeSessionActive(environmentId)) {
     return false
   }
   const context = createWebRuntimeBrowserCreationContext(args, environmentId)
diff --git a/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-reads.ts b/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-reads.ts
index 95fe0d154db..b165a81c3a2 100644
--- a/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-reads.ts
+++ b/src/renderer/src/runtime/hosted-terminals/hydration/host-terminal-scrollback-reads.ts
@@ -1,5 +1,5 @@
 import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
-import type { SessionReadTerminalScrollbackResult } from '../../../../../shared/rpc-contract/session-terminal-scrollback-params'
+import type { SessionReadTerminalScrollbackResult } from '../../../../../shared/rpc-contract/session-tabs/session-terminal-scrollback-params'
 import { SESSION_TERMINAL_SCROLLBACK_READ_RUNTIME_CAPABILITY } from '../../../../../shared/session-tabs-runtime-capabilities'
 import { useAppStore } from '@/store/index'
 import {
diff --git a/src/renderer/src/runtime/hosts/installation/managed-orcad-api-availability.ts b/src/renderer/src/runtime/hosts/installation/managed-orcad-api-availability.ts
index 2f8bb7f7c34..46707afc6de 100644
--- a/src/renderer/src/runtime/hosts/installation/managed-orcad-api-availability.ts
+++ b/src/renderer/src/runtime/hosts/installation/managed-orcad-api-availability.ts
@@ -1,4 +1,4 @@
-import type { ManagedOrcadPreloadApi } from '../../../../../preload/api/managed-orcad-api'
+import type { ManagedOrcadPreloadApi } from '../../../../../preload/api/runtime/managed-orcad-api'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 
 /** Web fallback stubs cannot manage SSH hosts. */
diff --git a/src/renderer/src/runtime/jira/runtime-jira-favourite-filters-client.ts b/src/renderer/src/runtime/jira/runtime-jira-favourite-filters-client.ts
index 746d9c614a5..a6e9d4820d7 100644
--- a/src/renderer/src/runtime/jira/runtime-jira-favourite-filters-client.ts
+++ b/src/renderer/src/runtime/jira/runtime-jira-favourite-filters-client.ts
@@ -2,7 +2,7 @@ import {
   parseJiraFavouriteFilterList,
   type JiraFavouriteFilterList
 } from '../../../../shared/jira/jira-favourite-filters'
-import { JiraFavouriteFilterParams } from '../../../../shared/rpc-contract/jira-favourite-filter-params'
+import { JiraFavouriteFilterParams } from '../../../../shared/rpc-contract/jira/jira-favourite-filter-params'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call'
 
diff --git a/src/renderer/src/runtime/workspace-layout/testing/layout-apply-test-double.ts b/src/renderer/src/runtime/workspace-layout/testing/layout-apply-test-double.ts
index 4e067822cbd..c049a625e77 100644
--- a/src/renderer/src/runtime/workspace-layout/testing/layout-apply-test-double.ts
+++ b/src/renderer/src/runtime/workspace-layout/testing/layout-apply-test-double.ts
@@ -1,7 +1,7 @@
 // Renderer-test main validates each layout.apply against its RPC schema and answers applied; switch-off sends none.
 import type { z } from 'zod'
 import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope'
-import { LayoutApplyParams } from '../../../../../shared/rpc-contract/workspace-layout-params'
+import { LayoutApplyParams } from '../../../../../shared/rpc-contract/workspace-layout/workspace-layout-params'
 import type {
   LayoutApplyReply,
   LayoutCommand
diff --git a/src/renderer/src/store/github/sources/github-source-lifetime.test.tsx b/src/renderer/src/store/github/sources/github-source-lifetime.test.tsx
deleted file mode 100644
index f79887fd371..00000000000
--- a/src/renderer/src/store/github/sources/github-source-lifetime.test.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-// @vitest-environment happy-dom
-import { cleanup } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useStore } from 'zustand'
-import { createTestStore, mockApi, resetRemoteRuntimeMocks } from '../github-slice-test-harness'
-import { createRepoUpdateActions } from '../../repos/repo-update'
-import { taskPageGitHubResumeCache } from '@/components/task-page/github/task-page-github-resume-cache'
-import type { AppState } from '../../types'
-import { createGlobalSettingsFixture } from '../../../../../shared/global-settings-test-fixture'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-
-const holder = vi.hoisted((): { store: ReturnType<typeof createTestStore> | null } => ({
-  store: null
-}))
-vi.mock('@/store/index', () => ({
-  useAppStore: Object.assign(
-    <T,>(selector: (state: AppState) => T) => useStore(holder.store!, selector),
-    {
-      getState: () => holder.store!.getState(),
-      subscribe: (listener: (state: AppState) => void) => holder.store!.subscribe(listener)
-    }
-  )
-}))
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn() } }))
-
-const origin = { owner: 'fork', repo: 'project' }
-const upstream = { owner: 'parent', repo: 'project' }
-const repo: Repo = {
-  id: 'source-repo',
-  path: '/source-repo',
-  displayName: 'Project',
-  addedAt: 1,
-  badgeColor: '',
-  executionHostId: 'local'
-}
-function row(owner: string, number = 12): GitHubWorkItem {
-  return {
-    id: `issue:${number}`,
-    repoId: repo.id,
-    type: 'issue',
-    number,
-    title: owner,
-    state: 'open',
-    url: `https://github.com/${owner}/project/issues/${number}`,
-    author: null,
-    labels: [],
-    assignees: [],
-    updatedAt: '2026-11-01T00:00:00Z'
-  }
-}
-const envelope = (owner: string) => ({
-  items: [row(owner)],
-  sources: {
-    issues: { owner, repo: 'project' },
-    prs: { owner, repo: 'project' },
-    originCandidate: origin,
-    upstreamCandidate: upstream
-  }
-})
-const args = [{ repoId: repo.id, path: repo.path }]
-const flush = async () => {
-  for (let i = 0; i < 8; i++) {
-    await Promise.resolve()
-  }
-}
-function setup() {
-  const store = createTestStore()
-  store.setState({
-    repos: [repo],
-    projects: [],
-    projectHostSetups: [],
-    settings: createGlobalSettingsFixture(),
-    fetchReposForAllHosts: vi.fn().mockResolvedValue(undefined),
-    ...createRepoUpdateActions(store.setState, store.getState)
-  })
-  holder.store = store
-  return store
-}
-beforeEach(() => {
-  vi.stubGlobal('window', document.defaultView)
-  Object.defineProperty(window, 'api', { configurable: true, value: mockApi })
-  vi.clearAllMocks()
-  resetRemoteRuntimeMocks()
-  mockApi.repos.update.mockResolvedValue(undefined)
-  mockApi.gh.listWorkItems.mockResolvedValue(envelope('parent'))
-})
-afterEach(() => {
-  cleanup()
-  holder.store = null
-})
-
-describe('GitHub source collection lifetime', () => {
-  it('rejects inverted A1/B/A2 list deliveries including page N', async () => {
-    const store = setup()
-    const a1 = Promise.withResolvers<ReturnType<typeof envelope>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(a1.promise)
-    const old = store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    await flush()
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const b = Promise.withResolvers<ReturnType<typeof envelope>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(b.promise)
-    const page = store.getState().fetchWorkItemsNextPage(args, 20, 20, '', 1)
-    await flush()
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'upstream', 'local')
-    mockApi.gh.listWorkItems.mockResolvedValueOnce(envelope('parent'))
-    const a2 = await store.getState().fetchWorkItemsAcrossRepos(args, 20, 20, '')
-    b.resolve(envelope('fork'))
-    a1.resolve(envelope('parent'))
-    expect(await old).toBeUndefined()
-    expect(await page).toBeUndefined()
-    expect(a2?.items.map((item) => item.url)).toEqual([row('parent').url])
-    expect(
-      store
-        .getState()
-        .getCachedWorkItems(repo.id, 20, '', repo.path)
-        ?.map((item) => item.url)
-    ).toEqual([row('parent').url])
-  })
-})
-
-describe('source mapping and estimate retirement', () => {
-  it('retires every query and resume page when origin alone changes, and cannot revive a removed owner through a pending save', async () => {
-    const store = setup()
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    mockApi.gh.countWorkItems.mockResolvedValue(40)
-    await store.getState().countWorkItemsAcrossRepos(args, '', 20)
-    const owner = store.getState().githubSourceCollections
-    const oldOwner = owner.context(repo)
-    taskPageGitHubResumeCache.write('old-context', 2, [row('parent')], undefined, [oldOwner])
-    const oldQuery = Promise.withResolvers<ReturnType<typeof envelope>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(oldQuery.promise)
-    const old = store.getState().fetchWorkItems(repo.id, repo.path, 20, 'label:old')
-    await flush()
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({
-      ...envelope('parent'),
-      sources: {
-        ...envelope('parent').sources,
-        originCandidate: { owner: 'new-fork', repo: 'project' }
-      }
-    })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, 'label:new')
-    oldQuery.resolve(envelope('parent'))
-    expect(await old).toBeUndefined()
-    expect(store.getState().getCachedWorkItems(repo.id, 20, '', repo.path)).toBeNull()
-    expect(taskPageGitHubResumeCache.read('old-context', 2)).toBeNull()
-    expect(owner.context(repo)).not.toBe(oldOwner)
-    const save = Promise.withResolvers<Repo>()
-    mockApi.repos.update.mockReturnValueOnce(save.promise)
-    const saving = store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const waiting = owner.awaitSave(store.getState().repos[0])
-    const oldCatalog = owner.catalogSnapshot()
-    store.setState({ repos: [] })
-    const removed = await waiting
-    expect(removed !== 'save-failed' && removed()).toBe(false)
-    store.setState({ repos: [{ ...repo, issueSourcePreference: 'upstream' }] })
-    const replacement = owner.context(store.getState().repos[0])
-    save.resolve({ ...repo, issueSourcePreference: 'origin' })
-    await saving
-    expect(store.getState().repos[0].issueSourcePreference).toBe('upstream')
-    expect(owner.context(store.getState().repos[0])).toBe(replacement)
-    expect(
-      owner.adopt({ ...repo, issueSourcePreference: 'origin' }, oldCatalog).issueSourcePreference
-    ).toBe('upstream')
-    expect(store.getState().getCachedWorkItems(repo.id, 20, '', repo.path)).toBeNull()
-  })
-})
diff --git a/src/renderer/src/store/github/sources/source-collections.ts b/src/renderer/src/store/github/sources/source-collections.ts
index 6d56e2f4591..bb24d84e6ce 100644
--- a/src/renderer/src/store/github/sources/source-collections.ts
+++ b/src/renderer/src/store/github/sources/source-collections.ts
@@ -9,7 +9,7 @@ import { nextProviderRequestId } from '../requests/request-coordination'
 import { withBoundedCacheEntry, evictStaleEntries } from '../cache/cache-policy'
 import { foldReportedCandidates } from './source-candidate-evidence'
 import { workItemsCacheKey } from '../cache/cache-identity'
-import { taskPageGitHubResumeCache } from '@/components/task-page/github/task-page-github-resume-cache'
+import { taskPageGitHubResumeCache } from '@/components/task-page/github/cache/task-page-github-resume-cache'
 import {
   GitHubSourceOwnership,
   githubCollectionScope,
diff --git a/src/renderer/src/store/github/task-records/github-task-records.test.ts b/src/renderer/src/store/github/task-records/github-task-records.test.ts
deleted file mode 100644
index ea149195500..00000000000
--- a/src/renderer/src/store/github/task-records/github-task-records.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { answered } from '../requests/answered-request.test-fixture'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
-import { createTestStore, mockApi, resetRemoteRuntimeMocks } from '../github-slice-test-harness'
-import { getTaskPageRepoSourceContext } from '@/lib/work-items/task-repo-source-context'
-import { resetTaskPageGitHubMutationRegistryForTests } from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
-
-const lookup = vi.hoisted(() => vi.fn())
-vi.mock('@/lib/work-items/github/github-work-item-source-lookup', () => ({
-  lookupGitHubWorkItemByOwnerRepoForSource: lookup
-}))
-const repo: Repo = {
-  id: 'repo',
-  path: '/repo',
-  displayName: 'Repo',
-  badgeColor: 'blue',
-  addedAt: 1,
-  ghAccount: { host: 'github.com', user: 'alice' }
-}
-const row: GitHubWorkItem = {
-  id: 'issue:42',
-  repoId: 'repo',
-  type: 'issue',
-  number: 42,
-  title: 'Original',
-  state: 'open',
-  labels: [],
-  assignees: [],
-  url: 'https://github.com/acme/widgets/issues/42',
-  author: null,
-  updatedAt: '2026-10-31T12:00:02Z'
-}
-function deferred<T>() {
-  let resolve!: (value: T) => void
-  let reject!: (error: Error) => void
-  const promise = new Promise<T>((r, fail) => {
-    resolve = r
-    reject = fail
-  })
-  return { promise, resolve, reject }
-}
-async function flush() {
-  await Promise.resolve()
-  await Promise.resolve()
-  await Promise.resolve()
-}
-function setup(repos = [repo]) {
-  const store = createTestStore()
-  store.setState({ repos })
-  const cache = store.getState().githubTaskCache
-  const binding = cache.capture(repos[0])!
-  return { store, cache, binding }
-}
-const sources = {
-  issues: { owner: 'acme', repo: 'widgets' },
-  prs: null,
-  originCandidate: null,
-  upstreamCandidate: null
-}
-/** A Tasks row cached by the real fetch, plus a binding captured for its source. */
-async function tasksRow(store: ReturnType<typeof createTestStore>, item: GitHubWorkItem = row) {
-  mockApi.gh.listWorkItems.mockResolvedValue({ items: [item], sources })
-  const sourceContext = getTaskPageRepoSourceContext(repo, 'github')
-  await store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { sourceContext })
-  const copy = () => Object.values(store.getState().workItemsCache).flatMap((e) => e.data ?? [])[0]
-  const capture = () => store.getState().githubTaskCache.capture(repo, sourceContext)!
-  const search = async () =>
-    answered(
-      await store
-        .getState()
-        .fetchWorkItems(repo.id, repo.path, 20, '', { sourceContext, force: true })
-    )[0]
-  return { copy, capture, search }
-}
-
-/** An account switch and back: the old binding is disposed and a new incarnation replaces it. */
-function rebind(store: ReturnType<typeof createTestStore>) {
-  store.setState({ repos: [{ ...repo, ghAccount: { host: 'github.com', user: 'bob' } }] })
-  store.setState({ repos: [repo] })
-}
-
-function taskFacts(item: GitHubWorkItem) {
-  return { title: item.title, state: item.state, labels: item.labels }
-}
-
-describe('shared GitHub task records through production store actions', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    resetTaskPageGitHubMutationRegistryForTests()
-    // This mock represents the already-shipped safe local item route.
-    Object.assign(mockApi.gh, { workItemByOwnerRepo: vi.fn() })
-    lookup.mockReset()
-    lookup.mockResolvedValue(row)
-  })
-
-  it('rejects pre-edit canonical C and coalesces one replacement after B settles', async () => {
-    const { cache, binding } = setup()
-    const c = deferred<GitHubWorkItem>()
-    const c2 = deferred<GitHubWorkItem>()
-    lookup.mockReturnValue(c2.promise)
-    const read = cache.readCanonical(row, binding, () => c.promise)
-    const b = cache.operation(row, binding, { labels: { new: true } })
-    b(true)
-    expect(lookup).not.toHaveBeenCalled()
-    c.resolve(row)
-    expect(await read).toBe(false)
-
-    c2.resolve({ ...row, labels: ['new'] })
-    await flush()
-    expect(cache.projectItem(row).labels).toEqual(['new'])
-  })
-
-  it('disposes an account incarnation and rejects its deferred result after A to B to A', async () => {
-    const { store, cache, binding } = setup()
-    const response = deferred<GitHubWorkItem>()
-    const read = cache.readCanonical(row, binding, () => response.promise)
-    const listener = vi.fn()
-    cache.subscribe(listener)
-    store.setState({ repos: [{ ...repo, ghAccount: { host: 'github.com', user: 'bob' } }] })
-    store.setState({ repos: [repo] })
-    response.resolve({ ...row, title: 'Old Alice' })
-    expect(await read).toBe(false)
-    expect(cache.current(binding)).toBe(false)
-    expect(cache.projectItem(row).title).toBe('Original')
-    expect(listener).toHaveBeenCalled()
-    expect(cache.capture(repo)!.incarnation).not.toBe(binding.incarnation)
-  })
-
-  it('establishes from the read after the last of two overlapping edits', async () => {
-    const { store, cache } = setup()
-    const { capture } = await tasksRow(store)
-    const r1 = deferred<GitHubWorkItem>(),
-      r2 = deferred<GitHubWorkItem>()
-    lookup.mockReturnValueOnce(r1.promise).mockReturnValueOnce(r2.promise)
-    cache.operation(row, capture(), { labels: { a: true } })(true)
-    cache.operation(row, capture(), { labels: { b: true } })(true)
-
-    r1.resolve({ ...row, labels: ['a'], updatedAt: '2026-10-31T12:00:03Z' })
-    await flush()
-
-    expect(cache.projectItem(row).labels).toEqual(['a', 'b'])
-    const after = {
-      ...row,
-      title: 'After B',
-      labels: ['a', 'b'],
-      updatedAt: '2026-10-31T12:00:04Z'
-    }
-    r2.resolve(after)
-    await flush()
-    expect(taskFacts(cache.projectItem(row))).toEqual(taskFacts(after))
-    cache.acceptSearch([after], capture())
-    await flush()
-  })
-
-  it('leaves copies to a replacement incarnation and reconciles them with its own read', async () => {
-    const { store, cache } = setup()
-    const { copy, capture } = await tasksRow(store)
-    await cache.readCanonical(row, capture(), async () => row)
-    const old = cache.operation(row, capture(), { labels: { old: true } })
-    expect(copy().labels).toEqual([])
-    rebind(store)
-    await tasksRow(store)
-    const next = cache.operation(copy(), capture(), { labels: { new: true } })
-    expect(cache.projectItem(copy()).labels).toEqual(['new'])
-    expect(old(false).labels).toEqual([])
-    lookup.mockResolvedValue({ ...row, title: 'Reconciled', updatedAt: '2026-10-31T12:00:03Z' })
-    next(false)
-    await flush()
-    // The late old settlement owes the replacement its own read, even though its own edit failed.
-
-    expect(copy()).toMatchObject({ title: 'Reconciled', labels: [] })
-  })
-  it('lets a Refresh queued behind a discarded one read once that owner retires', async () => {
-    const { cache, binding } = setup()
-    const first = deferred<GitHubWorkItem | null>()
-    const r1 = cache.readCanonical(row, binding, () => first.promise)
-    const second = vi.fn(async () => ({ ...row, title: 'Fresh' }))
-    const r2 = cache.readCanonical(row, binding, second)
-    first.resolve(null)
-    expect([await r1, await r2]).toEqual([false, true])
-
-    expect(cache.projectItem(row).title).toBe('Fresh')
-  })
-})
diff --git a/src/renderer/src/store/github/task-records/task-record-owners.ts b/src/renderer/src/store/github/task-records/task-record-owners.ts
index 4e1752c04e8..fbecf9347c1 100644
--- a/src/renderer/src/store/github/task-records/task-record-owners.ts
+++ b/src/renderer/src/store/github/task-records/task-record-owners.ts
@@ -1,5 +1,5 @@
-import { deleteConfirmedListSnapshot } from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
-import { deleteLastConfirmedClientValue } from '@/components/task-page/github/task-page-github-confirmed-client-values'
+import { deleteConfirmedListSnapshot } from '@/components/task-page/github/mutations/task-page-github-work-item-mutation-registry'
+import { deleteLastConfirmedClientValue } from '@/components/task-page/github/mutations/task-page-github-confirmed-client-values'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-items/work-item-types'
 import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
 import type { Repo } from '../../../../../shared/repo-types'
diff --git a/src/renderer/src/store/plugins/catalog/plugin-content-list-store.ts b/src/renderer/src/store/plugins/catalog/plugin-content-list-store.ts
index 6773a76c08b..a2f91980af4 100644
--- a/src/renderer/src/store/plugins/catalog/plugin-content-list-store.ts
+++ b/src/renderer/src/store/plugins/catalog/plugin-content-list-store.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { create } from 'zustand'
-import type { PluginsApi } from '../../../../../preload/api/plugin-host-api'
+import type { PluginsApi } from '../../../../../preload/api/plugins/plugin-host-api'
 import { structuralValuesEqual } from '../../../../../shared/structural-value-equality'
 import { arrayElementsUnchanged } from '../../../lib/catalog-reconciliation/catalog-identity'
 
diff --git a/src/renderer/src/store/plugins/updates/plugin-auto-updates.ts b/src/renderer/src/store/plugins/updates/plugin-auto-updates.ts
index d2c13aad942..78124eae11d 100644
--- a/src/renderer/src/store/plugins/updates/plugin-auto-updates.ts
+++ b/src/renderer/src/store/plugins/updates/plugin-auto-updates.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { toast } from 'sonner'
-import type { PluginAutoUpdateEvent } from '../../../../../preload/api/plugin-host-api'
+import type { PluginAutoUpdateEvent } from '../../../../../preload/api/plugins/plugin-host-api'
 import type { PluginAutoUpdateState } from '../../../../../shared/plugins/catalog/plugin-update-policy'
 import { translate } from '@/i18n/i18n'
 import { announcePluginUpdateReviews } from './plugin-update-review-toast'
diff --git a/src/renderer/src/store/slices/preflight/preflight.ts b/src/renderer/src/store/slices/preflight/preflight.ts
index 231ccd48f00..c85ec342ad1 100644
--- a/src/renderer/src/store/slices/preflight/preflight.ts
+++ b/src/renderer/src/store/slices/preflight/preflight.ts
@@ -7,7 +7,7 @@ import type { StateCreator } from 'zustand'
 import type {
   PreflightRuntimeContext,
   PreflightStatus
-} from '../../../../../preload/api/preflight-api'
+} from '../../../../../preload/api/preflight/preflight-api'
 import type { AppState } from '../../types'
 import type { LocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context-cache'
 
diff --git a/src/renderer/src/store/terminals/folder-access/mac-folder-access-fix.ts b/src/renderer/src/store/terminals/folder-access/mac-folder-access-fix.ts
index 14651460471..31e5ad5fc9d 100644
--- a/src/renderer/src/store/terminals/folder-access/mac-folder-access-fix.ts
+++ b/src/renderer/src/store/terminals/folder-access/mac-folder-access-fix.ts
@@ -2,7 +2,7 @@
 
 import { toast } from 'sonner'
 import { create } from 'zustand'
-import type { PtyManagementFolderAccessMismatch } from '../../../../../preload/api/pty-management-api'
+import type { PtyManagementFolderAccessMismatch } from '../../../../../preload/api/terminal/pty-management-api'
 
 export const FOLDER_ACCESS_MISMATCH_NOTICE_ID = 'mac-daemon-folder-access-mismatch'
 
diff --git a/src/renderer/src/web/preload-api/web-host-capability-api.ts b/src/renderer/src/web/preload-api/web-host-capability-api.ts
index 791718186e2..f796baf3f58 100644
--- a/src/renderer/src/web/preload-api/web-host-capability-api.ts
+++ b/src/renderer/src/web/preload-api/web-host-capability-api.ts
@@ -1,4 +1,7 @@
-import type { PreflightStatus, RefreshAgentsResult } from '../../../../preload/api/preflight-api'
+import type {
+  PreflightStatus,
+  RefreshAgentsResult
+} from '../../../../preload/api/preflight/preflight-api'
 import type { PreloadApi } from '../../../../preload/api-types'
 import type {
   ComputerUsePermissionSetupResult,
diff --git a/src/renderer/src/web/preload-api/web-native-chat-api.ts b/src/renderer/src/web/preload-api/web-native-chat-api.ts
index a81cb128e88..0485e20671a 100644
--- a/src/renderer/src/web/preload-api/web-native-chat-api.ts
+++ b/src/renderer/src/web/preload-api/web-native-chat-api.ts
@@ -1,7 +1,7 @@
 import type {
   NativeChatApi,
   NativeChatAppendedMessages
-} from '../../../../preload/api/native-chat-api'
+} from '../../../../preload/api/native-chat/native-chat-api'
 import { buildNativeChatUnsubscribe } from '../../../../shared/native-chat/native-chat-stream-unsubscribe'
 import {
   parseRuntimeNativeChatReadSessionResult,
diff --git a/src/renderer/src/web/preload-api/web-plugins-api.ts b/src/renderer/src/web/preload-api/web-plugins-api.ts
index c1f168e3471..5b6af608700 100644
--- a/src/renderer/src/web/preload-api/web-plugins-api.ts
+++ b/src/renderer/src/web/preload-api/web-plugins-api.ts
@@ -1,4 +1,4 @@
-import type { PluginsApi } from '../../../../preload/api/plugin-host-api'
+import type { PluginsApi } from '../../../../preload/api/plugins/plugin-host-api'
 
 /** Desktop-only: plugins run in the desktop app. Explicit because the fallback's `undefined`
  *  crashes callers expecting lists and records. */
diff --git a/src/renderer/src/web/preload-api/web-speech-api.ts b/src/renderer/src/web/preload-api/web-speech-api.ts
index d811f54b10f..075f6f35864 100644
--- a/src/renderer/src/web/preload-api/web-speech-api.ts
+++ b/src/renderer/src/web/preload-api/web-speech-api.ts
@@ -1,4 +1,4 @@
-import type { SpeechApi } from '../../../../preload/api/speech-api'
+import type { SpeechApi } from '../../../../preload/api/speech/speech-api'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { getDefaultVoiceSettings } from '../../../../shared/constants'
 import type {
@@ -10,7 +10,7 @@ import { hostDictationErrorMessage } from '../../../../shared/host-dictation-err
 import {
   MAX_DICTATION_AUDIO_CHUNK_BYTES,
   PCM_BYTES_PER_SAMPLE
-} from '../../../../shared/rpc-contract/speech-params'
+} from '../../../../shared/rpc-contract/speech/speech-params'
 import { encodeBase64Bytes } from '@/lib/base64-bytes'
 import { createNonSecureContextUuid } from '../../../../shared/non-secure-context-uuid'
 import { errorMessage } from '../../../../shared/error-message'
diff --git a/src/shared/__fixtures__/grok-inline-startup-pty-trace.ts b/src/shared/__fixtures__/grok-inline-startup-pty-trace.ts
deleted file mode 100644
index 97846def799..00000000000
--- a/src/shared/__fixtures__/grok-inline-startup-pty-trace.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import type { GrokStartupTraceChunk } from './grok-startup-pty-trace'
-
-/**
- * Recorded PTY output of `grok --no-alt-screen`, grok's inline (non
- * alternate-screen) rendering mode — also reachable via `--minimal` and
- * `[ui] screen_mode = "minimal"` in ~/.grok/config.toml.
- *
- * Recorded from: grok 1.0.0 (3cd0d0cbcebe) [stable] on macOS (darwin 25.3.0),
- * xterm-256color 120x30 via node-pty, cwd = an Orca git worktree, 10s of output
- * from spawn.
- *
- * This mode emits NO alternate-screen switch, so the composer-glyph marker never
- * anchors and the 2004-anchored quiet window is the only delivery path. Elision
- * follows the alt-screen fixture: entries without `data` are marker-free render
- * frames kept only as timestamp + byte count.
- */
-export const GROK_INLINE_STARTUP_PTY_TRACE: GrokStartupTraceChunk[] = [
-  {
-    t: 279,
-    data: '\u001b]0;grok\u0007\u001b[?1000h\u001b[?1002h\u001b[?1003h\u001b[?1015h\u001b[?1006h\u001b[?1004h\u001b[?2004h\u001b[?25l\u001b]12;rgb:c8/c8'
-  },
-  { t: 279, bytes: 8 },
-  { t: 2280, bytes: 11 },
-  { t: 2587, bytes: 5 },
-  { t: 2612, bytes: 825 },
-  { t: 2612, bytes: 925 },
-  { t: 2612, bytes: 928 },
-  { t: 2612, bytes: 958 },
-  { t: 2612, bytes: 810 },
-  { t: 2613, bytes: 1000 },
-  {
-    t: 2613,
-    data: ';80;80;88;48;2;20;20;20m╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮\u001b[39;48;2;20;20;20m  \u001b[26;1H  \u001b[38;2;80;80;88;48;2;20;20;20m│\u001b[38;2;225;225;225;48;2;20;20;20m \u001b[38;2;200;200;200;48;2;20;20;20m❯ \u001b[38;2;225;225;225;48;2;20;20;20m                                                                                                               \u001b[38;2;80;80;88;48;2;20;20;20m│\u001b[39;48;2;20;20;20m  \u001b[27;1H  \u001b[38;2;80;80;88;48;2;20;20;20m╰─────────────────────────────────────────────────────────────────────────────── \u001b[38;2;128;128;128;48;2;20;20;20mGrok 4.'
-  },
-  {
-    t: 2613,
-    data: '5 (high)\u001b[38;2;88;88;88;48;2;20;20;20m · \u001b[38;2;108;108;108;48;2;20;20;20malways-approve\u001b[38;2;80;80;88;48;2;20;20;20m ─╯\u001b[39;48;2;20;20;20m  \u001b[28;1H                                                                                                                        \u001b[29;1H                                                                                                              \u001b[38;2;108;108;108;48;2;20;20;20m[stable]\u001b[39;48;2;20;20;20m  \u001b[30;1H                                                                                                                        \u001b[39m\u001b[49m\u001b[59m\u001b[0m\u001b[26;7H\u001b[?25h\u001b[?2026l'
-  },
-  { t: 2614, bytes: 169 },
-  { t: 2676, bytes: 158 },
-  { t: 2697, bytes: 158 },
-  { t: 2772, bytes: 586 },
-  { t: 2781, bytes: 410 },
-  { t: 2866, bytes: 971 },
-  { t: 2866, bytes: 69 },
-  { t: 2878, bytes: 970 },
-  { t: 2878, bytes: 308 },
-  { t: 2951, bytes: 970 },
-  { t: 2951, bytes: 784 },
-  { t: 3036, bytes: 970 },
-  { t: 3036, bytes: 968 },
-  { t: 3036, bytes: 417 },
-  { t: 3121, bytes: 948 },
-  { t: 3121, bytes: 954 },
-  { t: 3121, bytes: 792 },
-  { t: 3207, bytes: 966 },
-  { t: 3207, bytes: 964 },
-  { t: 3207, bytes: 837 },
-  { t: 3291, bytes: 970 },
-  { t: 3291, bytes: 966 },
-  { t: 3291, bytes: 956 },
-  { t: 3291, bytes: 195 },
-  { t: 3376, bytes: 968 },
-  { t: 3376, bytes: 962 },
-  { t: 3376, bytes: 785 },
-  { t: 3461, bytes: 944 },
-  { t: 3461, bytes: 912 },
-  { t: 3461, bytes: 79 },
-  { t: 3546, bytes: 962 },
-  { t: 3546, bytes: 568 },
-  { t: 3630, bytes: 839 },
-  { t: 3630, bytes: 40 },
-  { t: 3715, bytes: 424 },
-  { t: 3800, bytes: 168 },
-  { t: 3885, bytes: 218 },
-  { t: 4139, bytes: 219 },
-  { t: 4394, bytes: 219 },
-  { t: 4732, bytes: 219 },
-  { t: 5582, bytes: 219 },
-  { t: 5922, bytes: 219 },
-  { t: 6177, bytes: 219 },
-  { t: 6432, bytes: 219 },
-  { t: 6602, bytes: 219 },
-  { t: 6686, bytes: 158 },
-  { t: 6771, bytes: 410 },
-  { t: 6857, bytes: 878 },
-  { t: 6857, bytes: 463 },
-  { t: 6941, bytes: 970 },
-  { t: 6941, bytes: 718 },
-  { t: 7026, bytes: 970 },
-  { t: 7026, bytes: 968 },
-  { t: 7026, bytes: 292 },
-  { t: 7110, bytes: 964 },
-  { t: 7110, bytes: 962 },
-  { t: 7110, bytes: 549 },
-  { t: 7195, bytes: 964 },
-  { t: 7195, bytes: 969 },
-  { t: 7195, bytes: 967 },
-  { t: 7195, bytes: 306 },
-  { t: 7279, bytes: 970 },
-  { t: 7279, bytes: 968 },
-  { t: 7279, bytes: 961 },
-  { t: 7279, bytes: 103 },
-  { t: 7364, bytes: 968 },
-  { t: 7364, bytes: 956 },
-  { t: 7364, bytes: 795 },
-  { t: 7449, bytes: 964 },
-  { t: 7450, bytes: 962 },
-  { t: 7450, bytes: 316 },
-  { t: 7535, bytes: 954 },
-  { t: 7535, bytes: 550 },
-  { t: 7621, bytes: 960 },
-  { t: 7621, bytes: 94 },
-  { t: 7704, bytes: 438 },
-  { t: 7789, bytes: 168 },
-  { t: 7874, bytes: 83 },
-  { t: 8043, bytes: 219 },
-  { t: 8381, bytes: 219 },
-  { t: 8635, bytes: 219 },
-  { t: 8890, bytes: 219 },
-  { t: 9144, bytes: 219 },
-  { t: 9398, bytes: 219 },
-  { t: 9738, bytes: 219 }
-]
diff --git a/src/shared/__fixtures__/grok-startup-pty-trace.ts b/src/shared/__fixtures__/grok-startup-pty-trace.ts
deleted file mode 100644
index c8b23c0d5ad..00000000000
--- a/src/shared/__fixtures__/grok-startup-pty-trace.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Recorded PTY output of a `grok` launch, used to pin when the draft-paste
- * readiness scanner would deliver a launch draft.
- *
- * Recorded from: grok 1.0.0 (3cd0d0cbcebe) [stable] on macOS (darwin 25.3.0),
- * xterm-256color 120x30 via node-pty, cwd = an Orca git worktree, 10s of output
- * from spawn.
- *
- * Entries without `data` are grok logo-shimmer render frames, verified to hold
- * none of DECSET 1049h / 2004h, DECTCEM show-cursor, or the composer glyphs
- * U+276F / U+203A. Only their timestamp and byte count are kept so the fixture
- * stays small; the replay substitutes filler of the recorded length. Timings are
- * what the scanner reacts to, so they are preserved verbatim.
- */
-export type GrokStartupTraceChunk = {
-  /** ms after spawn */
-  t: number
-  data?: string
-  /** Length of an elided, marker-free animation frame. */
-  bytes?: number
-}
-
-export const GROK_STARTUP_PTY_TRACE: GrokStartupTraceChunk[] = [
-  {
-    t: 274,
-    data: '\u001b]0;grok\u0007\u001b[?1049h\u001b[?1000h\u001b[?1002h\u001b[?1003h\u001b[?1015h\u001b[?1006h\u001b[?1004h\u001b[?2004h\u001b[?25l'
-  },
-  { t: 274, bytes: 18 },
-  { t: 582, bytes: 5 },
-  { t: 607, bytes: 825 },
-  { t: 607, bytes: 925 },
-  { t: 607, bytes: 928 },
-  { t: 607, bytes: 958 },
-  { t: 607, bytes: 810 },
-  { t: 607, bytes: 1000 },
-  {
-    t: 607,
-    data: ';80;80;88;48;2;20;20;20m╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮\u001b[39;48;2;20;20;20m  \u001b[26;1H  \u001b[38;2;80;80;88;48;2;20;20;20m│\u001b[38;2;225;225;225;48;2;20;20;20m \u001b[38;2;200;200;200;48;2;20;20;20m❯ \u001b[38;2;225;225;225;48;2;20;20;20m                                                                                                               \u001b[38;2;80;80;88;48;2;20;20;20m│\u001b[39;48;2;20;20;20m  \u001b[27;1H  \u001b[38;2;80;80;88;48;2;20;20;20m╰─────────────────────────────────────────────────────────────────────────────── \u001b[38;2;128;128;128;48;2;20;20;20mGrok 4.'
-  },
-  {
-    t: 607,
-    data: '5 (high)\u001b[38;2;88;88;88;48;2;20;20;20m · \u001b[38;2;108;108;108;48;2;20;20;20malways-approve\u001b[38;2;80;80;88;48;2;20;20;20m ─╯\u001b[39;48;2;20;20;20m  \u001b[28;1H                                                                                                                        \u001b[29;1H                                                                                                              \u001b[38;2;108;108;108;48;2;20;20;20m[stable]\u001b[39;48;2;20;20;20m  \u001b[30;1H                                                                                                                        \u001b[39m\u001b[49m\u001b[59m\u001b[0m\u001b[26;7H\u001b[?25h\u001b[?2026l'
-  },
-  { t: 613, bytes: 169 },
-  { t: 664, bytes: 158 },
-  { t: 691, bytes: 158 },
-  { t: 762, bytes: 410 },
-  { t: 776, bytes: 586 },
-  { t: 861, bytes: 971 },
-  { t: 861, bytes: 69 },
-  { t: 945, bytes: 970 },
-  { t: 945, bytes: 784 },
-  { t: 1031, bytes: 970 },
-  { t: 1031, bytes: 968 },
-  { t: 1031, bytes: 417 },
-  { t: 1109, bytes: 948 },
-  { t: 1110, bytes: 954 },
-  { t: 1110, bytes: 792 },
-  { t: 1115, bytes: 972 },
-  { t: 1115, bytes: 968 },
-  { t: 1115, bytes: 336 },
-  { t: 1200, bytes: 964 },
-  { t: 1200, bytes: 964 },
-  { t: 1200, bytes: 962 },
-  { t: 1200, bytes: 62 },
-  { t: 1286, bytes: 970 },
-  { t: 1286, bytes: 966 },
-  { t: 1286, bytes: 956 },
-  { t: 1286, bytes: 195 },
-  { t: 1370, bytes: 968 },
-  { t: 1370, bytes: 962 },
-  { t: 1370, bytes: 785 },
-  { t: 1455, bytes: 944 },
-  { t: 1455, bytes: 912 },
-  { t: 1455, bytes: 79 },
-  { t: 1540, bytes: 962 },
-  { t: 1540, bytes: 568 },
-  { t: 1625, bytes: 839 },
-  { t: 1625, bytes: 40 },
-  { t: 1710, bytes: 424 },
-  { t: 1795, bytes: 168 },
-  { t: 1879, bytes: 218 },
-  { t: 2134, bytes: 219 },
-  { t: 2389, bytes: 219 },
-  { t: 2728, bytes: 219 },
-  { t: 3579, bytes: 219 },
-  { t: 3918, bytes: 219 },
-  { t: 4172, bytes: 219 },
-  { t: 4425, bytes: 219 },
-  { t: 4594, bytes: 219 },
-  { t: 4680, bytes: 158 },
-  { t: 4764, bytes: 410 },
-  { t: 4850, bytes: 878 },
-  { t: 4850, bytes: 463 },
-  { t: 4934, bytes: 970 },
-  { t: 4934, bytes: 718 },
-  { t: 5019, bytes: 970 },
-  { t: 5019, bytes: 968 },
-  { t: 5019, bytes: 292 },
-  { t: 5103, bytes: 964 },
-  { t: 5103, bytes: 962 },
-  { t: 5103, bytes: 549 },
-  { t: 5188, bytes: 964 },
-  { t: 5188, bytes: 969 },
-  { t: 5188, bytes: 967 },
-  { t: 5188, bytes: 306 },
-  { t: 5272, bytes: 970 },
-  { t: 5272, bytes: 968 },
-  { t: 5272, bytes: 961 },
-  { t: 5272, bytes: 103 },
-  { t: 5358, bytes: 968 },
-  { t: 5358, bytes: 956 },
-  { t: 5358, bytes: 795 },
-  { t: 5442, bytes: 964 },
-  { t: 5442, bytes: 962 },
-  { t: 5442, bytes: 316 },
-  { t: 5527, bytes: 954 },
-  { t: 5527, bytes: 550 },
-  { t: 5612, bytes: 960 },
-  { t: 5612, bytes: 94 },
-  { t: 5696, bytes: 438 },
-  { t: 5781, bytes: 168 },
-  { t: 5866, bytes: 83 },
-  { t: 6120, bytes: 219 },
-  { t: 6375, bytes: 219 },
-  { t: 6631, bytes: 219 },
-  { t: 6884, bytes: 219 },
-  { t: 7139, bytes: 219 },
-  { t: 7393, bytes: 219 },
-  { t: 7732, bytes: 219 },
-  { t: 8580, bytes: 219 },
-  { t: 8664, bytes: 158 },
-  { t: 8750, bytes: 410 },
-  { t: 8835, bytes: 796 },
-  { t: 8919, bytes: 908 },
-  { t: 8919, bytes: 861 },
-  { t: 9004, bytes: 966 },
-  { t: 9004, bytes: 894 },
-  { t: 9090, bytes: 970 },
-  { t: 9090, bytes: 968 },
-  { t: 9090, bytes: 768 },
-  { t: 9175, bytes: 964 },
-  { t: 9175, bytes: 969 },
-  { t: 9175, bytes: 967 },
-  { t: 9175, bytes: 306 },
-  { t: 9260, bytes: 970 },
-  { t: 9260, bytes: 968 },
-  { t: 9260, bytes: 958 },
-  { t: 9260, bytes: 291 },
-  { t: 9344, bytes: 960 },
-  { t: 9344, bytes: 956 },
-  { t: 9344, bytes: 605 },
-  { t: 9430, bytes: 952 },
-  { t: 9430, bytes: 936 },
-  { t: 9430, bytes: 377 },
-  { t: 9515, bytes: 960 },
-  { t: 9515, bytes: 775 },
-  { t: 9600, bytes: 914 },
-  { t: 9600, bytes: 427 },
-  { t: 9684, bytes: 618 },
-  { t: 9770, bytes: 180 },
-  { t: 9855, bytes: 219 }
-]
diff --git a/src/shared/agent-hook-listener/claude-tool-request-identity.ts b/src/shared/agent-hook-listener/claude-tool-request-identity.ts
index 9ac8daea5eb..50a8062db1e 100644
--- a/src/shared/agent-hook-listener/claude-tool-request-identity.ts
+++ b/src/shared/agent-hook-listener/claude-tool-request-identity.ts
@@ -5,7 +5,7 @@ import { deriveToolInputPreview, readString } from './tool-input-preview'
 import { readClaudeBatchSettledRequests } from './claude-settled-permission-requests'
 import { extractPromptText } from './prompt-fields'
 import { hasExplicitUserPrompt } from './provider-event-routing'
-import { CLAUDE_NEW_SESSION_START_SOURCES } from './providers/claude-session-start-sources'
+import { CLAUDE_NEW_SESSION_START_SOURCES } from './providers/claude/lifecycle/claude-session-start-sources'
 
 /** The fields that tie a Claude PermissionRequest to the PreToolUse it is asking about. */
 export type ClaudeToolRequestFields = {
diff --git a/src/shared/agent-hook-listener/grok-result-discovery.ts b/src/shared/agent-hook-listener/grok-result-discovery.ts
index 7d13902a460..ebc1b8c30f7 100644
--- a/src/shared/agent-hook-listener/grok-result-discovery.ts
+++ b/src/shared/agent-hook-listener/grok-result-discovery.ts
@@ -16,7 +16,7 @@ import { parseAgentHookJson } from './request-body'
 import { GROK_HOME_ENVELOPE_MAX_LENGTH, GROK_SESSION_CWD_MAX_LENGTH } from './listener-limits'
 import { readLastAssistantFromTranscriptOnce } from './transcript-reader'
 import { isGrokEvent } from './provider-event-names'
-import { isAntigravityStopStillBusy } from './providers/antigravity-event-rules'
+import { isAntigravityStopStillBusy } from './providers/antigravity/antigravity-event-rules'
 
 export function parseHookBodyPayloadRecord(body: unknown): Record<string, unknown> | null {
   if (typeof body !== 'object' || body === null) {
diff --git a/src/shared/agent-hook-listener/listener-state.ts b/src/shared/agent-hook-listener/listener-state.ts
index 78409182259..b50e64ad0c2 100644
--- a/src/shared/agent-hook-listener/listener-state.ts
+++ b/src/shared/agent-hook-listener/listener-state.ts
@@ -9,12 +9,12 @@ import {
   type AgentStatusLegacyAdmissionMode
 } from '../agent-status/transport/agent-status-legacy-adapter'
 import type { AgentStatusLegacyIngressCaller } from '../agent-status/transport/agent-status-legacy-ingress-manifest'
-import type { ClaudeLaunchedBackgroundTasks } from './providers/claude-owed-task-notifications'
+import type { ClaudeLaunchedBackgroundTasks } from './providers/claude/background-tasks/claude-owed-task-notifications'
 import type { ClaudeSubagentRoster } from '../claude-subagent-roster'
 import type { ClaudeToolRequest } from './claude-tool-request-identity'
 import type { CodexSubagentRoster } from '../codex-subagent-roster'
 import type { CodexSubagentTranscriptState } from '../codex-subagent-transcript'
-import type { CodexAsyncQuestions } from './providers/codex-async-questions'
+import type { CodexAsyncQuestions } from './providers/codex/codex-async-questions'
 import type { MuseSessionLogState } from '../muse-session-log'
 import type { AgentHookEventPayload, ToolSnapshot } from './listener-event'
 import {
@@ -24,7 +24,7 @@ import {
   movePaneScopedSetEntries
 } from './pane-scoped-cache-entries'
 import type { JcodeUserPromptEvidence } from '../jcode-session-files'
-import type { JcodeHelperPermissionWait } from './providers/jcode-helper-permission-wait'
+import type { JcodeHelperPermissionWait } from './providers/jcode/jcode-helper-permission-wait'
 import type { HookRootAttempt } from './presence/hook-process-root-evidence'
 import {
   moveOpenCodeSessionBindings,
diff --git a/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-interrupt.test.ts b/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-interrupt.test.ts
index 4b773277bb8..2b28d839b91 100644
--- a/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-interrupt.test.ts
+++ b/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-interrupt.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from 'vitest'
 import { createHookListenerState, type HookListenerState } from '../listener-state'
 import { normalizeHookPayload } from './normalize-hook-payload'
-import '../providers/codex-state'
+import '../providers/codex/codex-state'
 import { PANE_KEY } from './agent-hook-listener-test-harness'
 
 // Payload shape from codex-rs/hooks/schema/generated/interrupt.command.input.schema.json.
diff --git a/src/shared/claude-background-task-status.test.ts b/src/shared/agent-hook-listener/normalization/claude-background-task-status.test.ts
similarity index 54%
rename from src/shared/claude-background-task-status.test.ts
rename to src/shared/agent-hook-listener/normalization/claude-background-task-status.test.ts
index 4a57728f280..ff91f384a8a 100644
--- a/src/shared/claude-background-task-status.test.ts
+++ b/src/shared/agent-hook-listener/normalization/claude-background-task-status.test.ts
@@ -1,17 +1,12 @@
 import { describe, expect, it } from 'vitest'
 import {
-  clearAllListenerCaches,
-  clearPaneCacheState,
   createHookListenerState,
   movePaneCacheState,
   type HookListenerState
-} from './agent-hook-listener/listener-state'
-import {
-  markClaudeLeadTurnInterrupted,
-  seedClaudeSubagentRosterFromSnapshots
-} from './agent-hook-listener/providers/claude-roster-state'
-import { normalizeHookPayload } from './agent-hook-listener/normalization/normalize-hook-payload'
-import { makePaneKey } from './workspace-layout/stable-pane-id'
+} from '../listener-state'
+import { seedClaudeSubagentRosterFromSnapshots } from '../providers/claude/lifecycle/claude-roster-state'
+import { normalizeHookPayload } from './normalize-hook-payload'
+import { makePaneKey } from '../../workspace-layout/stable-pane-id'
 
 const SOURCE_PANE = makePaneKey('tab-source', '11111111-1111-4111-8111-111111111111')
 const TARGET_PANE = makePaneKey('tab-target', '22222222-2222-4222-8222-222222222222')
@@ -30,46 +25,6 @@ function claudeEvent(state: HookListenerState, paneKey: string, payload: Record<
 describe('Claude background task status', () => {
   // SDK local_* names share inventory classification; teammate tasks stay running permanently, so lifecycle events own their pane state (#8825).
 
-  it('drains the Claude 2.1.229 background-task completion sequence', () => {
-    const state = createHookListenerState()
-
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'UserPromptSubmit',
-        prompt: 'run a background sleep'
-      })
-    ).toMatchObject({ state: 'working', workingMode: undefined })
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'Stop',
-        background_tasks: [RUNNING_SHELL]
-      })
-    ).toMatchObject({ state: 'working', workingMode: 'monitoring' })
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'SubagentStop',
-        agent_id: 'a70fdf2986e38302b',
-        background_tasks: [RUNNING_SHELL]
-      })
-    ).toMatchObject({ state: 'working', workingMode: 'monitoring' })
-
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'UserPromptSubmit',
-        prompt:
-          '<task-notification><task-id>b8rs2wmxg</task-id><status>completed</status></task-notification>'
-      })
-    ).toMatchObject({ state: 'working', workingMode: undefined })
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'Stop',
-        background_tasks: [],
-        session_crons: []
-      })?.state
-    ).toBe('done')
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(false)
-  })
-
   // Completion notifications need turnCompletedAt while the pane remains working for monitoring; pin both predicates (STA-4119).
 
   it('holds the finish of a lead that ends into a working subagent, unless the lead failed', () => {
@@ -213,52 +168,6 @@ describe('Claude background task status', () => {
     ).toMatchObject({ state: 'done', interrupted: true, mainAgent: { outcome: 'cancellation' } })
   })
 
-  it('drains a reported cron inventory mid-turn, not only at a turn boundary', () => {
-    const state = createHookListenerState()
-
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      session_crons: [{ id: 'cron-1' }]
-    })
-    expect(state.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(true)
-
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'PostToolUse',
-        session_crons: []
-      })?.state
-    ).toBe('working')
-    expect(state.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(false)
-
-    // A mid-turn drain must survive the boundary or a missing next inventory leaves stale cron work pinned.
-    expect(claudeEvent(state, SOURCE_PANE, { hook_event_name: 'Stop' })?.state).toBe('done')
-  })
-
-  it('only infers an omitted cron inventory is drained from modern lead Stop payloads', () => {
-    const createCronState = (): HookListenerState => {
-      const state = createHookListenerState()
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'Stop',
-        session_crons: [{ id: 'cron-1' }]
-      })
-      return state
-    }
-
-    const midTurnState = createCronState()
-    claudeEvent(midTurnState, SOURCE_PANE, {
-      hook_event_name: 'UserPromptSubmit',
-      prompt: 'continue',
-      background_tasks: []
-    })
-    expect(midTurnState.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(true)
-
-    const legacyStopState = createCronState()
-    expect(claudeEvent(legacyStopState, SOURCE_PANE, { hook_event_name: 'Stop' })?.state).toBe(
-      'working'
-    )
-    expect(legacyStopState.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(true)
-  })
-
   it('drops interrupted state on a mid-turn lead event with no prompt submit', () => {
     const state = createHookListenerState()
     claudeEvent(state, SOURCE_PANE, { hook_event_name: 'Stop', is_interrupt: true })
@@ -275,40 +184,6 @@ describe('Claude background task status', () => {
     ).toMatchObject({ state: 'working', interrupted: undefined })
   })
 
-  it('ignores child-attributed inventories for lead-owned background work', () => {
-    const state = createHookListenerState()
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      agent_id: 'child-1',
-      background_tasks: [RUNNING_SHELL],
-      session_crons: [{ id: 'cron-1' }]
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(false)
-    expect(state.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(false)
-
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [RUNNING_SHELL],
-      session_crons: [{ id: 'cron-1' }]
-    })
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      agent_id: 'child-1',
-      background_tasks: [],
-      session_crons: []
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(true)
-    expect(state.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(true)
-
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [],
-      session_crons: []
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(false)
-    expect(state.claudeActiveSessionCronPaneKeys.has(SOURCE_PANE)).toBe(false)
-  })
-
   it('retains live child rows when an agent inventory is partial or has a future status', () => {
     for (const backgroundTask of [
       { id: 'child-1', type: 'subagent', status: 'in_progress' },
@@ -348,31 +223,6 @@ describe('Claude background task status', () => {
     ).toBeUndefined()
   })
 
-  it('ignores TeammateIdle inventories for lead-owned background work', () => {
-    const state = createHookListenerState()
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [RUNNING_SHELL]
-    })
-
-    expect(
-      claudeEvent(state, SOURCE_PANE, {
-        hook_event_name: 'TeammateIdle',
-        teammate_name: 'reviewer',
-        background_tasks: []
-      })?.state
-    ).toBe('working')
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(true)
-
-    claudeEvent(state, SOURCE_PANE, { hook_event_name: 'Stop', background_tasks: [] })
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'TeammateIdle',
-      teammate_name: 'reviewer',
-      background_tasks: [RUNNING_SHELL]
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(false)
-  })
-
   it('shows a child permission wait after the lead turn is interrupted', () => {
     const state = createHookListenerState()
     claudeEvent(state, SOURCE_PANE, {
@@ -390,56 +240,4 @@ describe('Claude background task status', () => {
       })
     ).toMatchObject({ state: 'waiting', toolName: 'Bash' })
   })
-
-  it('preserves authoritative work across partial inventories and clears it on teardown', () => {
-    const state = createHookListenerState()
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [RUNNING_SHELL]
-    })
-
-    expect(claudeEvent(state, SOURCE_PANE, { hook_event_name: 'Stop' })).toMatchObject({
-      state: 'working',
-      workingMode: 'monitoring'
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(true)
-    clearPaneCacheState(state, SOURCE_PANE)
-    expect(state.claudeRunningNonAgentTaskPaneKeys.size).toBe(0)
-
-    claudeEvent(state, TARGET_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [RUNNING_SHELL]
-    })
-    clearAllListenerCaches(state)
-    expect(state.claudeRunningNonAgentTaskPaneKeys.size).toBe(0)
-  })
-
-  it('keeps a live shell as a confirmed done-gate for child lifecycle events after a cancel', () => {
-    const state = createHookListenerState()
-    // A truncated inventory adds a shell without retiring the restored child seed.
-    seedClaudeSubagentRosterFromSnapshots(state, SOURCE_PANE, [
-      { id: 'restored-1', state: 'working', startedAt: 1 }
-    ])
-    claudeEvent(state, SOURCE_PANE, { hook_event_name: 'UserPromptSubmit', prompt: 'resume' })
-    claudeEvent(state, SOURCE_PANE, {
-      hook_event_name: 'Stop',
-      background_tasks: [{ id: 'shell-x', status: 'running' }]
-    })
-    expect(state.claudeRunningNonAgentTaskPaneKeys.has(SOURCE_PANE)).toBe(true)
-    markClaudeLeadTurnInterrupted(state, SOURCE_PANE)
-
-    // A live shell confirms inventory regardless of lead verdict; a sibling’s end cannot make it restored-only.
-    const ended = normalizeHookPayload(
-      state,
-      'claude',
-      { paneKey: SOURCE_PANE, payload: { hook_event_name: 'SubagentStop', agent_id: 'other' } },
-      'production'
-    )
-    expect(ended?.restoredUnconfirmed).toBeUndefined()
-    expect(state.claudeUnconfirmedRestoredStatusPaneKeys.has(SOURCE_PANE)).toBe(false)
-    expect(ended?.payload).toMatchObject({
-      state: 'working',
-      mainAgent: { state: 'done', outcome: 'cancellation' }
-    })
-  })
 })
diff --git a/src/shared/agent-hook-listener/normalization/normalize-hook-payload.ts b/src/shared/agent-hook-listener/normalization/normalize-hook-payload.ts
index bd64f855b9a..ce89bf3ebab 100644
--- a/src/shared/agent-hook-listener/normalization/normalize-hook-payload.ts
+++ b/src/shared/agent-hook-listener/normalization/normalize-hook-payload.ts
@@ -8,7 +8,7 @@ import {
   canAcceptClaudeCompactCompletion,
   isClaudeCompactCompletionConsumed,
   markClaudeCompactCompletionConsumed
-} from '../providers/claude-compact-completion'
+} from '../providers/claude/lifecycle/claude-compact-completion'
 import { isProcessExitSessionEnd, parseHookEnvelope } from '../hook-envelope'
 import { readFirstString } from '../interactive-tool'
 import type { AgentHookEventPayload } from '../listener-event'
@@ -17,19 +17,19 @@ import type { HookListenerState } from '../listener-state'
 import { extractPromptText } from '../prompt-fields'
 import { normalizeProviderEvent } from '../provider-dispatch'
 import { hasExplicitUserPrompt } from '../provider-event-routing'
-import { hasExplicitAmpPrompt } from '../providers/amp-events'
+import { hasExplicitAmpPrompt } from '../providers/amp/amp-events'
 import {
   isOpenCodeSharedServerPost,
   resolveOpenCodeSharedServerEnvelope,
   suppressOpenCodeSharedServerPost,
   trackOpenCodePaneLaunchToken
 } from '../opencode-session-registry'
-import { claudeRowHasUnlistedLiveWork } from '../providers/claude-pane-hold-evidence'
+import { claudeRowHasUnlistedLiveWork } from '../providers/claude/lifecycle/claude-pane-hold-evidence'
 import { readString } from '../tool-input-preview'
 import { readClaudeBatchSettledRequests } from '../claude-settled-permission-requests'
 import { withClaudeToolRequestId } from '../claude-tool-request-identity'
 import { hasSeparateHookSessionAdmission, readPaneSessionContext } from '../pane-provider-session'
-import { routeJcodeHelperHook } from '../providers/jcode-helper-permission-wait'
+import { routeJcodeHelperHook } from '../providers/jcode/jcode-helper-permission-wait'
 /** Canonical transport-agnostic normalization entry shared by main and relay listeners. */
 
 export function normalizeHookPayload(
diff --git a/src/shared/agent-hook-listener/pane-provider-session.ts b/src/shared/agent-hook-listener/pane-provider-session.ts
index 9a66336b95d..c419c8d9b4d 100644
--- a/src/shared/agent-hook-listener/pane-provider-session.ts
+++ b/src/shared/agent-hook-listener/pane-provider-session.ts
@@ -9,8 +9,8 @@ import {
 import { readFirstString } from './interactive-tool'
 import type { HookListenerState } from './listener-state'
 import type { AgentHookEventPayload } from './listener-event'
-import { isGrokSubagentEvent } from './providers/grok-tool-fields'
-import { isHermesRootSessionEvent, withHermesPaneSessionId } from './providers/hermes-events'
+import { isGrokSubagentEvent } from './providers/grok/grok-tool-fields'
+import { isHermesRootSessionEvent, withHermesPaneSessionId } from './providers/hermes/hermes-events'
 import { readString } from './tool-input-preview'
 import { readFirstTranscriptRecord } from './transcript-reader'
 
diff --git a/src/shared/agent-hook-listener/provider-dispatch.ts b/src/shared/agent-hook-listener/provider-dispatch.ts
index 55af4fa0250..acc4e6efbfe 100644
--- a/src/shared/agent-hook-listener/provider-dispatch.ts
+++ b/src/shared/agent-hook-listener/provider-dispatch.ts
@@ -1,5 +1,5 @@
 import { normalizeCompatibleLifecycleEvent } from './providers/compatible-lifecycle-events'
-import { normalizeQoderEvent } from './providers/qoder-events'
+
 import type { AgentMainAgentStatus } from '../agent-status/lifecycle/main-agent-status'
 import type { ParsedAgentStatusPayload } from '../agent-status/contracts/agent-status-types'
 import type { AgentHookSource } from './transport/agent-hook-relay'
@@ -12,28 +12,29 @@ import type { HookListenerState } from './listener-state'
 import type { ExtractedPromptText } from './prompt-fields'
 import { isNewTurnEvent } from './provider-event-routing'
 import { readLastUserPromptFromTranscript } from './transcript-lines'
-import { readJcodeTurnPrompt } from './providers/jcode-turn-prompt'
-import { normalizeAntigravityEvent } from './providers/antigravity-events'
-import { normalizeAmpEvent } from './providers/amp-events'
-import { normalizeClaudeEvent } from './providers/claude-events'
-import { codexHookEventForEndedTurn, normalizeCodexEvent } from './providers/codex-events'
-import { codexHookEventForEphemeralThread } from './providers/codex-ephemeral-threads'
-import { normalizeGeminiEvent } from './providers/gemini-events'
-import { normalizeOpenCodeFamilyEvent } from './providers/opencode-family-events'
-import { normalizeCursorEvent } from './providers/cursor-events'
-import { normalizePiCompatibleEvent } from './providers/pi-family-events'
-import { normalizeDroidEvent } from './providers/droid-events'
-import { normalizeCommandCodeEvent } from './providers/command-code-events'
-import { normalizeGrokEvent } from './providers/grok-events'
-import { normalizeCopilotEvent } from './providers/copilot-events'
-import { normalizeHermesEvent } from './providers/hermes-events'
-import { normalizeDevinEvent } from './providers/devin-events'
-import { normalizeKimiEvent } from './providers/kimi-events'
-import { normalizeMuseEvent } from './providers/muse-events'
-import { normalizeDshEvent } from './providers/dsh-events'
-import { normalizeZCodeEvent } from './providers/zcode-events'
-import { normalizeJcodeEvent } from './providers/jcode-events'
-import { normalizeKiroEvent } from './providers/kiro-events'
+import { readJcodeTurnPrompt } from './providers/jcode/jcode-turn-prompt'
+import { normalizeAntigravityEvent } from './providers/antigravity/antigravity-events'
+import { normalizeAmpEvent } from './providers/amp/amp-events'
+import { normalizeClaudeEvent } from './providers/claude/claude-events'
+import { normalizeCodexEvent } from './providers/codex/codex-events'
+import { codexHookEventForEndedTurn } from './providers/codex/codex-ended-turn-event'
+import { codexHookEventForEphemeralThread } from './providers/codex/codex-ephemeral-threads'
+import { normalizeGeminiEvent } from './providers/gemini/gemini-events'
+import { normalizeOpenCodeFamilyEvent } from './providers/opencode-family/opencode-family-events'
+import { normalizeCursorEvent } from './providers/cursor/cursor-events'
+import { normalizePiCompatibleEvent } from './providers/pi-family/pi-family-events'
+import { normalizeDroidEvent } from './providers/droid/droid-events'
+import { normalizeCommandCodeEvent } from './providers/command-code/command-code-events'
+import { normalizeGrokEvent } from './providers/grok/grok-events'
+import { normalizeCopilotEvent } from './providers/copilot/copilot-events'
+import { normalizeHermesEvent } from './providers/hermes/hermes-events'
+import { normalizeDevinEvent } from './providers/devin/devin-events'
+import { normalizeKimiEvent } from './providers/kimi/kimi-events'
+import { normalizeMuseEvent } from './providers/muse/muse-events'
+import { normalizeDshEvent } from './providers/dsh/dsh-events'
+import { normalizeZCodeEvent } from './providers/zcode/zcode-events'
+import { normalizeJcodeEvent } from './providers/jcode/jcode-events'
+import { normalizeKiroEvent } from './providers/kiro/kiro-events'
 
 export type ProviderDispatchResult = {
   payload: ParsedAgentStatusPayload | null
@@ -209,7 +210,14 @@ export function normalizeProviderEvent(input: {
       break
     }
     case 'qoder':
-      payload = normalizeQoderEvent(state, eventName, promptText, paneKey, hookPayload)
+      payload = normalizeCompatibleLifecycleEvent(
+        'qoder',
+        state,
+        eventName,
+        promptText,
+        paneKey,
+        hookPayload
+      )
       break
     case 'kimi':
       payload = normalizeKimiEvent(state, eventName, promptText, paneKey, hookPayload)
diff --git a/src/shared/agent-hook-listener/provider-event-routing.ts b/src/shared/agent-hook-listener/provider-event-routing.ts
index 082e8662058..95c608dd75f 100644
--- a/src/shared/agent-hook-listener/provider-event-routing.ts
+++ b/src/shared/agent-hook-listener/provider-event-routing.ts
@@ -2,25 +2,25 @@ import type { AgentHookSource } from './transport/agent-hook-relay'
 import { isKnownHarnessInjectedUserTurnText } from '../harness-injected-user-turns'
 import type { ToolSnapshot } from './listener-event'
 import type { ExtractedPromptText } from './prompt-fields'
-import { extractClaudeToolFields } from './providers/claude-tool-fields'
-import { extractCodexToolFields } from './providers/codex-tool-fields'
-import { extractGeminiToolFields } from './providers/gemini-tool-fields'
-import { extractAntigravityToolFields } from './providers/antigravity-tool-fields'
-import { extractAmpToolFields } from './providers/amp-tool-fields'
-import { extractOpenCodeToolFields } from './providers/opencode-family-tool-fields'
-import { extractCursorToolFields } from './providers/cursor-tool-fields'
+import { extractClaudeToolFields } from './providers/claude/claude-tool-fields'
+import { extractCodexToolFields } from './providers/codex/codex-tool-fields'
+import { extractGeminiToolFields } from './providers/gemini/gemini-tool-fields'
+import { extractAntigravityToolFields } from './providers/antigravity/antigravity-tool-fields'
+import { extractAmpToolFields } from './providers/amp/amp-tool-fields'
+import { extractOpenCodeToolFields } from './providers/opencode-family/opencode-family-tool-fields'
+import { extractCursorToolFields } from './providers/cursor/cursor-tool-fields'
 import {
   extractCopilotToolFields,
   normalizeCopilotEventName
-} from './providers/copilot-tool-fields'
-import { extractPiToolFields } from './providers/pi-family-tool-fields'
-import { extractDroidToolFields } from './providers/droid-tool-fields'
-import { extractCommandCodeToolFields } from './providers/command-code-tool-fields'
+} from './providers/copilot/copilot-tool-fields'
+import { extractPiToolFields } from './providers/pi-family/pi-family-tool-fields'
+import { extractDroidToolFields } from './providers/droid/droid-tool-fields'
+import { extractCommandCodeToolFields } from './providers/command-code/command-code-tool-fields'
 import { isGrokEvent } from './provider-event-names'
-import { extractGrokToolFields } from './providers/grok-tool-fields'
-import { extractHermesToolFields } from './providers/hermes-tool-fields'
-import { extractJcodeToolFields } from './providers/jcode-tool-fields'
-import { extractKiroToolFields } from './providers/kiro-tool-fields'
+import { extractGrokToolFields } from './providers/grok/grok-tool-fields'
+import { extractHermesToolFields } from './providers/hermes/hermes-tool-fields'
+import { extractJcodeToolFields } from './providers/jcode/jcode-tool-fields'
+import { extractKiroToolFields } from './providers/kiro/kiro-tool-fields'
 
 /** Share provider boundaries with observation stamping; avoid a second event-name list. */
 export function isNewTurnEvent(source: AgentHookSource, eventName: unknown): boolean {
diff --git a/src/shared/agent-hook-listener/providers/amp-events.ts b/src/shared/agent-hook-listener/providers/amp/amp-events.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/amp-events.ts
rename to src/shared/agent-hook-listener/providers/amp/amp-events.ts
index ac45758dc4e..71e670a46f0 100644
--- a/src/shared/agent-hook-listener/providers/amp-events.ts
+++ b/src/shared/agent-hook-listener/providers/amp/amp-events.ts
@@ -1,13 +1,13 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { readFirstString } from '../interactive-tool'
-import { readBoundedString } from '../grok-result-discovery'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { AMP_MAX_SCOPED_THREAD_CACHE_KEYS, AMP_THREAD_ID_MAX_LENGTH } from '../listener-limits'
+} from '../../../agent-status/contracts/agent-status-types'
+import { readFirstString } from '../../interactive-tool'
+import { readBoundedString } from '../../grok-result-discovery'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { AMP_MAX_SCOPED_THREAD_CACHE_KEYS, AMP_THREAD_ID_MAX_LENGTH } from '../../listener-limits'
 
 export function normalizeAmpEvent(
   state: HookListenerState,
diff --git a/src/shared/agent-hook-listener/providers/amp-tool-fields.ts b/src/shared/agent-hook-listener/providers/amp/amp-tool-fields.ts
similarity index 90%
rename from src/shared/agent-hook-listener/providers/amp-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/amp/amp-tool-fields.ts
index 2bd8d3a8781..7a12ffc8c9a 100644
--- a/src/shared/agent-hook-listener/providers/amp-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/amp/amp-tool-fields.ts
@@ -1,12 +1,12 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { extractToolResponseText, readFirstString } from '../interactive-tool'
+} from '../../tool-input-preview'
+import { extractToolResponseText, readFirstString } from '../../interactive-tool'
 
 export function extractAmpToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/antigravity-background-command.test.ts b/src/shared/agent-hook-listener/providers/antigravity/antigravity-background-command.test.ts
similarity index 87%
rename from src/shared/agent-hook-listener/providers/antigravity-background-command.test.ts
rename to src/shared/agent-hook-listener/providers/antigravity/antigravity-background-command.test.ts
index 3494b8ea693..2c20d8a30c4 100644
--- a/src/shared/agent-hook-listener/providers/antigravity-background-command.test.ts
+++ b/src/shared/agent-hook-listener/providers/antigravity/antigravity-background-command.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
-import { createHookListenerState } from '../listener-state'
-import { normalizeHookPayload } from '../normalization/normalize-hook-payload'
-import { PANE_KEY } from '../normalization/agent-hook-listener-test-harness'
+import { createHookListenerState } from '../../listener-state'
+import { normalizeHookPayload } from '../../normalization/normalize-hook-payload'
+import { PANE_KEY } from '../../normalization/agent-hook-listener-test-harness'
 
 // Hook order captured from agy 1.5.2 when the model backgrounds run_command (WaitMsBeforeAsync 500).
 const turn = { conversationId: 'parent', lastUserInput: 'start the job' }
diff --git a/src/shared/agent-hook-listener/providers/antigravity-event-rules.ts b/src/shared/agent-hook-listener/providers/antigravity/antigravity-event-rules.ts
similarity index 100%
rename from src/shared/agent-hook-listener/providers/antigravity-event-rules.ts
rename to src/shared/agent-hook-listener/providers/antigravity/antigravity-event-rules.ts
diff --git a/src/shared/agent-hook-listener/providers/antigravity-events.ts b/src/shared/agent-hook-listener/providers/antigravity/antigravity-events.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/antigravity-events.ts
rename to src/shared/agent-hook-listener/providers/antigravity/antigravity-events.ts
index 490f5554677..0042ba19054 100644
--- a/src/shared/agent-hook-listener/providers/antigravity-events.ts
+++ b/src/shared/agent-hook-listener/providers/antigravity/antigravity-events.ts
@@ -1,12 +1,12 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { readFirstString } from '../interactive-tool'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readLastUserPromptFromTranscript } from '../transcript-lines'
+} from '../../../agent-status/contracts/agent-status-types'
+import { readFirstString } from '../../interactive-tool'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readLastUserPromptFromTranscript } from '../../transcript-lines'
 import { readAntigravityToolCall } from './antigravity-tool-fields'
 import { isAntigravityStopStillBusy } from './antigravity-event-rules'
 
diff --git a/src/shared/agent-hook-listener/providers/antigravity-tool-fields.ts b/src/shared/agent-hook-listener/providers/antigravity/antigravity-tool-fields.ts
similarity index 87%
rename from src/shared/agent-hook-listener/providers/antigravity-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/antigravity/antigravity-tool-fields.ts
index ba57349f14b..fe84d450e49 100644
--- a/src/shared/agent-hook-listener/providers/antigravity-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/antigravity/antigravity-tool-fields.ts
@@ -1,12 +1,12 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { readFirstString } from '../interactive-tool'
-import { readLastAssistantFromTranscript } from '../transcript-lines'
+} from '../../tool-input-preview'
+import { readFirstString } from '../../interactive-tool'
+import { readLastAssistantFromTranscript } from '../../transcript-lines'
 import { isAntigravityStopStillBusy } from './antigravity-event-rules'
 
 export function readAntigravityToolCall(hookPayload: Record<string, unknown>): {
diff --git a/src/shared/agent-hook-listener/providers/claude-helper-kill.test-fixture.ts b/src/shared/agent-hook-listener/providers/claude-helper-kill.test-fixture.ts
deleted file mode 100644
index f5b7993c56b..00000000000
--- a/src/shared/agent-hook-listener/providers/claude-helper-kill.test-fixture.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { mkdtemp, writeFile, mkdir, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, vi } from 'vitest'
-import { createHookListenerState } from '../listener-state'
-import { seedLegacyAgentStatusForTests } from '../legacy-agent-status-test-seed'
-import { normalizeHookPayload } from '../normalization/normalize-hook-payload'
-import { ClaudeHelperKillPoller } from './claude-helper-kill-poller'
-import { readClaudeTranscriptChunk } from './claude-transcript-cursor'
-import type { AgentHookEventPayload } from '../listener-event'
-
-export let dir: string
-export const now = Date.parse('2026-10-29T12:00:00Z')
-export const stamp = (offset: number) => new Date(now + offset).toISOString()
-export const kill = (offset = 1) =>
-  `${JSON.stringify({ type: 'system', subtype: 'agents_killed', timestamp: stamp(offset) })}\n`
-export const prompt = (offset: number) =>
-  `${JSON.stringify({
-    type: 'user',
-    timestamp: stamp(offset),
-    message: { role: 'user', content: 'Do the work' }
-  })}\n`
-
-beforeEach(async () => {
-  vi.spyOn(Date, 'now').mockReturnValue(now)
-  dir = await mkdtemp(join(tmpdir(), 'claude-helper-kill-'))
-})
-afterEach(async () => {
-  vi.restoreAllMocks()
-  await rm(dir, { recursive: true, force: true })
-})
-
-export async function pane(shell = false, reader = readClaudeTranscriptChunk, cron = false) {
-  const state = createHookListenerState()
-  const path = join(dir, 'session.jsonl')
-  await writeFile(path, prompt(-20))
-  await mkdir(join(dir, 'session', 'subagents'), { recursive: true })
-  const child = (id: string) => join(dir, 'session', 'subagents', `agent-${id}.jsonl`)
-  await writeFile(child('a123'), prompt(-10))
-  let current: AgentHookEventPayload | undefined
-  const events: AgentHookEventPayload[] = []
-  function post(payload: Record<string, unknown>) {
-    const event = normalizeHookPayload(
-      state,
-      'claude',
-      {
-        paneKey: 'test-tab:11111111-1111-4111-8111-111111111111',
-        env: 'production',
-        payload: { session_id: 'session', transcript_path: path, ...payload }
-      },
-      'production'
-    )
-    if (!event) {
-      throw new Error('hook declined')
-    }
-    current = event
-    seedLegacyAgentStatusForTests(state, event)
-    return event
-  }
-  post({ hook_event_name: 'UserPromptSubmit', prompt: 'work' })
-  post({ hook_event_name: 'SubagentStart', agent_id: 'a123' })
-  post({
-    hook_event_name: 'Stop',
-    last_assistant_message: 'READY',
-    background_tasks: [
-      { id: 'a123', type: 'subagent', status: 'running' },
-      ...(shell ? [{ id: 'shell', type: 'local_bash', status: 'running' }] : [])
-    ],
-    session_crons: cron ? [{ id: 'cron' }] : []
-  })
-  const publish = vi.fn((event: AgentHookEventPayload) => {
-    current = event
-    events.push(event)
-    seedLegacyAgentStatusForTests(state, event)
-  })
-  let listening = true
-  const poller = new ClaudeHelperKillPoller(
-    state,
-    { current: () => current, publish, listening: () => listening },
-    reader
-  )
-  poller.schedule(current!)
-  return {
-    state,
-    listen: (value: boolean) => {
-      listening = value
-      if (value) {
-        poller.activate()
-      }
-    },
-    path,
-    child,
-    post,
-    poller,
-    publish,
-    events,
-    row: () => current!,
-    replace: (row: AgentHookEventPayload) => {
-      current = row
-      poller.schedule(row)
-    }
-  }
-}
-
-export async function drain(p: Awaited<ReturnType<typeof pane>>) {
-  for (let i = 0; i < 8; i++) {
-    await p.poller.poll('test-tab:11111111-1111-4111-8111-111111111111')
-  }
-}
diff --git a/src/shared/agent-hook-listener/providers/claude-helper-kill.test.ts b/src/shared/agent-hook-listener/providers/claude-helper-kill.test.ts
deleted file mode 100644
index 77134f72180..00000000000
--- a/src/shared/agent-hook-listener/providers/claude-helper-kill.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { writeFile, appendFile, rename } from 'node:fs/promises'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { dir, kill, pane, drain, prompt, stamp } from './claude-helper-kill.test-fixture'
-
-describe('Claude helper provider evidence', () => {
-  it.each([false, true])(
-    'ignores mixed server-result echoes after a kill; real prompt: %s',
-    async (realPrompt) => {
-      const p = await pane()
-      try {
-        await writeFile(p.child('a123'), prompt(1))
-        await appendFile(p.path, kill(2))
-        await appendFile(
-          p.child('a123'),
-          `${JSON.stringify({
-            type: 'user',
-            timestamp: stamp(3),
-            message: {
-              role: 'user',
-              content: [
-                { type: 'text', text: 'server context' },
-                {
-                  type: 'advisor_tool_result',
-                  tool_use_id: 'server',
-                  content: { type: 'advisor_redacted_result' }
-                }
-              ]
-            }
-          })}\n`
-        )
-        if (realPrompt) {
-          await appendFile(p.child('a123'), prompt(4))
-        }
-        await drain(p)
-        if (realPrompt) {
-          expect(p.row().payload.subagents?.[0]?.state).toBe('working')
-        } else {
-          expect(p.row().payload.subagents ?? []).toEqual([])
-        }
-      } finally {
-        p.poller.clearAll()
-      }
-    }
-  )
-
-  it('forgets kills on parent file replacement', async () => {
-    const p = await pane()
-    try {
-      await appendFile(p.path, kill())
-      await drain(p)
-      expect(p.row().payload.subagents ?? []).toEqual([])
-      await writeFile(join(dir, 'replacement.jsonl'), kill())
-      await rename(join(dir, 'replacement.jsonl'), p.path)
-      p.replace(p.post({ hook_event_name: 'SubagentStart', agent_id: 'a123' }))
-      await drain(p)
-      expect(p.row().payload.subagents?.[0]?.state).toBe('working')
-    } finally {
-      p.poller.clearAll()
-    }
-  })
-
-  it('does not apply an in-flight read after pane retirement or to its successor', async () => {
-    const p = await pane()
-    try {
-      await appendFile(p.path, kill())
-      const reading = p.poller.poll('test-tab:11111111-1111-4111-8111-111111111111')
-      p.poller.clear('test-tab:11111111-1111-4111-8111-111111111111')
-      p.replace({
-        ...p.row(),
-        providerSession: { key: 'session_id', id: 'replacement', transcriptPath: p.path }
-      })
-      await reading
-      expect(p.publish).not.toHaveBeenCalled()
-    } finally {
-      p.poller.clearAll()
-    }
-  })
-})
diff --git a/src/shared/agent-hook-listener/providers/claude-transcript-semantics.test.ts b/src/shared/agent-hook-listener/providers/claude-transcript-semantics.test.ts
deleted file mode 100644
index a32cae6d045..00000000000
--- a/src/shared/agent-hook-listener/providers/claude-transcript-semantics.test.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { mkdtemp, writeFile, appendFile, readFile, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createClaudeTranscriptCursor, readClaudeTranscriptChunk } from './claude-transcript-cursor'
-import {
-  readClaudeHelperEvidence,
-  readClaudeChildPrompts,
-  type ClaudeChildTranscript,
-  type ClaudeHelperTranscriptEvidence
-} from './claude-helper-transcript-evidence'
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
-let dir: string
-const now = Date.parse('2026-10-29T12:00:00Z')
-const stamp = (offset: number) => new Date(now + offset).toISOString()
-const kill = (offset = 1) =>
-  `${JSON.stringify({ type: 'system', subtype: 'agents_killed', timestamp: stamp(offset) })}\n`
-const prompt = (offset: number) =>
-  `${JSON.stringify({ type: 'user', timestamp: stamp(offset), message: { content: 'Do the work' } })}\n`
-beforeEach(async () => {
-  dir = await mkdtemp(join(tmpdir(), 'claude-transcript-semantics-'))
-})
-afterEach(async () => {
-  vi.restoreAllMocks()
-  await rm(dir, { recursive: true, force: true })
-})
-
-describe('forward transcript reading', () => {
-  it('treats missing files as unverifiable and replacement/shrink as a new baseline', async () => {
-    const path = join(dir, 'replace.jsonl')
-    const cursor = createClaudeTranscriptCursor(path)
-    expect(await readClaudeTranscriptChunk(cursor)).toBeUndefined()
-    await writeFile(path, `${prompt(0)}${' '.repeat(200)}`)
-    await readClaudeTranscriptChunk(cursor)
-    await writeFile(path, kill())
-    expect((await readClaudeTranscriptChunk(cursor))?.records).toEqual([])
-    await appendFile(path, kill(20))
-    expect((await readClaudeTranscriptChunk(cursor))?.records).toHaveLength(1)
-  })
-})
-
-it('consumes every settled launch correlation at N and 10N without inventing failed resumes', () => {
-  for (const count of [10, 100]) {
-    const evidence = {
-      observedAt: now,
-      resumedAt: new Map<string, number>(),
-      launches: new Map<string, number>()
-    }
-    for (let index = 0; index < count; index++) {
-      for (const outcome of ['sync', 'failed', 'async', 'missing-time']) {
-        const id = `${outcome}-${index}`
-        readClaudeHelperEvidence(evidence, [
-          {
-            type: 'assistant',
-            timestamp: stamp(index),
-            message: { content: [{ type: 'tool_use', name: 'Agent', id }] }
-          },
-          {
-            type: 'user',
-            ...(outcome === 'missing-time' ? {} : { timestamp: stamp(index + 1) }),
-            toolUseResult: { isAsync: outcome === 'async' || outcome === 'failed', agentId: id },
-            message: {
-              content: [{ type: 'tool_result', tool_use_id: id, is_error: outcome === 'failed' }]
-            }
-          }
-        ])
-      }
-    }
-    expect(evidence.launches.size).toBe(0)
-    expect([...evidence.resumedAt.keys()]).toEqual(
-      Array.from({ length: count }, (_, i) => `async-${i}`)
-    )
-  }
-})
-
-it('matches complete JSON evidence on captured and adversarial final values without provisional facts', async () => {
-  const captured = await Promise.all(
-    ['parent', 'child'].map(async (stream) =>
-      (
-        await readFile(
-          new URL(`../../__fixtures__/claude-helper-kill-2.1.310-${stream}.jsonl`, import.meta.url),
-          'utf8'
-        )
-      )
-        .trim()
-        .split('\n')
-    )
-  )
-  const base = `"type":"user","timestamp":${JSON.stringify(stamp(20))}`
-  const huge = ' '.repeat(300_000)
-  const raw = [
-    ...captured.flat(),
-    `{${base},"message":{"content":"${huge}real é😀"}}`,
-    `{${base},"message":{"content":[{"text":"x","type":"text"},{"type":"tool_result"}]}}`,
-    `{${base},"message":{"content":[{"type":"text","text":"<unknown-tag>real"}]},"isMeta":true}`,
-    `{${base},"message":{"content":"real"},"isCompactSummary":true,"isCompactSummary":false}`,
-    `{${base},"message":{"content":"real"},"message":null}`,
-    `{${base},"message":{"content":[{"type":"text","text":"real"}],"content":false}}`,
-    `{${base},"message":{"content":"injected","content":[{"type":"text","text":"[Request interrupted by user]"}]}}`,
-    `{${base},"message":{"content":[{"type":"tool_result","type":"text","text":"real"}]}}`,
-    `{${base},"message":{"content":[{"type":"text","text":"real","text":null}]}}`,
-    `{${base},"message":{"content":"real"},"${'unknown'.repeat(60_000)}":[[[{"ignored":"${huge}"}]]]}`,
-    `{${base},"message":{"content":"\uFEFF\t\u00a0"}}`,
-    `{${base},"message":{"content":"\u0085"}}`,
-    `{${base},"message":{"content":"real"},"type":"system","subtype":"agents_killed"}`,
-    `{"type":"assistant","timestamp":${JSON.stringify(stamp(20))},"message":{"content":[{"type":"tool_use","name":"Task","id":"use","input":"${huge}"}]}}`,
-    `{"type":"user","toolUseResult":{"isAsync":true,"agentId":"a123"},"message":{"content":[{"type":"tool_result","tool_use_id":"use","is_error":false}]}}`,
-    `{"type":"user","toolUseResult":{"isAsync":true,"agentId":"a123"},"toolUseResult":3,"message":{"content":[{"type":"tool_result","tool_use_id":"use"}]}}`,
-    `{"type":"user","toolUseResult":{"isAsync":true,"agentId":"a123"},"message":{"content":[{"type":"tool_result","tool_use_id":"use","is_error":false,"is_error":true}]}}`,
-    `{"type":"user","toolUseResult":{"isAsync":true,"isAsync":false,"agentId":"a123"},"message":{"content":[{"type":"tool_result","tool_use_id":"use"}]}}`,
-    `{${base},"message":{"content":[{"type":"text","text":"real"}],"content":null},"message":{"content":"new final message"}}`,
-    `{${base},"message":{"content":"real"},"timestamp${'x'.repeat(300_000)}":"1900-01-01","ignored":1${'0'.repeat(300_000)}}`,
-    JSON.stringify({
-      type: 'user',
-      timestamp: stamp(20),
-      message: { content: `${' '.repeat(65)}[Request interrupted by user]` }
-    }),
-    `{"type":"system","subtype":"agents_killed","timestamp":${JSON.stringify(stamp(30))}} trailing`,
-    `{${base},"message":{"content":"real"},"bad":[1,]}`,
-    '[]',
-    'null',
-    'true',
-    '"not an object"'
-  ]
-  const originals: Record<string, unknown>[] = []
-  for (const line of raw) {
-    try {
-      const value: unknown = JSON.parse(line)
-      if (isRecord(value)) {
-        originals.push(value)
-      }
-    } catch {
-      /* Intentionally invalid complete frames have no effects. */
-    }
-  }
-  const path = join(dir, 'semantic-parity.jsonl')
-  const wire = `${raw.join('\r\n')}\r\n`
-  await writeFile(path, wire)
-  const cursor = createClaudeTranscriptCursor(path)
-  const actual: Record<string, unknown>[] = []
-  while (cursor.offset < Buffer.byteLength(wire)) {
-    const result = await readClaudeTranscriptChunk(cursor)
-    actual.push(...(result?.records ?? []))
-  }
-  expect(actual).toHaveLength(originals.length)
-  const evidence = (): ClaudeHelperTranscriptEvidence => ({
-    observedAt: now,
-    launches: new Map([['use', now + 20]]),
-    resumedAt: new Map()
-  })
-  for (let index = 0; index < originals.length; index++) {
-    const expected = evidence(),
-      projected = evidence()
-    readClaudeHelperEvidence(expected, [originals[index]])
-    readClaudeHelperEvidence(projected, [actual[index]])
-    expect(projected).toEqual(expected)
-    const expectedChild: ClaudeChildTranscript = { cursor: createClaudeTranscriptCursor(path) }
-    const projectedChild: ClaudeChildTranscript = { cursor: expectedChild.cursor }
-    readClaudeChildPrompts(expectedChild, [originals[index]])
-    readClaudeChildPrompts(projectedChild, [actual[index]])
-    expect(projectedChild.promptedAt).toBe(expectedChild.promptedAt)
-  }
-  const expected = evidence(),
-    projected = evidence()
-  readClaudeHelperEvidence(expected, originals)
-  readClaudeHelperEvidence(projected, actual)
-  expect(projected).toEqual(expected)
-  // Selected scalars/escaped keys cross every byte boundary, including UTF-8 and surrogate escapes.
-  const split = `{"ty\\u0070e":"assistant","timestamp":${JSON.stringify(stamp(20))},"message":{"content":[{"type":"tool_use","name":"Agent","id":"é😀\\ud800"}]}}\n`
-  await writeFile(path, split)
-  const tiny = createClaudeTranscriptCursor(path)
-  const selected: Record<string, unknown>[] = []
-  while (tiny.offset < Buffer.byteLength(split)) {
-    const chunk = await readClaudeTranscriptChunk(tiny, 1)
-    selected.push(...(chunk?.records ?? []))
-    if (tiny.offset < Buffer.byteLength(split)) {
-      expect(chunk?.records).toEqual([])
-      expect(chunk?.caughtUp).toBe(false)
-    }
-  }
-  const final = evidence(),
-    oracle = evidence()
-  readClaudeHelperEvidence(final, selected)
-  readClaudeHelperEvidence(oracle, [JSON.parse(split)])
-  expect(final).toEqual(oracle)
-})
diff --git a/src/shared/agent-hook-listener/providers/claude-owed-notification-expiry-timers.ts b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-notification-expiry-timers.ts
similarity index 84%
rename from src/shared/agent-hook-listener/providers/claude-owed-notification-expiry-timers.ts
rename to src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-notification-expiry-timers.ts
index 03ecb922f01..eb31d8f9ae6 100644
--- a/src/shared/agent-hook-listener/providers/claude-owed-notification-expiry-timers.ts
+++ b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-notification-expiry-timers.ts
@@ -1,13 +1,13 @@
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
-import { mainAgentIdleSince } from '../main-agent-turn-state'
-import { claudeRowHasUnlistedLiveWork } from './claude-pane-hold-evidence'
-import { buildClaudeCachedLeadStatusPayload } from './claude-lifecycle-events'
+import type { AgentHookEventPayload } from '../../../listener-event'
+import type { HookListenerState } from '../../../listener-state'
+import { mainAgentIdleSince } from '../../../main-agent-turn-state'
+import { claudeRowHasUnlistedLiveWork } from '../lifecycle/claude-pane-hold-evidence'
+import { buildClaudeCachedLeadStatusPayload } from '../lifecycle/claude-lifecycle-events'
 import {
   CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS,
   claudeOwedTaskNotificationDeadline
 } from './claude-owed-task-notifications'
-import { CodexSubagentPollScheduler } from '../transcripts/codex-subagent-poll-scheduler'
+import { CodexSubagentPollScheduler } from '../../../transcripts/codex-subagent-poll-scheduler'
 
 type PublishRow = (row: AgentHookEventPayload) => void
 
diff --git a/src/shared/agent-hook-listener/providers/claude-owed-task-notifications.ts b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-task-notifications.ts
similarity index 98%
rename from src/shared/agent-hook-listener/providers/claude-owed-task-notifications.ts
rename to src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-task-notifications.ts
index 877a2ac00a7..d1c5f38addf 100644
--- a/src/shared/agent-hook-listener/providers/claude-owed-task-notifications.ts
+++ b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-task-notifications.ts
@@ -1,5 +1,5 @@
-import { isRecord } from '../../agent-status/child-work/agent-status-child-work-value-guards'
-import { runsOrcaOrchestrationWait } from '../../orca-cli-invocations'
+import { isRecord } from '../../../../agent-status/child-work/agent-status-child-work-value-guards'
+import { runsOrcaOrchestrationWait } from '../../../../orca-cli-invocations'
 
 /** Main-agent background tasks keyed by launch/notification task ID. Notifications can arrive a turn after task end and an empty Stop; owed work keeps the pane active (#23942). Captures: __fixtures__/claude-task-notification-hooks.jsonl. */
 export type ClaudeLaunchedBackgroundTasks = Map<string, ClaudeLaunchedBackgroundTask>
diff --git a/src/shared/agent-hook-listener/providers/claude-task-notification-delivery.ts b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-task-notification-delivery.ts
similarity index 91%
rename from src/shared/agent-hook-listener/providers/claude-task-notification-delivery.ts
rename to src/shared/agent-hook-listener/providers/claude/background-tasks/claude-task-notification-delivery.ts
index d76dbf044d2..dabe7b95769 100644
--- a/src/shared/agent-hook-listener/providers/claude-task-notification-delivery.ts
+++ b/src/shared/agent-hook-listener/providers/claude/background-tasks/claude-task-notification-delivery.ts
@@ -1,4 +1,4 @@
-import type { readClaudeBackgroundAgentTasks } from '../../claude-background-task-inventory'
+import type { readClaudeBackgroundAgentTasks } from '../../../../claude-background-task-inventory'
 import {
   forgetStoppedClaudeShellTask,
   oweClaudeShellTaskNotifications,
@@ -7,9 +7,9 @@ import {
   recordClaudeUnconfirmedAgentNotification,
   settleClaudeTaskNotification
 } from './claude-owed-task-notifications'
-import { readClaudeTaskNotification } from '../../claude-task-notification-text'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
+import { readClaudeTaskNotification } from '../../../../claude-task-notification-text'
+import type { HookListenerState } from '../../../listener-state'
+import { readString } from '../../../tool-input-preview'
 
 /** Track main-agent launches only: child-launched task notifications wake that child, not this pane. */
 export function trackClaudeTaskNotificationDelivery(
diff --git a/src/shared/agent-hook-listener/providers/claude-events.ts b/src/shared/agent-hook-listener/providers/claude/claude-events.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/claude-events.ts
rename to src/shared/agent-hook-listener/providers/claude/claude-events.ts
index 1ae22a8a04b..467d90e34a8 100644
--- a/src/shared/agent-hook-listener/providers/claude-events.ts
+++ b/src/shared/agent-hook-listener/providers/claude/claude-events.ts
@@ -1,11 +1,11 @@
-import type { ParsedAgentStatusPayload } from '../../agent-status/contracts/agent-status-types'
-import { CLAUDE_NEW_SESSION_START_SOURCES } from './claude-session-start-sources'
+import type { ParsedAgentStatusPayload } from '../../../agent-status/contracts/agent-status-types'
+import { CLAUDE_NEW_SESSION_START_SOURCES } from './lifecycle/claude-session-start-sources'
 import {
   heldTurnCountsAsFinished,
   isAgentStatusHeldOpenByChildWork
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
-import { readClaudeBackgroundAgentTasks } from '../../claude-background-task-inventory'
+} from '../../../agent-status/lifecycle/agent-lead-status-fold'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
+import { readClaudeBackgroundAgentTasks } from '../../../claude-background-task-inventory'
 import {
   claudeRosterHasRestoredSnapshotSubagent,
   claudeRosterHasRuntimeWorkingSubagent,
@@ -13,31 +13,31 @@ import {
   isClaudeChildTurnEndEvent,
   reapUnconfirmedRestoredClaudeSubagents,
   upsertWorkingClaudeSubagent
-} from '../../claude-subagent-roster'
-import type { HookListenerState } from '../listener-state'
-import { readFirstString } from '../interactive-tool'
-import { shouldIgnoreCompactContinuationUserPromptSubmit } from '../prompt-fields'
-import { readString } from '../tool-input-preview'
+} from '../../../claude-subagent-roster'
+import type { HookListenerState } from '../../listener-state'
+import { readFirstString } from '../../interactive-tool'
+import { shouldIgnoreCompactContinuationUserPromptSubmit } from '../../prompt-fields'
+import { readString } from '../../tool-input-preview'
 import {
   buildClaudeCachedLeadStatusPayload,
   normalizeClaudeSubagentLifecycleEvent
-} from './claude-lifecycle-events'
+} from './lifecycle/claude-lifecycle-events'
 import {
   getOrCreateClaudeSubagentRoster,
   readClaudeLeadModel,
   setClaudeMainAgentTurnState,
   updateClaudeRunningNonAgentTask,
   voidClaimsOfReplacedClaudeSession
-} from './claude-roster-state'
+} from './lifecycle/claude-roster-state'
 import {
   resolveClaudePaneStatus,
   claudePaneHasRunningChildWork,
   claudeRowHasUnlistedLiveWork
-} from './claude-pane-hold-evidence'
-import { buildClaudeStatusPayload } from './claude-status-build'
-import { claudeWaitRequest, settleClaudeToolBatch } from './claude-tool-request-wait'
-import { trackClaudeTaskNotificationDelivery } from './claude-task-notification-delivery'
-import { recordClaudeTeammateSpawn } from './claude-teammate-spawn'
+} from './lifecycle/claude-pane-hold-evidence'
+import { buildClaudeStatusPayload } from './lifecycle/claude-status-build'
+import { claudeWaitRequest, settleClaudeToolBatch } from './lifecycle/claude-tool-request-wait'
+import { trackClaudeTaskNotificationDelivery } from './background-tasks/claude-task-notification-delivery'
+import { recordClaudeTeammateSpawn } from './lifecycle/claude-teammate-spawn'
 
 const CLAUDE_HOOK_AGENT_ID_PREFIX = 'hook-agent-'
 
diff --git a/src/shared/agent-hook-listener/providers/claude-tool-fields.ts b/src/shared/agent-hook-listener/providers/claude/claude-tool-fields.ts
similarity index 87%
rename from src/shared/agent-hook-listener/providers/claude-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/claude/claude-tool-fields.ts
index f0ce6fb4297..a28ab80e4e2 100644
--- a/src/shared/agent-hook-listener/providers/claude-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/claude/claude-tool-fields.ts
@@ -1,11 +1,16 @@
-import type { ToolSnapshot } from '../listener-event'
-import { deriveToolInputPreview, hasOwnField, readString, toolUpdate } from '../tool-input-preview'
+import type { ToolSnapshot } from '../../listener-event'
+import {
+  deriveToolInputPreview,
+  hasOwnField,
+  readString,
+  toolUpdate
+} from '../../tool-input-preview'
 import {
   clearActiveToolFieldsUpdate,
   deriveInteractivePrompt,
   extractToolResponseText
-} from '../interactive-tool'
-import { readLastAssistantFromTranscript } from '../transcript-lines'
+} from '../../interactive-tool'
+import { readLastAssistantFromTranscript } from '../../transcript-lines'
 
 export function extractClaudeToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/claude-compact-completion.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-compact-completion.ts
similarity index 95%
rename from src/shared/agent-hook-listener/providers/claude-compact-completion.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-compact-completion.ts
index fa8a1f5e784..36349230c4a 100644
--- a/src/shared/agent-hook-listener/providers/claude-compact-completion.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-compact-completion.ts
@@ -3,8 +3,8 @@
 import {
   agentProviderSessionsEqual,
   type AgentProviderSessionMetadata
-} from '../../agent-session/lifecycle/agent-session-resume'
-import type { AgentHookSource } from '../transport/agent-hook-relay'
+} from '../../../../agent-session/lifecycle/agent-session-resume'
+import type { AgentHookSource } from '../../../transport/agent-hook-relay'
 
 export type ClaudeCompactCompletionOwner = {
   source?: AgentHookSource
diff --git a/src/shared/agent-hook-listener/providers/claude-lifecycle-events.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-lifecycle-events.ts
similarity index 95%
rename from src/shared/agent-hook-listener/providers/claude-lifecycle-events.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-lifecycle-events.ts
index ec77de80f3f..3a752d90860 100644
--- a/src/shared/agent-hook-listener/providers/claude-lifecycle-events.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-lifecycle-events.ts
@@ -1,9 +1,9 @@
-import type { ParsedAgentStatusPayload } from '../../agent-status/contracts/agent-status-types'
+import type { ParsedAgentStatusPayload } from '../../../../agent-status/contracts/agent-status-types'
 import {
   markClaudeBackgroundAgentRunning,
   oweClaudeAgentTaskNotification,
   recordClaudeUnconfirmedAgentEnd
-} from './claude-owed-task-notifications'
+} from '../background-tasks/claude-owed-task-notifications'
 import {
   claudeRosterHasRestoredSnapshotSubagent,
   claudeRosterHasRuntimeWorkingSubagent,
@@ -11,10 +11,10 @@ import {
   idleClaudeTeammateByName,
   stopClaudeSubagent,
   upsertWorkingClaudeSubagent
-} from '../../claude-subagent-roster'
-import type { HookListenerState } from '../listener-state'
+} from '../../../../claude-subagent-roster'
+import type { HookListenerState } from '../../../listener-state'
 import { claudeRowHasUnlistedLiveWork, resolveClaudePaneStatus } from './claude-pane-hold-evidence'
-import { readString } from '../tool-input-preview'
+import { readString } from '../../../tool-input-preview'
 import {
   clearClaudePendingWaitForAgent,
   getOrCreateClaudeSubagentRoster
diff --git a/src/shared/agent-hook-listener/providers/claude-pane-hold-evidence.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-pane-hold-evidence.ts
similarity index 88%
rename from src/shared/agent-hook-listener/providers/claude-pane-hold-evidence.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-pane-hold-evidence.ts
index 74b5a91c958..2746ecaae3f 100644
--- a/src/shared/agent-hook-listener/providers/claude-pane-hold-evidence.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-pane-hold-evidence.ts
@@ -1,15 +1,15 @@
 import {
   foldAgentLeadStatus,
   type AgentLeadStatusResolution
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
-import { agentChildWorkLivenessFromEvidence } from '../../agent-status/child-work/agent-status-child-work-liveness'
+} from '../../../../agent-status/lifecycle/agent-lead-status-fold'
+import { agentChildWorkLivenessFromEvidence } from '../../../../agent-status/child-work/agent-status-child-work-liveness'
 import {
   claudeLiveOwedTaskNotificationKinds,
   claudeTasksAwaitAgents
-} from './claude-owed-task-notifications'
-import { claudeRosterHasWorkingSubagent } from '../../claude-subagent-roster'
-import type { HookListenerState } from '../listener-state'
-import { mainAgentIdleSince, type ClaudeLeadTurnState } from '../main-agent-turn-state'
+} from '../background-tasks/claude-owed-task-notifications'
+import { claudeRosterHasWorkingSubagent } from '../../../../claude-subagent-roster'
+import type { HookListenerState } from '../../../listener-state'
+import { mainAgentIdleSince, type ClaudeLeadTurnState } from '../../../main-agent-turn-state'
 
 /** Everything that can hold a pane whose main agent's own turn is over. */
 type ClaudePaneHoldEvidence = {
diff --git a/src/shared/agent-hook-listener/providers/claude-roster-state.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/claude-roster-state.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state.ts
index 2dfbf769611..cbaf4cf4e73 100644
--- a/src/shared/agent-hook-listener/providers/claude-roster-state.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state.ts
@@ -1,22 +1,22 @@
 import {
   AGENT_MODEL_MAX_LENGTH,
   normalizeOptionalField
-} from '../../agent-status/contracts/agent-status-field-normalization'
-import type { AgentMainAgentStatus } from '../../agent-status/lifecycle/main-agent-status'
+} from '../../../../agent-status/contracts/agent-status-field-normalization'
+import type { AgentMainAgentStatus } from '../../../../agent-status/lifecycle/main-agent-status'
 import type {
   AgentStatusState,
   AgentWorkingMode
-} from '../../agent-status/contracts/agent-status-types'
-import type { AgentSubagentSnapshot } from '../../agent-status/contracts/agent-status-subagent-snapshot'
+} from '../../../../agent-status/contracts/agent-status-types'
+import type { AgentSubagentSnapshot } from '../../../../agent-status/contracts/agent-status-subagent-snapshot'
 import {
   continueMainAgentStatus,
   mainAgentTurnInterrupted
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
-import type { ClaudeSubagentRoster } from '../../claude-subagent-roster'
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
-import type { ClaudeLeadTurnState } from '../main-agent-turn-state'
-import { readString } from '../tool-input-preview'
+} from '../../../../agent-status/lifecycle/agent-lead-status-fold'
+import type { ClaudeSubagentRoster } from '../../../../claude-subagent-roster'
+import type { AgentHookEventPayload } from '../../../listener-event'
+import type { HookListenerState } from '../../../listener-state'
+import type { ClaudeLeadTurnState } from '../../../main-agent-turn-state'
+import { readString } from '../../../tool-input-preview'
 import { CLAUDE_NEW_SESSION_START_SOURCES } from './claude-session-start-sources'
 import { resolveClaudePaneStatus } from './claude-pane-hold-evidence'
 
diff --git a/src/shared/agent-hook-listener/providers/claude-session-start-sources.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-session-start-sources.ts
similarity index 100%
rename from src/shared/agent-hook-listener/providers/claude-session-start-sources.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-session-start-sources.ts
diff --git a/src/shared/agent-hook-listener/providers/claude-status-build.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-status-build.ts
similarity index 83%
rename from src/shared/agent-hook-listener/providers/claude-status-build.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-status-build.ts
index 8957e6cb192..b22799f9243 100644
--- a/src/shared/agent-hook-listener/providers/claude-status-build.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-status-build.ts
@@ -3,12 +3,12 @@ import {
   type AgentStatusState,
   type AgentWorkingMode,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { claudeRosterToSnapshots } from '../../claude-subagent-roster'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import type { HookListenerState } from '../listener-state'
-import { mainAgentTurnInterrupted } from '../../agent-status/lifecycle/agent-lead-status-fold'
+} from '../../../../agent-status/contracts/agent-status-types'
+import { claudeRosterToSnapshots } from '../../../../claude-subagent-roster'
+import { resolvePrompt, resolveToolState } from '../../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../../provider-event-routing'
+import type { HookListenerState } from '../../../listener-state'
+import { mainAgentTurnInterrupted } from '../../../../agent-status/lifecycle/agent-lead-status-fold'
 import { claudeMainAgentStatusForPayload } from './claude-roster-state'
 
 export function buildClaudeStatusPayload(
diff --git a/src/shared/agent-hook-listener/providers/claude-teammate-spawn.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-teammate-spawn.ts
similarity index 88%
rename from src/shared/agent-hook-listener/providers/claude-teammate-spawn.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-teammate-spawn.ts
index 65926f6037b..ccf3a6b707f 100644
--- a/src/shared/agent-hook-listener/providers/claude-teammate-spawn.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-teammate-spawn.ts
@@ -1,9 +1,9 @@
 import {
   isClaudeTeammateLifecycleId,
   recordClaudeTeammateTaskDescription
-} from '../../claude-subagent-roster'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
+} from '../../../../claude-subagent-roster'
+import type { HookListenerState } from '../../../listener-state'
+import { readString } from '../../../tool-input-preview'
 import { getOrCreateClaudeSubagentRoster } from './claude-roster-state'
 
 // Captured Claude 2.1.308 names background_tasks entries by the lead Agent call’s spawn description.
diff --git a/src/shared/agent-hook-listener/providers/claude-tool-request-wait.ts b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-tool-request-wait.ts
similarity index 85%
rename from src/shared/agent-hook-listener/providers/claude-tool-request-wait.ts
rename to src/shared/agent-hook-listener/providers/claude/lifecycle/claude-tool-request-wait.ts
index 9c98ed3729d..336e59cc31a 100644
--- a/src/shared/agent-hook-listener/providers/claude-tool-request-wait.ts
+++ b/src/shared/agent-hook-listener/providers/claude/lifecycle/claude-tool-request-wait.ts
@@ -1,8 +1,8 @@
-import type { ParsedAgentStatusPayload } from '../../agent-status/contracts/agent-status-types'
-import { readClaudeBatchSettledRequests } from '../claude-settled-permission-requests'
-import { claudeHasRequestAwaitingUser } from '../claude-tool-request-identity'
-import type { HookListenerState } from '../listener-state'
-import type { ClaudeLeadTurnState } from '../main-agent-turn-state'
+import type { ParsedAgentStatusPayload } from '../../../../agent-status/contracts/agent-status-types'
+import { readClaudeBatchSettledRequests } from '../../../claude-settled-permission-requests'
+import { claudeHasRequestAwaitingUser } from '../../../claude-tool-request-identity'
+import type { HookListenerState } from '../../../listener-state'
+import type { ClaudeLeadTurnState } from '../../../main-agent-turn-state'
 import { buildClaudeCachedLeadStatusPayload } from './claude-lifecycle-events'
 import { resolveClaudePaneStatus } from './claude-pane-hold-evidence'
 import { setClaudeMainAgentTurnState } from './claude-roster-state'
diff --git a/src/shared/agent-hook-listener/providers/claude-helper-kill-poller.ts b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-kill-poller.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/claude-helper-kill-poller.ts
rename to src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-kill-poller.ts
index f4d6861d0e0..1a0761459b6 100644
--- a/src/shared/agent-hook-listener/providers/claude-helper-kill-poller.ts
+++ b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-kill-poller.ts
@@ -1,15 +1,15 @@
 import { dirname, basename, join, posix, win32 } from 'node:path'
-import { AgentTranscriptPollScheduler } from '../transcripts/agent-transcript-poll-scheduler'
+import { AgentTranscriptPollScheduler } from '../../../transcripts/agent-transcript-poll-scheduler'
 import {
   claudeRosterHasRuntimeWorkingSubagent,
   stopClaudeSubagent
-} from '../../claude-subagent-roster'
-import { stopOwingClaudeAgentTaskNotification } from './claude-owed-task-notifications'
-import type { HookListenerState } from '../listener-state'
-import type { AgentHookEventPayload } from '../listener-event'
-import { buildClaudeCachedLeadStatusPayload } from './claude-lifecycle-events'
-import { clearClaudePendingWaitForAgent } from './claude-roster-state'
-import { claudeRowHasUnlistedLiveWork } from './claude-pane-hold-evidence'
+} from '../../../../claude-subagent-roster'
+import { stopOwingClaudeAgentTaskNotification } from '../background-tasks/claude-owed-task-notifications'
+import type { HookListenerState } from '../../../listener-state'
+import type { AgentHookEventPayload } from '../../../listener-event'
+import { buildClaudeCachedLeadStatusPayload } from '../lifecycle/claude-lifecycle-events'
+import { clearClaudePendingWaitForAgent } from '../lifecycle/claude-roster-state'
+import { claudeRowHasUnlistedLiveWork } from '../lifecycle/claude-pane-hold-evidence'
 import {
   createClaudeTranscriptCursor,
   clearClaudeTranscriptCursor,
diff --git a/src/shared/agent-hook-listener/providers/claude-helper-transcript-evidence.ts b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-transcript-evidence.ts
similarity index 97%
rename from src/shared/agent-hook-listener/providers/claude-helper-transcript-evidence.ts
rename to src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-transcript-evidence.ts
index 24c750aa1a7..deb7ff71a46 100644
--- a/src/shared/agent-hook-listener/providers/claude-helper-transcript-evidence.ts
+++ b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-helper-transcript-evidence.ts
@@ -1,10 +1,10 @@
-import { isClaudeToolResultContent } from '../../claude-tool-content'
+import { isClaudeToolResultContent } from '../../../../claude-tool-content'
 import { setImmediate as yieldToEventLoop } from 'node:timers/promises'
 import type {
   ClaudeTranscriptCursor,
   ClaudeTranscriptApplication
 } from './claude-transcript-cursor'
-import { isKnownHarnessInjectedUserTurnText } from '../../harness-injected-user-turns'
+import { isKnownHarnessInjectedUserTurnText } from '../../../../harness-injected-user-turns'
 
 export type ClaudeHelperTranscriptEvidence = {
   observedAt: number
diff --git a/src/shared/agent-hook-listener/providers/claude-transcript-cursor.ts b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-cursor.ts
similarity index 100%
rename from src/shared/agent-hook-listener/providers/claude-transcript-cursor.ts
rename to src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-cursor.ts
diff --git a/src/shared/agent-hook-listener/providers/claude-transcript-decoder.ts b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-decoder.ts
similarity index 97%
rename from src/shared/agent-hook-listener/providers/claude-transcript-decoder.ts
rename to src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-decoder.ts
index e2dfdc3f91b..45134956778 100644
--- a/src/shared/agent-hook-listener/providers/claude-transcript-decoder.ts
+++ b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-decoder.ts
@@ -1,8 +1,8 @@
 import parser, { type Token } from 'stream-json/core/parser.js'
 import exec from 'stream-chain/exec.js'
 import { none } from 'stream-chain/defs.js'
-import { isKnownHarnessInjectedUserTurnText } from '../../harness-injected-user-turns'
-import { isClaudeToolResultContent } from '../../claude-tool-content'
+import { isKnownHarnessInjectedUserTurnText } from '../../../../harness-injected-user-turns'
+import { isClaudeToolResultContent } from '../../../../claude-tool-content'
 
 type Scope = 'root' | 'message' | 'content' | 'block' | 'result' | 'discard'
 type Frame = {
diff --git a/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-semantics.test.ts b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-semantics.test.ts
new file mode 100644
index 00000000000..26d788d0b27
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/claude/transcripts/claude-transcript-semantics.test.ts
@@ -0,0 +1,34 @@
+import { mkdtemp, writeFile, appendFile, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createClaudeTranscriptCursor, readClaudeTranscriptChunk } from './claude-transcript-cursor'
+
+let dir: string
+const now = Date.parse('2026-10-29T12:00:00Z')
+const stamp = (offset: number) => new Date(now + offset).toISOString()
+const kill = (offset = 1) =>
+  `${JSON.stringify({ type: 'system', subtype: 'agents_killed', timestamp: stamp(offset) })}\n`
+const prompt = (offset: number) =>
+  `${JSON.stringify({ type: 'user', timestamp: stamp(offset), message: { content: 'Do the work' } })}\n`
+beforeEach(async () => {
+  dir = await mkdtemp(join(tmpdir(), 'claude-transcript-semantics-'))
+})
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await rm(dir, { recursive: true, force: true })
+})
+
+describe('forward transcript reading', () => {
+  it('treats missing files as unverifiable and replacement/shrink as a new baseline', async () => {
+    const path = join(dir, 'replace.jsonl')
+    const cursor = createClaudeTranscriptCursor(path)
+    expect(await readClaudeTranscriptChunk(cursor)).toBeUndefined()
+    await writeFile(path, `${prompt(0)}${' '.repeat(200)}`)
+    await readClaudeTranscriptChunk(cursor)
+    await writeFile(path, kill())
+    expect((await readClaudeTranscriptChunk(cursor))?.records).toEqual([])
+    await appendFile(path, kill(20))
+    expect((await readClaudeTranscriptChunk(cursor))?.records).toHaveLength(1)
+  })
+})
diff --git a/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-main-agent.test.ts b/src/shared/agent-hook-listener/providers/codex/agent-hook-listener-codex-main-agent.test.ts
similarity index 92%
rename from src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-main-agent.test.ts
rename to src/shared/agent-hook-listener/providers/codex/agent-hook-listener-codex-main-agent.test.ts
index ee52fc1fe24..d4947b0e9a0 100644
--- a/src/shared/agent-hook-listener/normalization/agent-hook-listener-codex-main-agent.test.ts
+++ b/src/shared/agent-hook-listener/providers/codex/agent-hook-listener-codex-main-agent.test.ts
@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, it } from 'vitest'
-import { createHookListenerState, type HookListenerState } from '../listener-state'
+import { createHookListenerState, type HookListenerState } from '../../listener-state'
 import {
   markCodexLeadTurnInterrupted,
   reconcileRemoteCodexState,
   seedCodexStateFromSnapshot
-} from '../providers/codex-state'
-import { PANE_KEY } from './agent-hook-listener-test-harness'
+} from './codex-state'
+import { PANE_KEY } from '../../normalization/agent-hook-listener-test-harness'
 
 describe('the Codex root record seeded from a durable row', () => {
   let state: HookListenerState
diff --git a/src/shared/agent-hook-listener/providers/codex-async-questions.ts b/src/shared/agent-hook-listener/providers/codex/codex-async-questions.ts
similarity index 96%
rename from src/shared/agent-hook-listener/providers/codex-async-questions.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-async-questions.ts
index 4f0e47921f9..ed117fd04ae 100644
--- a/src/shared/agent-hook-listener/providers/codex-async-questions.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-async-questions.ts
@@ -1,9 +1,9 @@
 import {
   CODEX_ASYNC_QUESTION_TOOL,
   parseCodexAsyncQuestionsInput
-} from '../../codex-async-question-input'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
+} from '../../../codex-async-question-input'
+import type { HookListenerState } from '../../listener-state'
+import { readString } from '../../tool-input-preview'
 
 /** One `request_user_input_async` call and the question indexes it still waits on. */
 type CodexAsyncQuestionCall = {
diff --git a/src/shared/agent-hook-listener/providers/codex-ended-turn-event.ts b/src/shared/agent-hook-listener/providers/codex/codex-ended-turn-event.ts
similarity index 79%
rename from src/shared/agent-hook-listener/providers/codex-ended-turn-event.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-ended-turn-event.ts
index 3ef0a57c3fe..11d15729ad7 100644
--- a/src/shared/agent-hook-listener/providers/codex-ended-turn-event.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-ended-turn-event.ts
@@ -1,6 +1,6 @@
-import { codexTranscriptTurnEnd } from '../../codex-subagent-transcript'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
+import { codexTranscriptTurnEnd } from '../../../codex-subagent-transcript'
+import type { HookListenerState } from '../../listener-state'
+import { readString } from '../../tool-input-preview'
 
 /** Replay rollout-confirmed root ends as missing Stops, including /review; drop delayed hooks once the lead moved to another turn. */
 export function codexHookEventForEndedTurn(
diff --git a/src/shared/agent-hook-listener/providers/codex-ephemeral-threads.ts b/src/shared/agent-hook-listener/providers/codex/codex-ephemeral-threads.ts
similarity index 94%
rename from src/shared/agent-hook-listener/providers/codex-ephemeral-threads.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-ephemeral-threads.ts
index f4f1daf6b66..ef0ba3dd290 100644
--- a/src/shared/agent-hook-listener/providers/codex-ephemeral-threads.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-ephemeral-threads.ts
@@ -1,6 +1,6 @@
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
+import type { AgentHookEventPayload } from '../../listener-event'
+import type { HookListenerState } from '../../listener-state'
+import { readString } from '../../tool-input-preview'
 
 // Enough for any run of /side chats in one pane; the oldest ended long ago.
 const MAX_FORKS_PER_PANE = 16
diff --git a/src/shared/agent-hook-listener/providers/codex-events.ts b/src/shared/agent-hook-listener/providers/codex/codex-events.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/codex-events.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-events.ts
index aaff6d57a3d..def9de822a5 100644
--- a/src/shared/agent-hook-listener/providers/codex-events.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-events.ts
@@ -1,35 +1,35 @@
 import {
   AGENT_MODEL_MAX_LENGTH,
   normalizeOptionalField
-} from '../../agent-status/contracts/agent-status-field-normalization'
+} from '../../../agent-status/contracts/agent-status-field-normalization'
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
+} from '../../../agent-status/contracts/agent-status-types'
 
 import {
   mainAgentTurnInterrupted,
   type AgentLeadStatusResolution
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
+} from '../../../agent-status/lifecycle/agent-lead-status-fold'
 import {
   codexRosterToSnapshots,
   enrichCodexSubagentIdentity,
   finishCodexSubagent,
   upsertCodexSubagent
-} from '../../codex-subagent-roster'
+} from '../../../codex-subagent-roster'
 import {
   codexTranscriptTurnEnd,
   reconcileCodexSubagentTranscript
-} from '../../codex-subagent-transcript'
+} from '../../../codex-subagent-transcript'
 import {
   codexTurnApprovalsAreAutoReviewed,
   reconcileCodexSubagentReviewer
-} from '../../codex-subagent-reviewer'
-import { readFirstString } from '../interactive-tool'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../../codex-subagent-reviewer'
+import { readFirstString } from '../../interactive-tool'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 import { applyCodexSessionStart } from './codex-session-start'
 import {
   codexHookEventState,
@@ -302,5 +302,3 @@ export function normalizeCodexEvent(
     updateLead: true
   })
 }
-
-export { codexHookEventForEndedTurn } from './codex-ended-turn-event'
diff --git a/src/shared/agent-hook-listener/providers/codex-question-skip.ts b/src/shared/agent-hook-listener/providers/codex/codex-question-skip.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/codex-question-skip.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-question-skip.ts
index cce40781eb0..ef6f3c716e9 100644
--- a/src/shared/agent-hook-listener/providers/codex-question-skip.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-question-skip.ts
@@ -1,5 +1,5 @@
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
+import type { AgentHookEventPayload } from '../../listener-event'
+import type { HookListenerState } from '../../listener-state'
 import { pendingCodexAsyncQuestion, skipCodexAsyncQuestion } from './codex-async-questions'
 import { buildCodexStatusPayload } from './codex-events'
 import { resolveCodexPaneStatus, setCodexMainAgentTurnState } from './codex-state'
diff --git a/src/shared/agent-hook-listener/providers/codex-session-start.ts b/src/shared/agent-hook-listener/providers/codex/codex-session-start.ts
similarity index 95%
rename from src/shared/agent-hook-listener/providers/codex-session-start.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-session-start.ts
index 9dc8ad63ce2..6d829ecae83 100644
--- a/src/shared/agent-hook-listener/providers/codex-session-start.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-session-start.ts
@@ -1,15 +1,15 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
+} from '../../../agent-status/contracts/agent-status-types'
 import {
   sameAgentStatusSessionOwner,
   sameAgentStatusTerminalOwner
-} from '../../agent-status/identity/agent-status-terminal-owner'
-import type { AgentLeadStatusResolution } from '../../agent-status/lifecycle/agent-lead-status-fold'
-import { codexRosterToSnapshots, type CodexSubagentRoster } from '../../codex-subagent-roster'
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
+} from '../../../agent-status/identity/agent-status-terminal-owner'
+import type { AgentLeadStatusResolution } from '../../../agent-status/lifecycle/agent-lead-status-fold'
+import { codexRosterToSnapshots, type CodexSubagentRoster } from '../../../codex-subagent-roster'
+import type { AgentHookEventPayload } from '../../listener-event'
+import type { HookListenerState } from '../../listener-state'
 import {
   codexMainAgentStatusForPayload,
   reconcileRemoteCodexState,
diff --git a/src/shared/agent-hook-listener/providers/codex-state.ts b/src/shared/agent-hook-listener/providers/codex/codex-state.ts
similarity index 94%
rename from src/shared/agent-hook-listener/providers/codex-state.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-state.ts
index 39e9d88f518..96ad622aa0c 100644
--- a/src/shared/agent-hook-listener/providers/codex-state.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-state.ts
@@ -1,27 +1,27 @@
-import type { AgentMainAgentStatus } from '../../agent-status/lifecycle/main-agent-status'
-import type { ParsedAgentStatusPayload } from '../../agent-status/contracts/agent-status-types'
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
-import { CODEX_ASYNC_QUESTION_TOOL } from '../../codex-async-question-input'
+import type { AgentMainAgentStatus } from '../../../agent-status/lifecycle/main-agent-status'
+import type { ParsedAgentStatusPayload } from '../../../agent-status/contracts/agent-status-types'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
+import { CODEX_ASYNC_QUESTION_TOOL } from '../../../codex-async-question-input'
 import {
   continueMainAgentStatus,
   foldAgentLeadStatus,
   mainAgentTurnInterrupted,
   type AgentLeadStatusResolution
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
+} from '../../../agent-status/lifecycle/agent-lead-status-fold'
 import {
   codexRosterChildWorkLiveness,
   codexRosterToSnapshots,
   finishCodexSubagent,
   seedCodexSubagentRoster,
   type CodexSubagentRoster
-} from '../../codex-subagent-roster'
+} from '../../../codex-subagent-roster'
 import {
   createCodexSubagentTranscriptState,
   hasTrackedCodexTranscriptSubagents,
   type CodexSubagentTranscriptState
-} from '../../codex-subagent-transcript'
-import type { HookListenerState } from '../listener-state'
-import type { CodexLeadTurnState } from '../main-agent-turn-state'
+} from '../../../codex-subagent-transcript'
+import type { HookListenerState } from '../../listener-state'
+import type { CodexLeadTurnState } from '../../main-agent-turn-state'
 
 export function getOrCreateCodexSubagentRoster(
   state: HookListenerState,
diff --git a/src/shared/agent-hook-listener/providers/codex-tool-fields.ts b/src/shared/agent-hook-listener/providers/codex/codex-tool-fields.ts
similarity index 88%
rename from src/shared/agent-hook-listener/providers/codex-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-tool-fields.ts
index 09b87c794a5..a3271f2f9c1 100644
--- a/src/shared/agent-hook-listener/providers/codex-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-tool-fields.ts
@@ -1,11 +1,11 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { deriveInteractivePrompt } from '../interactive-tool'
+} from '../../tool-input-preview'
+import { deriveInteractivePrompt } from '../../interactive-tool'
 
 export function extractCodexToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/codex-transcript-poll.ts b/src/shared/agent-hook-listener/providers/codex/codex-transcript-poll.ts
similarity index 87%
rename from src/shared/agent-hook-listener/providers/codex-transcript-poll.ts
rename to src/shared/agent-hook-listener/providers/codex/codex-transcript-poll.ts
index 608994e21d5..d7cc2f32371 100644
--- a/src/shared/agent-hook-listener/providers/codex-transcript-poll.ts
+++ b/src/shared/agent-hook-listener/providers/codex/codex-transcript-poll.ts
@@ -1,15 +1,15 @@
-import { record } from '../../codex-rollout-jsonl-cursor'
+import { record } from '../../../codex-rollout-jsonl-cursor'
 import {
   hasPendingCodexSubagentIdentity,
   retryPendingCodexSubagentIdentities
-} from '../../codex-subagent-roster'
+} from '../../../codex-subagent-roster'
 import {
   codexTranscriptTurnEnd,
   reconcileCodexSubagentTranscript
-} from '../../codex-subagent-transcript'
-import { normalizeHookPayload } from '../normalization/normalize-hook-payload'
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
+} from '../../../codex-subagent-transcript'
+import { normalizeHookPayload } from '../../normalization/normalize-hook-payload'
+import type { AgentHookEventPayload } from '../../listener-event'
+import type { HookListenerState } from '../../listener-state'
 import { buildCodexChildDrivenStatusPayload } from './codex-events'
 import { getOrCreateCodexSubagentRoster, markCodexLeadTurnInterrupted } from './codex-state'
 
diff --git a/src/shared/agent-hook-listener/providers/command-code-events.ts b/src/shared/agent-hook-listener/providers/command-code/command-code-events.ts
similarity index 80%
rename from src/shared/agent-hook-listener/providers/command-code-events.ts
rename to src/shared/agent-hook-listener/providers/command-code/command-code-events.ts
index a86d56deeda..dc762a7443b 100644
--- a/src/shared/agent-hook-listener/providers/command-code-events.ts
+++ b/src/shared/agent-hook-listener/providers/command-code/command-code-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 export function normalizeCommandCodeEvent(
   state: HookListenerState,
diff --git a/src/shared/agent-hook-listener/providers/command-code-tool-fields.ts b/src/shared/agent-hook-listener/providers/command-code/command-code-tool-fields.ts
similarity index 86%
rename from src/shared/agent-hook-listener/providers/command-code-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/command-code/command-code-tool-fields.ts
index 5d785d832c3..c92fdc0a3c6 100644
--- a/src/shared/agent-hook-listener/providers/command-code-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/command-code/command-code-tool-fields.ts
@@ -1,13 +1,13 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   hasOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { extractToolResponseText } from '../interactive-tool'
-import { readLastCommandCodeAssistantFromTranscript } from '../command-code-transcript'
+} from '../../tool-input-preview'
+import { extractToolResponseText } from '../../interactive-tool'
+import { readLastCommandCodeAssistantFromTranscript } from '../../command-code-transcript'
 
 export function extractCommandCodeToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/copilot-events.ts b/src/shared/agent-hook-listener/providers/copilot/copilot-events.ts
similarity index 88%
rename from src/shared/agent-hook-listener/providers/copilot-events.ts
rename to src/shared/agent-hook-listener/providers/copilot/copilot-events.ts
index 9410202769a..9cb2b009f49 100644
--- a/src/shared/agent-hook-listener/providers/copilot-events.ts
+++ b/src/shared/agent-hook-listener/providers/copilot/copilot-events.ts
@@ -1,11 +1,11 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { readFirstString } from '../interactive-tool'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import { readFirstString } from '../../interactive-tool'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 import {
   isAskUserTool,
   normalizeCopilotEventName,
diff --git a/src/shared/agent-hook-listener/providers/copilot-tool-fields.ts b/src/shared/agent-hook-listener/providers/copilot/copilot-tool-fields.ts
similarity index 97%
rename from src/shared/agent-hook-listener/providers/copilot-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/copilot/copilot-tool-fields.ts
index 491be19a30f..f5b99ec90c9 100644
--- a/src/shared/agent-hook-listener/providers/copilot-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/copilot/copilot-tool-fields.ts
@@ -1,17 +1,17 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
+} from '../../tool-input-preview'
 import {
   clearActiveToolFieldsUpdate,
   extractToolResponseText,
   parseJsonObjectString,
   readFirstString
-} from '../interactive-tool'
-import { readLastAssistantFromTranscript } from '../transcript-lines'
+} from '../../interactive-tool'
+import { readLastAssistantFromTranscript } from '../../transcript-lines'
 
 export function normalizeCopilotEventName(eventName: unknown): unknown {
   if (typeof eventName !== 'string') {
diff --git a/src/shared/agent-hook-listener/providers/cursor-events.ts b/src/shared/agent-hook-listener/providers/cursor/cursor-events.ts
similarity index 88%
rename from src/shared/agent-hook-listener/providers/cursor-events.ts
rename to src/shared/agent-hook-listener/providers/cursor/cursor-events.ts
index e45fff8b06b..28ecfcb04ad 100644
--- a/src/shared/agent-hook-listener/providers/cursor-events.ts
+++ b/src/shared/agent-hook-listener/providers/cursor/cursor-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 export function normalizeCursorEvent(
   state: HookListenerState,
diff --git a/src/shared/agent-hook-listener/providers/cursor-tool-fields.ts b/src/shared/agent-hook-listener/providers/cursor/cursor-tool-fields.ts
similarity index 95%
rename from src/shared/agent-hook-listener/providers/cursor-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/cursor/cursor-tool-fields.ts
index 7e0ab173c18..ed47925fa75 100644
--- a/src/shared/agent-hook-listener/providers/cursor-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/cursor/cursor-tool-fields.ts
@@ -1,12 +1,12 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveToolInputPreview,
   hasAnyOwnField,
   hasOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { clearActiveToolFieldsUpdate, extractToolResponseText } from '../interactive-tool'
+} from '../../tool-input-preview'
+import { clearActiveToolFieldsUpdate, extractToolResponseText } from '../../interactive-tool'
 
 export function extractCursorToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/devin-events.ts b/src/shared/agent-hook-listener/providers/devin/devin-events.ts
similarity index 89%
rename from src/shared/agent-hook-listener/providers/devin-events.ts
rename to src/shared/agent-hook-listener/providers/devin/devin-events.ts
index 89c203ceb5f..8e23302dba2 100644
--- a/src/shared/agent-hook-listener/providers/devin-events.ts
+++ b/src/shared/agent-hook-listener/providers/devin/devin-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 // Why: Devin uses Claude-compatible payloads but its own lifecycle event set; normalize those event names while keeping Devin attribution.
 export function normalizeDevinEvent(
diff --git a/src/shared/agent-hook-listener/providers/droid-events.ts b/src/shared/agent-hook-listener/providers/droid/droid-events.ts
similarity index 90%
rename from src/shared/agent-hook-listener/providers/droid-events.ts
rename to src/shared/agent-hook-listener/providers/droid/droid-events.ts
index 8a7de57105a..61e56171f2d 100644
--- a/src/shared/agent-hook-listener/providers/droid-events.ts
+++ b/src/shared/agent-hook-listener/providers/droid/droid-events.ts
@@ -1,11 +1,11 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../../agent-status/contracts/agent-status-types'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 import {
   isDroidAskUserTool,
   isDroidHighRiskToolUse,
diff --git a/src/shared/agent-hook-listener/providers/droid-tool-fields.ts b/src/shared/agent-hook-listener/providers/droid/droid-tool-fields.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/droid-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/droid/droid-tool-fields.ts
index 1f88f2da439..52561f4f2bd 100644
--- a/src/shared/agent-hook-listener/providers/droid-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/droid/droid-tool-fields.ts
@@ -1,12 +1,12 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { extractToolResponseText } from '../interactive-tool'
-import { readLastAssistantFromTranscript } from '../transcript-lines'
+} from '../../tool-input-preview'
+import { extractToolResponseText } from '../../interactive-tool'
+import { readLastAssistantFromTranscript } from '../../transcript-lines'
 
 export function isDroidPermissionNotification(message: string | undefined): boolean {
   if (!message) {
diff --git a/src/shared/agent-hook-listener/providers/dsh-events.test.ts b/src/shared/agent-hook-listener/providers/dsh/dsh-events.test.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/dsh-events.test.ts
rename to src/shared/agent-hook-listener/providers/dsh/dsh-events.test.ts
index c64cce02b74..5d2503b6819 100644
--- a/src/shared/agent-hook-listener/providers/dsh-events.test.ts
+++ b/src/shared/agent-hook-listener/providers/dsh/dsh-events.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest'
-import { createHookListenerState, type HookListenerState } from '../listener-state'
-import { normalizeAndAccept } from '../normalization/agent-hook-listener-test-harness'
+import { createHookListenerState, type HookListenerState } from '../../listener-state'
+import { normalizeAndAccept } from '../../normalization/agent-hook-listener-test-harness'
 
 // Real @deepseek-ai/dsh-hooks-claude-code0.1.5-rc.3 payloads: session/cwd/event fields and empty transcript_path, mounted through DSH_HOME/cordis.patch.yml.
 const SESSION_ID = '9478e2d8-29bc-4009-ab32-657efa2bd763'
diff --git a/src/shared/agent-hook-listener/providers/dsh-events.ts b/src/shared/agent-hook-listener/providers/dsh/dsh-events.ts
similarity index 84%
rename from src/shared/agent-hook-listener/providers/dsh-events.ts
rename to src/shared/agent-hook-listener/providers/dsh/dsh-events.ts
index 74675e79feb..997151d3a49 100644
--- a/src/shared/agent-hook-listener/providers/dsh-events.ts
+++ b/src/shared/agent-hook-listener/providers/dsh/dsh-events.ts
@@ -1,16 +1,16 @@
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
 import {
   resolvePrompt,
   resolveToolState,
   shouldIgnoreCompactContinuationUserPromptSubmit
-} from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 
 /** DSH's Claude-shaped bridge lacks Notification/PermissionRequest. ask_user_question blocks between Pre/PostToolUse; unobservable approval pauses remain working. */
 export function normalizeDshEvent(
diff --git a/src/shared/agent-hook-listener/providers/gemini-events.ts b/src/shared/agent-hook-listener/providers/gemini/gemini-events.ts
similarity index 83%
rename from src/shared/agent-hook-listener/providers/gemini-events.ts
rename to src/shared/agent-hook-listener/providers/gemini/gemini-events.ts
index 894135d9aeb..940119a8a03 100644
--- a/src/shared/agent-hook-listener/providers/gemini-events.ts
+++ b/src/shared/agent-hook-listener/providers/gemini/gemini-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 export function normalizeGeminiEvent(
   state: HookListenerState,
diff --git a/src/shared/agent-hook-listener/providers/gemini-tool-fields.ts b/src/shared/agent-hook-listener/providers/gemini/gemini-tool-fields.ts
similarity index 91%
rename from src/shared/agent-hook-listener/providers/gemini-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/gemini/gemini-tool-fields.ts
index 9fadfea6e3c..40bbe9b960f 100644
--- a/src/shared/agent-hook-listener/providers/gemini-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/gemini/gemini-tool-fields.ts
@@ -1,10 +1,10 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
+} from '../../tool-input-preview'
 
 export function extractGeminiToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/grok-background-tasks.ts b/src/shared/agent-hook-listener/providers/grok/grok-background-tasks.ts
similarity index 89%
rename from src/shared/agent-hook-listener/providers/grok-background-tasks.ts
rename to src/shared/agent-hook-listener/providers/grok/grok-background-tasks.ts
index 558f8d0bf2f..c503aa9d3ad 100644
--- a/src/shared/agent-hook-listener/providers/grok-background-tasks.ts
+++ b/src/shared/agent-hook-listener/providers/grok/grok-background-tasks.ts
@@ -1,12 +1,12 @@
-import type { AgentChildWorkKind } from '../../agent-status/child-work/agent-status-child-work'
+import type { AgentChildWorkKind } from '../../../agent-status/child-work/agent-status-child-work'
 import {
   agentChildWorkLiveness,
   type AgentChildWorkLiveness
-} from '../../agent-status/child-work/agent-status-child-work-liveness'
-import { isRecord } from '../../agent-status/child-work/agent-status-child-work-value-guards'
-import type { HookListenerState } from '../listener-state'
-import { isGrokEvent } from '../provider-event-names'
-import { readString } from '../tool-input-preview'
+} from '../../../agent-status/child-work/agent-status-child-work-liveness'
+import { isRecord } from '../../../agent-status/child-work/agent-status-child-work-value-guards'
+import type { HookListenerState } from '../../listener-state'
+import { isGrokEvent } from '../../provider-event-names'
+import { readString } from '../../tool-input-preview'
 import { getGrokNotificationType } from './grok-tool-fields'
 
 // Grok's own task ids per pane, since StopCancelled carries no inventory. A child session's id is its
diff --git a/src/shared/agent-hook-listener/providers/grok-events.ts b/src/shared/agent-hook-listener/providers/grok/grok-events.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/grok-events.ts
rename to src/shared/agent-hook-listener/providers/grok/grok-events.ts
index a2ac1ce621f..9ba5f9f2e68 100644
--- a/src/shared/agent-hook-listener/providers/grok-events.ts
+++ b/src/shared/agent-hook-listener/providers/grok/grok-events.ts
@@ -1,23 +1,23 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
+} from '../../../agent-status/contracts/agent-status-types'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
 import {
   continueMainAgentStatus,
   foldAgentLeadStatus
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
+} from '../../../agent-status/lifecycle/agent-lead-status-fold'
 import {
   agentChildWorkLiveness,
   type AgentChildWorkLiveness,
   type AgentChildWorkLivenessCandidate
-} from '../../agent-status/child-work/agent-status-child-work-liveness'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { normalizeGrokPromptId } from '../listener-limits'
-import { resolvePrompt, resolveToolState, stripGrokUserQueryWrapper } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
-import { isGrokEvent } from '../provider-event-names'
+} from '../../../agent-status/child-work/agent-status-child-work-liveness'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { normalizeGrokPromptId } from '../../listener-limits'
+import { resolvePrompt, resolveToolState, stripGrokUserQueryWrapper } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
+import { isGrokEvent } from '../../provider-event-names'
 import {
   grokBackgroundTaskLiveness,
   grokFiniteTaskKind,
diff --git a/src/shared/agent-hook-listener/providers/grok-tool-fields.ts b/src/shared/agent-hook-listener/providers/grok/grok-tool-fields.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/grok-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/grok/grok-tool-fields.ts
index fab7c0b962c..d3e9b118800 100644
--- a/src/shared/agent-hook-listener/providers/grok-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/grok/grok-tool-fields.ts
@@ -1,19 +1,19 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
+} from '../../tool-input-preview'
 import {
   clearActiveToolFieldsUpdate,
   deriveInteractivePrompt,
   extractToolResponseText
-} from '../interactive-tool'
-import { readLastAssistantFromTranscript } from '../transcript-lines'
-import { readLastAssistantFromGrokChatHistory } from '../grok-result-discovery'
-import { isGrokEvent } from '../provider-event-names'
+} from '../../interactive-tool'
+import { readLastAssistantFromTranscript } from '../../transcript-lines'
+import { readLastAssistantFromGrokChatHistory } from '../../grok-result-discovery'
+import { isGrokEvent } from '../../provider-event-names'
 
 export function extractGrokToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/hermes-events.test.ts b/src/shared/agent-hook-listener/providers/hermes/hermes-events.test.ts
similarity index 99%
rename from src/shared/agent-hook-listener/providers/hermes-events.test.ts
rename to src/shared/agent-hook-listener/providers/hermes/hermes-events.test.ts
index 27f40b21947..00dfc756d09 100644
--- a/src/shared/agent-hook-listener/providers/hermes-events.test.ts
+++ b/src/shared/agent-hook-listener/providers/hermes/hermes-events.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { createHookListenerState, type HookListenerState } from '../listener-state'
+import { createHookListenerState, type HookListenerState } from '../../listener-state'
 import { normalizeHermesEvent } from './hermes-events'
 
 describe('normalizeHermesEvent', () => {
diff --git a/src/shared/agent-hook-listener/providers/hermes-events.ts b/src/shared/agent-hook-listener/providers/hermes/hermes-events.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/hermes-events.ts
rename to src/shared/agent-hook-listener/providers/hermes/hermes-events.ts
index 8572bc025a9..bf01a2e2d12 100644
--- a/src/shared/agent-hook-listener/providers/hermes-events.ts
+++ b/src/shared/agent-hook-listener/providers/hermes/hermes-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 /** Session open/switch/reset is idle, not a turn. done+sessionBoundary avoids phantom work and 30-minute tui-idle vetoes. */
 const HERMES_EVENT_STATES: Record<string, 'working' | 'waiting' | 'done'> = {
diff --git a/src/shared/agent-hook-listener/providers/hermes-tool-fields.ts b/src/shared/agent-hook-listener/providers/hermes/hermes-tool-fields.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/hermes-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/hermes/hermes-tool-fields.ts
index 865e92b20ff..45e82d2dd68 100644
--- a/src/shared/agent-hook-listener/providers/hermes-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/hermes/hermes-tool-fields.ts
@@ -1,12 +1,12 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   hasAnyOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
-import { extractToolResponseText } from '../interactive-tool'
+} from '../../tool-input-preview'
+import { extractToolResponseText } from '../../interactive-tool'
 
 export function extractHermesToolFields(
   eventName: unknown,
diff --git a/src/shared/agent-hook-listener/providers/jcode-turn-prompt.test.ts b/src/shared/agent-hook-listener/providers/jcode-turn-prompt.test.ts
deleted file mode 100644
index a1ec6b923b6..00000000000
--- a/src/shared/agent-hook-listener/providers/jcode-turn-prompt.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { JcodeUserPromptEvidence } from '../../jcode-session-files'
-
-const { readMock } = vi.hoisted(() => ({
-  readMock: vi.fn<() => JcodeUserPromptEvidence | null>()
-}))
-vi.mock('../../jcode-session-files', () => ({
-  readLastJcodeUserPromptFromHookPayload: readMock
-}))
-
-import { createHookListenerState, type HookListenerState } from '../listener-state'
-import { readJcodeTurnPrompt } from './jcode-turn-prompt'
-
-const PAYLOAD = { session_id: 'session_jc_9' }
-
-// jcode blocks on pre_tool; repeated synchronous transcript scans add latency to every tool.
-describe('jcode turn prompt cache', () => {
-  let state: HookListenerState
-
-  beforeEach(() => {
-    state = createHookListenerState()
-    readMock.mockReset()
-    readMock.mockReturnValue({ text: 'ship it', interactionKey: 'k1' })
-  })
-
-  it('re-reads on the next turn, so a new prompt is not served from the old turn', () => {
-    const first = readJcodeTurnPrompt(state, 'turn_start', 'pane-a', PAYLOAD)
-    expect(first).toEqual({ text: 'ship it', interactionKey: 'k1' })
-    const next = { text: 'review the release', interactionKey: 'k2' }
-    readMock.mockReturnValue(next)
-    expect(readJcodeTurnPrompt(state, 'pre_tool', 'pane-a', PAYLOAD)).toEqual(first)
-    expect(readJcodeTurnPrompt(state, 'turn_start', 'pane-a', PAYLOAD)).toEqual(next)
-    expect(readJcodeTurnPrompt(state, 'post_tool', 'pane-a', PAYLOAD)).toEqual(next)
-    expect(readMock).toHaveBeenCalledTimes(2)
-  })
-
-  it('caches per pane, so one pane cannot answer for another', () => {
-    const paneA = { text: 'ship it', interactionKey: 'k1' }
-    const paneB = { text: 'review the release', interactionKey: 'k2' }
-    const payloadB = { session_id: 'session_jc_10' }
-    readMock.mockReturnValueOnce(paneA).mockReturnValueOnce(paneB)
-    expect(readJcodeTurnPrompt(state, 'pre_tool', 'pane-a', PAYLOAD)).toEqual(paneA)
-    expect(readJcodeTurnPrompt(state, 'pre_tool', 'pane-b', payloadB)).toEqual(paneB)
-    expect(readJcodeTurnPrompt(state, 'post_tool', 'pane-a', PAYLOAD)).toEqual(paneA)
-    expect(readJcodeTurnPrompt(state, 'post_tool', 'pane-b', payloadB)).toEqual(paneB)
-    expect(readMock).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/shared/agent-hook-listener/providers/jcode-events.ts b/src/shared/agent-hook-listener/providers/jcode/jcode-events.ts
similarity index 89%
rename from src/shared/agent-hook-listener/providers/jcode-events.ts
rename to src/shared/agent-hook-listener/providers/jcode/jcode-events.ts
index 3a111fa2691..8321bc6d428 100644
--- a/src/shared/agent-hook-listener/providers/jcode-events.ts
+++ b/src/shared/agent-hook-listener/providers/jcode/jcode-events.ts
@@ -2,11 +2,11 @@ import {
   normalizeAgentStatusPayload,
   type AgentStatusState,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../../agent-status/contracts/agent-status-types'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 import { isJcodeUserInputTool } from './jcode-tool-fields'
 
 // Lifecycle mapping follows docs/reference/jcode-hook-events.md; idle session_start takes the early path.
diff --git a/src/shared/agent-hook-listener/providers/jcode-helper-permission-wait.ts b/src/shared/agent-hook-listener/providers/jcode/jcode-helper-permission-wait.ts
similarity index 90%
rename from src/shared/agent-hook-listener/providers/jcode-helper-permission-wait.ts
rename to src/shared/agent-hook-listener/providers/jcode/jcode-helper-permission-wait.ts
index 3dbe62cb420..89cb8610105 100644
--- a/src/shared/agent-hook-listener/providers/jcode-helper-permission-wait.ts
+++ b/src/shared/agent-hook-listener/providers/jcode/jcode-helper-permission-wait.ts
@@ -1,9 +1,9 @@
-import { isCachedJcodeHelperSession } from '../../jcode-helper-sessions'
-import type { ParsedHookEnvelope } from '../hook-envelope'
-import type { AgentHookEventPayload } from '../listener-event'
-import type { HookListenerState } from '../listener-state'
-import { readString } from '../tool-input-preview'
-import type { AgentHookSource } from '../transport/agent-hook-relay'
+import { isCachedJcodeHelperSession } from '../../../jcode-helper-sessions'
+import type { ParsedHookEnvelope } from '../../hook-envelope'
+import type { AgentHookEventPayload } from '../../listener-event'
+import type { HookListenerState } from '../../listener-state'
+import { readString } from '../../tool-input-preview'
+import type { AgentHookSource } from '../../transport/agent-hook-relay'
 import { extractJcodeToolFields, isJcodeUserInputTool } from './jcode-tool-fields'
 
 type HelperRequest = { toolInput?: string; interactivePrompt?: string }
diff --git a/src/shared/agent-hook-listener/providers/jcode-tool-fields.ts b/src/shared/agent-hook-listener/providers/jcode/jcode-tool-fields.ts
similarity index 96%
rename from src/shared/agent-hook-listener/providers/jcode-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/jcode/jcode-tool-fields.ts
index 78a72ff4263..63030e70075 100644
--- a/src/shared/agent-hook-listener/providers/jcode-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/jcode/jcode-tool-fields.ts
@@ -1,11 +1,11 @@
-import type { ToolSnapshot } from '../listener-event'
+import type { ToolSnapshot } from '../../listener-event'
 import {
   deriveFallbackToolInputPreview,
   deriveToolInputPreview,
   hasOwnField,
   readString,
   toolUpdate
-} from '../tool-input-preview'
+} from '../../tool-input-preview'
 
 /** Only request_permission waits on a person (resolved via jcode permissions); other safety decisions stay in-model/tool. Match exactly to avoid widening human waits. */
 export function isJcodeUserInputTool(toolName: string | undefined): boolean {
diff --git a/src/shared/agent-hook-listener/providers/jcode-turn-prompt.ts b/src/shared/agent-hook-listener/providers/jcode/jcode-turn-prompt.ts
similarity index 81%
rename from src/shared/agent-hook-listener/providers/jcode-turn-prompt.ts
rename to src/shared/agent-hook-listener/providers/jcode/jcode-turn-prompt.ts
index 7b6459bdacd..b7fa7e50440 100644
--- a/src/shared/agent-hook-listener/providers/jcode-turn-prompt.ts
+++ b/src/shared/agent-hook-listener/providers/jcode/jcode-turn-prompt.ts
@@ -1,9 +1,9 @@
 import {
   readLastJcodeUserPromptFromHookPayload,
   type JcodeUserPromptEvidence
-} from '../../jcode-session-files'
-import { isNewTurnEvent } from '../provider-event-routing'
-import type { HookListenerState } from '../listener-state'
+} from '../../../jcode-session-files'
+import { isNewTurnEvent } from '../../provider-event-routing'
+import type { HookListenerState } from '../../listener-state'
 
 /** Cache one bounded synchronous journal read per turn: jcode blocks on pre_tool. Without a pane key, read directly. */
 export function readJcodeTurnPrompt(
diff --git a/src/shared/agent-hook-listener/providers/kimi-events.ts b/src/shared/agent-hook-listener/providers/kimi/kimi-events.ts
similarity index 90%
rename from src/shared/agent-hook-listener/providers/kimi-events.ts
rename to src/shared/agent-hook-listener/providers/kimi/kimi-events.ts
index 96cc084b19e..667d6a84c72 100644
--- a/src/shared/agent-hook-listener/providers/kimi-events.ts
+++ b/src/shared/agent-hook-listener/providers/kimi/kimi-events.ts
@@ -1,15 +1,15 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
 import {
   resolvePrompt,
   resolveToolState,
   shouldIgnoreCompactContinuationUserPromptSubmit
-} from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 
 // Auto-allowed AskUserQuestion still blocks a human on PreToolUse.
 export function isKimiUserInputTool(toolName: string | undefined): boolean {
diff --git a/src/shared/agent-hook-listener/providers/kiro-events.ts b/src/shared/agent-hook-listener/providers/kiro/kiro-events.ts
similarity index 84%
rename from src/shared/agent-hook-listener/providers/kiro-events.ts
rename to src/shared/agent-hook-listener/providers/kiro/kiro-events.ts
index 942150f7062..b3bcab5a35e 100644
--- a/src/shared/agent-hook-listener/providers/kiro-events.ts
+++ b/src/shared/agent-hook-listener/providers/kiro/kiro-events.ts
@@ -1,10 +1,10 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 /** Agent-config Kiro hooks use Claude-shaped fields without permission/notification events; approval pauses remain working. Subagents have their own config/hooks, not the lead's. */
 export function normalizeKiroEvent(
diff --git a/src/shared/agent-hook-listener/providers/kiro-tool-fields.ts b/src/shared/agent-hook-listener/providers/kiro/kiro-tool-fields.ts
similarity index 84%
rename from src/shared/agent-hook-listener/providers/kiro-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/kiro/kiro-tool-fields.ts
index 7d5fe87711e..514a49312df 100644
--- a/src/shared/agent-hook-listener/providers/kiro-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/kiro/kiro-tool-fields.ts
@@ -1,6 +1,6 @@
-import type { ToolSnapshot } from '../listener-event'
-import { readString } from '../tool-input-preview'
-import { extractClaudeToolFields } from './claude-tool-fields'
+import type { ToolSnapshot } from '../../listener-event'
+import { readString } from '../../tool-input-preview'
+import { extractClaudeToolFields } from '../claude/claude-tool-fields'
 
 /** Kiro V2 camelCase hook names mapped onto Claude's; V3 already sends Claude's names. */
 export const KIRO_CLAUDE_EVENT_NAMES: Readonly<Record<string, string>> = Object.freeze({
diff --git a/src/shared/agent-hook-listener/providers/muse-events.test.ts b/src/shared/agent-hook-listener/providers/muse-events.test.ts
deleted file mode 100644
index c0496d2aef0..00000000000
--- a/src/shared/agent-hook-listener/providers/muse-events.test.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { appendFileSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { createHookListenerState, type HookListenerState } from '../listener-state'
-import { normalizeAndAccept, PANE_KEY } from '../normalization/agent-hook-listener-test-harness'
-
-const SESSION_ID = '01a0caa3-0e77-7d41-bad7-46283a45633d'
-const TURN_ID = 'e495d1a5-59aa-47b4-8efb-a1bd75509afc'
-const CHILD_ID = '1471f5e6-bd60-41a2-bfcf-c9086dbd4092'
-const PROMPT_ID = '01a0caa3-a25a-7810-8229-4de04b2e7ca3'
-const QUESTION = {
-  id: 'fav_color',
-  header: 'Color',
-  question: 'What is your favorite color?',
-  options: [{ label: 'Blue' }, { label: 'Green' }, { label: 'Red' }]
-}
-
-const envelope = {
-  cwd: '/tmp/ws',
-  transcript_path: null,
-  model: 'muse-spark-1.3',
-  permission_mode: 'default',
-  model_provider: 'meta'
-}
-const main = { ...envelope, session_id: SESSION_ID, turn_id: TURN_ID }
-const child = { ...envelope, session_id: CHILD_ID, turn_id: CHILD_ID }
-const reminderInput = { decision: 'none', skill_id: 'bundled:grill' }
-
-function sessionLogLine(event: Record<string, unknown>): string {
-  return `${JSON.stringify({
-    schema_version: 1,
-    stream: { kind: 'session', id: SESSION_ID },
-    record_type: 'event',
-    payload_type: 'runtime.session',
-    payload: { kind: 'run', run_id: TURN_ID, event }
-  })}\n`
-}
-
-function childReminderHooks(): Record<string, unknown>[] {
-  return [
-    {
-      ...child,
-      hook_event_name: 'PreToolUse',
-      tool_name: 'submit_reminder_decision',
-      tool_input: reminderInput,
-      tool_use_id: 'call_child'
-    },
-    {
-      ...child,
-      hook_event_name: 'PermissionRequest',
-      tool_name: 'submit_reminder_decision',
-      tool_input: reminderInput
-    },
-    {
-      ...child,
-      hook_event_name: 'PostToolUseFailure',
-      tool_name: 'submit_reminder_decision',
-      tool_input: reminderInput,
-      error:
-        'tool failed: invalid reminder decision payload: unexpected field `additionalProperties`'
-    },
-    { ...child, hook_event_name: 'SubagentStop', subagent_id: 'skill-reminder' }
-  ]
-}
-
-describe('Muse hook events', () => {
-  let state: HookListenerState
-  let dataHome: string
-
-  beforeEach(() => {
-    state = createHookListenerState()
-    dataHome = mkdtempSync(join(tmpdir(), 'muse-events-'))
-    vi.stubEnv('XDG_DATA_HOME', dataHome)
-  })
-
-  afterEach(() => {
-    vi.unstubAllEnvs()
-    rmSync(dataHome, { recursive: true, force: true })
-  })
-
-  function sessionLogPath(): string {
-    const date = new Date(Number.parseInt(SESSION_ID.replace(/-/g, '').slice(0, 12), 16))
-    const dir = join(
-      dataHome,
-      'muse',
-      'sessions',
-      String(date.getFullYear()),
-      String(date.getMonth() + 1).padStart(2, '0'),
-      String(date.getDate()).padStart(2, '0'),
-      SESSION_ID
-    )
-    mkdirSync(dir, { recursive: true })
-    return join(dir, 'session.jsonl')
-  }
-
-  it('drops reminder-subagent hooks announced by SubagentStart, even after Stop', () => {
-    normalizeAndAccept(state, 'muse', {
-      ...main,
-      hook_event_name: 'UserPromptSubmit',
-      prompt: 'list files'
-    })
-    const start = normalizeAndAccept(state, 'muse', {
-      ...child,
-      hook_event_name: 'SubagentStart',
-      subagent_id: 'skill-reminder',
-      child_session_id: CHILD_ID
-    })
-    expect(start).toBeNull()
-    for (const hook of childReminderHooks()) {
-      expect(normalizeAndAccept(state, 'muse', hook)).toBeNull()
-    }
-
-    const stopped = normalizeAndAccept(state, 'muse', {
-      ...main,
-      hook_event_name: 'Stop',
-      stop_hook_active: false,
-      last_assistant_message: 'Here are the files.'
-    })
-    expect(stopped?.payload.state).toBe('done')
-    for (const hook of childReminderHooks()) {
-      expect(normalizeAndAccept(state, 'muse', hook)).toBeNull()
-    }
-    expect(state.lastStatusByPaneKey.get(PANE_KEY)?.payload).toMatchObject({
-      state: 'done',
-      lastAssistantMessage: 'Here are the files.'
-    })
-  })
-
-  // Restart/reconnect can lose the child's SubagentStart.
-  it('drops child-session hooks whose turn id equals their session id without SubagentStart', () => {
-    normalizeAndAccept(state, 'muse', {
-      ...main,
-      hook_event_name: 'Stop',
-      stop_hook_active: false,
-      last_assistant_message: 'done'
-    })
-    for (const hook of childReminderHooks()) {
-      expect(normalizeAndAccept(state, 'muse', hook)).toBeNull()
-    }
-    expect(state.lastStatusByPaneKey.get(PANE_KEY)?.payload.state).toBe('done')
-  })
-
-  // Muse 1.4.14 subagent_spawn trace: the child starts before the lead's Stop and ends long after it.
-  const SPAWNED_ID = '01a1afae-e716-7a93-8ecf-67cb69c7e7aa'
-  const spawned = { ...envelope, session_id: CHILD_ID, turn_id: CHILD_ID }
-  const leadStop = {
-    ...main,
-    hook_event_name: 'Stop',
-    stop_hook_active: false,
-    last_assistant_message: 'SPAWNED'
-  }
-
-  function holdLeadStopForSpawnedChild(): void {
-    normalizeAndAccept(state, 'muse', {
-      ...main,
-      hook_event_name: 'UserPromptSubmit',
-      prompt: 'go'
-    })
-    normalizeAndAccept(state, 'muse', {
-      ...spawned,
-      hook_event_name: 'SubagentStart',
-      subagent_id: SPAWNED_ID,
-      child_session_id: CHILD_ID
-    })
-    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload).toMatchObject({
-      state: 'working',
-      mainAgent: { state: 'done' }
-    })
-  }
-
-  it('holds the finished turn working until the spawned subagent stops', () => {
-    holdLeadStopForSpawnedChild()
-    expect(
-      normalizeAndAccept(state, 'muse', {
-        ...spawned,
-        hook_event_name: 'SubagentStop',
-        subagent_id: SPAWNED_ID,
-        child_session_id: CHILD_ID
-      })
-    ).toBeNull()
-    // The transcript poll replays the held Stop.
-    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload.state).toBe('done')
-  })
-
-  it('releases a held turn when the user interrupts Muse', () => {
-    holdLeadStopForSpawnedChild()
-    expect(normalizeAndAccept(state, 'muse', { ...main, hook_event_name: 'Interrupt' })).toBeNull()
-    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload.state).toBe('done')
-  })
-
-  it('reports a request_user_input question from the session log until it settles', () => {
-    const logPath = sessionLogPath()
-    const body = { ...main, hook_event_name: 'UserPromptSubmit', prompt: 'ask my favorite color' }
-    const working = normalizeAndAccept(state, 'muse', body)
-    expect(working?.payload.state).toBe('working')
-
-    writeFileSync(
-      logPath,
-      sessionLogLine({
-        kind: 'user_input_prompt_requested',
-        prompt_id: PROMPT_ID,
-        tool_name: 'request_user_input',
-        questions: [QUESTION]
-      })
-    )
-    const waiting = normalizeAndAccept(state, 'muse', body)
-    expect(waiting?.payload).toMatchObject({
-      agentType: 'muse',
-      state: 'waiting',
-      toolName: 'request_user_input',
-      prompt: 'ask my favorite color',
-      interactivePrompt: JSON.stringify({ questions: [QUESTION] })
-    })
-
-    appendFileSync(
-      logPath,
-      sessionLogLine({
-        kind: 'user_input_prompt_settled',
-        prompt_id: PROMPT_ID,
-        outcome: 'answered',
-        answers: [{ id: 'fav_color', selected_label: 'Blue' }]
-      })
-    )
-    const answered = normalizeAndAccept(state, 'muse', body)
-    expect(answered?.payload.state).toBe('working')
-    expect(answered?.payload.interactivePrompt).toBeUndefined()
-  })
-})
diff --git a/src/shared/agent-hook-listener/providers/muse/muse-events.test.ts b/src/shared/agent-hook-listener/providers/muse/muse-events.test.ts
new file mode 100644
index 00000000000..b204ef7b561
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/muse/muse-events.test.ts
@@ -0,0 +1,85 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { createHookListenerState, type HookListenerState } from '../../listener-state'
+import { normalizeAndAccept } from '../../normalization/agent-hook-listener-test-harness'
+
+const SESSION_ID = '01a0caa3-0e77-7d41-bad7-46283a45633d'
+const TURN_ID = 'e495d1a5-59aa-47b4-8efb-a1bd75509afc'
+const CHILD_ID = '1471f5e6-bd60-41a2-bfcf-c9086dbd4092'
+
+const envelope = {
+  cwd: '/tmp/ws',
+  transcript_path: null,
+  model: 'muse-spark-1.3',
+  permission_mode: 'default',
+  model_provider: 'meta'
+}
+const main = { ...envelope, session_id: SESSION_ID, turn_id: TURN_ID }
+
+describe('Muse hook events', () => {
+  let state: HookListenerState
+  let dataHome: string
+
+  beforeEach(() => {
+    state = createHookListenerState()
+    dataHome = mkdtempSync(join(tmpdir(), 'muse-events-'))
+    vi.stubEnv('XDG_DATA_HOME', dataHome)
+  })
+
+  afterEach(() => {
+    vi.unstubAllEnvs()
+    rmSync(dataHome, { recursive: true, force: true })
+  })
+
+  // Restart/reconnect can lose the child's SubagentStart.
+
+  // Muse 1.4.14 subagent_spawn trace: the child starts before the lead's Stop and ends long after it.
+  const SPAWNED_ID = '01a1afae-e716-7a93-8ecf-67cb69c7e7aa'
+  const spawned = { ...envelope, session_id: CHILD_ID, turn_id: CHILD_ID }
+  const leadStop = {
+    ...main,
+    hook_event_name: 'Stop',
+    stop_hook_active: false,
+    last_assistant_message: 'SPAWNED'
+  }
+
+  function holdLeadStopForSpawnedChild(): void {
+    normalizeAndAccept(state, 'muse', {
+      ...main,
+      hook_event_name: 'UserPromptSubmit',
+      prompt: 'go'
+    })
+    normalizeAndAccept(state, 'muse', {
+      ...spawned,
+      hook_event_name: 'SubagentStart',
+      subagent_id: SPAWNED_ID,
+      child_session_id: CHILD_ID
+    })
+    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload).toMatchObject({
+      state: 'working',
+      mainAgent: { state: 'done' }
+    })
+  }
+
+  it('holds the finished turn working until the spawned subagent stops', () => {
+    holdLeadStopForSpawnedChild()
+    expect(
+      normalizeAndAccept(state, 'muse', {
+        ...spawned,
+        hook_event_name: 'SubagentStop',
+        subagent_id: SPAWNED_ID,
+        child_session_id: CHILD_ID
+      })
+    ).toBeNull()
+    // The transcript poll replays the held Stop.
+    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload.state).toBe('done')
+  })
+
+  it('releases a held turn when the user interrupts Muse', () => {
+    holdLeadStopForSpawnedChild()
+    expect(normalizeAndAccept(state, 'muse', { ...main, hook_event_name: 'Interrupt' })).toBeNull()
+    expect(normalizeAndAccept(state, 'muse', leadStop)?.payload.state).toBe('done')
+  })
+})
diff --git a/src/shared/agent-hook-listener/providers/muse-events.ts b/src/shared/agent-hook-listener/providers/muse/muse-events.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/muse-events.ts
rename to src/shared/agent-hook-listener/providers/muse/muse-events.ts
index 58f1741d728..a63dcbb000c 100644
--- a/src/shared/agent-hook-listener/providers/muse-events.ts
+++ b/src/shared/agent-hook-listener/providers/muse/muse-events.ts
@@ -1,25 +1,25 @@
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
+} from '../../../agent-status/contracts/agent-status-types'
 import {
   agentChildWorkLiveness,
   type AgentChildWorkLiveness
-} from '../../agent-status/child-work/agent-status-child-work-liveness'
+} from '../../../agent-status/child-work/agent-status-child-work-liveness'
 import {
   continueMainAgentStatus,
   foldAgentLeadStatus
-} from '../../agent-status/lifecycle/agent-lead-status-fold'
-import { createMuseSessionLogState, readMusePendingUserInput } from '../../muse-session-log'
-import type { HookListenerState, MusePaneState } from '../listener-state'
+} from '../../../agent-status/lifecycle/agent-lead-status-fold'
+import { createMuseSessionLogState, readMusePendingUserInput } from '../../../muse-session-log'
+import type { HookListenerState, MusePaneState } from '../../listener-state'
 import {
   resolvePrompt,
   resolveToolState,
   shouldIgnoreCompactContinuationUserPromptSubmit
-} from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 
 // Reminders use role names (skill-reminder); spawned children use UUIDs.
 const BACKGROUND_SUBAGENT_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
diff --git a/src/shared/agent-hook-listener/providers/opencode-family-events.ts b/src/shared/agent-hook-listener/providers/opencode-family/opencode-family-events.ts
similarity index 85%
rename from src/shared/agent-hook-listener/providers/opencode-family-events.ts
rename to src/shared/agent-hook-listener/providers/opencode-family/opencode-family-events.ts
index f5b4df3fef5..8f98e2e6ea3 100644
--- a/src/shared/agent-hook-listener/providers/opencode-family-events.ts
+++ b/src/shared/agent-hook-listener/providers/opencode-family/opencode-family-events.ts
@@ -1,12 +1,12 @@
-import { continueMainAgentStatus } from '../../agent-status/lifecycle/agent-lead-status-fold'
+import { continueMainAgentStatus } from '../../../agent-status/lifecycle/agent-lead-status-fold'
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { AgentMainAgentStatus } from '../../agent-status/lifecycle/main-agent-status'
-import type { HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { AgentMainAgentStatus } from '../../../agent-status/lifecycle/main-agent-status'
+import type { HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
 
 export function normalizeOpenCodeFamilyEvent(
   source: 'opencode' | 'opencode2' | 'mimo-code',
diff --git a/src/shared/agent-hook-listener/providers/opencode-family-tool-fields.ts b/src/shared/agent-hook-listener/providers/opencode-family/opencode-family-tool-fields.ts
similarity index 92%
rename from src/shared/agent-hook-listener/providers/opencode-family-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/opencode-family/opencode-family-tool-fields.ts
index 1afec20f4ff..a7fec2f2b47 100644
--- a/src/shared/agent-hook-listener/providers/opencode-family-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/opencode-family/opencode-family-tool-fields.ts
@@ -1,11 +1,11 @@
-import { capOpenCodeHookText } from '../listener-limits'
-import type { ToolSnapshot } from '../listener-event'
-import { hasAnyOwnField, hasOwnField, readString, toolUpdate } from '../tool-input-preview'
+import { capOpenCodeHookText } from '../../listener-limits'
+import type { ToolSnapshot } from '../../listener-event'
+import { hasAnyOwnField, hasOwnField, readString, toolUpdate } from '../../tool-input-preview'
 import {
   deriveInteractivePrompt,
   readFirstString,
   stripHookEnvelopeKeys
-} from '../interactive-tool'
+} from '../../interactive-tool'
 
 /** Resumed sessions emit no SessionStart; explicitly retire permission fields or answered cards persist on later frames. */
 const OPENCODE_TOOL_FIELDS_RETIRED: ToolSnapshot = {
diff --git a/src/shared/agent-hook-listener/providers/pi-family-events.ts b/src/shared/agent-hook-listener/providers/pi-family/pi-family-events.ts
similarity index 93%
rename from src/shared/agent-hook-listener/providers/pi-family-events.ts
rename to src/shared/agent-hook-listener/providers/pi-family/pi-family-events.ts
index 850eb031221..faa8d3567c9 100644
--- a/src/shared/agent-hook-listener/providers/pi-family-events.ts
+++ b/src/shared/agent-hook-listener/providers/pi-family/pi-family-events.ts
@@ -1,13 +1,13 @@
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
-import { clearPaneTurnCacheState, type HookListenerState } from '../listener-state'
-import { resolvePrompt, resolveToolState } from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
-import { parseOmpPlanReviewPrompt } from '../../omp-plan-review-prompt'
+} from '../../../agent-status/contracts/agent-status-types'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
+import { clearPaneTurnCacheState, type HookListenerState } from '../../listener-state'
+import { resolvePrompt, resolveToolState } from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
+import { parseOmpPlanReviewPrompt } from '../../../omp-plan-review-prompt'
 
 /** Normalize Pi/OMP/Prime lifecycle, question waits and live roster/model evidence; ignore events with no status. */
 export function normalizePiCompatibleEvent(
diff --git a/src/shared/agent-hook-listener/providers/pi-family-tool-fields.ts b/src/shared/agent-hook-listener/providers/pi-family/pi-family-tool-fields.ts
similarity index 90%
rename from src/shared/agent-hook-listener/providers/pi-family-tool-fields.ts
rename to src/shared/agent-hook-listener/providers/pi-family/pi-family-tool-fields.ts
index 38821a3f8f3..649c37fcaa5 100644
--- a/src/shared/agent-hook-listener/providers/pi-family-tool-fields.ts
+++ b/src/shared/agent-hook-listener/providers/pi-family/pi-family-tool-fields.ts
@@ -1,8 +1,13 @@
-import type { ToolSnapshot } from '../listener-event'
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
-import { deriveToolInputPreview, hasOwnField, readString, toolUpdate } from '../tool-input-preview'
-import { clearActiveToolFieldsUpdate, deriveInteractivePrompt } from '../interactive-tool'
-import { serializeOmpPlanReviewPrompt } from '../../omp-plan-review-prompt'
+import type { ToolSnapshot } from '../../listener-event'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
+import {
+  deriveToolInputPreview,
+  hasOwnField,
+  readString,
+  toolUpdate
+} from '../../tool-input-preview'
+import { clearActiveToolFieldsUpdate, deriveInteractivePrompt } from '../../interactive-tool'
+import { serializeOmpPlanReviewPrompt } from '../../../omp-plan-review-prompt'
 
 /** OMP's `ask` carries the same questions/options payload as Pi's question tool. */
 function serializeQuestionPrompt(toolInput: unknown): string | undefined {
diff --git a/src/shared/agent-hook-listener/providers/qoder-events.ts b/src/shared/agent-hook-listener/providers/qoder-events.ts
deleted file mode 100644
index c83923d58f7..00000000000
--- a/src/shared/agent-hook-listener/providers/qoder-events.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { normalizeCompatibleLifecycleEvent } from './compatible-lifecycle-events'
-import type { HookListenerState } from '../listener-state'
-
-export function normalizeQoderEvent(
-  state: HookListenerState,
-  eventName: unknown,
-  promptText: string,
-  paneKey: string,
-  hookPayload: Record<string, unknown>
-) {
-  return normalizeCompatibleLifecycleEvent(
-    'qoder',
-    state,
-    eventName,
-    promptText,
-    paneKey,
-    hookPayload
-  )
-}
diff --git a/src/shared/agent-hook-listener/providers/zcode-events.test.ts b/src/shared/agent-hook-listener/providers/zcode/zcode-events.test.ts
similarity index 94%
rename from src/shared/agent-hook-listener/providers/zcode-events.test.ts
rename to src/shared/agent-hook-listener/providers/zcode/zcode-events.test.ts
index 43feebb3bc7..cc04c44b1fa 100644
--- a/src/shared/agent-hook-listener/providers/zcode-events.test.ts
+++ b/src/shared/agent-hook-listener/providers/zcode/zcode-events.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest'
-import { createHookListenerState, type HookListenerState } from '../listener-state'
-import { normalizeAndAccept } from '../normalization/agent-hook-listener-test-harness'
+import { createHookListenerState, type HookListenerState } from '../../listener-state'
+import { normalizeAndAccept } from '../../normalization/agent-hook-listener-test-harness'
 
 const SESSION_ID = 'sess_01a0caa30e777d41bad746283a45633d'
 const TURN_ID = 'turn_e495d1a559aa478efba1bd75509afc'
diff --git a/src/shared/agent-hook-listener/providers/zcode-events.ts b/src/shared/agent-hook-listener/providers/zcode/zcode-events.ts
similarity index 87%
rename from src/shared/agent-hook-listener/providers/zcode-events.ts
rename to src/shared/agent-hook-listener/providers/zcode/zcode-events.ts
index 72bdf3239dc..bc52b65909b 100644
--- a/src/shared/agent-hook-listener/providers/zcode-events.ts
+++ b/src/shared/agent-hook-listener/providers/zcode/zcode-events.ts
@@ -1,16 +1,16 @@
-import { isAskUserQuestionTool } from '../../agent-status/lifecycle/agent-question-answered-intent'
+import { isAskUserQuestionTool } from '../../../agent-status/lifecycle/agent-question-answered-intent'
 import {
   normalizeAgentStatusPayload,
   type ParsedAgentStatusPayload
-} from '../../agent-status/contracts/agent-status-types'
-import type { HookListenerState } from '../listener-state'
+} from '../../../agent-status/contracts/agent-status-types'
+import type { HookListenerState } from '../../listener-state'
 import {
   resolvePrompt,
   resolveToolState,
   shouldIgnoreCompactContinuationUserPromptSubmit
-} from '../prompt-fields'
-import { extractToolFields, isNewTurnEvent } from '../provider-event-routing'
-import { readString } from '../tool-input-preview'
+} from '../../prompt-fields'
+import { extractToolFields, isNewTurnEvent } from '../../provider-event-routing'
+import { readString } from '../../tool-input-preview'
 
 // ZCode configured-runner-input emits Claude-compatible aliases beside native camelCase; reuse Claude tool fields with ZCode identity.
 const ZCODE_IDLE_SESSION_START_SOURCES: ReadonlySet<string> = new Set([
diff --git a/src/shared/agent-hook-listener/transcript-poll-policy.ts b/src/shared/agent-hook-listener/transcript-poll-policy.ts
index c18f2aad283..7cec0e32f7a 100644
--- a/src/shared/agent-hook-listener/transcript-poll-policy.ts
+++ b/src/shared/agent-hook-listener/transcript-poll-policy.ts
@@ -1,8 +1,8 @@
 import type { AgentHookSource } from './transport/agent-hook-relay'
 import type { AgentHookEventPayload } from './listener-event'
 import type { HookListenerState } from './listener-state'
-import { hasCodexTranscriptSubagents } from './providers/codex-state'
-import { hasMuseSessionLog } from './providers/muse-events'
+import { hasCodexTranscriptSubagents } from './providers/codex/codex-state'
+import { hasMuseSessionLog } from './providers/muse/muse-events'
 import { hasPendingCodexSubagentIdentity } from '../codex-subagent-roster'
 import { parseHookEnvelope } from './hook-envelope'
 
diff --git a/src/shared/agent-launch/contracts/agent-pane-launch-request.ts b/src/shared/agent-launch/contracts/agent-pane-launch-request.ts
index 40128368231..b69737bce20 100644
--- a/src/shared/agent-launch/contracts/agent-pane-launch-request.ts
+++ b/src/shared/agent-launch/contracts/agent-pane-launch-request.ts
@@ -1,5 +1,5 @@
 import type { z } from 'zod'
-import type { AgentLaunch } from '../../rpc-contract/agent-launch-params'
+import type { AgentLaunch } from '../../rpc-contract/agent-launch/agent-launch-params'
 
 /** `agent.launch` params a pane hands its own spawn; main names the pane, and nothing is recorded. */
 export type AgentPaneLaunchRequest = {
diff --git a/src/shared/agent-launch/permissions/tui-agent-auto-permissions.test.ts b/src/shared/agent-launch/permissions/tui-agent-auto-permissions.test.ts
index 93d5736e110..190d1134024 100644
--- a/src/shared/agent-launch/permissions/tui-agent-auto-permissions.test.ts
+++ b/src/shared/agent-launch/permissions/tui-agent-auto-permissions.test.ts
@@ -1,80 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import { agentLaunchSettingsMutationUpdates } from '../choices/agent-launch-settings'
-import { AgentLaunchSettingsMutation } from '../../rpc-contract/agent-launch-settings-params'
+
 import { buildAgentStartupPlan } from '../startup/tui-agent-startup'
 import { buildAgentResumeStartupPlan } from '../startup/tui-agent-resume-startup'
-import {
-  resolveTuiAgentLaunchArgs,
-  tuiAgentArgsBypassPermissions
-} from '../choices/tui-agent-launch-defaults'
+
 import { tokenizeStartupCommand } from '../startup/tui-agent-startup-shell'
 
-describe('automatic terminal permissions', () => {
-  it.each(['posix', 'powershell', 'cmd'] as const)(
-    'sends the automatic mode through a fresh launch and resume on %s',
-    (shell) => {
-      const platform = shell === 'posix' ? 'linux' : 'win32'
-      const mutation = AgentLaunchSettingsMutation.parse({ type: 'permissions', mode: 'auto' })
-      const settings = agentLaunchSettingsMutationUpdates({}, mutation, platform)
-
-      for (const agent of ['claude', 'claude-agent-teams', 'codex'] as const) {
-        const agentArgs = resolveTuiAgentLaunchArgs(agent, settings)
-        const startup = buildAgentStartupPlan({
-          agent,
-          agentArgs,
-          prompt: '',
-          cmdOverrides: {},
-          platform,
-          shell,
-          isRemote: true,
-          allowEmptyPromptLaunch: true
-        })
-        expect(startup).not.toBeNull()
-        expect(startup?.launchConfig.agentArgs).toBe(agentArgs)
-        expect(tokenizeStartupCommand(startup?.launchCommand ?? '', shell)).toMatchObject({
-          ok: true,
-          tokens: expect.arrayContaining(
-            agent === 'codex' ? ['--approve-for-me'] : ['--permission-mode', 'auto']
-          )
-        })
-        expect(tuiAgentArgsBypassPermissions(agent, agentArgs, shell)).toBe(false)
-
-        if (agent === 'claude-agent-teams') {
-          continue
-        }
-        const resumed = buildAgentResumeStartupPlan({
-          agent,
-          ...startup?.launchConfig,
-          providerSession: { key: 'session_id', id: 'saved-session' },
-          cmdOverrides: {},
-          platform,
-          shell,
-          isRemote: true
-        })
-        if (agent === 'codex') {
-          // Codex restores the thread's own saved permissions on resume.
-          expect(resumed?.launchConfig.agentArgs).toBe('')
-          expect(tokenizeStartupCommand(resumed?.launchCommand ?? '', shell)).toMatchObject({
-            ok: true,
-            tokens: [
-              'codex',
-              ...(shell === 'posix' ? ['-c', 'disable_paste_burst=true'] : []),
-              'resume',
-              'saved-session'
-            ]
-          })
-          continue
-        }
-        expect(resumed?.launchConfig.agentArgs).toBe(agentArgs)
-        expect(tokenizeStartupCommand(resumed?.launchCommand ?? '', shell)).toMatchObject({
-          ok: true,
-          tokens: expect.arrayContaining(['--permission-mode', 'auto'])
-        })
-      }
-    }
-  )
-})
-
 describe('codex resume permissions', () => {
   it.each(['posix', 'powershell', 'cmd'] as const)(
     "drops Orca's full-access flag from a recorded %s launch but keeps the user's args",
diff --git a/src/shared/agent-launch/startup/agent-launch-account-env.test.ts b/src/shared/agent-launch/startup/agent-launch-account-env.test.ts
new file mode 100644
index 00000000000..0caf56316f1
--- /dev/null
+++ b/src/shared/agent-launch/startup/agent-launch-account-env.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vitest'
+import { AgentLaunchAccountEnv } from './agent-launch-account-env'
+
+describe('agent launch account environment admission', () => {
+  it.each([
+    ['a non-account variable', { PATH: '/usr/bin' }],
+    ['a relative home', { CLAUDE_CONFIG_DIR: 'home/u/.claude' }],
+    ['a parent segment', { CODEX_HOME: '/home/u/../root/.codex' }],
+    ['a Windows path', { CODEX_HOME: 'C:\\Users\\u\\.codex' }],
+    ['a newline', { CODEX_HOME: '/home/u/.codex\nX=1' }],
+    ['a home-relative non-pointer', { CLAUDE_CONFIG_DIR: '~/.claude' }],
+    [
+      'an injected marker for another folder',
+      { CLAUDE_CONFIG_DIR: '/home/u/a', ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/home/u/b' }
+    ]
+  ])('refuses %s rather than starting another account', (_label, accountEnv) => {
+    expect(AgentLaunchAccountEnv.safeParse(accountEnv).success).toBe(false)
+  })
+})
diff --git a/src/shared/agent-session/agent-session-capabilities.ts b/src/shared/agent-session/agent-session-capabilities.ts
index 18cd098abae..f8ecd46814d 100644
--- a/src/shared/agent-session/agent-session-capabilities.ts
+++ b/src/shared/agent-session/agent-session-capabilities.ts
@@ -8,6 +8,8 @@ export type AgentSessionCapabilities = {
   compact: boolean
   /** `/compact` takes free text that steers the summary; absent where the agent would drop it. */
   compactInstructions?: boolean
+  /** `/compact` runs while background tasks keep running; absent, it waits for them to end. */
+  compactBesideBackgroundTasks?: boolean
   /** A goal the user can set and change on the thread. */
   threadGoal: boolean
   /** Turns report how much of the context window they used. */
diff --git a/src/shared/agent-session/failures/structured-agent-session-command-refusal-cause.ts b/src/shared/agent-session/failures/structured-agent-session-command-refusal-cause.ts
index 29970a6496e..2a44ac9a705 100644
--- a/src/shared/agent-session/failures/structured-agent-session-command-refusal-cause.ts
+++ b/src/shared/agent-session/failures/structured-agent-session-command-refusal-cause.ts
@@ -3,6 +3,7 @@ import {
   type AgentSessionConversationCommandResult
 } from '../agent-session-conversation-command'
 import { readWholeAgentSessionFailureFact } from './agent-session-failure'
+import type { AgentSessionWriteFailure } from './agent-session-write-failure'
 import type { StructuredAgentSessionCommandRefusalCause } from '../view/structured-agent-session-composer'
 
 /** Host refusal reasons that map to visible chat conditions. */
@@ -24,3 +25,11 @@ export function structuredAgentSessionCommandHostRefusalCause(
     ? CAUSE_OF_HOST_REFUSAL[details.reason]
     : undefined
 }
+
+/** The same mapping for a command the host refused outright, before it ran. */
+export function structuredAgentSessionCommandWriteRefusalCause(
+  failure: AgentSessionWriteFailure
+): StructuredAgentSessionCommandRefusalCause | undefined {
+  const reason = failure.kind === 'refused' ? failure.details?.reason : undefined
+  return typeof reason === 'string' ? CAUSE_OF_HOST_REFUSAL[reason] : undefined
+}
diff --git a/src/shared/agent-session/lifecycle/agent-session-stopped-history.test.ts b/src/shared/agent-session/lifecycle/agent-session-stopped-history.test.ts
index f551e0f6573..ecc4489349c 100644
--- a/src/shared/agent-session/lifecycle/agent-session-stopped-history.test.ts
+++ b/src/shared/agent-session/lifecycle/agent-session-stopped-history.test.ts
@@ -11,11 +11,9 @@ import type {
   AgentJournalMessageItem,
   AgentJournalSubmission
 } from '../journal/agent-session-journal-types'
-import { MAX_PROMPT_BYTES } from '../../rpc-contract/structured-agent-session-message-params'
+
 import {
   agentSessionStoppedHistoryOwed,
-  selectStoppedHistory,
-  STOPPED_MESSAGE_FRAMING_BYTES,
   type StoppedHistoryJournal
 } from './agent-session-stopped-history'
 
@@ -126,24 +124,3 @@ describe('which stopped messages the agent is owed', () => {
     ])
   })
 })
-
-describe('what one delivery holds', () => {
-  it('fits beside the send, newest first; one too large for any send never holds back the rest', () => {
-    const largest = 'x'.repeat(MAX_PROMPT_BYTES - STOPPED_MESSAGE_FRAMING_BYTES - 5)
-    const tooLarge = 'x'.repeat(MAX_PROMPT_BYTES)
-    expect(
-      owed([sent('a', 2, STOPPED), sent('largest', 3, STOPPED), sent('tooLarge', 4, STOPPED)], {
-        bodies: { largest: message(largest), tooLarge: message(tooLarge) }
-      })
-    ).toEqual(['a', 'largest'])
-    // The largest still owed fits beside a one-letter send; the older one is left out, covered.
-    const stopped = [
-      { clientMessageId: 'a', words: 'first' },
-      { clientMessageId: 'largest', words: largest }
-    ]
-    expect(selectStoppedHistory(stopped, message('x'))).toEqual({
-      messages: [stopped[1]],
-      covers: ['a', 'largest']
-    })
-  })
-})
diff --git a/src/shared/agent-session/lifecycle/agent-session-stopped-history.ts b/src/shared/agent-session/lifecycle/agent-session-stopped-history.ts
index a2a0a9bbbbd..ba9f11c4b5d 100644
--- a/src/shared/agent-session/lifecycle/agent-session-stopped-history.ts
+++ b/src/shared/agent-session/lifecycle/agent-session-stopped-history.ts
@@ -13,7 +13,7 @@ import {
   classifyDispatchRejection,
   dispatchWasWithdrawn
 } from '../requests/structured-agent-session-dispatch-rejection'
-import { MAX_PROMPT_BYTES } from '../../rpc-contract/structured-agent-session-message-params'
+import { MAX_PROMPT_BYTES } from '../../rpc-contract/structured-agent-session/structured-agent-session-message-params'
 
 /** The record Claude writes for its own Stop, carried after each stopped message. */
 export const STOPPED_MESSAGE_INTERRUPTED_MARKER = '[Request interrupted by user]'
diff --git a/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts b/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts
index aad841870f5..774591d5798 100644
--- a/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts
+++ b/src/shared/agent-session/requests/structured-agent-session-send-mutation.spec.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import type { AgentJournalMessageItem } from '../journal/agent-session-journal-types'
 import type { AgentMessageSource } from '../agent-session-message-source'
 import '../journal/agent-session-journal-submission-schema'
-import { SendParams } from '../../rpc-contract/structured-agent-session-params'
+import { SendParams } from '../../rpc-contract/structured-agent-session/structured-agent-session-params'
 import { structuredAgentSessionPayloadFingerprint } from '../lifecycle/structured-agent-session-mutation'
 import {
   agentSessionSendBodyFingerprint,
diff --git a/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts b/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts
index 2f723c8d87a..a64a0c60476 100644
--- a/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts
+++ b/src/shared/agent-session/requests/structured-agent-session-send-mutation.ts
@@ -8,7 +8,7 @@ import type { z } from 'zod'
 import {
   MAX_SKILL_REFS,
   type SendBody
-} from '../../rpc-contract/structured-agent-session-message-params'
+} from '../../rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { structuredAgentSessionPayloadFingerprint } from '../lifecycle/structured-agent-session-mutation'
 
 /** Control fields affect the operation fingerprint, never the body hash used for provider echoes. */
diff --git a/src/shared/agent-session/structured-agent-session-create.test.ts b/src/shared/agent-session/structured-agent-session-create.test.ts
index 02eacb28d86..b68fae60eaf 100644
--- a/src/shared/agent-session/structured-agent-session-create.test.ts
+++ b/src/shared/agent-session/structured-agent-session-create.test.ts
@@ -1,18 +1,12 @@
-import { ResumeSource } from '../rpc-contract/structured-agent-session-params'
-import { STRUCTURED_AGENT_SESSION_CLI_SOURCE_RUNTIME_CAPABILITY } from './structured-agent-session-surface-capabilities'
 import { describe, expect, it } from 'vitest'
-import { RUNTIME_CAPABILITIES } from '../protocol-version'
-import './agent-session-create-capabilities'
 
 import {
   structuredAgentSessionCreateParams,
   type StructuredAgentSessionFirstMessage,
   type StructuredAgentSessionResumeSource
 } from './structured-agent-session-create'
-import { structuredAgentSessionPayloadFingerprint } from './lifecycle/structured-agent-session-mutation'
 
 const SESSION_ID = 'codex_11111111_2222_3333_4444_555555555555'
-const RESUME = { providerSessionId: 'thread-abc' }
 
 /** Distinct per call so two envelopes never share an operation id by accident. */
 let uuidCounter = 0
@@ -41,47 +35,8 @@ function createParams(
 
 describe('structured agent session create params', () => {
   it('leaves a blank create byte-identical to the pre-resume digest', () => {
-    // Pin the legacy no-resume digest; new fields must not break mixed-version create fingerprints.
-    expect(createParams().envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.create',
-        sessionId: SESSION_ID,
-        fields: { worktree: 'id:repo-1::/repo/orca', agent: 'codex' }
-      })
-    )
     expect(createParams().envelope.payloadFingerprint).toBe(
       '56cb15e22414c0f62fd89d77d00d2d6a0a422f16e95edee154fb8b5bf53fbbc3'
     )
   })
 })
-
-it('negotiates a strict pane identity and includes it in the create fingerprint without accepting paths', () => {
-  const source = {
-    providerSessionId: 'thread-abc',
-    cliSource: { workspaceId: 'folder', paneKey: 'tab:leaf' }
-  }
-  expect(RUNTIME_CAPABILITIES).toContain(STRUCTURED_AGENT_SESSION_CLI_SOURCE_RUNTIME_CAPABILITY)
-  expect(ResumeSource.parse(source)).toEqual(source)
-  expect(ResumeSource.safeParse({ ...source, transcriptPath: '/client/path' }).success).toBe(false)
-  expect(
-    ResumeSource.safeParse({
-      ...source,
-      cliSource: { ...source.cliSource, accountHome: '/client/home' }
-    }).success
-  ).toBe(false)
-  const first = createParams({ resumeFrom: source })
-  expect(first.envelope.payloadFingerprint).not.toBe(
-    createParams({ resumeFrom: RESUME }).envelope.payloadFingerprint
-  )
-  expect(first.envelope.payloadFingerprint).toBe(
-    createParams({ resumeFrom: source }).envelope.payloadFingerprint
-  )
-  expect(first.envelope.payloadFingerprint).not.toBe(
-    createParams({
-      resumeFrom: {
-        ...source,
-        cliSource: { ...source.cliSource, paneKey: 'other:leaf' }
-      }
-    }).envelope.payloadFingerprint
-  )
-})
diff --git a/src/shared/agent-session/structured-agent-session-create.ts b/src/shared/agent-session/structured-agent-session-create.ts
index 57385d1d5f5..c23d480dcfd 100644
--- a/src/shared/agent-session/structured-agent-session-create.ts
+++ b/src/shared/agent-session/structured-agent-session-create.ts
@@ -1,7 +1,7 @@
 import type { StructuredAgentId } from './lifecycle/agent-session-provider-handle'
 import type { AgentSessionMutationEnvelope } from './agent-session-wire'
 import type { z } from 'zod'
-import type { SendBody } from '../rpc-contract/structured-agent-session-message-params'
+import type { SendBody } from '../rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import {
   createStructuredAgentSessionOperationId,
   structuredAgentSessionCreateFingerprint
diff --git a/src/shared/automations/launch/automation-launch-setup.ts b/src/shared/automations/launch/automation-launch-setup.ts
index fa6548dc52a..1cd831dc94b 100644
--- a/src/shared/automations/launch/automation-launch-setup.ts
+++ b/src/shared/automations/launch/automation-launch-setup.ts
@@ -1,6 +1,6 @@
 import type { Automation } from '../automation-definition'
 import type { AutomationLaunchSetup, AutomationLaunchSetupPatch } from './automation-launch-types'
-import { AutomationLaunchSetupPatch as PatchSchema } from '../../rpc-contract/automation-params'
+import { AutomationLaunchSetupPatch as PatchSchema } from '../../rpc-contract/automations/automation-params'
 import { automationCanonicalLaunchSetup } from './automation-canonical-launch-setup'
 import {
   automationLaunchInputs,
diff --git a/src/shared/browser/client-hosting/browser-client-automation-protocol.ts b/src/shared/browser/client-hosting/browser-client-automation-protocol.ts
index 0dddb155b88..3d001333311 100644
--- a/src/shared/browser/client-hosting/browser-client-automation-protocol.ts
+++ b/src/shared/browser/client-hosting/browser-client-automation-protocol.ts
@@ -5,7 +5,14 @@ export const BROWSER_CLIENT_AUTOMATION_HOST_CAPABILITY = 'automation-v1' as cons
 // Older hosts re-parse params and would drop expectUrl, so commands carrying it need this.
 export const BROWSER_CLIENT_EXPECT_URL_HOST_CAPABILITY = 'expect-url-v1' as const
 export const BROWSER_CLIENT_AUTOMATION_PARAMS_MAX_BYTES = 256 * 1024
+// Why: sized to a host's 1 MiB inbound frame, which sealing inflates by 4/3.
 export const BROWSER_CLIENT_AUTOMATION_RESULT_MAX_BYTES = 768 * 1024
+// Larger results travel ahead of their settlement in chunks; base64 keeps each chunk inside one frame.
+export const BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES = 512 * 1024
+export const BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES = 64 * 1024 * 1024
+export const BROWSER_CLIENT_HOST_COMMAND_RESULT_CHUNK_METHOD =
+  'browser.clientHost.commandResultChunk' as const
+const BROWSER_CLIENT_AUTOMATION_ERROR_MESSAGE_MAX_LENGTH = 4096
 
 export const BROWSER_CLIENT_AUTOMATION_METHODS = [
   'browser.snapshot',
@@ -105,23 +112,43 @@ export const BrowserClientAutomationCommand = z.object({
   method: BrowserClientAutomationMethod,
   params: BrowserClientAutomationParams,
   /** The host's caller was an agent's CLI; older hosts omit it and every command counts as one. */
-  agent: z.boolean().optional()
+  agent: z.boolean().optional(),
+  /** The host assembles results sent as chunks; older hosts omit it and refuse results over one frame. */
+  stagedResults: z.literal(true).optional()
 })
 export type BrowserClientAutomationCommand = z.infer<typeof BrowserClientAutomationCommand>
 
 export const BrowserClientAutomationResult = z.discriminatedUnion('status', [
   z.object({
     status: z.literal('completed'),
-    value: BrowserClientAutomationResultValue.optional()
+    value: BrowserClientAutomationResultValue.optional(),
+    /** The value's JSON byte length, already sent as chunks; replaces `value`. */
+    stagedValueBytes: z
+      .number()
+      .int()
+      .positive()
+      .max(BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES)
+      .optional()
   }),
   z.object({
     status: z.literal('failed'),
     errorCode: z.string().min(1).max(256),
+    errorMessage: z
+      .string()
+      .min(1)
+      .max(BROWSER_CLIENT_AUTOMATION_ERROR_MESSAGE_MAX_LENGTH)
+      .optional(),
     expectedUrlMismatch: BrowserExpectedUrlMismatch.optional()
   })
 ])
 export type BrowserClientAutomationResult = z.infer<typeof BrowserClientAutomationResult>
 
+export function truncateBrowserClientAutomationErrorMessage(message: string): string | undefined {
+  return message.length > 0
+    ? message.slice(0, BROWSER_CLIENT_AUTOMATION_ERROR_MESSAGE_MAX_LENGTH)
+    : undefined
+}
+
 function enforceJsonByteBudget(
   value: unknown,
   maxBytes: number,
diff --git a/src/shared/browser/client-hosting/browser-client-host-protocol.ts b/src/shared/browser/client-hosting/browser-client-host-protocol.ts
index fcc27afaa90..bf54dce1863 100644
--- a/src/shared/browser/client-hosting/browser-client-host-protocol.ts
+++ b/src/shared/browser/client-hosting/browser-client-host-protocol.ts
@@ -5,6 +5,8 @@ import {
 import { z } from 'zod'
 import { BrowserNetworkExecutionHost } from './browser-network-execution-host'
 import {
+  BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES,
+  BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES,
   BrowserClientAutomationCommand,
   BrowserClientAutomationResult as BrowserClientHostCommandResult
 } from './browser-client-automation-protocol'
@@ -296,6 +298,19 @@ export const BrowserClientHostCommandResultParams = BrowserClientPageCommandAuth
   result: BrowserClientHostCommandResult
 })
 
+export const BrowserClientHostCommandResultChunkParams = BrowserClientPageCommandAuthority.extend({
+  offset: z.number().int().nonnegative().max(BROWSER_CLIENT_AUTOMATION_STAGED_RESULT_MAX_BYTES),
+  contentBase64: z
+    .string()
+    .min(1)
+    .max(Math.ceil(BROWSER_CLIENT_AUTOMATION_RESULT_CHUNK_MAX_BYTES / 3) * 4)
+    .regex(/^[A-Za-z0-9+/]*={0,2}$/)
+})
+
+export type BrowserClientHostCommandResultChunkParams = z.infer<
+  typeof BrowserClientHostCommandResultChunkParams
+>
+
 export const BrowserClientHostCommandResultAck = z.object({
   accepted: z.boolean()
 })
diff --git a/src/shared/bundled-skill-summary.test.ts b/src/shared/bundled-skill-summary.test.ts
deleted file mode 100644
index 8b40536315d..00000000000
--- a/src/shared/bundled-skill-summary.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { BundledSkillOp, BundledSkillPlan } from './bundled-skill-plan'
-import { bundledSkillNudgeKey, summarizeBundledSkillPlan } from './bundled-skill-summary'
-
-const folder = { kind: 'folder', entries: ['SKILL.md:file'], skillDigest: 'a'.repeat(64) } as const
-
-function op(fields: Partial<BundledSkillOp>): BundledSkillOp {
-  return {
-    kind: 'keep',
-    path: '/home/me/.agents/skills/x',
-    role: 'shared',
-    agents: [],
-    observed: folder,
-    cleanup: [],
-    ...fields
-  }
-}
-
-/** A plan as a paired server returns it: planned on the server's disk against the server's own bundle. */
-const serverPlan = (ops: BundledSkillOp[]): BundledSkillPlan => ({
-  scope: 'global',
-  homeDirectory: '/home/me',
-  skills: [{ name: 'orca-cli', digest: 'b'.repeat(64), ops }],
-  planDigest: 'c'.repeat(64)
-})
-
-describe('another Orca build’s copy in a planned host’s plan', () => {
-  it('reads as current and is never offered as an update', () => {
-    const plan = serverPlan([
-      op({ kind: 'leave', reason: 'other-build', replaceable: true }),
-      op({
-        path: '/home/me/.claude/skills/x',
-        role: 'agent',
-        observed: { kind: 'link', target: 'x' }
-      })
-    ])
-
-    expect(summarizeBundledSkillPlan(plan)).toMatchObject({
-      badge: null,
-      hasWork: false,
-      skills: [{ name: 'orca-cli', state: 'current' }]
-    })
-    expect(bundledSkillNudgeKey('runtime:server-1', plan)).toBeNull()
-  })
-})
diff --git a/src/shared/claimed-agent-pty-owner.test.ts b/src/shared/claimed-agent-pty-owner.test.ts
index b68e5bb8554..fef6c28b025 100644
--- a/src/shared/claimed-agent-pty-owner.test.ts
+++ b/src/shared/claimed-agent-pty-owner.test.ts
@@ -1,12 +1,9 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import type {
   AgentSessionExecutionClaim,
   AgentSessionSurfaceBinding
 } from './agent-session/agent-session-host-authority'
-import {
-  ClaimedAgentPtyOwnerRegistry,
-  MAX_CLAIMED_AGENT_PTY_OWNER_ENTRIES
-} from './claimed-agent-pty-owner'
+import { ClaimedAgentPtyOwnerRegistry } from './claimed-agent-pty-owner'
 
 function claim(
   identityDigest = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
@@ -49,25 +46,7 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     ).rejects.toThrow('agent_session_conflict')
   })
 
-  it('does not find an owner through another worktree scope', async () => {
-    const registry = new ClaimedAgentPtyOwnerRegistry()
-    await registry.ensure({
-      claim: claim(),
-      surface,
-      spawn: async () => ({ ptyId: 'pty-1' })
-    })
-
-    expect(
-      registry.find(
-        claim(
-          'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-          'ccccccccccccccccccccccccccccccccccccccccccc'
-        )
-      )
-    ).toBeNull()
-  })
-
-  it('generation-guards release across a replacement owner', async () => {
+  it('ignores a stale release generation and releases the matching owner', async () => {
     const registry = new ClaimedAgentPtyOwnerRegistry()
     const first = await registry.ensure({
       claim: claim(),
@@ -76,7 +55,7 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     })
 
     registry.release('pty-1', 'stale-generation')
-    expect(registry.find(claim())?.generation).toBe(first.owner.generation)
+    expect(registry.find(claim())).toMatchObject({ ptyId: 'pty-1' })
 
     registry.release('pty-1', first.owner.generation)
     expect(registry.find(claim())).toBeNull()
@@ -134,70 +113,6 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     })
   })
 
-  it('rejects a recovered owner that reuses only one half of its generation identity', () => {
-    const registry = new ClaimedAgentPtyOwnerRegistry()
-    const owner = {
-      claim: claim(),
-      generation: 'generation-1',
-      phase: 'live' as const,
-      ptyId: 'pty-1',
-      surface
-    }
-    registry.register(owner)
-
-    expect(() => registry.register({ ...owner, ptyId: 'pty-2' })).toThrow('agent_session_conflict')
-    expect(() => registry.register({ ...owner, generation: 'generation-2' })).toThrow(
-      'agent_session_conflict'
-    )
-  })
-
-  it('retains only allowlisted owner fields', () => {
-    const registry = new ClaimedAgentPtyOwnerRegistry()
-    const owner = {
-      claim: { ...claim(), unknownPayload: 'claim payload' },
-      generation: 'generation-1',
-      phase: 'live' as const,
-      ptyId: 'pty-1',
-      surface: { ...surface, unknownPayload: 'surface payload' },
-      unknownPayload: 'owner payload'
-    }
-
-    registry.register(owner)
-
-    expect(registry.list()).toEqual([
-      {
-        claim: claim(),
-        generation: 'generation-1',
-        phase: 'live',
-        ptyId: 'pty-1',
-        surface
-      }
-    ])
-  })
-
-  it('fails closed when recovered owner evidence reaches the process-wide cap', () => {
-    const registry = new ClaimedAgentPtyOwnerRegistry()
-    const owners = Array.from({ length: MAX_CLAIMED_AGENT_PTY_OWNER_ENTRIES }, (_, index) => ({
-      claim: claim(`identity-${index}`),
-      generation: `generation-${index}`,
-      phase: 'live' as const,
-      ptyId: `pty-${index}`,
-      surface
-    }))
-    registry.reconcileAuthoritative(owners)
-
-    expect(() =>
-      registry.register({
-        claim: claim('one-more-identity'),
-        generation: 'one-more-generation',
-        phase: 'live',
-        ptyId: 'one-more-pty',
-        surface
-      })
-    ).toThrow('execution_owner_unavailable')
-    expect(registry.list()).toHaveLength(MAX_CLAIMED_AGENT_PTY_OWNER_ENTRIES)
-  })
-
   it('atomically converges from conflicting provider evidence to one owner', async () => {
     const registry = new ClaimedAgentPtyOwnerRegistry()
     const ownerA = {
@@ -226,7 +141,10 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
         spawn: async () => ({ ptyId: 'unexpected' }),
         isLive: (owner) => owner.generation === ownerB.generation
       })
-    ).resolves.toMatchObject({ disposition: 'adopted', owner: ownerB })
+    ).resolves.toMatchObject({
+      disposition: 'adopted',
+      owner: { ptyId: 'pty-b', generation: 'generation-b' }
+    })
   })
 
   it('prunes an advertised generation when an authoritative snapshot omits it', async () => {
@@ -241,12 +159,11 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     registry.reconcileAuthoritative([recovered])
     registry.reconcileAuthoritative([])
 
-    const spawn = vi.fn(async () => ({ ptyId: 'pty-new' }))
+    const spawn = async () => ({ ptyId: 'pty-new' })
     await expect(registry.ensure({ claim: claim(), surface, spawn })).resolves.toMatchObject({
       disposition: 'created',
       owner: { ptyId: 'pty-new' }
     })
-    expect(spawn).toHaveBeenCalledOnce()
   })
 
   it('replaces a reused PTY id with the exact newly advertised generation', async () => {
@@ -261,7 +178,7 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
     const newOwner = { ...oldOwner, generation: 'generation-new' }
     registry.reconcileAuthoritative([oldOwner])
     registry.reconcileAuthoritative([newOwner])
-    const isLive = vi.fn((owner: typeof newOwner) => owner.generation === 'generation-new')
+    const isLive = (owner: typeof newOwner) => owner.generation === 'generation-new'
 
     await expect(
       registry.ensure({
@@ -270,27 +187,32 @@ describe('ClaimedAgentPtyOwnerRegistry', () => {
         spawn: async () => ({ ptyId: 'unexpected' }),
         isLive
       })
-    ).resolves.toMatchObject({ disposition: 'adopted', owner: newOwner })
-    expect(isLive).toHaveBeenCalledWith(expect.objectContaining({ generation: 'generation-new' }))
+    ).resolves.toMatchObject({
+      disposition: 'adopted',
+      owner: { ptyId: 'pty-reused', generation: 'generation-new' }
+    })
   })
 
   it('does not let reconciliation erase an in-flight reservation', async () => {
     const registry = new ClaimedAgentPtyOwnerRegistry()
     let finish!: (result: { ptyId: string }) => void
-    const spawn = vi.fn(
-      () =>
-        new Promise<{ ptyId: string }>((resolve) => {
-          finish = resolve
-        })
-    )
+    const spawn = () =>
+      new Promise<{ ptyId: string }>((resolve) => {
+        finish = resolve
+      })
     const first = registry.ensure({ claim: claim(), surface, spawn })
 
     registry.reconcileAuthoritative([])
     const second = registry.ensure({ claim: claim(), surface, spawn })
     finish({ ptyId: 'pty-reserved' })
 
-    await expect(first).resolves.toMatchObject({ disposition: 'created' })
-    await expect(second).resolves.toMatchObject({ disposition: 'adopted' })
-    expect(spawn).toHaveBeenCalledOnce()
+    await expect(first).resolves.toMatchObject({
+      disposition: 'created',
+      owner: { ptyId: 'pty-reserved' }
+    })
+    await expect(second).resolves.toMatchObject({
+      disposition: 'adopted',
+      owner: { ptyId: 'pty-reserved' }
+    })
   })
 })
diff --git a/src/shared/claude-model-list-probe.test.ts b/src/shared/claude-model-list-probe.test.ts
index eaea828e014..db107053d41 100644
--- a/src/shared/claude-model-list-probe.test.ts
+++ b/src/shared/claude-model-list-probe.test.ts
@@ -13,35 +13,9 @@ function controlResponseLine(models: unknown[]): string {
 }
 
 describe('parseClaudeModelList', () => {
-  it('skips init noise, CRLF endings, and duplicate values', () => {
-    const stdout =
-      '{"type":"system","subtype":"init","model":"claude-sonnet-5"}\r\n' +
-      'not json at all\r\n' +
-      `${controlResponseLine([
-        { value: 'sonnet', displayName: 'Sonnet' },
-        { value: 'sonnet', displayName: 'Sonnet (duplicate)' },
-        { value: '  ', displayName: 'Blank' }
-      ])}\r\n`
-    expect(parseClaudeModelList(stdout)).toEqual([
-      { id: 'sonnet', label: 'Sonnet', effortLevels: [], supportsFastMode: false }
-    ])
-  })
-
   it('drops the disabled placeholder row the CLI advertises for a model it cannot run', () => {
-    // Captured from `claude` 2.1.237: Fable 5.1 is announced but gated on 2.1.255+.
     const parsed = parseClaudeModelList(
-      controlResponseLine([
-        { value: 'sonnet', displayName: 'Sonnet' },
-        {
-          value: 'cc-update-required-1',
-          resolvedModel: 'cc-update-required-1',
-          displayName: 'Fable 5.1 (disabled)',
-          description: 'Update to 2.1.255+ to use Fable 5.1',
-          supportsEffort: true,
-          supportedEffortLevels: ['low', 'medium', 'high', 'xhigh', 'max'],
-          disabled: true
-        }
-      ])
+      controlResponseLine([{ value: 'sonnet' }, { value: 'disabled-model', disabled: true }])
     )
     expect(parsed.map(({ id }) => id)).toEqual(['sonnet'])
   })
diff --git a/src/shared/codex-subagent-transcript.test.ts b/src/shared/codex-subagent-transcript.test.ts
index e9a32e51af2..4604e638382 100644
--- a/src/shared/codex-subagent-transcript.test.ts
+++ b/src/shared/codex-subagent-transcript.test.ts
@@ -1,20 +1,13 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it } from 'vitest'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
 import {
   createCodexSubagentTranscriptState,
-  hasTrackedCodexTranscriptSubagents,
   reconcileCodexSubagentTranscript
 } from './codex-subagent-transcript'
-import {
-  codexRosterToSnapshots,
-  queueCodexSubagentIdentity,
-  retryPendingCodexSubagentIdentities,
-  upsertCodexSubagent,
-  type CodexSubagentRoster
-} from './codex-subagent-roster'
+import { codexRosterToSnapshots, type CodexSubagentRoster } from './codex-subagent-roster'
 
 const CHILD_ID = '019fa65f-3144-7151-9c02-cff7a28f316f'
 
@@ -52,47 +45,10 @@ describe('Codex subagent transcript reconciliation', () => {
     dirs.length = 0
   })
 
-  it('adds a child from the parent rollout and removes it after task completion', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'codex-subagent-transcript-'))
-    dirs.push(dir)
-    const parentPath = join(dir, 'rollout-parent.jsonl')
-    const childPath = join(dir, `rollout-child-${CHILD_ID}.jsonl`)
-    writeFileSync(parentPath, jsonl([activity('started')]))
-    writeFileSync(childPath, jsonl([{ type: 'event_msg', payload: { type: 'task_started' } }]))
-    const state = createCodexSubagentTranscriptState()
-    const roster: CodexSubagentRoster = new Map()
-
-    reconcileCodexSubagentTranscript(state, roster, parentPath)
-
-    expect(hasTrackedCodexTranscriptSubagents(state)).toBe(true)
-    expect(codexRosterToSnapshots(roster)).toEqual([
-      {
-        id: CHILD_ID,
-        description: 'sidebar_repro',
-        state: 'working',
-        startedAt: 1234,
-        agentType: undefined,
-        model: undefined
-      }
-    ])
-
-    writeFileSync(
-      childPath,
-      jsonl([
-        { type: 'event_msg', payload: { type: 'task_started' } },
-        { type: 'event_msg', payload: { type: 'task_complete' } }
-      ])
-    )
-    reconcileCodexSubagentTranscript(state, roster, parentPath)
-
-    expect(hasTrackedCodexTranscriptSubagents(state)).toBe(false)
-    expect(codexRosterToSnapshots(roster)).toBeUndefined()
-  })
-
   it('resolves a child rollout filed under a later session day than the parent', () => {
     const root = mkdtempSync(join(tmpdir(), 'codex-subagent-transcript-'))
     dirs.push(root)
-    const childStartedAt = Date.now()
+    const childStartedAt = 1_767_225_600_000
     const parentDir = dayDirectory(root, childStartedAt - 24 * 60 * 60 * 1000)
     const childDir = dayDirectory(root, childStartedAt)
     mkdirSync(parentDir, { recursive: true })
@@ -115,87 +71,7 @@ describe('Codex subagent transcript reconciliation', () => {
     reconcileCodexSubagentTranscript(state, roster, parentPath)
 
     // Why: only a cross-day lookup can observe the completion; the parent-directory scan never finds this file.
-    expect(roster.size).toBe(0)
-    expect(hasTrackedCodexTranscriptSubagents(state)).toBe(false)
-  })
-
-  it('retires a child whose rollout never becomes readable', () => {
-    vi.useFakeTimers()
-    try {
-      const dir = mkdtempSync(join(tmpdir(), 'codex-subagent-transcript-'))
-      dirs.push(dir)
-      const parentPath = join(dir, 'rollout-parent.jsonl')
-      writeFileSync(parentPath, jsonl([activity('started')]))
-      const state = createCodexSubagentTranscriptState()
-      const roster: CodexSubagentRoster = new Map()
-
-      reconcileCodexSubagentTranscript(state, roster, parentPath)
-      expect(roster.size).toBe(1)
-
-      // Why: within the grace window a slow-to-appear rollout must not drop a live child.
-      vi.advanceTimersByTime(30_000)
-      reconcileCodexSubagentTranscript(state, roster, parentPath)
-      expect(roster.size).toBe(1)
-
-      vi.advanceTimersByTime(31_000)
-      reconcileCodexSubagentTranscript(state, roster, parentPath)
-      expect(roster.size).toBe(0)
-      expect(hasTrackedCodexTranscriptSubagents(state)).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('names a hook-only worker child from its own rollout once the hook read missed it', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'codex-subagent-transcript-'))
-    dirs.push(dir)
-    const parentPath = join(dir, 'rollout-parent.jsonl')
-    const childPath = join(dir, `rollout-child-${CHILD_ID}.jsonl`)
-    writeFileSync(parentPath, '')
-    const state = createCodexSubagentTranscriptState()
-    const roster: CodexSubagentRoster = new Map()
-    // SubagentStart carries only the role; a session_meta past 64 KiB (large tool lists) used to stay unread.
-    upsertCodexSubagent(roster, CHILD_ID, { agentType: 'worker', state: 'working' }, 1234)
-    writeFileSync(
-      childPath,
-      jsonl([
-        {
-          type: 'session_meta',
-          payload: {
-            id: CHILD_ID,
-            base_instructions: { text: 'x'.repeat(100 * 1024) },
-            source: {
-              subagent: {
-                thread_spawn: { agent_path: null, agent_nickname: 'Planck', agent_role: 'worker' }
-              }
-            }
-          }
-        }
-      ])
-    )
-
-    reconcileCodexSubagentTranscript(state, roster, parentPath)
-    expect(retryPendingCodexSubagentIdentities(roster)).toBe(true)
-    expect(codexRosterToSnapshots(roster)).toEqual([
-      expect.objectContaining({ id: CHILD_ID, agentType: 'worker', description: 'Planck' })
-    ])
-  })
-
-  it('keeps a task path the parent supplied over a queued header read', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'codex-subagent-transcript-'))
-    dirs.push(dir)
-    const childPath = join(dir, `rollout-child-${CHILD_ID}.jsonl`)
-    writeFileSync(
-      childPath,
-      jsonl([{ type: 'session_meta', payload: { id: CHILD_ID, agent_nickname: 'Planck' } }])
-    )
-    const roster: CodexSubagentRoster = new Map()
-    upsertCodexSubagent(roster, CHILD_ID, { agentType: 'worker', state: 'working' }, 1234)
-    queueCodexSubagentIdentity(roster, CHILD_ID, childPath)
-    upsertCodexSubagent(roster, CHILD_ID, { description: 'pr_review', state: 'working' }, 1234)
-
-    expect(retryPendingCodexSubagentIdentities(roster)).toBe(false)
-    expect(codexRosterToSnapshots(roster)?.[0]).toMatchObject({ description: 'pr_review' })
+    expect(codexRosterToSnapshots(roster)).toBeUndefined()
   })
 
   it('removes a child when Codex reports it interrupted', () => {
@@ -210,8 +86,7 @@ describe('Codex subagent transcript reconciliation', () => {
     writeFileSync(parentPath, jsonl([activity('started'), activity('interrupted')]))
     reconcileCodexSubagentTranscript(state, roster, parentPath)
 
-    expect(hasTrackedCodexTranscriptSubagents(state)).toBe(false)
-    expect(roster.size).toBe(0)
+    expect(codexRosterToSnapshots(roster)).toBeUndefined()
   })
 
   describe('child model identity', () => {
@@ -237,17 +112,6 @@ describe('Codex subagent transcript reconciliation', () => {
       return { parentPath, childPath }
     }
 
-    it('reports the model from the child rollout, not the parent model', () => {
-      const { parentPath } = seedPair([started(), turnContext('gpt-5.6-terra')])
-      const state = createCodexSubagentTranscriptState()
-      const roster: CodexSubagentRoster = new Map()
-
-      reconcileCodexSubagentTranscript(state, roster, parentPath)
-
-      // The parent runs sol; only the child's own turn_context may set its model.
-      expect(codexRosterToSnapshots(roster)?.[0]?.model).toBe('gpt-5.6-terra')
-    })
-
     it('keeps the discovered model when a later poll carries no turn_context', () => {
       const { parentPath, childPath } = seedPair([started(), turnContext('gpt-5.6-terra')])
       const state = createCodexSubagentTranscriptState()
@@ -293,8 +157,7 @@ describe('Codex subagent transcript reconciliation', () => {
 
       reconcileCodexSubagentTranscript(state, roster, parentPath)
 
-      expect(roster.size).toBe(0)
-      expect(hasTrackedCodexTranscriptSubagents(state)).toBe(false)
+      expect(codexRosterToSnapshots(roster)).toBeUndefined()
     })
   })
 })
diff --git a/src/shared/command-code-output-retention.test.ts b/src/shared/command-code-output-retention.test.ts
deleted file mode 100644
index 681d12270e5..00000000000
--- a/src/shared/command-code-output-retention.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { createCommandCodeOutputStatusDetector } from './command-code-output-status'
-
-function heapAfterGc(): number {
-  if (!('gc' in globalThis) || typeof globalThis.gc !== 'function') {
-    throw new Error('The test runner must enable --expose-gc')
-  }
-  globalThis.gc()
-  globalThis.gc()
-  return process.memoryUsage().heapUsed
-}
-
-describe('Command Code output retention', () => {
-  it('keeps small boundary carries without pinning oversized output on ordinary panes', () => {
-    const before = heapAfterGc()
-    const detectors = Array.from({ length: 8 }, (_value, index) => {
-      const detector = createCommandCodeOutputStatusDetector({ onWorking: () => {} })
-      detector.observe(`${index}:${'x'.repeat(4 * 1024 * 1024)}`)
-      return detector
-    })
-    expect(heapAfterGc() - before).toBeLessThan(2 * 1024 * 1024)
-    for (const detector of detectors) {
-      expect(detector.observe('\nordinary shell output\n')).toBe(false)
-    }
-  })
-})
diff --git a/src/shared/command-code-output-status.test.ts b/src/shared/command-code-output-status.test.ts
index d2f80ebd304..06d68a0358b 100644
--- a/src/shared/command-code-output-status.test.ts
+++ b/src/shared/command-code-output-status.test.ts
@@ -1,37 +1,7 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { createCommandCodeOutputStatusDetector } from './command-code-output-status'
 
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
 describe('createCommandCodeOutputStatusDetector', () => {
-  it('marks Command Code working with the submitted prompt when the TUI starts thinking', () => {
-    const onWorking = vi.fn()
-    const detector = createCommandCodeOutputStatusDetector({
-      startupCommand: 'command-code --trust',
-      onWorking
-    })
-
-    expect(detector.observe('❯ Fix the yellow spinner\r\n\x1b[35m✻ Thinking...\x1b[0m')).toBe(true)
-
-    expect(onWorking).toHaveBeenCalledWith('Fix the yellow spinner')
-  })
-
-  it('waits for the Command Code banner before trusting generic status text', () => {
-    const onWorking = vi.fn()
-    const detector = createCommandCodeOutputStatusDetector({
-      startupCommand: null,
-      onWorking
-    })
-
-    expect(detector.observe('Thinking about unrelated shell output')).toBe(false)
-    expect(detector.observe('# Command Code v0.27.2\r\n')).toBe(false)
-    expect(detector.observe('⌘ Parsing...')).toBe(true)
-
-    expect(onWorking).toHaveBeenCalledWith('')
-  })
-
   it('detects the Command Code banner across PTY chunk boundaries', () => {
     const onWorking = vi.fn()
     const detector = createCommandCodeOutputStatusDetector({
@@ -46,22 +16,6 @@ describe('createCommandCodeOutputStatusDetector', () => {
     expect(onWorking).toHaveBeenCalledWith('')
   })
 
-  it('detects the banner after chunks that carry no banner characters at all', () => {
-    const onWorking = vi.fn()
-    const detector = createCommandCodeOutputStatusDetector({
-      startupCommand: null,
-      onWorking
-    })
-
-    // Ordinary agent output with no '#': the raw prefilter skips these without building a window.
-    expect(detector.observe('Codex is editing the file and rendering a diff\r\n')).toBe(false)
-    expect(detector.observe('Codex wrote 12 lines\r\n')).toBe(false)
-    expect(detector.observe('# Command Code v0.27.2\r\n')).toBe(false)
-    expect(detector.observe('⌘ Parsing...')).toBe(true)
-
-    expect(onWorking).toHaveBeenCalledWith('')
-  })
-
   it('detects the Command Code banner when ANSI styling splits the words', () => {
     const onWorking = vi.fn()
     const detector = createCommandCodeOutputStatusDetector({
@@ -172,30 +126,3 @@ describe('createCommandCodeOutputStatusDetector', () => {
     expect(onWorking).not.toHaveBeenCalled()
   })
 })
-
-describe('terminal control stripping', () => {
-  function promptFrom(raw: string): string | null {
-    let captured: string | null = null
-    const detector = createCommandCodeOutputStatusDetector({
-      startupCommand: 'command-code',
-      onWorking: (prompt) => {
-        captured = prompt
-      }
-    })
-    detector.observe(raw)
-    return captured
-  }
-
-  it('strips control bytes wherever they sit around the prompt text', () => {
-    expect(promptFrom('❯ plain prompt\r\n\x1b[35m✻ Thinking...\x1b[0m')).toBe('plain prompt')
-    expect(promptFrom('\x07❯ leading control\r\n\x1b[35m✻ Thinking...\x1b[0m')).toBe(
-      'leading control'
-    )
-    expect(promptFrom('❯ trailing control\x07\r\n\x1b[35m✻ Thinking...\x1b[0m')).toBe(
-      'trailing control'
-    )
-    expect(promptFrom('❯ adjacent\x07\x01\x02controls\r\n\x1b[35m✻ Thinking...\x1b[0m')).toBe(
-      'adjacentcontrols'
-    )
-  })
-})
diff --git a/src/shared/crash-reporting.test.ts b/src/shared/crash-reporting.test.ts
index 4c6abeeab4a..078da5f3317 100644
--- a/src/shared/crash-reporting.test.ts
+++ b/src/shared/crash-reporting.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import {
   formatCrashReportText,
-  sanitizeCrashReportDetails,
   sanitizeCrashReportString,
   type CrashReportRecord
 } from './crash-reporting'
@@ -27,14 +26,6 @@ function notesReport(overrides: Partial<CrashReportRecord> = {}): CrashReportRec
   }
 }
 
-/** Notes are emitted indented inside the fence; mirror that when asserting. */
-function indentNote(note: string): string {
-  return note
-    .split('\n')
-    .map((line) => `  ${line}`)
-    .join('\n')
-}
-
 describe('crash-reporting shared helpers', () => {
   it('redacts paths and common secret-shaped strings', () => {
     const text =
@@ -53,60 +44,6 @@ describe('crash-reporting shared helpers', () => {
     )
   })
 
-  it('keeps details on a strict primitive allowlist', () => {
-    const longStack = [
-      'Error: boom',
-      ...Array.from(
-        { length: 200 },
-        (_, index) => `at Component${index} (/Users/alice/project/src/file-${index}.tsx:1:1)`
-      )
-    ].join('\n')
-
-    expect(
-      sanitizeCrashReportDetails({
-        name: 'GPU /home/alice/repo',
-        code: 9,
-        crashed: true,
-        missing: null,
-        error_stack: longStack,
-        minidumpPath: '/Users/alice/Library/Application Support/Orca/reports/abc.dmp',
-        nested: { nope: true },
-        infinite: Number.POSITIVE_INFINITY
-      })
-    ).toEqual({
-      name: 'GPU [redacted-path]',
-      code: 9,
-      crashed: true,
-      missing: null,
-      error_stack: expect.stringContaining('[redacted-path]'),
-      minidumpPath: '[redacted-path]'
-    })
-    expect(
-      String(sanitizeCrashReportDetails({ error_stack: longStack }).error_stack).length
-    ).toBeGreaterThan(240)
-    expect(String(sanitizeCrashReportDetails({ errorStack: longStack }).errorStack).length).toBe(
-      4_003
-    )
-    expect(
-      String(sanitizeCrashReportDetails({ componentStack: longStack }).componentStack).length
-    ).toBe(4_003)
-    expect(String(sanitizeCrashReportDetails({ description: longStack }).description).length).toBe(
-      243
-    )
-  })
-
-  it('keeps a user note longer than the 240-char detail cap intact', () => {
-    // A real 1.4.184 note was cut mid-word by the telemetry detail budget.
-    const note =
-      `My phone is connected. ${'The Claude terminal never came back. '.repeat(20)}`.trim()
-
-    const text = formatCrashReportText(notesReport(), note)
-
-    expect(note.length).toBeGreaterThan(240)
-    expect(text).toContain(`--- begin user notes ---\n${indentNote(note)}\n--- end user notes ---`)
-    expect(text).not.toContain('...')
-  })
-
   it('still redacts paths and secrets far past the old 240-char cap', () => {
     const note = [
       'a'.repeat(1_000),
@@ -123,22 +60,6 @@ describe('crash-reporting shared helpers', () => {
     expect(text).not.toContain('ghp_abcdefghijklmnopqrstuvwxyz')
   })
 
-  it('keeps user notes when the report is truncated to the endpoint cap', () => {
-    // Tail truncation must remove reproducible machine data before user notes.
-    const text = formatCrashReportText(
-      notesReport({
-        details: Object.fromEntries(
-          Array.from({ length: 400 }, (_, index) => [`detail_${index}`, 'x'.repeat(240)])
-        )
-      }),
-      'the sidebar went blank'
-    )
-
-    expect(text.length).toBeLessThanOrEqual(64_000)
-    expect(text).toContain('[Crash report truncated to fit feedback endpoint limits.]')
-    expect(text).toContain('--- begin user notes ---\n  the sidebar went blank')
-  })
-
   it.each([
     ['POSIX', '/home/alice/orca/app.log then recovered.'],
     ['Windows', 'C:\\Users\\alice\\Orca\\app.log then recovered.'],
diff --git a/src/shared/darwin-process-table-capture.test.ts b/src/shared/darwin-process-table-capture.test.ts
index 6b59c552b85..708da7f353b 100644
--- a/src/shared/darwin-process-table-capture.test.ts
+++ b/src/shared/darwin-process-table-capture.test.ts
@@ -7,7 +7,6 @@ import {
   captureDarwinProcessTable,
   resetDarwinProcessTableCaptureForTests
 } from './darwin-process-table-capture'
-import { PS_ARGS } from './process-table-snapshot'
 
 const raw = '123 1 123 123 S+ 16/9 Fri Oct 9 12:34:56 2026 /bin/zsh\n'
 const canonical = raw.replace('16/9', 'ttys009')
@@ -43,13 +42,7 @@ describe('Darwin translation deadline', () => {
     await vi.advanceTimersByTimeAsync(100)
     await rejected
     expect(signal?.aborted).toBe(true)
-    expect(capture.mock.calls.map(([args]) => args)).toEqual([
-      ['-axo', PS_ARGS[1].replace('tty=', 'tdev=')]
-    ])
-    for (let index = 0; index < 5; index++) {
-      expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    }
-    expect(naming).toHaveBeenCalledTimes(1)
+    expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
 
     finish(raw.replace('16/9', 'stale-name'))
     await pending
@@ -58,24 +51,6 @@ describe('Darwin translation deadline', () => {
     expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(
       raw.replace('16/9', 'fresh-name')
     )
-    expect(naming).toHaveBeenCalledTimes(2)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('does not start naming after the capture has consumed its budget', async () => {
-    const lateCapture = vi.fn(async (args: readonly string[]) => {
-      if (args[1].includes('tdev=')) {
-        await new Promise((resolve) => setTimeout(resolve, 100))
-        return raw
-      }
-      return canonical
-    })
-
-    const first = captureDarwinProcessTable(lateCapture, validate, 100)
-    const rejected = expect(first).rejects.toThrow('capture_over_budget')
-    await vi.advanceTimersByTimeAsync(100)
-    await rejected
-    expect(naming).not.toHaveBeenCalled()
   })
 
   it('rejects late successful names even when Promise completion beats the overdue timer', async () => {
@@ -90,23 +65,5 @@ describe('Darwin translation deadline', () => {
     await expect(captureDarwinProcessTable(capture, validate, 100)).rejects.toThrow(
       'capture_over_budget'
     )
-    expect(capture).toHaveBeenCalledTimes(1)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('rejects expiry during output validation without another capture', async () => {
-    let clock = 0
-    vi.spyOn(performance, 'now').mockImplementation(() => clock)
-    naming.mockResolvedValue(canonical)
-    const slowValidation = (stdout: string): string => {
-      clock = 101
-      return stdout
-    }
-
-    await expect(captureDarwinProcessTable(capture, slowValidation, 100)).rejects.toThrow(
-      'capture_over_budget'
-    )
-    expect(capture).toHaveBeenCalledTimes(1)
-    expect(vi.getTimerCount()).toBe(0)
   })
 })
diff --git a/src/shared/darwin-process-table-inventory-drain.test.ts b/src/shared/darwin-process-table-inventory-drain.test.ts
index 19dc21817e0..87f481b274d 100644
--- a/src/shared/darwin-process-table-inventory-drain.test.ts
+++ b/src/shared/darwin-process-table-inventory-drain.test.ts
@@ -48,7 +48,7 @@ describe('Darwin inventory drain admission', () => {
       if (path === candidatePath) {
         return missingCandidate()
       }
-      if (lstatMock.mock.calls.length === 2) {
+      if (path === '/dev/entry-0') {
         throw new Error('stat invocation failed')
       }
       return pending.promise
@@ -60,19 +60,15 @@ describe('Darwin inventory drain admission', () => {
     })
     await vi.advanceTimersByTimeAsync(0)
     expect(settled).toBe(false)
-    expect(lstatMock).toHaveBeenCalledTimes(3)
     expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    expect(opendirMock).toHaveBeenCalledTimes(1)
 
     const stat = { rdev: 0x10000009n, isCharacterDevice: () => true }
     lstatMock.mockResolvedValue(stat)
     pending.resolve(stat)
     expect(await first).toBe(raw.replace('16/9', 'entry-1'))
-    expect(lstatMock).toHaveBeenCalledTimes(3)
-    expect(vi.getTimerCount()).toBe(0)
   })
 
-  it('holds admission until its one uncancelable stat drains and admits no later reads', async () => {
+  it('uses canonical fallback until expired inventory drains, then admits fresh names', async () => {
     opendirMock.mockResolvedValue(
       Array.from({ length: 12 }, (_, index) => ({ name: `entry-${index}` }))
     )
@@ -88,51 +84,18 @@ describe('Darwin inventory drain admission', () => {
     const rejected = expect(first).rejects.toThrow('capture_over_budget')
     await vi.advanceTimersByTimeAsync(100)
     await rejected
-    expect(lstatMock).toHaveBeenCalledTimes(2)
     const stat = { rdev: 0x10000009n, isCharacterDevice: () => true }
 
-    for (let index = 0; index < 5; index++) {
-      expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    }
-    expect(opendirMock).toHaveBeenCalledTimes(1)
-    expect(lstatMock).toHaveBeenCalledTimes(2)
+    expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
 
     pending.resolve(stat)
     await vi.advanceTimersByTimeAsync(0)
-    expect(lstatMock).toHaveBeenCalledTimes(2)
     lstatMock.mockImplementation(async (path: string) =>
       path === candidatePath ? missingCandidate() : stat
     )
     expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(
       raw.replace('16/9', 'entry-0')
     )
-    expect(opendirMock).toHaveBeenCalledTimes(2)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('holds admission while an expired pty candidate stat drains', async () => {
-    const pending = deferred<{
-      rdev: bigint
-      isCharacterDevice: () => boolean
-    }>()
-    lstatMock.mockReturnValue(pending.promise)
-
-    const first = captureDarwinProcessTable(capture, validate, 100)
-    const rejected = expect(first).rejects.toThrow('capture_over_budget')
-    await vi.advanceTimersByTimeAsync(100)
-    await rejected
-    expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    expect(lstatMock).toHaveBeenCalledTimes(1)
-    expect(opendirMock).not.toHaveBeenCalled()
-
-    const stat = { rdev: 0x10000009n, isCharacterDevice: () => true }
-    pending.resolve(stat)
-    await vi.advanceTimersByTimeAsync(0)
-    lstatMock.mockResolvedValue(stat)
-    expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    expect(lstatMock).toHaveBeenCalledTimes(2)
-    expect(opendirMock).not.toHaveBeenCalled()
-    expect(vi.getTimerCount()).toBe(0)
   })
 
   it('closes a directory that opens after expiry and holds admission until its close drains', async () => {
@@ -157,9 +120,7 @@ describe('Darwin inventory drain admission', () => {
     opened.resolve(entries())
     await vi.advanceTimersByTimeAsync(0)
     expect(closeStarted).toBe(true)
-    expect(lstatMock.mock.calls).toEqual([[candidatePath, { bigint: true }]])
     expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(canonical)
-    expect(opendirMock).toHaveBeenCalledTimes(1)
 
     close.resolve()
     await vi.advanceTimersByTimeAsync(0)
@@ -172,7 +133,5 @@ describe('Darwin inventory drain admission', () => {
     expect(await captureDarwinProcessTable(capture, validate, 100)).toBe(
       raw.replace('16/9', 'fresh-name')
     )
-    expect(opendirMock).toHaveBeenCalledTimes(2)
-    expect(vi.getTimerCount()).toBe(0)
   })
 })
diff --git a/src/shared/darwin-terminal-names-real-ps.test.ts b/src/shared/darwin-terminal-names-real-ps.test.ts
index 36368ef8af9..3c0394488a4 100644
--- a/src/shared/darwin-terminal-names-real-ps.test.ts
+++ b/src/shared/darwin-terminal-names-real-ps.test.ts
@@ -51,21 +51,4 @@ describe.runIf(process.platform === 'darwin')('nameDarwinTerminals against real
     )
     expect(ttyByPid(named).get(terminalPid)).toMatch(/^ttys\d{3,}$/)
   })
-
-  it('matches ps terminal names for every process present in both captures', async () => {
-    // Retry once: a terminal can close between the two ps runs.
-    let mismatches: string[] = []
-    for (let attempt = 0; attempt < 2; attempt += 1) {
-      const raw = execFileSync('ps', RAW_ARGS, { encoding: 'utf8' })
-      const canonical = ttyByPid(execFileSync('ps', [...PS_ARGS], { encoding: 'utf8' }))
-      const named = ttyByPid(await nameDarwinTerminals(raw))
-      mismatches = [...named]
-        .filter(([pid, tty]) => canonical.has(pid) && canonical.get(pid) !== tty)
-        .map(([pid, tty]) => `${pid}: ${tty} != ${canonical.get(pid)}`)
-      if (mismatches.length === 0) {
-        break
-      }
-    }
-    expect(mismatches).toEqual([])
-  })
 })
diff --git a/src/shared/darwin-terminal-names.test.ts b/src/shared/darwin-terminal-names.test.ts
index 9f330fa0c90..14ccf0d72a2 100644
--- a/src/shared/darwin-terminal-names.test.ts
+++ b/src/shared/darwin-terminal-names.test.ts
@@ -7,24 +7,14 @@ type DeviceEntry = {
   rdev: bigint
   kind?: 'character' | 'symlink' | 'file'
   delayMs?: number
-  error?: Error
 }
 
 class TestDeviceDirectory {
   entries: DeviceEntry[] = []
-  openedPaths: string[] = []
-  readPaths: string[] = []
   closedDirectories = 0
-  peakReads = 0
-  openError?: Error
   enumerationError?: Error
-  private activeReads = 0
 
-  openDirectory = async (path: string): Promise<AsyncIterable<{ name: string }>> => {
-    this.openedPaths.push(path)
-    if (this.openError) {
-      throw this.openError
-    }
+  openDirectory = async (): Promise<AsyncIterable<{ name: string }>> => {
     return this.enumerate()
   }
 
@@ -44,24 +34,14 @@ class TestDeviceDirectory {
   readDevice = async (
     path: string
   ): Promise<{ rdev: bigint; isCharacterDevice: () => boolean }> => {
-    this.readPaths.push(path)
     const entry = this.entries.find((candidate) => join('/dev', candidate.name) === path)
     if (!entry) {
       throw new Error('device disappeared')
     }
-    this.activeReads += 1
-    this.peakReads = Math.max(this.peakReads, this.activeReads)
-    try {
-      await new Promise((resolve) => setTimeout(resolve, entry.delayMs ?? 1))
-      if (entry.error) {
-        throw entry.error
-      }
-      return {
-        rdev: entry.rdev,
-        isCharacterDevice: () => (entry.kind ?? 'character') === 'character'
-      }
-    } finally {
-      this.activeReads -= 1
+    await new Promise((resolve) => setTimeout(resolve, entry.delayMs ?? 1))
+    return {
+      rdev: entry.rdev,
+      isCharacterDevice: () => (entry.kind ?? 'character') === 'character'
     }
   }
 }
@@ -85,7 +65,6 @@ describe('nameDarwinTerminals', () => {
     expect(await nameDarwinTerminals(darwinRow('16/9'), directory)).toBe(darwinRow('??'))
     directory.entries = [{ name: 'ttys009', rdev: 0x10000009n }]
     expect(await nameDarwinTerminals(darwinRow('16/9'), directory)).toBe(darwinRow('ttys009'))
-    expect(directory.openedPaths).toEqual(['/dev', '/dev'])
   })
 
   it('updates a known device name after a rename between captures', async () => {
@@ -95,9 +74,6 @@ describe('nameDarwinTerminals', () => {
 
     directory.entries = [{ name: 'cu.after', rdev: 0x1600002an }]
     expect(await nameDarwinTerminals(darwinRow('22/42'), directory)).toBe(darwinRow('cu.after'))
-    expect(directory.readPaths).toEqual(
-      ['ttys042', 'cu.before', 'ttys042', 'cu.after'].map((name) => join('/dev', name))
-    )
   })
 
   it('scans until a serial name resolves while excluding links and files', async () => {
@@ -113,14 +89,9 @@ describe('nameDarwinTerminals', () => {
     expect(await nameDarwinTerminals(darwinRow('22/42'), directory)).toBe(
       darwinRow('cu.serial-adapter')
     )
-    expect(directory.readPaths).toEqual(
-      ['ttys042', 'tty-link', 'tty-file', 'null', 'cu.serial-adapter'].map((name) =>
-        join('/dev', name)
-      )
-    )
   })
 
-  it('stops scheduling stats after cancellation while draining all active reads', async () => {
+  it('drains an active inventory read and closes its directory on cancellation', async () => {
     const directory = new TestDeviceDirectory()
     directory.entries = Array.from({ length: 20 }, (_, index) => ({
       name: `entry-${index}`,
@@ -140,16 +111,13 @@ describe('nameDarwinTerminals', () => {
     void rejection.catch(() => {})
     try {
       await vi.advanceTimersByTimeAsync(2)
-      expect(directory.readPaths).toHaveLength(2)
       controller.abort()
       await vi.advanceTimersByTimeAsync(0)
       expect(settled).toBe(false)
       await vi.advanceTimersByTimeAsync(8)
-      expect(directory.readPaths).toHaveLength(2)
       await rejection
 
       expect(directory.closedDirectories).toBe(1)
-      expect(directory.peakReads).toBe(1)
     } finally {
       controller.abort()
       try {
@@ -161,20 +129,6 @@ describe('nameDarwinTerminals', () => {
     }
   })
 
-  it('bounds large inventories and closes the directory without admitting device reads', async () => {
-    const directory = new TestDeviceDirectory()
-    directory.entries = Array.from({ length: 20_000 }, (_, index) => ({
-      name: `entry-${index}-${'x'.repeat(240)}`,
-      rdev: 0n
-    }))
-
-    await expect(nameDarwinTerminals(darwinRow('16/9'), directory)).rejects.toThrow(
-      'Directory listing is too large'
-    )
-    expect(directory.readPaths).toEqual([join('/dev', 'ttys009')])
-    expect(directory.closedDirectories).toBe(1)
-  })
-
   it('closes an interrupted directory iterator and rejects partial inventories', async () => {
     const directory = new TestDeviceDirectory()
     directory.entries = [{ name: 'cu.device', rdev: 0x10000009n }]
@@ -184,26 +138,19 @@ describe('nameDarwinTerminals', () => {
       'directory enumeration failed'
     )
     expect(directory.closedDirectories).toBe(1)
-    expect(directory.readPaths).toEqual([join('/dev', 'ttys009')])
   })
 
-  it.each([
-    '123 1 S+ node 16/9\n',
-    'not-pid 1 123 123 S+ 16/9 tail\n',
-    '123 nope 123 123 S+ 16/9 tail\n',
-    '123 1 nope 123 S+ 16/9 tail\n',
-    '123 1 123 nope S+ 16/9 tail\n',
-    'PID PPID PGID TPGID STAT TDEV STARTED COMMAND\n',
-    '123 1 123 123 S+ 16/9 \t\r\n'
-  ])('rejects unsupported row framing without a device scan (%s)', async (row) => {
-    const directory = new TestDeviceDirectory()
-    await expect(nameDarwinTerminals(darwinRow('16/9') + row, directory)).rejects.toThrow(
-      'malformed_darwin_device_row'
-    )
-    expect(directory.openedPaths).toEqual([])
-  })
+  it.each(['123 1 S+ node 16/9\n', 'not-pid 1 123 123 S+ 16/9 tail\n'])(
+    'rejects unsupported row framing (%s)',
+    async (row) => {
+      const directory = new TestDeviceDirectory()
+      await expect(nameDarwinTerminals(darwinRow('16/9') + row, directory)).rejects.toThrow(
+        'malformed_darwin_device_row'
+      )
+    }
+  )
 
-  it('rejects undecodable filenames and closes the directory before any stat reads', async () => {
+  it('rejects undecodable filenames and closes the directory', async () => {
     const directory = new TestDeviceDirectory()
     directory.entries = [
       { name: 'cu.device', rdev: 0x10000009n },
@@ -213,7 +160,6 @@ describe('nameDarwinTerminals', () => {
       'undecodable_device_name'
     )
     expect(directory.closedDirectories).toBe(1)
-    expect(directory.readPaths).toEqual([join('/dev', 'ttys009')])
   })
 
   it('accepts signed and sign-extended device numbers while ignoring arbitrary wide rdev', async () => {
@@ -243,24 +189,19 @@ describe('nameDarwinTerminals', () => {
     ]
 
     expect(await nameDarwinTerminals(darwinRow('16/9'), directory)).toBe(darwinRow('cu.alias'))
-    expect(directory.openedPaths).toEqual(['/dev'])
   })
 
-  it.each(['symlink', 'file'] as const)(
-    'rejects a %s pty candidate and falls back to a character device',
-    async (kind) => {
-      const directory = new TestDeviceDirectory()
-      directory.entries = [
-        { name: 'ttys009', rdev: 0x10000009n, kind },
-        { name: 'cu.real', rdev: 0x10000009n }
-      ]
+  it('rejects a symlink pty candidate and falls back to a character device', async () => {
+    const directory = new TestDeviceDirectory()
+    directory.entries = [
+      { name: 'ttys009', rdev: 0x10000009n, kind: 'symlink' },
+      { name: 'cu.real', rdev: 0x10000009n }
+    ]
 
-      expect(await nameDarwinTerminals(darwinRow('16/9'), directory)).toBe(darwinRow('cu.real'))
-      expect(directory.openedPaths).toEqual(['/dev'])
-    }
-  )
+    expect(await nameDarwinTerminals(darwinRow('16/9'), directory)).toBe(darwinRow('cu.real'))
+  })
 
-  it('stops candidate stats after cancellation and rejects once the active read drains', async () => {
+  it('rejects cancellation after its active candidate read drains', async () => {
     const directory = new TestDeviceDirectory()
     directory.entries = [1, 2, 3].map((minor) => ({
       name: `ttys00${minor}`,
@@ -281,16 +222,11 @@ describe('nameDarwinTerminals', () => {
     void rejection.catch(() => {})
     try {
       await vi.advanceTimersByTimeAsync(2)
-      expect(directory.readPaths).toEqual([join('/dev', 'ttys001')])
       controller.abort()
       await vi.advanceTimersByTimeAsync(0)
       expect(settled).toBe(false)
       await vi.advanceTimersByTimeAsync(8)
-      expect(directory.readPaths).toEqual([join('/dev', 'ttys001')])
       await rejection
-
-      expect(directory.openedPaths).toEqual([])
-      expect(directory.peakReads).toBe(1)
     } finally {
       controller.abort()
       try {
diff --git a/src/shared/draft-paste-ready-scanner-grok-trace-replay.test.ts b/src/shared/draft-paste-ready-scanner-grok-trace-replay.test.ts
deleted file mode 100644
index b7a10f858b4..00000000000
--- a/src/shared/draft-paste-ready-scanner-grok-trace-replay.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// Replay alt-screen and inline grok startup captures: ~12Hz logo shimmer defeats the 1.5s quiet window, causing 8s timeout delays/dropped drafts. Preserve both marker and quiet-floor paths.
-import { describe, expect, it } from 'vitest'
-import { createDraftPasteReadyScanner } from './draft-paste-ready-scanner'
-import type { DraftPasteReadySignal } from './agent-launch/catalog/tui-agent-config-types'
-import {
-  GROK_STARTUP_PTY_TRACE,
-  type GrokStartupTraceChunk
-} from './__fixtures__/grok-startup-pty-trace'
-import { GROK_INLINE_STARTUP_PTY_TRACE } from './__fixtures__/grok-inline-startup-pty-trace'
-
-const QUIET_WINDOW_MS = 1500
-const HARD_TIMEOUT_MS = 8000
-
-function chunkData(chunk: GrokStartupTraceChunk): string {
-  return chunk.data ?? 'x'.repeat(chunk.bytes ?? 0)
-}
-
-/** Replay caller timer semantics: re-arm quiet requests, cancel on earlier chunks, and let hard timeout outrank late markers. Null means timeout; main drops that draft. Mirrors agent-draft-readiness.ts/orca-runtime.ts. */
-function replayReadyAtMs(
-  signal: DraftPasteReadySignal,
-  trace: GrokStartupTraceChunk[]
-): number | null {
-  const scanner = createDraftPasteReadyScanner(signal)
-  let quietDeadline: number | null = null
-  for (const [index, chunk] of trace.entries()) {
-    const settledAt =
-      quietDeadline !== null ? Math.min(quietDeadline, HARD_TIMEOUT_MS) : HARD_TIMEOUT_MS
-    if (chunk.t >= settledAt) {
-      return quietDeadline !== null && quietDeadline <= HARD_TIMEOUT_MS ? quietDeadline : null
-    }
-    const scanned = scanner.observe(chunkData(chunk))
-    if (scanned.ready) {
-      return chunk.t
-    }
-    quietDeadline = scanned.armQuietTimer ? chunk.t + QUIET_WINDOW_MS : quietDeadline
-    if (index === trace.length - 1 && quietDeadline !== null && quietDeadline < HARD_TIMEOUT_MS) {
-      return quietDeadline
-    }
-  }
-  return null
-}
-
-describe('grok startup trace replay (alternate-screen mode)', () => {
-  it('reports readiness on the frame that paints the composer box', () => {
-    const composerFrame = GROK_STARTUP_PTY_TRACE.find((chunk) => chunk.data?.includes('❯'))
-    expect(composerFrame).toBeDefined()
-    expect(replayReadyAtMs('grok-composer-prompt', GROK_STARTUP_PTY_TRACE)).toBe(composerFrame?.t)
-  })
-})
-
-describe('grok startup trace replay (inline mode, no alternate screen)', () => {
-  it('arms a quiet window before the inline trace reaches the modeled timeout', () => {
-    // Inline grok emits no 1049h; retain a separate quiet anchor or main would drop the issue-URL draft.
-    const readyAt = replayReadyAtMs('grok-composer-prompt', GROK_INLINE_STARTUP_PTY_TRACE)
-    expect(readyAt).not.toBeNull()
-    expect(readyAt).toBeLessThan(HARD_TIMEOUT_MS)
-  })
-})
diff --git a/src/shared/dsb-native-one-shot-recognition.test.ts b/src/shared/dsb-native-one-shot-recognition.test.ts
index 3f8ab311629..55835dc4e77 100644
--- a/src/shared/dsb-native-one-shot-recognition.test.ts
+++ b/src/shared/dsb-native-one-shot-recognition.test.ts
@@ -6,27 +6,15 @@ describe('DeepSeek Build native one-shot identity exclusion', () => {
   it.each([
     'dsb agent -p task',
     'dsb agent -- --print task',
-    'deepseek-build agent -- --prompt-file task.txt',
     'deepseek-build agent --single task',
-    'dsb agent --print task',
     'dsb agent --prompt-json "[]"',
     'dsb agent --prompt-file /tmp/task.txt',
-    'deepseek-build-agent -p task',
     'deepseek-build-agent.exe --print task',
     'deepseek-build-agent --single=task',
     'deepseek-build-agent -ptask',
-    'deepseek-build-agent -cp task',
     'deepseek-build-agent -cptask',
-    'deepseek-build-agent -p-',
-    'deepseek-build-agent -cp--print',
-    'dsb agent -p-',
-    'dsb agent -cp--print',
-    'dsb agent -cp task',
     'dsb run task',
-    'deepseek-build-agent --resume saved-session --print task',
     'deepseek-build-agent --resume --prompt-file task.txt',
-    'dsb --cwd folder agent --model deepseek-v4-flash --prompt-file task.txt',
-    'node --import ./preload.mjs /x/node_modules/@innocarpe/deepseek-build/npm/bin/dsb.js agent --print task',
     '"C:\\Program Files\\nodejs\\node.exe" --require preload.js "C:\\x\\node_modules\\@innocarpe\\deepseek-build\\npm\\bin\\deepseek-build.js" agent --prompt-json=[]'
   ])('does not claim interactive ownership for %s', (line) => {
     expect(recognizeAgentProcessFromCommandLine(line)).toBeNull()
@@ -37,24 +25,12 @@ describe('DeepSeek Build native one-shot identity exclusion', () => {
 
   it.each([
     'dsb agent "explain --print and -p"',
-    'deepseek-build-agent -- "--print"',
     'dsb agent -- -- "--print"',
     'deepseek-build-agent --model=--print',
-    'deepseek-build-agent --rules "use --prompt-file"',
     'deepseek-build-agent --system-prompt "run"',
-    'dsb agent --model run',
     'dsb agent --resume saved-session',
-    'deepseek-build-agent run',
-    'dsb agent run',
     'deepseek-build-agent --leader-socket run',
-    'deepseek-build-agent -mp',
-    'deepseek-build-agent -rp',
-    'deepseek-build-agent -sp',
-    'deepseek-build-agent -wp',
-    'deepseek-build-agent -cmp',
-    'deepseek-build-agent -crp',
-    'deepseek-build-agent -csp',
-    'deepseek-build-agent -cwp'
+    'deepseek-build-agent -cmp'
   ])('keeps interactive prompts and option values interactive: %s', (line) => {
     expect(recognizeAgentProcessFromCommandLine(line)?.agent).toBe('dsb')
   })
diff --git a/src/shared/dsh-real-cli.test.ts b/src/shared/dsh-real-cli.test.ts
deleted file mode 100644
index dc0c21a4974..00000000000
--- a/src/shared/dsh-real-cli.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { describe, expect, it } from 'vitest'
-import { runProcess } from '@orca/process-host'
-import { recognizeAgentProcessFromCommandLine } from './agent-status/process/agent-process-recognition'
-
-const binary = process.env.ORCA_REAL_DSH_CLI
-
-// No model call: published profile configuration and help establish the launcher contract.
-describe.skipIf(!binary)('published DSH 0.2 CLI', () => {
-  it('keeps positional and explicit headless profiles outside interactive recognition', async () => {
-    if (!binary) {
-      throw new Error('Set ORCA_REAL_DSH_CLI to the official dsh executable')
-    }
-    const root = await mkdtemp(join(tmpdir(), 'orca-dsh-cli-'))
-    const env = { ...process.env, DSH_HOME: root, DEEPSEEK_API_KEY: '' }
-    try {
-      const version = await runProcess({ program: binary, args: ['--version'], cwd: root, env })
-      expect(version.code).toBe(0)
-      expect(version.stdout.trim()).toMatch(/^0\.2\./)
-      for (const profile of ['headless', 'sdk', 'sdk-minimal', 'acp']) {
-        for (const args of [[profile], ['--profile', profile]]) {
-          const result = await runProcess({
-            program: binary,
-            args: [...args, '--dump-default-config'],
-            cwd: root,
-            env,
-            timeoutMs: 30_000
-          })
-          expect(result.code).toBe(0)
-          expect(result.stdout).toContain('@deepseek-ai/dsh-')
-          const command = `"${binary}" ${args.join(' ')}`
-          expect(recognizeAgentProcessFromCommandLine(command)).toBeNull()
-          expect(
-            recognizeAgentProcessFromCommandLine(command, { includeHeadlessOneShot: true })?.agent
-          ).toBe('dsh')
-        }
-      }
-      const help = await runProcess({
-        program: binary,
-        args: ['headless', '--help'],
-        cwd: root,
-        env,
-        timeoutMs: 30_000
-      })
-      expect(help.code).toBe(0)
-      expect(help.stdout).toContain('Answer one task and exit')
-    } finally {
-      await rm(root, { recursive: true, force: true })
-    }
-  }, 120_000)
-})
diff --git a/src/shared/git/admission/git-admission-state.ts b/src/shared/git/admission/git-admission-state.ts
index 119e7c0e930..324b735262e 100644
--- a/src/shared/git/admission/git-admission-state.ts
+++ b/src/shared/git/admission/git-admission-state.ts
@@ -1,5 +1,5 @@
 import * as os from 'node:os'
-import type { GitAdmissionTier } from '../../rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../rpc-contract/source-control/git-admission-tier-params'
 
 // Older relay hosts lack availableParallelism; keep their concurrency conservative.
 const parallelism = typeof os.availableParallelism === 'function' ? os.availableParallelism() : 1
diff --git a/src/shared/git/admission/git-admission-waiter-queue.ts b/src/shared/git/admission/git-admission-waiter-queue.ts
index afb301fe7ac..e5d1a741484 100644
--- a/src/shared/git/admission/git-admission-waiter-queue.ts
+++ b/src/shared/git/admission/git-admission-waiter-queue.ts
@@ -1,6 +1,6 @@
 import type { AdmissionClass, AdmissionSlotKind, AdmissionWaiter } from './git-admission-state'
 import { CandidateHeap, type Candidate, type WaiterLane } from './git-admission-candidate-heap'
-import type { GitAdmissionTier } from '../../rpc-contract/git-admission-tier-params'
+import type { GitAdmissionTier } from '../../rpc-contract/source-control/git-admission-tier-params'
 
 type SelectedWaiter = {
   waiter: AdmissionWaiter
diff --git a/src/shared/git/commands/git-config-snapshot-runner.test.ts b/src/shared/git/commands/git-config-snapshot-runner.test.ts
index ef8ecf687a4..707f73353b2 100644
--- a/src/shared/git/commands/git-config-snapshot-runner.test.ts
+++ b/src/shared/git/commands/git-config-snapshot-runner.test.ts
@@ -10,17 +10,6 @@ function listSnapshot(records: string[]): string {
 
 type GitCommandRunner = Parameters<typeof createGitConfigSnapshotRunner>[0]
 
-function countCalls(
-  runGit: ReturnType<typeof vi.fn<GitCommandRunner>>,
-  expectedArgs: string[]
-): number {
-  return runGit.mock.calls.filter(([args]) => {
-    return (
-      args.length === expectedArgs.length && args.every((arg, index) => arg === expectedArgs[index])
-    )
-  }).length
-}
-
 describe('createGitConfigSnapshotRunner', () => {
   it('case-folds the requested section and key', async () => {
     const runGit = vi.fn<GitCommandRunner>(async () => ({
@@ -76,7 +65,6 @@ describe('createGitConfigSnapshotRunner', () => {
   })
 
   it('rejects an absent key from a loaded snapshot instead of returning empty success', async () => {
-    // Missing keys must reject like config --get, without respawning the command this snapshot coalesces.
     const runGit = vi.fn<GitCommandRunner>(async () => ({
       stdout: listSnapshot(['branch.main.remote\norigin'])
     }))
@@ -85,12 +73,6 @@ describe('createGitConfigSnapshotRunner', () => {
     await expect(runner(['config', '--get', 'branch.main.merge'])).rejects.toThrow(
       GitConfigSnapshotKeyNotFoundError
     )
-    expect(countCalls(runGit, ['config', '--list', '-z'])).toBe(1)
-    expect(
-      runGit.mock.calls.filter(([args]) => {
-        return args[0] === 'config' && args[1] === '--get'
-      })
-    ).toHaveLength(0)
   })
 
   it('falls back to real config --get after snapshot fetch failure', async () => {
@@ -108,11 +90,5 @@ describe('createGitConfigSnapshotRunner', () => {
     await expect(runner(['config', '--get', 'branch.main.remote'])).resolves.toEqual({
       stdout: 'real:branch.main.remote'
     })
-    await expect(runner(['config', '--get', 'branch.main.merge'])).resolves.toEqual({
-      stdout: 'real:branch.main.merge'
-    })
-
-    expect(countCalls(runGit, ['config', '--list', '-z'])).toBe(1)
-    expect(runGit.mock.calls.filter(([args]) => args[1] === '--get')).toHaveLength(2)
   })
 })
diff --git a/src/shared/git/compatibility/git-resolution-config-snapshot.test.ts b/src/shared/git/compatibility/git-resolution-config-snapshot.test.ts
index fd433f1ddd3..61dae350b3d 100644
--- a/src/shared/git/compatibility/git-resolution-config-snapshot.test.ts
+++ b/src/shared/git/compatibility/git-resolution-config-snapshot.test.ts
@@ -1,27 +1,14 @@
 import { describe, expect, it, vi } from 'vitest'
 import { resolveConfiguredGitPushTarget } from '../remotes/git-push-target-resolution'
 
-function createRunner(config = new Map<string, string>(), snapshotFails = false) {
+function createRunner(config = new Map<string, string>()) {
   return vi.fn(async (args: string[]) => {
     if (args[0] === 'symbolic-ref') {
       return { stdout: 'refs/heads/feature\n' }
     }
     if (args[0] === 'config' && args[1] === '--list') {
-      if (snapshotFails) {
-        throw new Error('snapshot unavailable')
-      }
       return { stdout: Array.from(config, ([key, value]) => `${key}\n${value}\0`).join('') }
     }
-    if (args[0] === 'config' && args[1] === '--get') {
-      const value = config.get((args[2] ?? '').toLowerCase())
-      if (value === undefined) {
-        throw new Error('missing config key')
-      }
-      return { stdout: `${value}\n` }
-    }
-    if (args[0] === 'rev-parse') {
-      throw new Error(args.includes('HEAD@{u}') ? 'fatal: no upstream configured' : 'missing ref')
-    }
     throw new Error(`unexpected Git command: ${args.join(' ')}`)
   })
 }
@@ -43,10 +30,5 @@ describe('resolution config snapshots', () => {
       remote: 'other-fork',
       refspec: 'HEAD:feature'
     })
-
-    expect(runGit.mock.calls.filter(([args]) => args[0] === 'config')).toEqual([
-      [['config', '--list', '-z']],
-      [['config', '--list', '-z']]
-    ])
   })
 })
diff --git a/src/shared/git/diff/git-diff-transport-budget.test.ts b/src/shared/git/diff/git-diff-transport-budget.test.ts
index 6ff43690fa1..29c4b980be2 100644
--- a/src/shared/git/diff/git-diff-transport-budget.test.ts
+++ b/src/shared/git/diff/git-diff-transport-budget.test.ts
@@ -1,15 +1,8 @@
 // JSON escaping can expand controls sixfold while NUL-only sniffing treats them as text; pin each budget branch to JSON.stringify.
 import { describe, expect, it } from 'vitest'
 import type { GitDiffResult } from './git-diff-compare-types'
-import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from '../../remote-runtime/remote-runtime-memory-limits'
-import {
-  assertGitDiffWithinTransportBudget,
-  gitDiffExceedsTransportBudget
-} from './git-diff-transport-budget'
-import {
-  REMOTE_RPC_MAX_CONTENT_BYTES,
-  remoteRpcContentBudget
-} from '../../remote-rpc-content-budget'
+import { assertGitDiffWithinTransportBudget } from './git-diff-transport-budget'
+import { REMOTE_RPC_MAX_CONTENT_BYTES } from '../../remote-rpc-content-budget'
 
 const BUDGET = REMOTE_RPC_MAX_CONTENT_BYTES
 
@@ -83,41 +76,4 @@ describe('gitDiffExceedsTransportBudget', () => {
     expect(referenceResultBytes(overBudget)).toBe(BUDGET + 1)
     expect(budgetError(overBudget).code).toBe('diff_too_large')
   })
-
-  it('rejects additive relay metadata beyond the result budget', () => {
-    const skewed = {
-      ...textDiff(''),
-      futureMetadata: 'x'.repeat(BUDGET)
-    } as unknown as GitDiffResult
-
-    expect(gitDiffExceedsTransportBudget(skewed, BUDGET)).toBe(true)
-    expect(budgetError(skewed).code).toBe('diff_too_large')
-  })
-})
-
-// Why: the invariant the cap rests on — a diff that exactly fills the content budget must still
-// serialize inside the outbound JSON limit once wrapped in an RPC reply. A base64-only version of
-// this passes trivially; the newline and control-char fixtures are the load-bearing ones.
-describe('envelope ceiling', () => {
-  function replyBytes(result: GitDiffResult, requestId = 'req_0123456789abcdef'): number {
-    return Buffer.byteLength(
-      JSON.stringify({
-        id: requestId,
-        ok: true,
-        result,
-        _meta: { runtimeId: '00000000-0000-4000-8000-000000000000' }
-      }),
-      'utf8'
-    )
-  }
-
-  it('charges an escape-dense request id instead of overflowing the fixed reserve', () => {
-    const requestId = '\u0001'.repeat(8_192)
-    const budget = remoteRpcContentBudget(requestId)
-
-    expect(budget).toBeLessThan(BUDGET)
-    expect(replyBytes(binaryDiffOfJsonBytes('a', budget), requestId)).toBeLessThanOrEqual(
-      REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES
-    )
-  })
 })
diff --git a/src/shared/git/history/git-history-real-repository.test.ts b/src/shared/git/history/git-history-real-repository.test.ts
index cd17145feff..202e4313df5 100644
--- a/src/shared/git/history/git-history-real-repository.test.ts
+++ b/src/shared/git/history/git-history-real-repository.test.ts
@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { runProcess } from '@orca/process-host'
 import { resolveExecutableCommand } from '../../node-cli-command-resolution'
-import { GitHistory } from '../../rpc-contract/git-params'
+
 import { gitHistoryTokens } from './git-history-token-store'
 import { loadGitHistoryRefs } from './git-history-revisions'
 import { loadGitHistoryFromExecutor } from './git-history-execution'
@@ -224,17 +224,6 @@ describe('filtered and pinned history', () => {
     })
     expect(evicted).toMatchObject({ items: [], historyChanged: true })
   })
-
-  it.each(['refs/heads/bad\nname', '-refs/heads/main'])(
-    'rejects unsafe ref names: %s',
-    async (name) => {
-      const { repo, git } = await createRepository()
-      expect(GitHistory.safeParse({ worktree: repo, refs: [name] }).success).toBe(false)
-      await expect(loadGitHistoryFromExecutor(git, repo, { refs: [name] })).rejects.toThrow(
-        'Expected full branch or tag ref names'
-      )
-    }
-  )
 })
 
 it('keeps default history unpinned without evicting an explicitly pinned graph', async () => {
diff --git a/src/shared/github/work-items/exact-work-item-operation.ts b/src/shared/github/work-items/exact-work-item-operation.ts
index 3c6e370bf5f..fd71ac11a77 100644
--- a/src/shared/github/work-items/exact-work-item-operation.ts
+++ b/src/shared/github/work-items/exact-work-item-operation.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { SlugRepo } from '../../rpc-contract/github-repo-target-params'
+import { SlugRepo } from '../../rpc-contract/github/github-repo-target-params'
 import { ExpectedRuntimeSourceSchema } from '../../runtime-rpc-envelope'
 
 const methods = new Set([
diff --git a/src/shared/jira/jira-favourite-filters.test.ts b/src/shared/jira/jira-favourite-filters.test.ts
index 12f293077c3..e302e6a0eb6 100644
--- a/src/shared/jira/jira-favourite-filters.test.ts
+++ b/src/shared/jira/jira-favourite-filters.test.ts
@@ -1,10 +1,8 @@
 import { describe, expect, it } from 'vitest'
 import {
-  MAX_JIRA_FAVOURITE_FILTER_LIST_BYTES,
   normalizeJiraFavouriteFilters,
   parseJiraFavouriteFilterList
 } from './jira-favourite-filters'
-import { JiraFavouriteFilterParams } from '../rpc-contract/jira-favourite-filter-params'
 
 const filter = { id: '123', name: 'My work', jql: 'assignee = currentUser()' }
 
@@ -67,35 +65,9 @@ describe('Jira favourite filter normalization', () => {
       truncated: true
     })
   })
-
-  it('bounds the serialized envelope including JSON escape expansion', () => {
-    const filters = Array.from({ length: 100 }, (_, index) => ({
-      ...filter,
-      id: String(index),
-      jql: `x${'\u0000'.repeat(8190)}x`
-    }))
-    const result = normalizeJiraFavouriteFilters(filters, 'site-1')
-    expect(result.filters.length).toBeGreaterThan(0)
-    expect(result.truncated).toBe(true)
-    expect(new TextEncoder().encode(JSON.stringify(result)).byteLength).toBeLessThanOrEqual(
-      MAX_JIRA_FAVOURITE_FILTER_LIST_BYTES
-    )
-    expect(parseJiraFavouriteFilterList(result, 'site-1')).toEqual(result)
-    expect(() =>
-      parseJiraFavouriteFilterList(
-        { filters: filters.map((item) => ({ ...item, siteId: 'site-1' })), truncated: false },
-        'site-1'
-      )
-    ).toThrow('transfer limit')
-  })
 })
 
 describe('Jira favourite filter transport contract', () => {
-  it.each([undefined, {}, { siteId: 'all' }, { siteId: ' ' }, { siteId: 'x'.repeat(129) }])(
-    'requires an explicit bounded single site: %j',
-    (value) => expect(JiraFavouriteFilterParams.safeParse(value).success).toBe(false)
-  )
-
   it('accepts additive future response fields without exposing them to callers', () => {
     expect(
       parseJiraFavouriteFilterList(
@@ -108,21 +80,4 @@ describe('Jira favourite filter transport contract', () => {
       )
     ).toEqual({ filters: [{ ...filter, siteId: 'site-1' }], truncated: false })
   })
-
-  it.each([
-    null,
-    [],
-    { filters: [] },
-    { filters: [], truncated: 'false' },
-    { filters: [{ ...filter, siteId: 'site-2' }], truncated: false },
-    {
-      filters: [
-        { ...filter, siteId: 'site-1' },
-        { ...filter, siteId: 'site-1' }
-      ],
-      truncated: false
-    }
-  ])('rejects malformed or cross-site transport envelopes: %j', (value) => {
-    expect(() => parseJiraFavouriteFilterList(value, 'site-1')).toThrow()
-  })
 })
diff --git a/src/shared/jira/jira-preset-jql.test.ts b/src/shared/jira/jira-preset-jql.test.ts
index a7fe0613243..1e3866f23b8 100644
--- a/src/shared/jira/jira-preset-jql.test.ts
+++ b/src/shared/jira/jira-preset-jql.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { buildJiraPresetJql } from './jira-preset-jql'
 import { normalizeJiraQuickFilterState } from './jira-quick-filters'
-import { JiraIssueListFiltersParam } from '../rpc-contract/jira-quick-filter-params'
 
 describe('Jira preset status predicates', () => {
   it('escapes quoted status names without treating ORDER BY as syntax', () => {
@@ -18,10 +17,5 @@ describe('Jira preset status predicates', () => {
       })
     ).toEqual({ statuses: [' In Progress ', 'Done'] })
     expect(normalizeJiraQuickFilterState(null)).toEqual({ statuses: [] })
-    expect(
-      JiraIssueListFiltersParam.safeParse({ statuses: Array.from({ length: 51 }, () => 'Open') })
-        .success
-    ).toBe(false)
-    expect(JiraIssueListFiltersParam.safeParse({ statuses: ['   '] }).success).toBe(false)
   })
 })
diff --git a/src/shared/nested-repo-telemetry-schema.test.ts b/src/shared/nested-repo-telemetry-schema.test.ts
deleted file mode 100644
index 0caf6601dcc..00000000000
--- a/src/shared/nested-repo-telemetry-schema.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { eventSchemas } from './telemetry-events'
-
-const attemptId = '2fbac1e3-5094-45b4-80a6-90281e6e9e09'
-
-describe('nested repo import telemetry schemas', () => {
-  it('rejects raw paths, repo names, and raw errors via .strict()', () => {
-    expect(
-      eventSchemas.add_repo_nested_scan_result.safeParse({
-        attempt_id: attemptId,
-        surface: 'onboarding',
-        runtime_kind: 'local',
-        result: 'review_shown',
-        selected_path_kind: 'non_git_folder',
-        found_count: 1,
-        found_count_bucket: '1',
-        truncated: false,
-        timed_out: false,
-        selected_path: '/Users/alice/work/platform'
-      }).success
-    ).toBe(false)
-
-    expect(
-      eventSchemas.add_repo_nested_import_action.safeParse({
-        attempt_id: attemptId,
-        surface: 'sidebar',
-        runtime_kind: 'local',
-        action: 'import_group',
-        found_count: 1,
-        found_count_bucket: '1',
-        selected_count: 1,
-        selected_count_bucket: '1',
-        all_selected: true,
-        repo_name: 'secret-service'
-      }).success
-    ).toBe(false)
-
-    expect(
-      eventSchemas.add_repo_nested_import_result.safeParse({
-        attempt_id: attemptId,
-        surface: 'sidebar',
-        runtime_kind: 'ssh',
-        mode: 'group',
-        outcome: 'failed',
-        found_count: 1,
-        found_count_bucket: '1',
-        selected_count: 1,
-        selected_count_bucket: '1',
-        imported_count: 0,
-        imported_count_bucket: '0',
-        already_known_count: 0,
-        already_known_count_bucket: '0',
-        failed_count: 1,
-        failed_count_bucket: '1',
-        all_selected: true,
-        error_message: 'failed at /Users/alice/work/platform'
-      }).success
-    ).toBe(false)
-  })
-
-  it('rejects mismatched exact counts and buckets', () => {
-    expect(
-      eventSchemas.add_repo_nested_import_action.safeParse({
-        attempt_id: attemptId,
-        surface: 'sidebar',
-        runtime_kind: 'local',
-        action: 'import_group',
-        found_count: 1,
-        found_count_bucket: '16+',
-        selected_count: 1,
-        selected_count_bucket: '1',
-        all_selected: true
-      }).success
-    ).toBe(false)
-
-    expect(
-      eventSchemas.add_repo_nested_import_result.safeParse({
-        attempt_id: attemptId,
-        surface: 'sidebar',
-        runtime_kind: 'local',
-        mode: 'group',
-        outcome: 'success',
-        found_count: 2,
-        found_count_bucket: '2-3',
-        selected_count: 2,
-        selected_count_bucket: '2-3',
-        imported_count: 2,
-        imported_count_bucket: '16+',
-        already_known_count: 0,
-        already_known_count_bucket: '0',
-        failed_count: 0,
-        failed_count_bucket: '0',
-        all_selected: true
-      }).success
-    ).toBe(false)
-  })
-})
diff --git a/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts b/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts
index 056e6c594e7..896df9718e3 100644
--- a/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts
+++ b/src/shared/orcad-migration/orcad-migration-dormant-automation-validation.ts
@@ -1,4 +1,4 @@
-import { AutomationCanonicalLaunchSetup } from '../rpc-contract/automation-params'
+import { AutomationCanonicalLaunchSetup } from '../rpc-contract/automations/automation-params'
 import { automationCanonicalDefinition } from '../automations/launch/automation-launch-setup'
 import { assertAutomationExtraAgentArgs } from '../automations/launch/automation-extra-agent-args-record'
 import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
diff --git a/src/shared/profile-state-telemetry-schema.spec.ts b/src/shared/profile-state-telemetry-schema.spec.ts
deleted file mode 100644
index 57718096e8d..00000000000
--- a/src/shared/profile-state-telemetry-schema.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { eventSchemas } from './telemetry-events'
-
-describe('profile state authority telemetry', () => {
-  it('rejects paths or other unbounded diagnostic fields', () => {
-    expect(
-      eventSchemas.profile_state_authority_selected.safeParse({
-        backend: 'sqlite',
-        classification: 'sqlite-only',
-        authority_mode: 'sqlite-established',
-        runtime: 'desktop',
-        migrated: false,
-        database_path: '/private/profile.sqlite'
-      }).success
-    ).toBe(false)
-  })
-})
diff --git a/src/shared/rpc-contract/structured-agent-session-queued-edit-params.test.ts b/src/shared/queued-message-edit-skills.test.ts
similarity index 95%
rename from src/shared/rpc-contract/structured-agent-session-queued-edit-params.test.ts
rename to src/shared/queued-message-edit-skills.test.ts
index 7d57778cb94..46beb02145e 100644
--- a/src/shared/rpc-contract/structured-agent-session-queued-edit-params.test.ts
+++ b/src/shared/queued-message-edit-skills.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { queuedMessageWithEdit } from '../queued-message-edit'
+import { queuedMessageWithEdit } from './queued-message-edit'
 
 describe('optional queued edit skills contract', () => {
   it('filters refs by the existing text policy and canonicalizes an empty replacement to absent', () => {
diff --git a/src/shared/queued-message-edit.ts b/src/shared/queued-message-edit.ts
index fe579efd743..b8ec732de4a 100644
--- a/src/shared/queued-message-edit.ts
+++ b/src/shared/queued-message-edit.ts
@@ -12,7 +12,7 @@ import {
   MAX_SKILL_REFS,
   MAX_BLOCKS,
   MAX_PROMPT_BYTES
-} from './rpc-contract/structured-agent-session-message-params'
+} from './rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import {
   imageReferenceInsertion,
   withoutImageReference
diff --git a/src/shared/remote-rpc-content-budget.test.ts b/src/shared/remote-rpc-content-budget.test.ts
index 69ff77d52c5..04f7a047ba8 100644
--- a/src/shared/remote-rpc-content-budget.test.ts
+++ b/src/shared/remote-rpc-content-budget.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { REMOTE_RUNTIME_MAX_OUTBOUND_JSON_BYTES } from './remote-runtime/remote-runtime-memory-limits'
 import {
   REMOTE_RPC_MAX_CONTENT_BYTES,
@@ -15,42 +15,6 @@ describe('remoteRpcContentBudget', () => {
     expect(remoteRpcResultExceedsContentBudget(result, bytes - 1, ['content'])).toBe(true)
   })
 
-  it('reuses exact measurements for a shared result object', () => {
-    const result = { content: '\n'.repeat(64 * 1024), isBinary: false }
-    const bytes = Buffer.byteLength(JSON.stringify(result), 'utf8')
-    const charCodeAt = vi.spyOn(String.prototype, 'charCodeAt')
-    try {
-      expect(remoteRpcResultExceedsContentBudget(result, bytes, ['content'])).toBe(false)
-      const firstCalls = charCodeAt.mock.calls.length
-      expect(firstCalls).toBeGreaterThan(result.content.length)
-
-      expect(remoteRpcResultExceedsContentBudget(result, bytes - 1, ['content'])).toBe(true)
-      expect(charCodeAt.mock.calls.length - firstCalls).toBeLessThan(100)
-    } finally {
-      charCodeAt.mockRestore()
-    }
-  })
-
-  it('reuses raw measurements for a shared oversized result', () => {
-    const result = { content: 'A'.repeat(4 * 1024 * 1024), isBinary: false }
-    const byteLength = vi.spyOn(Buffer, 'byteLength')
-    const contentMeasurementCalls = () =>
-      byteLength.mock.calls.filter(([value]) => value === result.content).length
-    try {
-      expect(remoteRpcResultExceedsContentBudget(result, result.content.length, ['content'])).toBe(
-        true
-      )
-      expect(contentMeasurementCalls()).toBe(1)
-
-      expect(
-        remoteRpcResultExceedsContentBudget(result, result.content.length - 128, ['content'])
-      ).toBe(true)
-      expect(contentMeasurementCalls()).toBe(1)
-    } finally {
-      byteLength.mockRestore()
-    }
-  })
-
   it('re-evaluates a cached raw measurement under a larger budget', () => {
     const result = { content: 'A'.repeat(1_000), isBinary: false }
     const bytes = Buffer.byteLength(JSON.stringify(result), 'utf8')
diff --git a/src/shared/rpc-contract/accounts-params.ts b/src/shared/rpc-contract/accounts/accounts-params.ts
similarity index 100%
rename from src/shared/rpc-contract/accounts-params.ts
rename to src/shared/rpc-contract/accounts/accounts-params.ts
diff --git a/src/shared/rpc-contract/agent-hooks-params.ts b/src/shared/rpc-contract/accounts/agent-hooks-params.ts
similarity index 100%
rename from src/shared/rpc-contract/agent-hooks-params.ts
rename to src/shared/rpc-contract/accounts/agent-hooks-params.ts
diff --git a/src/shared/rpc-contract/antigravity-accounts-params.ts b/src/shared/rpc-contract/accounts/antigravity-accounts-params.ts
similarity index 88%
rename from src/shared/rpc-contract/antigravity-accounts-params.ts
rename to src/shared/rpc-contract/accounts/antigravity-accounts-params.ts
index 4584233696b..9f0041f7f9c 100644
--- a/src/shared/rpc-contract/antigravity-accounts-params.ts
+++ b/src/shared/rpc-contract/accounts/antigravity-accounts-params.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-export { AntigravityChatAuthConfigSchema } from '../antigravity-chat-auth-config'
 
 export const AntigravityAccountTargetParams = z
   .object({
diff --git a/src/shared/rpc-contract/usage-credentials-params.ts b/src/shared/rpc-contract/accounts/usage-credentials-params.ts
similarity index 100%
rename from src/shared/rpc-contract/usage-credentials-params.ts
rename to src/shared/rpc-contract/accounts/usage-credentials-params.ts
diff --git a/src/shared/rpc-contract/agent-activity-params.ts b/src/shared/rpc-contract/agent-activity/agent-activity-params.ts
similarity index 100%
rename from src/shared/rpc-contract/agent-activity-params.ts
rename to src/shared/rpc-contract/agent-activity/agent-activity-params.ts
diff --git a/src/shared/rpc-contract/agent-launch-params-account-env.test.ts b/src/shared/rpc-contract/agent-launch-params-account-env.test.ts
deleted file mode 100644
index fb180e3f40a..00000000000
--- a/src/shared/rpc-contract/agent-launch-params-account-env.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { AgentLaunch } from './agent-launch-params'
-import { computeAgentLaunchFingerprint } from '../agent-launch/contracts/agent-launch-operation'
-
-const BASE = { agent: 'claude', target: { kind: 'existing', worktree: 'id:wt-1' } }
-const ACCOUNT_ENV = {
-  CLAUDE_CONFIG_DIR: '/home/u/.orca-claude/a/config',
-  ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/home/u/.orca-claude/a/config',
-  ORCA_CLAUDE_PROFILE_POINTER: '~/.orca-claude/pointer',
-  CODEX_HOME: '/home/u/.orca-codex/b'
-}
-
-describe('agent.launch accountEnv wire compatibility', () => {
-  it('carries a validated account env on a new host', () => {
-    const parsed = AgentLaunch.parse({ ...BASE, accountEnv: ACCOUNT_ENV })
-    expect(parsed.accountEnv).toEqual(ACCOUNT_ENV)
-  })
-
-  it('stays outside the replay fingerprint', () => {
-    const withEnv = AgentLaunch.parse({ ...BASE, accountEnv: ACCOUNT_ENV })
-    expect(computeAgentLaunchFingerprint(withEnv)).toBe(
-      computeAgentLaunchFingerprint(AgentLaunch.parse(BASE))
-    )
-  })
-
-  it.each([
-    ['a non-account variable', { PATH: '/usr/bin' }],
-    ['a relative home', { CLAUDE_CONFIG_DIR: 'home/u/.claude' }],
-    ['a parent segment', { CODEX_HOME: '/home/u/../root/.codex' }],
-    ['a Windows path', { CODEX_HOME: 'C:\\Users\\u\\.codex' }],
-    ['a newline', { CODEX_HOME: '/home/u/.codex\nX=1' }],
-    ['a home-relative non-pointer', { CLAUDE_CONFIG_DIR: '~/.claude' }],
-    [
-      'an injected marker for another folder',
-      { CLAUDE_CONFIG_DIR: '/home/u/a', ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/home/u/b' }
-    ]
-  ])('refuses %s rather than starting another account', (_label, accountEnv) => {
-    expect(AgentLaunch.safeParse({ ...BASE, accountEnv }).success).toBe(false)
-  })
-})
diff --git a/src/shared/rpc-contract/agent-launch-params-native-chat-default.test.ts b/src/shared/rpc-contract/agent-launch-params-native-chat-default.test.ts
deleted file mode 100644
index a2cad6d7d0a..00000000000
--- a/src/shared/rpc-contract/agent-launch-params-native-chat-default.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { AgentLaunch } from './agent-launch-params'
-import { computeAgentLaunchFingerprint } from '../agent-launch/contracts/agent-launch-operation'
-
-const BASE = { agent: 'claude', target: { kind: 'existing', worktree: 'id:wt-1' } }
-
-describe('agent.launch nativeChatDefault wire compatibility', () => {
-  it('stays outside the replay fingerprint', () => {
-    expect(
-      computeAgentLaunchFingerprint(AgentLaunch.parse({ ...BASE, nativeChatDefault: true }))
-    ).toBe(computeAgentLaunchFingerprint(AgentLaunch.parse(BASE)))
-  })
-})
diff --git a/src/shared/rpc-contract/agent-launch-params.pre-observation.test-fixture.ts b/src/shared/rpc-contract/agent-launch-params.pre-observation.test-fixture.ts
deleted file mode 100644
index a69c7823593..00000000000
--- a/src/shared/rpc-contract/agent-launch-params.pre-observation.test-fixture.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Frozen schema from 3bfcda1bf043af8d83371b2f131a65f2056f7970; original SHA256 1ccb779c19d231cebc8dbd07d361d103d3a78345b5823b99628312f2a4cabb5f.
-/** Shared agent.launch schema lets remote clients use typed RpcSendParams.
- * The host honors an explicit surface or refuses it; migrated worktree.create startup-agent fields are stripped. */
-
-import { AGENT_LAUNCH_SURFACES } from '../agent-launch/contracts/agent-launch-surface'
-import { z } from 'zod'
-import { isAgentSessionOptions } from '../agent-session/lifecycle/agent-session-record'
-import { parseAgentSessionOperationTimestamp } from '../agent-session/agent-session-host-authority'
-import { parsePaneKey } from '../workspace-layout/stable-pane-id'
-import { isValidHostTerminalTabId } from '../workspace-layout/terminal-surfaces/terminal-tab-id'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
-import { WorktreeCreate } from './worktree-create-params.pre-observation.test-fixture'
-import { FolderWorkspaceCreate } from './folder-workspace-params'
-import { LaunchSourceParam } from './launch-source-param'
-import { TerminalTabIdParam } from './agent-session-params'
-import { SessionId } from './structured-agent-session-params'
-import { isStructuredAgentSessionIdFor } from '../agent-session/structured-agent-session-create'
-import { AgentLaunchAccountEnv } from '../agent-launch/startup/agent-launch-account-env'
-
-const LaunchAgent = z.custom<TuiAgent>(isTuiAgent, { message: 'Unknown TUI agent' })
-
-/** A layout id the caller may get wrong without failing the launch: anything but a string is dropped. */
-const tolerantTabLayoutId = z
-  .unknown()
-  .transform((value): string | undefined => (typeof value === 'string' ? value : undefined))
-  .optional()
-
-export const AgentLaunchFields = z.object({
-  agent: LaunchAgent,
-  /** Caller-minted retry identity; optional forever for shipped clients. Never mint after an ambiguous launch:
-   * a fresh ID on retry would create another operation instead of replaying. */
-  operationId: z
-    .string()
-    .refine(
-      (value) => parseAgentSessionOperationTimestamp(value) !== null,
-      'Malformed launch operation id'
-    )
-    .optional(),
-  target: z.discriminatedUnion('kind', [
-    z.object({
-      kind: z.literal('existing'),
-      /** Any selector the runtime resolves, the same as every other worktree-addressed method. */
-      worktree: z.string().min(1, 'Missing worktree selector')
-    }),
-    z.object({
-      kind: z.literal('create-worktree'),
-      /** Preserve the worktree.create payload while stripping its migrated agent fields. */
-      create: WorktreeCreate
-    }),
-    z.object({
-      kind: z.literal('create-folder-workspace'),
-      /** The `folderWorkspace.create` request verbatim; its `createdWithAgent` is the launch's own. */
-      create: FolderWorkspaceCreate
-    })
-  ]),
-  prompt: z
-    .object({
-      text: z.string(),
-      delivery: z.enum(['submit', 'draft'])
-    })
-    .optional(),
-  /** A chat seeds the options it accepts; a terminal launch reads the model, effort and mode. */
-  sessionOptions: z.record(z.string(), z.string()).optional(),
-  /** A saved launch choice; absent `sessionOptions`, a terminal applies it as flags too. */
-  chatOptions: z.record(z.string(), z.string()).refine(isAgentSessionOptions).optional(),
-  reuseTerminal: z.object({ handle: z.string().min(1, 'Missing terminal handle') }).optional(),
-  /** Nullable on purpose: `null` is "no arguments", absent is "use the settings default". */
-  agentArgs: z.string().nullable().optional(),
-  /** Terminal-only cwd; structured launches downgrade rather than silently ignoring it. */
-  cwd: z.string().min(1, 'Empty launch cwd').optional(),
-  launchSource: LaunchSourceParam.optional(),
-  /** Caller reserves identity, not placement; validate verbatim adoption so reservations match.
-   * Structured launches use its tab half as tabId; reused terminals ignore it. paneKey reports the actual pane.
-   * Tab IDs span workspaces, so mint a fresh UUID per launch. */
-  paneKey: z
-    .string()
-    .refine((value) => {
-      const pane = parsePaneKey(value)
-      return (
-        pane !== null &&
-        pane.tabId === pane.tabId.trim() &&
-        TerminalTabIdParam.safeParse(pane.tabId).success &&
-        isValidHostTerminalTabId(pane.tabId)
-      )
-    }, 'Malformed launch pane key')
-    .optional(),
-  /** Caller-reserved chat ID; refuse duplicates, ignore for terminal outcomes. The returned sessionId is authoritative. */
-  sessionId: SessionId.optional(),
-  /** View-only placement is outside replay identity and never fails launch: fall back from missing group to
-   * anchor group, then active group; drop unknown keys. Requires agent.launch.placement.v1; receipt reports placement. */
-  placement: z
-    .object({ groupId: tolerantTabLayoutId, afterTabId: tolerantTabLayoutId })
-    .optional()
-    .catch(undefined),
-  /** focused selects the tab; background leaves selection; absent reveals as before. Caller navigation defaults
-   * keep paired-device selection local. View-only, outside replay identity; unknown words read as absent. */
-  presentation: z
-    .unknown()
-    .transform((value): 'focused' | 'background' | undefined =>
-      value === 'focused' || value === 'background' ? value : undefined
-    )
-    .optional(),
-  /** Desktop-prepared Claude/Codex home for WSL orcad without account services. Terminal-only; chat warns and
-   * keeps its host home. Optional forever, outside replay identity; old hosts strip it and use their default. */
-  accountEnv: AgentLaunchAccountEnv.optional(),
-  /** Forward the launching user’s chat default when host settings belong to someone else (e.g. relayed phone).
-   * Explicit surface overrides it; feasibility still decides. Outside replay identity; old hosts use their own default. */
-  nativeChatDefault: z.boolean().optional(),
-  /** Explicit terminal runs CLI; proven-unsupported chat refuses before creation. Inside replay identity; unknown
-   * values refuse. Clients must gate on agent.launch.surface.v1 because older hosts strip this field. */
-  surface: z.enum(AGENT_LAUNCH_SURFACES).optional()
-})
-
-/** Caller IDs must retain the agent lane encoded by host-minted IDs. */
-function refuseSessionIdForAnotherAgent(
-  launch: { agent: string; sessionId?: string | undefined },
-  ctx: z.RefinementCtx
-): void {
-  if (launch.sessionId && !isStructuredAgentSessionIdFor(launch.agent, launch.sessionId)) {
-    ctx.addIssue({
-      code: z.ZodIssueCode.custom,
-      path: ['sessionId'],
-      message: 'Launch session id must be named for its agent'
-    })
-  }
-}
-
-export const AgentLaunch = AgentLaunchFields.superRefine(refuseSessionIdForAnotherAgent)
-
-export type AgentLaunchParams = z.infer<typeof AgentLaunch>
-
-// A distinct method prevents an older receiver from silently dropping the replay requirement.
-export const AgentLaunchReplay = AgentLaunchFields.required({ operationId: true }).superRefine(
-  refuseSessionIdForAnotherAgent
-)
diff --git a/src/shared/rpc-contract/agent-launch-params.test.ts b/src/shared/rpc-contract/agent-launch/agent-launch-params.test.ts
similarity index 67%
rename from src/shared/rpc-contract/agent-launch-params.test.ts
rename to src/shared/rpc-contract/agent-launch/agent-launch-params.test.ts
index ba2412d7bed..71ea5ba22a9 100644
--- a/src/shared/rpc-contract/agent-launch-params.test.ts
+++ b/src/shared/rpc-contract/agent-launch/agent-launch-params.test.ts
@@ -6,18 +6,6 @@ import { AgentLaunch } from './agent-launch-params'
 const BASE = { agent: 'claude', target: { kind: 'existing', worktree: 'wt-1' } }
 
 describe('agent.launch params', () => {
-  it('keeps agentArgs tri-state: a string, an explicit null, and absent are three answers', () => {
-    expect(AgentLaunch.parse({ ...BASE, agentArgs: '--model opus' }).agentArgs).toBe('--model opus')
-    expect(AgentLaunch.parse({ ...BASE, agentArgs: null }).agentArgs).toBeNull()
-    expect(AgentLaunch.parse(BASE)).not.toHaveProperty('agentArgs')
-  })
-
-  it('accepts a launchSource this build has never heard of', () => {
-    const parsed = AgentLaunch.safeParse({ ...BASE, launchSource: 'a_surface_added_later' })
-    expect(parsed.success).toBe(true)
-    expect(parsed.data?.launchSource).toBe('a_surface_added_later')
-  })
-
   it('reads placement and presentation, and never refuses a launch over either', () => {
     const parsed = AgentLaunch.parse({
       ...BASE,
diff --git a/src/shared/rpc-contract/agent-launch-params.ts b/src/shared/rpc-contract/agent-launch/agent-launch-params.ts
similarity index 84%
rename from src/shared/rpc-contract/agent-launch-params.ts
rename to src/shared/rpc-contract/agent-launch/agent-launch-params.ts
index fbdb9864735..440c190308d 100644
--- a/src/shared/rpc-contract/agent-launch-params.ts
+++ b/src/shared/rpc-contract/agent-launch/agent-launch-params.ts
@@ -1,21 +1,21 @@
 /** Shared agent.launch schema lets remote clients use typed RpcSendParams.
  * The host honors an explicit surface or refuses it; migrated worktree.create startup-agent fields are stripped. */
 
-import { AGENT_LAUNCH_SURFACES } from '../agent-launch/contracts/agent-launch-surface'
+import { AGENT_LAUNCH_SURFACES } from '../../agent-launch/contracts/agent-launch-surface'
 import { z } from 'zod'
-import { isAgentSessionOptions } from '../agent-session/lifecycle/agent-session-record'
-import { parseAgentSessionOperationTimestamp } from '../agent-session/agent-session-host-authority'
-import { parsePaneKey } from '../workspace-layout/stable-pane-id'
-import { isValidHostTerminalTabId } from '../workspace-layout/terminal-surfaces/terminal-tab-id'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
-import { WorktreeCreate } from './worktree-create-params'
-import { FolderWorkspaceCreate } from './folder-workspace-params'
+import { isAgentSessionOptions } from '../../agent-session/lifecycle/agent-session-record'
+import { parseAgentSessionOperationTimestamp } from '../../agent-session/agent-session-host-authority'
+import { parsePaneKey } from '../../workspace-layout/stable-pane-id'
+import { isValidHostTerminalTabId } from '../../workspace-layout/terminal-surfaces/terminal-tab-id'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
+import { WorktreeCreate } from '../workspaces/worktree-create-params'
+import { FolderWorkspaceCreate } from '../workspaces/folder-workspace-params'
 import { LaunchSourceParam } from './launch-source-param'
-import { TerminalTabIdParam } from './agent-session-params'
-import { SessionId } from './structured-agent-session-params'
-import { isStructuredAgentSessionIdFor } from '../agent-session/structured-agent-session-create'
-import { AgentLaunchAccountEnv } from '../agent-launch/startup/agent-launch-account-env'
+import { TerminalTabIdParam } from '../terminal/agent-session-params'
+import { SessionId } from '../structured-agent-session/structured-agent-session-identifiers'
+import { isStructuredAgentSessionIdFor } from '../../agent-session/structured-agent-session-create'
+import { AgentLaunchAccountEnv } from '../../agent-launch/startup/agent-launch-account-env'
 
 const LaunchAgent = z.custom<TuiAgent>(isTuiAgent, { message: 'Unknown TUI agent' })
 
diff --git a/src/shared/rpc-contract/agent-launch-settings-params.ts b/src/shared/rpc-contract/agent-launch/agent-launch-settings-params.ts
similarity index 90%
rename from src/shared/rpc-contract/agent-launch-settings-params.ts
rename to src/shared/rpc-contract/agent-launch/agent-launch-settings-params.ts
index c23582f532d..36f326013e2 100644
--- a/src/shared/rpc-contract/agent-launch-settings-params.ts
+++ b/src/shared/rpc-contract/agent-launch/agent-launch-settings-params.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { AGENT_PERMISSION_CHOICES } from '../agent-launch/permissions/tui-agent-permission-choice'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { AGENT_PERMISSION_CHOICES } from '../../agent-launch/permissions/tui-agent-permission-choice'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
 
 const Agent = z.custom<TuiAgent>((value) => typeof value === 'string' && isTuiAgent(value))
 const Value = z
diff --git a/src/shared/rpc-contract/launch-source-param.ts b/src/shared/rpc-contract/agent-launch/launch-source-param.ts
similarity index 100%
rename from src/shared/rpc-contract/launch-source-param.ts
rename to src/shared/rpc-contract/agent-launch/launch-source-param.ts
diff --git a/src/shared/rpc-contract/agent-session-params-account-env.test.ts b/src/shared/rpc-contract/agent-session-params-account-env.test.ts
deleted file mode 100644
index 470d6f594c4..00000000000
--- a/src/shared/rpc-contract/agent-session-params-account-env.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { CreateAgentSessionParams, EnsureAgentSessionParams } from './agent-session-params'
-
-const ACCOUNT_ENV = {
-  CLAUDE_CONFIG_DIR: '/home/u/.orca-claude/a/config',
-  ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/home/u/.orca-claude/a/config',
-  ORCA_CLAUDE_PROFILE_POINTER: '~/.orca-claude/pointer',
-  CODEX_HOME: '/home/u/.orca-codex/b'
-}
-const CREATE = {
-  clientOperationId: `${Date.now()}-${'a'.repeat(32)}`,
-  worktree: 'id:wt-1',
-  agent: 'claude'
-}
-const ENSURE = {
-  kind: 'explicit',
-  worktree: 'id:wt-1',
-  agent: 'codex',
-  providerSession: { key: 'session_id', id: 'session-1' }
-}
-
-describe.each([
-  ['terminal.createAgentSession', CreateAgentSessionParams, CREATE],
-  ['terminal.ensureAgentSession', EnsureAgentSessionParams, ENSURE]
-] as const)('%s accountEnv wire compatibility', (_method, schema, base) => {
-  it.each([
-    ['a non-account variable', { PATH: '/usr/bin' }],
-    ['a relative home', { CLAUDE_CONFIG_DIR: 'home/u/.claude' }],
-    ['a parent segment', { CODEX_HOME: '/home/u/../root/.codex' }],
-    ['a Windows path', { CODEX_HOME: 'C:\\Users\\u\\.codex' }],
-    ['a newline', { CODEX_HOME: '/home/u/.codex\nX=1' }]
-  ])('refuses %s rather than starting another account', (_label, accountEnv) => {
-    expect(schema.safeParse({ ...base, accountEnv }).success).toBe(false)
-  })
-})
-
-describe('agent-session.account-env.v1', () => {
-  it('is not accepted on an automatic ensure, which hosts refuse anyway', () => {
-    const automatic = { kind: 'automatic', sleepingCheckpointId: 'a'.repeat(32) }
-    expect(EnsureAgentSessionParams.safeParse(automatic).success).toBe(true)
-    expect(
-      EnsureAgentSessionParams.safeParse({ ...automatic, accountEnv: ACCOUNT_ENV }).success
-    ).toBe(false)
-  })
-})
diff --git a/src/shared/rpc-contract/agent-session-spawn-intent-params.test.ts b/src/shared/rpc-contract/agent-session-spawn-intent-params.test.ts
deleted file mode 100644
index 3cbdd04b3de..00000000000
--- a/src/shared/rpc-contract/agent-session-spawn-intent-params.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { EnsureAgentSessionParams } from './agent-session-params'
-import { TerminalCreateParams } from './terminal-unary-params'
-
-const explicitResume = {
-  kind: 'explicit',
-  worktree: 'id:repo::/tmp/wt',
-  agent: 'claude',
-  providerSession: { key: 'session_id', id: 'provider-session-1' }
-} as const
-
-describe('spawnIntent on terminal-creating RPCs', () => {
-  it('never accepts interactive, which a daemon kept across an update would let skip the gate', () => {
-    expect(
-      EnsureAgentSessionParams.safeParse({ ...explicitResume, spawnIntent: 'interactive' }).success
-    ).toBe(false)
-    expect(TerminalCreateParams.safeParse({ spawnIntent: 'interactive' }).success).toBe(false)
-  })
-})
diff --git a/src/shared/rpc-contract/ai-vault-params.ts b/src/shared/rpc-contract/ai-vault/ai-vault-params.ts
similarity index 91%
rename from src/shared/rpc-contract/ai-vault-params.ts
rename to src/shared/rpc-contract/ai-vault/ai-vault-params.ts
index 4ef3f897ad1..bb8d55a968e 100644
--- a/src/shared/rpc-contract/ai-vault-params.ts
+++ b/src/shared/rpc-contract/ai-vault/ai-vault-params.ts
@@ -1,8 +1,8 @@
 import { z } from 'zod'
-import { parseExecutionHostId } from '../execution-host'
-import { AI_VAULT_AGENTS, boundedAiVaultScopeArgs } from '../ai-vault/contracts/ai-vault-types'
-import { OptionalBoolean } from './rpc-param-primitives'
-import { AI_VAULT_SESSION_TITLE_REQUEST_MAX_COUNT } from '../ai-vault/contracts/ai-vault-session-title'
+import { parseExecutionHostId } from '../../execution-host'
+import { AI_VAULT_AGENTS, boundedAiVaultScopeArgs } from '../../ai-vault/contracts/ai-vault-types'
+import { OptionalBoolean } from '../rpc-param-primitives'
+import { AI_VAULT_SESSION_TITLE_REQUEST_MAX_COUNT } from '../../ai-vault/contracts/ai-vault-session-title'
 
 // Bound discovery input; scopePaths are host-local match prefixes, never traversal paths.
 export const AI_VAULT_SCOPE_PATH_MAX_LENGTH = 4096
diff --git a/src/shared/rpc-contract/artifacts-params.ts b/src/shared/rpc-contract/artifacts/artifacts-params.ts
similarity index 97%
rename from src/shared/rpc-contract/artifacts-params.ts
rename to src/shared/rpc-contract/artifacts/artifacts-params.ts
index 48b9b5e27ec..9cdb8fe3aaf 100644
--- a/src/shared/rpc-contract/artifacts-params.ts
+++ b/src/shared/rpc-contract/artifacts/artifacts-params.ts
@@ -4,7 +4,7 @@ import {
   ARTIFACT_MAX_REQUEST_BYTES,
   artifactContentByteLength,
   artifactWriteRequestByteLength
-} from '../artifacts/artifacts'
+} from '../../artifacts/artifacts'
 
 export const CloudOptions = {
   apiUrl: z.string().max(2_048).optional(),
diff --git a/src/shared/rpc-contract/automation-params.ts b/src/shared/rpc-contract/automations/automation-params.ts
similarity index 95%
rename from src/shared/rpc-contract/automation-params.ts
rename to src/shared/rpc-contract/automations/automation-params.ts
index 037dae6961c..f363ca7e630 100644
--- a/src/shared/rpc-contract/automation-params.ts
+++ b/src/shared/rpc-contract/automations/automation-params.ts
@@ -1,7 +1,7 @@
 import * as z from 'zod'
-import { ChoicePatch, OptionKey } from './agent-launch-settings-params'
-import { AGENT_PERMISSION_CHOICES } from '../agent-launch/permissions/tui-agent-permission-choice'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
+import { ChoicePatch, OptionKey } from '../agent-launch/agent-launch-settings-params'
+import { AGENT_PERMISSION_CHOICES } from '../../agent-launch/permissions/tui-agent-permission-choice'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
 import {
   OptionalBoolean,
   OptionalPlainString,
@@ -9,13 +9,13 @@ import {
   OptionalString,
   requiredNumber,
   requiredString
-} from './rpc-param-primitives'
-import { normalizeExecutionHostId } from '../execution-host'
-import { isValidAutomationSchedule } from '../automations/scheduling/automation-schedule-parsing'
+} from '../rpc-param-primitives'
+import { normalizeExecutionHostId } from '../../execution-host'
+import { isValidAutomationSchedule } from '../../automations/scheduling/automation-schedule-parsing'
 import {
   MAX_AUTOMATION_PRECHECK_TIMEOUT_SECONDS,
   normalizeAutomationPrecheckTimeoutSeconds
-} from '../automations/launch/automation-precheck'
+} from '../../automations/launch/automation-precheck'
 
 export const TuiAgent = requiredString('Missing provider').refine(isTuiAgent, {
   message: 'Unknown provider'
diff --git a/src/shared/rpc-contract/browser-core-params.ts b/src/shared/rpc-contract/browser/browser-core-params.ts
similarity index 63%
rename from src/shared/rpc-contract/browser-core-params.ts
rename to src/shared/rpc-contract/browser/browser-core-params.ts
index 6cd0dccfbd3..2292b1a6bd4 100644
--- a/src/shared/rpc-contract/browser-core-params.ts
+++ b/src/shared/rpc-contract/browser/browser-core-params.ts
@@ -1,4 +1,4 @@
-import { BrowserTarget, requiredString } from './rpc-param-primitives'
+import { BrowserTarget, requiredString } from '../rpc-param-primitives'
 
 export const CertificateProceed = BrowserTarget.extend({
   challengeId: requiredString('Missing required challengeId')
diff --git a/src/shared/rpc-contract/browser-extension-params.ts b/src/shared/rpc-contract/browser/browser-extension-params.ts
similarity index 84%
rename from src/shared/rpc-contract/browser-extension-params.ts
rename to src/shared/rpc-contract/browser/browser-extension-params.ts
index 3e03d82aefe..0e1050509e0 100644
--- a/src/shared/rpc-contract/browser-extension-params.ts
+++ b/src/shared/rpc-contract/browser/browser-extension-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { isChromeExtensionId } from '../browser/extensions/browser-extension-url'
+import { isChromeExtensionId } from '../../browser/extensions/browser-extension-url'
 
 export const ExtensionList = z.object({ profileId: z.string().min(1).optional() })
 export const ExtensionReload = z
diff --git a/src/shared/rpc-contract/browser-extras-params.ts b/src/shared/rpc-contract/browser/browser-extras-params.ts
similarity index 86%
rename from src/shared/rpc-contract/browser-extras-params.ts
rename to src/shared/rpc-contract/browser/browser-extras-params.ts
index 421c8976608..c68986b049b 100644
--- a/src/shared/rpc-contract/browser-extras-params.ts
+++ b/src/shared/rpc-contract/browser/browser-extras-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { MouseButton, MouseXY } from './browser-params'
-import { OptionalFiniteNumber } from './rpc-param-primitives'
+import { OptionalFiniteNumber } from '../rpc-param-primitives'
 
 export const MouseModifiers = z
   .unknown()
diff --git a/src/shared/rpc-contract/browser-identity-params.ts b/src/shared/rpc-contract/browser/browser-identity-params.ts
similarity index 94%
rename from src/shared/rpc-contract/browser-identity-params.ts
rename to src/shared/rpc-contract/browser/browser-identity-params.ts
index ab5ae3fe4c6..863ba45fb22 100644
--- a/src/shared/rpc-contract/browser-identity-params.ts
+++ b/src/shared/rpc-contract/browser/browser-identity-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 export const ProfileCreate = z
   .object({
diff --git a/src/shared/rpc-contract/browser-observation-params.ts b/src/shared/rpc-contract/browser/browser-observation-params.ts
similarity index 96%
rename from src/shared/rpc-contract/browser-observation-params.ts
rename to src/shared/rpc-contract/browser/browser-observation-params.ts
index e18dacd2958..987725a4067 100644
--- a/src/shared/rpc-contract/browser-observation-params.ts
+++ b/src/shared/rpc-contract/browser/browser-observation-params.ts
@@ -4,7 +4,7 @@ import {
   OptionalBoolean,
   OptionalPositiveInt,
   OptionalString
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 
 export const Snapshot = BrowserTarget.extend({
   interactive: OptionalBoolean,
diff --git a/src/shared/rpc-contract/browser-params.ts b/src/shared/rpc-contract/browser/browser-params.ts
similarity index 99%
rename from src/shared/rpc-contract/browser-params.ts
rename to src/shared/rpc-contract/browser/browser-params.ts
index 236e64b134c..8cd6c41c6d7 100644
--- a/src/shared/rpc-contract/browser-params.ts
+++ b/src/shared/rpc-contract/browser/browser-params.ts
@@ -8,7 +8,7 @@ import {
   OptionalString,
   requiredString,
   requiredStringAllowingEmpty
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 
 export const Element = ExpectUrlBrowserTarget.extend({
   element: requiredString('Missing required --element')
diff --git a/src/shared/rpc-contract/browser-screencast-params.ts b/src/shared/rpc-contract/browser/browser-screencast-params.ts
similarity index 100%
rename from src/shared/rpc-contract/browser-screencast-params.ts
rename to src/shared/rpc-contract/browser/browser-screencast-params.ts
diff --git a/src/shared/rpc-contract/browser-tab-create-params.ts b/src/shared/rpc-contract/browser/browser-tab-create-params.ts
similarity index 75%
rename from src/shared/rpc-contract/browser-tab-create-params.ts
rename to src/shared/rpc-contract/browser/browser-tab-create-params.ts
index 297e467dcb5..c98aca8bf25 100644
--- a/src/shared/rpc-contract/browser-tab-create-params.ts
+++ b/src/shared/rpc-contract/browser/browser-tab-create-params.ts
@@ -1,8 +1,8 @@
 import { z } from 'zod'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
-import { BrowserPageCreationPlacement } from '../browser/client-hosting/browser-client-host-placement'
-import { OptionalString } from './rpc-param-primitives'
-import { BROWSER_TAB_SPLIT_DIRECTIONS } from '../browser-tab-split-direction'
+import { RUNTIME_NAVIGATION_TARGETS } from '../../runtime-navigation'
+import { BrowserPageCreationPlacement } from '../../browser/client-hosting/browser-client-host-placement'
+import { OptionalString } from '../rpc-param-primitives'
+import { BROWSER_TAB_SPLIT_DIRECTIONS } from '../../browser-tab-split-direction'
 
 export const BrowserTabCreateParams = z.object({
   url: OptionalString,
diff --git a/src/shared/rpc-contract/client-events-params.ts b/src/shared/rpc-contract/client-ui/client-events-params.ts
similarity index 100%
rename from src/shared/rpc-contract/client-events-params.ts
rename to src/shared/rpc-contract/client-ui/client-events-params.ts
diff --git a/src/shared/rpc-contract/client-settings-params.ts b/src/shared/rpc-contract/client-ui/client-settings-params.ts
similarity index 83%
rename from src/shared/rpc-contract/client-settings-params.ts
rename to src/shared/rpc-contract/client-ui/client-settings-params.ts
index 69f038dd21e..1022bfdb088 100644
--- a/src/shared/rpc-contract/client-settings-params.ts
+++ b/src/shared/rpc-contract/client-ui/client-settings-params.ts
@@ -1,17 +1,17 @@
 import { z } from 'zod'
-import { isTaskProvider } from '../work-items/task-providers'
-import type { TaskProvider } from '../work-items/task-providers'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { normalizeDisabledTuiAgents } from '../agent-launch/catalog/tui-agent-selection'
+import { isTaskProvider } from '../../work-items/task-providers'
+import type { TaskProvider } from '../../work-items/task-providers'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { normalizeDisabledTuiAgents } from '../../agent-launch/catalog/tui-agent-selection'
 import {
   normalizeTuiAgentArgsRecord,
   normalizeTuiAgentEnvRecord
-} from '../agent-launch/choices/tui-agent-launch-defaults'
-import { MACHINE_NAME_MAX_LENGTH } from '../machine-name'
-import { normalizePRBotAuthorOverrides } from '../source-control/review-comments/pr-bot-author-overrides'
-import { WorktreeVisibilityDefaultsUpdate } from './worktree-visibility-defaults-params'
-import { WorkspaceCleanupRulesParam } from './workspace-cleanup-policy-params'
-import { AGENT_CHAT_PERMISSION_MODES } from '../agent-launch/permissions/agent-chat-permission-mode'
+} from '../../agent-launch/choices/tui-agent-launch-defaults'
+import { MACHINE_NAME_MAX_LENGTH } from '../../machine-name'
+import { normalizePRBotAuthorOverrides } from '../../source-control/review-comments/pr-bot-author-overrides'
+import { WorktreeVisibilityDefaultsUpdate } from '../workspaces/worktree-visibility-defaults-params'
+import { WorkspaceCleanupRulesParam } from '../workspace-cleanup/workspace-cleanup-policy-params'
+import { AGENT_CHAT_PERMISSION_MODES } from '../../agent-launch/permissions/agent-chat-permission-mode'
 
 export const TaskProviderParam = z.custom<TaskProvider>(isTaskProvider, {
   message: 'Unknown task provider'
diff --git a/src/shared/rpc-contract/client-ui-params.ts b/src/shared/rpc-contract/client-ui/client-ui-params.ts
similarity index 94%
rename from src/shared/rpc-contract/client-ui-params.ts
rename to src/shared/rpc-contract/client-ui/client-ui-params.ts
index 72afc5a285e..0abb159f1ab 100644
--- a/src/shared/rpc-contract/client-ui-params.ts
+++ b/src/shared/rpc-contract/client-ui/client-ui-params.ts
@@ -1,19 +1,22 @@
-import { GitHistoryRefName } from './git-params'
+import { GitHistoryRefName } from '../source-control/git-params'
 import { z } from 'zod'
-import { isFeatureTipSeenId } from '../feature-tips'
+import { isFeatureTipSeenId } from '../../feature-tips'
 import {
   WORKTREE_CARD_PROPERTIES,
   normalizeWorktreeCardProperties
-} from '../worktree/card-properties'
-import { isPluginPanelTabKey } from '../plugins/manifest/plugin-manifest'
-import { isFeatureInteractionId } from '../feature-interactions'
-import type { FeatureInteractionId } from '../feature-interactions'
-import { ACTIVITY_GROUP_BY_VALUES, THREAD_READ_FILTER_VALUES } from '../agents-view-thread-filters'
-import { isReleaseChannel } from '../release-channel'
-import type { ReleaseChannel } from '../release-channel'
+} from '../../worktree/card-properties'
+import { isPluginPanelTabKey } from '../../plugins/frames/plugin-tab-key'
+import { isFeatureInteractionId } from '../../feature-interactions'
+import type { FeatureInteractionId } from '../../feature-interaction-catalog'
+import {
+  ACTIVITY_GROUP_BY_VALUES,
+  THREAD_READ_FILTER_VALUES
+} from '../../agents-view-thread-filters'
+import { isReleaseChannel } from '../../release-channel'
+import type { ReleaseChannel } from '../../release-channel'
 import { ClientUiWorkspaceFilterFields } from './client-ui-workspace-filter-fields-params'
 import { TaskResumeState } from './task-resume-state-params'
-import { WorkspaceCleanup } from './workspace-cleanup-ui-params'
+import { WorkspaceCleanup } from '../workspace-cleanup/workspace-cleanup-ui-params'
 import { omitUndefinedValues, tolerateUnknownValues } from './ui-update-value-tolerance-params'
 
 export const NullableString = z.string().nullable()
diff --git a/src/shared/rpc-contract/client-ui-workspace-filter-fields-params.ts b/src/shared/rpc-contract/client-ui/client-ui-workspace-filter-fields-params.ts
similarity index 100%
rename from src/shared/rpc-contract/client-ui-workspace-filter-fields-params.ts
rename to src/shared/rpc-contract/client-ui/client-ui-workspace-filter-fields-params.ts
diff --git a/src/shared/rpc-contract/client-workspace-view-params.ts b/src/shared/rpc-contract/client-ui/client-workspace-view-params.ts
similarity index 100%
rename from src/shared/rpc-contract/client-workspace-view-params.ts
rename to src/shared/rpc-contract/client-ui/client-workspace-view-params.ts
diff --git a/src/shared/rpc-contract/sidebar-session-params.ts b/src/shared/rpc-contract/client-ui/sidebar-session-params.ts
similarity index 100%
rename from src/shared/rpc-contract/sidebar-session-params.ts
rename to src/shared/rpc-contract/client-ui/sidebar-session-params.ts
diff --git a/src/shared/rpc-contract/task-resume-state-params.ts b/src/shared/rpc-contract/client-ui/task-resume-state-params.ts
similarity index 100%
rename from src/shared/rpc-contract/task-resume-state-params.ts
rename to src/shared/rpc-contract/client-ui/task-resume-state-params.ts
diff --git a/src/shared/rpc-contract/ui-update-value-tolerance-params.ts b/src/shared/rpc-contract/client-ui/ui-update-value-tolerance-params.ts
similarity index 100%
rename from src/shared/rpc-contract/ui-update-value-tolerance-params.ts
rename to src/shared/rpc-contract/client-ui/ui-update-value-tolerance-params.ts
diff --git a/src/shared/rpc-contract/clipboard-params.ts b/src/shared/rpc-contract/clipboard/clipboard-params.ts
similarity index 92%
rename from src/shared/rpc-contract/clipboard-params.ts
rename to src/shared/rpc-contract/clipboard/clipboard-params.ts
index 029134be34a..7a458ff6816 100644
--- a/src/shared/rpc-contract/clipboard-params.ts
+++ b/src/shared/rpc-contract/clipboard/clipboard-params.ts
@@ -1,10 +1,8 @@
 import { z } from 'zod'
 import {
-  CLIPBOARD_IMAGE_MAX_BASE64_CHARS,
+  CLIPBOARD_IMAGE_MAX_BASE64_CHARS as MAX_CLIPBOARD_IMAGE_BASE64_CHARS,
   CLIPBOARD_IMAGE_TOO_LARGE_ERROR
-} from '../clipboard-image'
-
-export const MAX_CLIPBOARD_IMAGE_BASE64_CHARS = CLIPBOARD_IMAGE_MAX_BASE64_CHARS
+} from '../../clipboard-image'
 
 export const CLIPBOARD_IMAGE_UPLOAD_CHUNK_BASE64_CHARS = 512 * 1024
 
diff --git a/src/shared/rpc-contract/computer-params.ts b/src/shared/rpc-contract/computer/computer-params.ts
similarity index 100%
rename from src/shared/rpc-contract/computer-params.ts
rename to src/shared/rpc-contract/computer/computer-params.ts
diff --git a/src/shared/rpc-contract/computer-schemas-params.ts b/src/shared/rpc-contract/computer/computer-schemas-params.ts
similarity index 99%
rename from src/shared/rpc-contract/computer-schemas-params.ts
rename to src/shared/rpc-contract/computer/computer-schemas-params.ts
index eefe11d745c..e66ca391b47 100644
--- a/src/shared/rpc-contract/computer-schemas-params.ts
+++ b/src/shared/rpc-contract/computer/computer-schemas-params.ts
@@ -5,12 +5,12 @@ import {
   OptionalString,
   requiredString,
   requiredStringAllowingEmpty
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 import {
   computerUseClickModifiersValidationMessage,
   computerUseHotkeyValidationMessage,
   computerUsePressKeyValidationMessage
-} from '../computer-use-key-spec'
+} from '../../computer-use-key-spec'
 
 export const OptionalNonNegativeInt = z.number().int().nonnegative().optional()
 
diff --git a/src/shared/rpc-contract/connector-params.ts b/src/shared/rpc-contract/connectors/connector-params.ts
similarity index 94%
rename from src/shared/rpc-contract/connector-params.ts
rename to src/shared/rpc-contract/connectors/connector-params.ts
index d68a3ed4c69..b90d5f86a0d 100644
--- a/src/shared/rpc-contract/connector-params.ts
+++ b/src/shared/rpc-contract/connectors/connector-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { CONNECTOR_SOURCES } from '../external-conversation-link'
-import { AgentLaunchFields } from './agent-launch-params'
+import { CONNECTOR_SOURCES } from '../../external-conversation-link'
+import { AgentLaunchFields } from '../agent-launch/agent-launch-params'
 
 const ConnectorDelivery = {
   source: z.enum(CONNECTOR_SOURCES),
diff --git a/src/shared/rpc-contract/emulator-params.ts b/src/shared/rpc-contract/emulator/emulator-params.ts
similarity index 100%
rename from src/shared/rpc-contract/emulator-params.ts
rename to src/shared/rpc-contract/emulator/emulator-params.ts
diff --git a/src/shared/rpc-contract/files-mutation-params.ts b/src/shared/rpc-contract/filesystem/files-mutation-params.ts
similarity index 100%
rename from src/shared/rpc-contract/files-mutation-params.ts
rename to src/shared/rpc-contract/filesystem/files-mutation-params.ts
diff --git a/src/shared/rpc-contract/files-params.ts b/src/shared/rpc-contract/filesystem/files-params.ts
similarity index 93%
rename from src/shared/rpc-contract/files-params.ts
rename to src/shared/rpc-contract/filesystem/files-params.ts
index 95da45fa297..352ccd6bd51 100644
--- a/src/shared/rpc-contract/files-params.ts
+++ b/src/shared/rpc-contract/filesystem/files-params.ts
@@ -1,8 +1,8 @@
-import { PATH_EXISTENCE_BATCH_MAX } from '../file-access/path-existence-batch'
-import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../file-listing/file-dir-page'
+import { PATH_EXISTENCE_BATCH_MAX } from '../../file-access/path-existence-batch'
+import { FILE_READ_DIR_MAX_PAGE_ENTRIES } from '../../file-listing/file-dir-page'
 import { z } from 'zod'
-import { QUICK_OPEN_REMOTE_QUERY_MAX_CODE_UNITS } from '../quick-open/quick-open-path-search'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
+import { QUICK_OPEN_REMOTE_QUERY_MAX_CODE_UNITS } from '../../quick-open/quick-open-path-search'
+import { RUNTIME_NAVIGATION_TARGETS } from '../../runtime-navigation'
 import { FileOpen, WorktreeSelector } from './files-target-params'
 
 export const FilePathsExist = WorktreeSelector.extend({
diff --git a/src/shared/rpc-contract/files-staged-save-params.ts b/src/shared/rpc-contract/filesystem/files-staged-save-params.ts
similarity index 91%
rename from src/shared/rpc-contract/files-staged-save-params.ts
rename to src/shared/rpc-contract/filesystem/files-staged-save-params.ts
index f37850a42ad..99f6d244bd8 100644
--- a/src/shared/rpc-contract/files-staged-save-params.ts
+++ b/src/shared/rpc-contract/filesystem/files-staged-save-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { STAGED_FILE_SAVE_LIMITS } from '../file-write/staged-file-save'
+import { STAGED_FILE_SAVE_LIMITS } from '../../file-write/staged-file-save'
 import {
   FileMutationOpen,
   FileWriteDiskPreconditionParam,
diff --git a/src/shared/rpc-contract/files-target-params.ts b/src/shared/rpc-contract/filesystem/files-target-params.ts
similarity index 100%
rename from src/shared/rpc-contract/files-target-params.ts
rename to src/shared/rpc-contract/filesystem/files-target-params.ts
diff --git a/src/shared/rpc-contract/files-terminal-artifact-params.ts b/src/shared/rpc-contract/filesystem/files-terminal-artifact-params.ts
similarity index 100%
rename from src/shared/rpc-contract/files-terminal-artifact-params.ts
rename to src/shared/rpc-contract/filesystem/files-terminal-artifact-params.ts
diff --git a/src/shared/rpc-contract/github-account-binding-params.ts b/src/shared/rpc-contract/github/github-account-binding-params.ts
similarity index 85%
rename from src/shared/rpc-contract/github-account-binding-params.ts
rename to src/shared/rpc-contract/github/github-account-binding-params.ts
index 8e055c645ca..5dc12e33c4f 100644
--- a/src/shared/rpc-contract/github-account-binding-params.ts
+++ b/src/shared/rpc-contract/github/github-account-binding-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { RepoSelector } from './github-repo-target-params'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 export const BindableAccounts = RepoSelector.extend({
   refreshCapability: z.boolean().optional()
diff --git a/src/shared/rpc-contract/github-attachment-params.ts b/src/shared/rpc-contract/github/github-attachment-params.ts
similarity index 100%
rename from src/shared/rpc-contract/github-attachment-params.ts
rename to src/shared/rpc-contract/github/github-attachment-params.ts
diff --git a/src/shared/rpc-contract/github-issue-params.ts b/src/shared/rpc-contract/github/github-issue-params.ts
similarity index 93%
rename from src/shared/rpc-contract/github-issue-params.ts
rename to src/shared/rpc-contract/github/github-issue-params.ts
index 8d562291eb0..676d525363f 100644
--- a/src/shared/rpc-contract/github-issue-params.ts
+++ b/src/shared/rpc-contract/github/github-issue-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { RepoSelector, SlugRepo } from './github-repo-target-params'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 import { IssueUpdate } from './github-issue-update-params'
 
 export const Issue = RepoSelector.extend({
diff --git a/src/shared/rpc-contract/github-issue-update-params.ts b/src/shared/rpc-contract/github/github-issue-update-params.ts
similarity index 88%
rename from src/shared/rpc-contract/github-issue-update-params.ts
rename to src/shared/rpc-contract/github/github-issue-update-params.ts
index 40eb7ab7d51..16039b5a3a0 100644
--- a/src/shared/rpc-contract/github-issue-update-params.ts
+++ b/src/shared/rpc-contract/github/github-issue-update-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalString } from './rpc-param-primitives'
+import { OptionalString } from '../rpc-param-primitives'
 
 // Why: repo-selector and slug-addressed issue updates must accept the identical field set.
 export const IssueUpdate = z.object({
diff --git a/src/shared/rpc-contract/github-project-params.ts b/src/shared/rpc-contract/github/github-project-params.ts
similarity index 97%
rename from src/shared/rpc-contract/github-project-params.ts
rename to src/shared/rpc-contract/github/github-project-params.ts
index 01af068d81e..a5684aa6fae 100644
--- a/src/shared/rpc-contract/github-project-params.ts
+++ b/src/shared/rpc-contract/github/github-project-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { SlugRepo } from './github-repo-target-params'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 import { IssueUpdate } from './github-issue-update-params'
 
 export const SlugAssignableUsers = SlugRepo.extend({
diff --git a/src/shared/rpc-contract/github-pull-request-params.ts b/src/shared/rpc-contract/github/github-pull-request-params.ts
similarity index 93%
rename from src/shared/rpc-contract/github-pull-request-params.ts
rename to src/shared/rpc-contract/github/github-pull-request-params.ts
index 24562bf5b57..925315ce91a 100644
--- a/src/shared/rpc-contract/github-pull-request-params.ts
+++ b/src/shared/rpc-contract/github/github-pull-request-params.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
-import type { GitHubPRRefreshReason } from '../github/pull-requests/refresh/pull-request-refresh-types'
+import type { GitHubPRRefreshReason } from '../../github/pull-requests/refresh/pull-request-refresh-types'
 import { OptionalGhAccountExpectation, RepoSelector, SlugRepo } from './github-repo-target-params'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const OptionalPRRefreshReason = z
   .unknown()
diff --git a/src/shared/rpc-contract/github-pull-request-update-params.ts b/src/shared/rpc-contract/github/github-pull-request-update-params.ts
similarity index 97%
rename from src/shared/rpc-contract/github-pull-request-update-params.ts
rename to src/shared/rpc-contract/github/github-pull-request-update-params.ts
index 642b0ce1856..55e184c216b 100644
--- a/src/shared/rpc-contract/github-pull-request-update-params.ts
+++ b/src/shared/rpc-contract/github/github-pull-request-update-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { RepoSelector, SlugRepo } from './github-repo-target-params'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const UpdatePrTitle = RepoSelector.extend({
   prNumber: z.number().int().positive(),
diff --git a/src/shared/rpc-contract/github-repo-target-params.ts b/src/shared/rpc-contract/github/github-repo-target-params.ts
similarity index 88%
rename from src/shared/rpc-contract/github-repo-target-params.ts
rename to src/shared/rpc-contract/github/github-repo-target-params.ts
index e207b3b9ef2..7f30c035a74 100644
--- a/src/shared/rpc-contract/github-repo-target-params.ts
+++ b/src/shared/rpc-contract/github/github-repo-target-params.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
-import { normalizeGhAccountBinding } from '../github/accounts/account-binding'
-import { OptionalBoolean, OptionalString, requiredString } from './rpc-param-primitives'
-import { OptionalExecutionHostId } from './worktree-params'
+import { normalizeGhAccountBinding } from '../../github/accounts/account-binding'
+import { OptionalBoolean, OptionalString, requiredString } from '../rpc-param-primitives'
+import { OptionalExecutionHostId } from '../workspaces/worktree-params'
 
 export const RepoSelector = z.object({
   repo: requiredString('Missing repo selector')
diff --git a/src/shared/rpc-contract/github-repo-work-item-params.ts b/src/shared/rpc-contract/github/github-repo-work-item-params.ts
similarity index 97%
rename from src/shared/rpc-contract/github-repo-work-item-params.ts
rename to src/shared/rpc-contract/github/github-repo-work-item-params.ts
index 7a8cc02f1ec..7b1cae906b5 100644
--- a/src/shared/rpc-contract/github-repo-work-item-params.ts
+++ b/src/shared/rpc-contract/github/github-repo-work-item-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { OptionalGhAccountExpectation, RepoSelector, SlugRepo } from './github-repo-target-params'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const WorkItemsList = RepoSelector.extend({
   limit: OptionalFiniteNumber,
diff --git a/src/shared/rpc-contract/environment-doctor-params.ts b/src/shared/rpc-contract/host-management/environment-doctor-params.ts
similarity index 79%
rename from src/shared/rpc-contract/environment-doctor-params.ts
rename to src/shared/rpc-contract/host-management/environment-doctor-params.ts
index bef829d597c..e066a57d55b 100644
--- a/src/shared/rpc-contract/environment-doctor-params.ts
+++ b/src/shared/rpc-contract/host-management/environment-doctor-params.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 /** A checkout path on the host. The RPC never re-runs setup: that executes repo code. */
 export const EnvironmentDoctorParams = z.object({
diff --git a/src/shared/rpc-contract/managed-runtime-install-params.ts b/src/shared/rpc-contract/host-management/managed-runtime-install-params.ts
similarity index 71%
rename from src/shared/rpc-contract/managed-runtime-install-params.ts
rename to src/shared/rpc-contract/host-management/managed-runtime-install-params.ts
index 97bf0a99d19..62832800a2e 100644
--- a/src/shared/rpc-contract/managed-runtime-install-params.ts
+++ b/src/shared/rpc-contract/host-management/managed-runtime-install-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { StructuredAgent } from './structured-agent-session-params'
+import { StructuredAgent } from '../structured-agent-session/structured-agent-session-params'
 
 export const ManagedRuntimeAgentParams = z.strictObject({ agent: StructuredAgent })
 
diff --git a/src/shared/rpc-contract/managed-server-params.ts b/src/shared/rpc-contract/host-management/managed-server-params.ts
similarity index 90%
rename from src/shared/rpc-contract/managed-server-params.ts
rename to src/shared/rpc-contract/host-management/managed-server-params.ts
index 4cd482d2cfa..7f9c3978d6f 100644
--- a/src/shared/rpc-contract/managed-server-params.ts
+++ b/src/shared/rpc-contract/host-management/managed-server-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 /** A managed Orca server on this host, by environment name or id. */
 export const ManagedServerSelector = z.object({
diff --git a/src/shared/rpc-contract/orcad-migration-params.ts b/src/shared/rpc-contract/host-management/orcad-migration-params.ts
similarity index 93%
rename from src/shared/rpc-contract/orcad-migration-params.ts
rename to src/shared/rpc-contract/host-management/orcad-migration-params.ts
index f70a16c3bdf..c368f632a8f 100644
--- a/src/shared/rpc-contract/orcad-migration-params.ts
+++ b/src/shared/rpc-contract/host-management/orcad-migration-params.ts
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import {
   MAX_ORCAD_MIGRATION_BLOBS,
   OrcadMigrationBlobDescriptorSchema
-} from '../orcad-migration/orcad-migration-blob-transfer'
+} from '../../orcad-migration/orcad-migration-blob-transfer'
 
 // Let the handler parse/digest-check the manifest so malformed input receives a migration-specific refusal.
 export const OrcadMigrationCatalogParams = z.object({ manifest: z.unknown() })
diff --git a/src/shared/rpc-contract/recipe-vm-wake-params.ts b/src/shared/rpc-contract/host-management/recipe-vm-wake-params.ts
similarity index 78%
rename from src/shared/rpc-contract/recipe-vm-wake-params.ts
rename to src/shared/rpc-contract/host-management/recipe-vm-wake-params.ts
index 26a1398c346..0a9c3025a0e 100644
--- a/src/shared/rpc-contract/recipe-vm-wake-params.ts
+++ b/src/shared/rpc-contract/host-management/recipe-vm-wake-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 /** A saved runtime environment served by a recipe VM, by name or id. */
 export const RecipeVmWakeParams = z.object({
diff --git a/src/shared/rpc-contract/runtime-client-capabilities-params.ts b/src/shared/rpc-contract/host-management/runtime-client-capabilities-params.ts
similarity index 100%
rename from src/shared/rpc-contract/runtime-client-capabilities-params.ts
rename to src/shared/rpc-contract/host-management/runtime-client-capabilities-params.ts
diff --git a/src/shared/rpc-contract/status-params.ts b/src/shared/rpc-contract/host-management/status-params.ts
similarity index 100%
rename from src/shared/rpc-contract/status-params.ts
rename to src/shared/rpc-contract/host-management/status-params.ts
diff --git a/src/shared/rpc-contract/jira-favourite-filter-params.ts b/src/shared/rpc-contract/jira/jira-favourite-filter-params.ts
similarity index 100%
rename from src/shared/rpc-contract/jira-favourite-filter-params.ts
rename to src/shared/rpc-contract/jira/jira-favourite-filter-params.ts
diff --git a/src/shared/rpc-contract/jira-params.ts b/src/shared/rpc-contract/jira/jira-params.ts
similarity index 99%
rename from src/shared/rpc-contract/jira-params.ts
rename to src/shared/rpc-contract/jira/jira-params.ts
index 4bae29213bf..5e696d7a93f 100644
--- a/src/shared/rpc-contract/jira-params.ts
+++ b/src/shared/rpc-contract/jira/jira-params.ts
@@ -5,7 +5,7 @@ import {
   OptionalPlainString,
   OptionalString,
   requiredString
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 
 export const VALID_FILTERS = ['assigned', 'reported', 'all', 'done'] as const
 
diff --git a/src/shared/rpc-contract/jira-quick-filter-params.ts b/src/shared/rpc-contract/jira/jira-quick-filter-params.ts
similarity index 93%
rename from src/shared/rpc-contract/jira-quick-filter-params.ts
rename to src/shared/rpc-contract/jira/jira-quick-filter-params.ts
index 9fea30075ee..9dd2771847e 100644
--- a/src/shared/rpc-contract/jira-quick-filter-params.ts
+++ b/src/shared/rpc-contract/jira/jira-quick-filter-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { MAX_JIRA_STATUS_FILTERS, MAX_JIRA_STATUS_NAME_LENGTH } from '../jira/jira-quick-filters'
+import { MAX_JIRA_STATUS_FILTERS, MAX_JIRA_STATUS_NAME_LENGTH } from '../../jira/jira-quick-filters'
 
 const JiraStatuses = z
   .array(
diff --git a/src/shared/rpc-contract/jira-saved-filter-params.ts b/src/shared/rpc-contract/jira/jira-saved-filter-params.ts
similarity index 88%
rename from src/shared/rpc-contract/jira-saved-filter-params.ts
rename to src/shared/rpc-contract/jira/jira-saved-filter-params.ts
index 61708fa4a01..a4668f47774 100644
--- a/src/shared/rpc-contract/jira-saved-filter-params.ts
+++ b/src/shared/rpc-contract/jira/jira-saved-filter-params.ts
@@ -1,10 +1,10 @@
-import { isUtf8ByteLengthWithinLimit } from '../utf8-byte-limits'
+import { isUtf8ByteLengthWithinLimit } from '../../utf8-byte-limits'
 import { z } from 'zod'
 import {
   MAX_JIRA_SAVED_FILTER_ID_LENGTH,
   MAX_JIRA_SAVED_FILTER_NAME_LENGTH,
   MAX_JIRA_SAVED_FILTER_JQL_LENGTH
-} from '../jira/jira-saved-filters'
+} from '../../jira/jira-saved-filters'
 
 const FilterId = z.string().trim().min(1).max(MAX_JIRA_SAVED_FILTER_ID_LENGTH)
 export const JiraSavedFilterMutationParam = z.discriminatedUnion('kind', [
diff --git a/src/shared/rpc-contract/linear-agent-access-params.ts b/src/shared/rpc-contract/linear/linear-agent-access-params.ts
similarity index 99%
rename from src/shared/rpc-contract/linear-agent-access-params.ts
rename to src/shared/rpc-contract/linear/linear-agent-access-params.ts
index f7e71fee18b..6940dfbf5ca 100644
--- a/src/shared/rpc-contract/linear-agent-access-params.ts
+++ b/src/shared/rpc-contract/linear/linear-agent-access-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const LINEAR_DUE_DATE_PATTERN = /^\d{4}-\d{2}-\d{2}$/
 
diff --git a/src/shared/rpc-contract/linear-issue-attribute-filter-params.ts b/src/shared/rpc-contract/linear/linear-issue-attribute-filter-params.ts
similarity index 95%
rename from src/shared/rpc-contract/linear-issue-attribute-filter-params.ts
rename to src/shared/rpc-contract/linear/linear-issue-attribute-filter-params.ts
index 21eb4ab5bcd..4ae66d58d6f 100644
--- a/src/shared/rpc-contract/linear-issue-attribute-filter-params.ts
+++ b/src/shared/rpc-contract/linear/linear-issue-attribute-filter-params.ts
@@ -4,7 +4,7 @@ import {
   LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_LABEL_IDS,
   LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_PRIORITIES,
   LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_STATE_IDS
-} from '../linear/issue-attribute-filter'
+} from '../../linear/issue-attribute-filter'
 
 export const LinearAttributeFilterId = z
   .string()
diff --git a/src/shared/rpc-contract/linear-issue-list-params.ts b/src/shared/rpc-contract/linear/linear-issue-list-params.ts
similarity index 93%
rename from src/shared/rpc-contract/linear-issue-list-params.ts
rename to src/shared/rpc-contract/linear/linear-issue-list-params.ts
index ec4813f4186..0a2c5abfa54 100644
--- a/src/shared/rpc-contract/linear-issue-list-params.ts
+++ b/src/shared/rpc-contract/linear/linear-issue-list-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString } from '../rpc-param-primitives'
 import { LinearIssueAttributeFilterSchema } from './linear-issue-attribute-filter-params'
 
 export const LegacyListIssues = z
diff --git a/src/shared/rpc-contract/linear-params.ts b/src/shared/rpc-contract/linear/linear-params.ts
similarity index 99%
rename from src/shared/rpc-contract/linear-params.ts
rename to src/shared/rpc-contract/linear/linear-params.ts
index 313227c6029..154dc1e9b9e 100644
--- a/src/shared/rpc-contract/linear-params.ts
+++ b/src/shared/rpc-contract/linear/linear-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const VALID_CUSTOM_VIEW_MODELS = ['issue', 'project'] as const
 
diff --git a/src/shared/rpc-contract/linear-project-create-params.ts b/src/shared/rpc-contract/linear/linear-project-create-params.ts
similarity index 90%
rename from src/shared/rpc-contract/linear-project-create-params.ts
rename to src/shared/rpc-contract/linear/linear-project-create-params.ts
index 2eec8beb1fa..057ad2d4579 100644
--- a/src/shared/rpc-contract/linear-project-create-params.ts
+++ b/src/shared/rpc-contract/linear/linear-project-create-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const LinearPriority = z.number().int().min(0).max(4).optional()
 
diff --git a/src/shared/rpc-contract/link-preview-params.ts b/src/shared/rpc-contract/link-preview/link-preview-params.ts
similarity index 66%
rename from src/shared/rpc-contract/link-preview-params.ts
rename to src/shared/rpc-contract/link-preview/link-preview-params.ts
index 74b2db6d4ff..a1197a99fd8 100644
--- a/src/shared/rpc-contract/link-preview-params.ts
+++ b/src/shared/rpc-contract/link-preview/link-preview-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 export const LinkPreviewGetParams = z.object({
   url: requiredString('Missing url')
diff --git a/src/shared/rpc-contract/native-chat-params.ts b/src/shared/rpc-contract/native-chat/native-chat-params.ts
similarity index 95%
rename from src/shared/rpc-contract/native-chat-params.ts
rename to src/shared/rpc-contract/native-chat/native-chat-params.ts
index 3b164bc4694..f70ea64e17e 100644
--- a/src/shared/rpc-contract/native-chat-params.ts
+++ b/src/shared/rpc-contract/native-chat/native-chat-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import type { AgentType } from '../agent-status/contracts/agent-status-types'
+import type { AgentType } from '../../agent-status/contracts/agent-status-types'
 
 // Expose the same transcript readers over RPC for paired mobile/web native chat.
 
diff --git a/src/shared/rpc-contract/notifications-params.ts b/src/shared/rpc-contract/notifications/notifications-params.ts
similarity index 98%
rename from src/shared/rpc-contract/notifications-params.ts
rename to src/shared/rpc-contract/notifications/notifications-params.ts
index 83b20ba8bab..dccbb353e62 100644
--- a/src/shared/rpc-contract/notifications-params.ts
+++ b/src/shared/rpc-contract/notifications/notifications-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { MOBILE_PUSH_APNS_ENVIRONMENTS, MOBILE_PUSH_PLATFORMS } from '../mobile-push-contract'
+import { MOBILE_PUSH_APNS_ENVIRONMENTS, MOBILE_PUSH_PLATFORMS } from '../../mobile-push-contract'
 
 export const NotificationUnsubscribeParams = z.object({
   subscriptionId: z
diff --git a/src/shared/rpc-contract/orchestration-approval-answer-params.ts b/src/shared/rpc-contract/orchestration/orchestration-approval-answer-params.ts
similarity index 84%
rename from src/shared/rpc-contract/orchestration-approval-answer-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-approval-answer-params.ts
index e01bfd10438..bcadbbeeec1 100644
--- a/src/shared/rpc-contract/orchestration-approval-answer-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-approval-answer-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 // One screenful; the reason reaches the worker's agent as text.
 export const APPROVAL_REASON_MAX_CHARS = 4_000
diff --git a/src/shared/rpc-contract/orchestration-federation-control-params.ts b/src/shared/rpc-contract/orchestration/orchestration-federation-control-params.ts
similarity index 78%
rename from src/shared/rpc-contract/orchestration-federation-control-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-federation-control-params.ts
index 6783d065573..988178b0113 100644
--- a/src/shared/rpc-contract/orchestration-federation-control-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-federation-control-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, requiredString } from './rpc-param-primitives'
-import { ORCHESTRATION_WORKER_READ_SOURCES } from '../orchestration/workers/orchestration-worker-output'
+import { OptionalFiniteNumber, requiredString } from '../rpc-param-primitives'
+import { ORCHESTRATION_WORKER_READ_SOURCES } from '../../orchestration/workers/orchestration-worker-output'
 
 export const FederationDispatchParams = z.object({
   dispatchId: requiredString('Missing Dispatch ID')
diff --git a/src/shared/rpc-contract/orchestration-federation-relay-params.ts b/src/shared/rpc-contract/orchestration/orchestration-federation-relay-params.ts
similarity index 95%
rename from src/shared/rpc-contract/orchestration-federation-relay-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-federation-relay-params.ts
index edf0e9f1727..f857ad58fd2 100644
--- a/src/shared/rpc-contract/orchestration-federation-relay-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-federation-relay-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, requiredString } from '../rpc-param-primitives'
 
 export const FederationPullParams = z.object({
   dispatchId: requiredString('Missing Dispatch ID'),
diff --git a/src/shared/rpc-contract/orchestration-federation-start-params.ts b/src/shared/rpc-contract/orchestration/orchestration-federation-start-params.ts
similarity index 93%
rename from src/shared/rpc-contract/orchestration-federation-start-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-federation-start-params.ts
index 36da2c56dca..d0a696162c6 100644
--- a/src/shared/rpc-contract/orchestration-federation-start-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-federation-start-params.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 import { OptionalWorkerLaunchPreference } from './orchestration-worker-start-params'
-import { CrossStoreParentRefSchema } from './cross-store-parent-params'
+import { CrossStoreParentRefSchema } from '../workspaces/cross-store-parent-params'
 
 export const FederationAttachStartParams = z.object({
   /** Omitted by v1.4.198 coordinators; the worker host then mints a stub home Run. */
diff --git a/src/shared/rpc-contract/orchestration-gates-params.ts b/src/shared/rpc-contract/orchestration/orchestration-gates-params.ts
similarity index 96%
rename from src/shared/rpc-contract/orchestration-gates-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-gates-params.ts
index c7ea607b345..440a48833f3 100644
--- a/src/shared/rpc-contract/orchestration-gates-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-gates-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const RunParams = z.object({
   spec: requiredString('Missing --spec'),
diff --git a/src/shared/rpc-contract/orchestration-params.ts b/src/shared/rpc-contract/orchestration/orchestration-params.ts
similarity index 99%
rename from src/shared/rpc-contract/orchestration-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-params.ts
index a86e95b8198..37ff460e5b8 100644
--- a/src/shared/rpc-contract/orchestration-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-params.ts
@@ -4,7 +4,7 @@ import {
   OptionalFiniteNumber,
   OptionalString,
   requiredString
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 
 export type DispatchMutationMessageType =
   | 'worker_done'
diff --git a/src/shared/rpc-contract/orchestration-peer-mail-params.ts b/src/shared/rpc-contract/orchestration/orchestration-peer-mail-params.ts
similarity index 98%
rename from src/shared/rpc-contract/orchestration-peer-mail-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-peer-mail-params.ts
index 09fadb16720..741cbcf2c30 100644
--- a/src/shared/rpc-contract/orchestration-peer-mail-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-peer-mail-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 /** Agent mail one Orca carries to an agent on a paired Orca, inside a conversation the sender's Orca opened. */
 export const PeerMailDeliverParams = z.object({
diff --git a/src/shared/rpc-contract/orchestration-runs-mutation-request-show-params.ts b/src/shared/rpc-contract/orchestration/orchestration-runs-mutation-request-show-params.ts
similarity index 80%
rename from src/shared/rpc-contract/orchestration-runs-mutation-request-show-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-runs-mutation-request-show-params.ts
index 063b02614fc..14745d34b28 100644
--- a/src/shared/rpc-contract/orchestration-runs-mutation-request-show-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-runs-mutation-request-show-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 export const RequestShowParams = z.object({
   request: requiredString('Missing --request'),
diff --git a/src/shared/rpc-contract/orchestration-runs-params.ts b/src/shared/rpc-contract/orchestration/orchestration-runs-params.ts
similarity index 88%
rename from src/shared/rpc-contract/orchestration-runs-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-runs-params.ts
index 0ca615ce93a..e7237dbbcff 100644
--- a/src/shared/rpc-contract/orchestration-runs-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-runs-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { OptionalBoolean, OptionalString, requiredString } from './rpc-param-primitives'
-import { ORCHESTRATION_RUN_PAGE_LIMIT } from '../orchestration/orchestration-run-pagination'
+import { OptionalBoolean, OptionalString, requiredString } from '../rpc-param-primitives'
+import { ORCHESTRATION_RUN_PAGE_LIMIT } from '../../orchestration/orchestration-run-pagination'
 
 export const RunCreateParams = z.object({
   objective: requiredString('Missing --objective'),
diff --git a/src/shared/rpc-contract/orchestration-worker-control-params.ts b/src/shared/rpc-contract/orchestration/orchestration-worker-control-params.ts
similarity index 66%
rename from src/shared/rpc-contract/orchestration-worker-control-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-worker-control-params.ts
index 2d9b43a0fca..80b7ad194c2 100644
--- a/src/shared/rpc-contract/orchestration-worker-control-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-worker-control-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, requiredString } from './rpc-param-primitives'
-import { ORCHESTRATION_WORKER_READ_SOURCES } from '../orchestration/workers/orchestration-worker-output'
+import { OptionalFiniteNumber, requiredString } from '../rpc-param-primitives'
+import { ORCHESTRATION_WORKER_READ_SOURCES } from '../../orchestration/workers/orchestration-worker-output'
 
 export const WorkerDispatchParams = z.object({ dispatch: requiredString('Missing --dispatch') })
 
diff --git a/src/shared/rpc-contract/orchestration-worker-release-params.ts b/src/shared/rpc-contract/orchestration/orchestration-worker-release-params.ts
similarity index 100%
rename from src/shared/rpc-contract/orchestration-worker-release-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-worker-release-params.ts
diff --git a/src/shared/rpc-contract/orchestration-worker-release-schemas-params.ts b/src/shared/rpc-contract/orchestration/orchestration-worker-release-schemas-params.ts
similarity index 83%
rename from src/shared/rpc-contract/orchestration-worker-release-schemas-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-worker-release-schemas-params.ts
index 5178184782a..e66b34130d7 100644
--- a/src/shared/rpc-contract/orchestration-worker-release-schemas-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-worker-release-schemas-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
-import { ORCHESTRATION_FLEET_PAGE_MAX } from '../orchestration/fleet/orchestration-fleet-projection'
+import { requiredString } from '../rpc-param-primitives'
+import { ORCHESTRATION_FLEET_PAGE_MAX } from '../../orchestration/fleet/orchestration-fleet-projection'
 
 export const WorkerDispatchParams = z.object({ dispatch: requiredString('Missing --dispatch') })
 
diff --git a/src/shared/rpc-contract/orchestration-worker-start-params.ts b/src/shared/rpc-contract/orchestration/orchestration-worker-start-params.ts
similarity index 98%
rename from src/shared/rpc-contract/orchestration-worker-start-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-worker-start-params.ts
index 1cbdeb8853c..4d1764a3218 100644
--- a/src/shared/rpc-contract/orchestration-worker-start-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-worker-start-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const OptionalWorkerLaunchPreference = z
   .string()
diff --git a/src/shared/rpc-contract/orchestration-worker-stop-params.ts b/src/shared/rpc-contract/orchestration/orchestration-worker-stop-params.ts
similarity index 68%
rename from src/shared/rpc-contract/orchestration-worker-stop-params.ts
rename to src/shared/rpc-contract/orchestration/orchestration-worker-stop-params.ts
index cb465c8808b..3f9aca1f949 100644
--- a/src/shared/rpc-contract/orchestration-worker-stop-params.ts
+++ b/src/shared/rpc-contract/orchestration/orchestration-worker-stop-params.ts
@@ -1,4 +1,4 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 export const WorkerDispatchParams = z.object({ dispatch: requiredString('Missing --dispatch') })
diff --git a/src/shared/rpc-contract/plugins-params.ts b/src/shared/rpc-contract/plugins/plugins-params.ts
similarity index 95%
rename from src/shared/rpc-contract/plugins-params.ts
rename to src/shared/rpc-contract/plugins/plugins-params.ts
index 57c433d376e..16f6c9c5290 100644
--- a/src/shared/rpc-contract/plugins-params.ts
+++ b/src/shared/rpc-contract/plugins/plugins-params.ts
@@ -1,13 +1,13 @@
 import { z } from 'zod'
-import { isQualifiedPluginKey } from '../plugins/manifest/plugin-manifest'
+import { isQualifiedPluginKey } from '../../plugins/frames/plugin-tab-key'
 import {
   PLUGIN_PANEL_REQUEST_MAX_TIMEOUT_MS,
   pluginBridgeNameSchema,
   pluginPanelCallerSchema
-} from '../plugins/workers/plugin-panel-bridge-protocol'
-import { pluginShotActsSchema } from '../plugins/view/plugin-shot-acts'
-import { pluginEditorShotActsSchema } from '../plugins/view/plugin-editor-shot-acts'
-import { PLUGIN_DECLARATIVE_RENDER_LANE } from '../plugins/declarative/plugin-declarative-limits'
+} from '../../plugins/workers/plugin-panel-bridge-protocol'
+import { pluginShotActsSchema } from '../../plugins/view/plugin-shot-acts'
+import { pluginEditorShotActsSchema } from '../../plugins/view/plugin-editor-shot-acts'
+import { PLUGIN_DECLARATIVE_RENDER_LANE } from '../../plugins/declarative/plugin-declarative-limits'
 
 // Why optional: only `approval_required` hands it out; older hosts strip it and older callers omit it.
 const approvalFingerprintParam = z.string().min(1).max(128).optional()
diff --git a/src/shared/rpc-contract/preflight-params.ts b/src/shared/rpc-contract/preflight/preflight-params.ts
similarity index 76%
rename from src/shared/rpc-contract/preflight-params.ts
rename to src/shared/rpc-contract/preflight/preflight-params.ts
index 63e9376aec6..2d8ad66dadd 100644
--- a/src/shared/rpc-contract/preflight-params.ts
+++ b/src/shared/rpc-contract/preflight/preflight-params.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../constants'
-import { parseRoutableExecutionHostId } from '../execution-host'
-import { OptionalExecutionHostId } from './worktree-params'
-import { RepoSelector } from './github-repo-target-params'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
-import type { WorkspaceLaunchKind } from '../agent-launch/contracts/workspace-launch-kind'
-import type { ProjectExecutionRuntimeResolution } from '../execution-host/project-execution-runtime'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../constants'
+import { parseRoutableExecutionHostId } from '../../execution-host'
+import { OptionalExecutionHostId } from '../workspaces/worktree-params'
+import { RepoSelector } from '../github/github-repo-target-params'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
+import type { WorkspaceLaunchKind } from '../../agent-launch/contracts/workspace-launch-kind'
+import type { ProjectExecutionRuntimeResolution } from '../../execution-host/project-execution-runtime'
 
 export const PreflightCheck = z.object({
   force: z.boolean().optional()
diff --git a/src/shared/rpc-contract/project-runtime-params.ts b/src/shared/rpc-contract/projects/project-runtime-params.ts
similarity index 97%
rename from src/shared/rpc-contract/project-runtime-params.ts
rename to src/shared/rpc-contract/projects/project-runtime-params.ts
index af7656e773d..2794b6198c3 100644
--- a/src/shared/rpc-contract/project-runtime-params.ts
+++ b/src/shared/rpc-contract/projects/project-runtime-params.ts
@@ -1,10 +1,10 @@
 import { z } from 'zod'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 import {
   LOCAL_EXECUTION_HOST_ID,
   normalizeExecutionHostId,
   parseExecutionHostId
-} from '../execution-host'
+} from '../../execution-host'
 
 export const ProjectProviderIdentity = z.object({
   provider: z.literal('github'),
diff --git a/src/shared/rpc-contract/repo-params.ts b/src/shared/rpc-contract/projects/repo-params.ts
similarity index 97%
rename from src/shared/rpc-contract/repo-params.ts
rename to src/shared/rpc-contract/projects/repo-params.ts
index 9fff939fffa..3759ef1883e 100644
--- a/src/shared/rpc-contract/repo-params.ts
+++ b/src/shared/rpc-contract/projects/repo-params.ts
@@ -9,9 +9,9 @@ import {
   OptionalFiniteNumber,
   OptionalString,
   requiredString
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 import { createRepoUpdateSchema } from './repo-update-params'
-import { RepoSelector, RepoShow } from './github-repo-target-params'
+import { RepoSelector, RepoShow } from '../github/github-repo-target-params'
 
 export const RepoPath = z.object({
   path: requiredString('Missing repo path'),
diff --git a/src/shared/rpc-contract/repo-update-params.ts b/src/shared/rpc-contract/projects/repo-update-params.ts
similarity index 81%
rename from src/shared/rpc-contract/repo-update-params.ts
rename to src/shared/rpc-contract/projects/repo-update-params.ts
index e17467183d0..cbe034b0fa8 100644
--- a/src/shared/rpc-contract/repo-update-params.ts
+++ b/src/shared/rpc-contract/projects/repo-update-params.ts
@@ -1,17 +1,17 @@
 import { z } from 'zod'
-import { normalizeRepoSourceControlAiOverrides } from '../source-control/ai/settings/source-control-ai-repo-settings'
-import { normalizeRepoBadgeColor } from '../repo-badge-color'
-import { sanitizeRepoIcon } from '../repo-icon'
-import { normalizeGhAccountBinding } from '../github/accounts/account-binding'
-import { normalizeJiraProjectReference } from '../jira/jira-project-reference'
+import { normalizeRepoSourceControlAiOverrides } from '../../source-control/ai/settings/source-control-ai-repo-settings'
+import { normalizeRepoBadgeColor } from '../../repo-badge-color'
+import { sanitizeRepoIcon } from '../../repo-icon'
+import { normalizeGhAccountBinding } from '../../github/accounts/account-binding'
+import { normalizeJiraProjectReference } from '../../jira/jira-project-reference'
 import {
   normalizeCustomWorktreeVisibilitySources,
   normalizeWorktreeVisibilitySourcePreferences
-} from '../worktree/visibility-sources'
-import { OptionalFiniteNumber, OptionalString } from './rpc-param-primitives'
-import { editorFormatterSchema } from '../editor-formatter'
-import { normalizeDictationTerms } from '../dictation-dictionary'
-import { RepoWorkspaceCleanupPolicyParam } from './workspace-cleanup-policy-params'
+} from '../../worktree/visibility-sources'
+import { OptionalFiniteNumber, OptionalString } from '../rpc-param-primitives'
+import { editorFormatterSchema } from '../../editor-formatter'
+import { normalizeDictationTerms } from '../../dictation-dictionary'
+import { RepoWorkspaceCleanupPolicyParam } from '../workspace-cleanup/workspace-cleanup-policy-params'
 
 export const RepoSourceControlAiOverrides = z
   .unknown()
diff --git a/src/shared/rpc-contract/reference-params.ts b/src/shared/rpc-contract/references/reference-params.ts
similarity index 88%
rename from src/shared/rpc-contract/reference-params.ts
rename to src/shared/rpc-contract/references/reference-params.ts
index 60f985982e4..dbf884cb55e 100644
--- a/src/shared/rpc-contract/reference-params.ts
+++ b/src/shared/rpc-contract/references/reference-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString, OptionalString } from './rpc-param-primitives'
+import { requiredString, OptionalString } from '../rpc-param-primitives'
 
 export const ReferenceList = z.object({
   worktree: requiredString('Missing worktree selector'),
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index 443c1a5a2aa..816f74c7104 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -16,6 +16,7 @@ import {
 } from '../browser/client-hosting/browser-client-file-channel-protocol'
 import {
   BrowserClientHostAttachParams,
+  BrowserClientHostCommandResultChunkParams,
   BrowserClientHostCommandResultParams,
   BrowserNetworkTunnelAttachParams
 } from '../browser/client-hosting/browser-client-host-protocol'
@@ -72,47 +73,49 @@ import {
   SelectClaudeAccountParams,
   SelectCodexAccountForTargetParams,
   SelectDataAccountParams
-} from './accounts-params'
-import { AgentActivityClearParams, AgentActivitySetReadParams } from './agent-activity-params'
-import { PrepareCodexForWslPaneParams } from './agent-hooks-params'
-import { AgentLaunch, AgentLaunchReplay } from './agent-launch-params'
-import { AgentLaunchSettingsMutation } from './agent-launch-settings-params'
+} from './accounts/accounts-params'
+import { PrepareCodexForWslPaneParams } from './accounts/agent-hooks-params'
 import {
-  AttachmentReadParams,
-  AttachmentTextReadParams,
-  AttachmentUploadAppendParams,
-  AttachmentUploadIdParams,
-  AttachmentUploadStartParams
-} from './agent-session-attachment-params'
-import { CurrentRequestsParams } from './agent-session-current-requests-params'
-import { CreateAgentSessionParams, EnsureAgentSessionParams } from './agent-session-params'
-import { ReadVisualParams } from './agent-session-visual-params'
+  AntigravityAccountMutationParams,
+  AntigravityAccountTargetParams,
+  AntigravityChatSignInCompleteParams,
+  AntigravityChatSignInFlowParams
+} from './accounts/antigravity-accounts-params'
+import {
+  UsageCredentialApiKeyParams,
+  UsageCredentialSessionCookieParams
+} from './accounts/usage-credentials-params'
+import {
+  AgentActivityClearParams,
+  AgentActivitySetReadParams
+} from './agent-activity/agent-activity-params'
+import { AgentLaunch, AgentLaunchReplay } from './agent-launch/agent-launch-params'
+import { AgentLaunchSettingsMutation } from './agent-launch/agent-launch-settings-params'
 import {
   AiVaultDeleteSessionParams,
   AiVaultListSessionsParams,
   AiVaultPrepareSessionHandoffParams,
   AiVaultPrepareSessionResumeParams,
   AiVaultSessionTitlesParams
-} from './ai-vault-params'
+} from './ai-vault/ai-vault-params'
 import {
-  AntigravityAccountMutationParams,
-  AntigravityAccountTargetParams,
-  AntigravityChatSignInCompleteParams,
-  AntigravityChatSignInFlowParams
-} from './antigravity-accounts-params'
-import { ArtifactsDeleteParams, ListOptions, SourceRequest, WriteRequest } from './artifacts-params'
+  ArtifactsDeleteParams,
+  ListOptions,
+  SourceRequest,
+  WriteRequest
+} from './artifacts/artifacts-params'
 import {
   AutomationCreate,
   AutomationId,
   AutomationList,
   AutomationRuns,
   AutomationUpdate
-} from './automation-params'
-import { CertificateProceed } from './browser-core-params'
-import { ExtensionList, ExtensionReload } from './browser-extension-params'
-import { MouseClick } from './browser-extras-params'
-import { BrowserIdentitySet, ProfileCreate } from './browser-identity-params'
-import { Screenshot, Snapshot } from './browser-observation-params'
+} from './automations/automation-params'
+import { CertificateProceed } from './browser/browser-core-params'
+import { ExtensionList, ExtensionReload } from './browser/browser-extension-params'
+import { MouseClick } from './browser/browser-extras-params'
+import { BrowserIdentitySet, ProfileCreate } from './browser/browser-identity-params'
+import { Screenshot, Snapshot } from './browser/browser-observation-params'
 import {
   Check,
   ClipboardWrite,
@@ -164,25 +167,32 @@ import {
   Upload,
   Viewport,
   Wait
-} from './browser-params'
-import { ScreencastAck, ScreencastUnsubscribe } from './browser-screencast-params'
-import { BrowserOpenUrlParams, BrowserTabCreateParams } from './browser-tab-create-params'
-import { ClientEventsSubscribeParams, ClientEventsUnsubscribeParams } from './client-events-params'
+} from './browser/browser-params'
+import { ScreencastAck, ScreencastUnsubscribe } from './browser/browser-screencast-params'
+import { BrowserOpenUrlParams, BrowserTabCreateParams } from './browser/browser-tab-create-params'
+import {
+  ClientEventsSubscribeParams,
+  ClientEventsUnsubscribeParams
+} from './client-ui/client-events-params'
 import {
   NativeChatSessionOptionsMutation,
   PRBotAuthorOverrideUpdate,
   SettingsUpdate
-} from './client-settings-params'
-import { FeatureInteractionIdParam, UiUpdate } from './client-ui-params'
-import { ClientWorkspaceViewParams } from './client-workspace-view-params'
+} from './client-ui/client-settings-params'
+import { FeatureInteractionIdParam, UiUpdate } from './client-ui/client-ui-params'
+import { ClientWorkspaceViewParams } from './client-ui/client-workspace-view-params'
+import { SidebarSessionBeginParams } from './client-ui/sidebar-session-params'
 import {
   AbortImageUpload,
   AppendImageUploadChunk,
   CommitImageUpload,
   SaveImageAsTempFile,
   StartImageUpload
-} from './clipboard-params'
-import { ComputerCapabilitiesParams, ComputerPermissionsStatusParams } from './computer-params'
+} from './clipboard/clipboard-params'
+import {
+  ComputerCapabilitiesParams,
+  ComputerPermissionsStatusParams
+} from './computer/computer-params'
 import {
   Click,
   ComputerObserveTarget,
@@ -197,7 +207,7 @@ import {
   Scroll as ScrollOfComputerSchemasParams,
   SetValue,
   TypeText
-} from './computer-schemas-params'
+} from './computer/computer-schemas-params'
 import {
   ConnectorAnswer,
   ConnectorCancel,
@@ -206,7 +216,7 @@ import {
   ConnectorSend,
   ConnectorStart,
   ConnectorWatch
-} from './connector-params'
+} from './connectors/connector-params'
 import {
   AttachParams as AttachParamsOfEmulatorParams,
   AxParams,
@@ -226,8 +236,7 @@ import {
   ShutdownParams,
   TapParams,
   TypeParams
-} from './emulator-params'
-import { EnvironmentDoctorParams } from './environment-doctor-params'
+} from './emulator/emulator-params'
 import {
   FileCommitUpload,
   FileCopy,
@@ -240,7 +249,7 @@ import {
   FileWriteBase64,
   FileWriteBase64Chunk,
   FileWriteIfUnchanged
-} from './files-mutation-params'
+} from './filesystem/files-mutation-params'
 import {
   ChatImageRead,
   DocPreviewFileRead,
@@ -257,25 +266,312 @@ import {
   FileUnwatch,
   ResolveTerminalPath,
   ServerDirectoryBrowse
-} from './files-params'
+} from './filesystem/files-params'
 import {
   FileSaveAbort,
   FileSaveBegin,
   FileSaveChunk,
   FileSaveCommit
-} from './files-staged-save-params'
-import { FileOpen, FileWatch, WorktreeSelector } from './files-target-params'
+} from './filesystem/files-staged-save-params'
+import { FileOpen, FileWatch, WorktreeSelector } from './filesystem/files-target-params'
 import {
   TerminalArtifactFile,
   TerminalArtifactFileChunk,
   TerminalArtifactFileWrite
-} from './files-terminal-artifact-params'
+} from './filesystem/files-terminal-artifact-params'
+import { BindableAccounts, ValidateAccountBinding } from './github/github-account-binding-params'
+import { UploadGitHubAttachment } from './github/github-attachment-params'
+import { CreateIssue, Issue, IssueComment, UpdateIssue } from './github/github-issue-params'
 import {
-  FolderWorkspaceCreate,
-  FolderWorkspaceDelete,
-  FolderWorkspacePathStatus,
-  FolderWorkspaceUpdate
-} from './folder-workspace-params'
+  ClearProjectItemField,
+  GithubProjectListAccessibleParams,
+  ProjectItemField,
+  ProjectRef,
+  ProjectViewTable,
+  ProjectViews,
+  ProjectWorkItemDetailsBySlug,
+  SlugAssignableUsers,
+  SlugIssueComment,
+  SlugIssueCommentDelete,
+  SlugIssueCommentEdit,
+  SlugIssueTypeUpdate,
+  SlugIssueUpdate,
+  SlugPullRequestUpdate
+} from './github/github-project-params'
+import {
+  PRCommentReaction,
+  PrForBranch,
+  PullRequest,
+  PullRequestCheckDetails,
+  PullRequestChecks,
+  PullRequestFileContents,
+  PullRequestFileViewed,
+  RerunPullRequestChecks,
+  ReviewThread
+} from './github/github-pull-request-params'
+import {
+  MarkPrDraft,
+  MarkPrReadyForReview,
+  MergePr,
+  PRReviewComment,
+  PRReviewCommentReply,
+  RemovePrReviewers,
+  RequestPrReviewers,
+  SetPrAutoMerge,
+  UpdatePr,
+  UpdatePrState,
+  UpdatePrTitle
+} from './github/github-pull-request-update-params'
+import {
+  RepoIssueCommandRead,
+  RepoSelector,
+  RepoShow,
+  RepoWithGitHubAccountExpectation,
+  SlugRepo
+} from './github/github-repo-target-params'
+import {
+  IssuesList,
+  RateLimit,
+  WorkItem,
+  WorkItemByOwnerRepo,
+  WorkItemDetails,
+  WorkItemsCount,
+  WorkItemsList
+} from './github/github-repo-work-item-params'
+import { EnvironmentDoctorParams } from './host-management/environment-doctor-params'
+import {
+  ManagedRuntimeAgentParams,
+  ManagedRuntimeCancelParams
+} from './host-management/managed-runtime-install-params'
+import {
+  ManagedServerRecover,
+  ManagedServerSelector,
+  ManagedServerUpdate
+} from './host-management/managed-server-params'
+import {
+  OrcadMigrationCatalogParams,
+  OrcadMigrationCatalogReferenceParams,
+  OrcadMigrationCommitCatalogParams
+} from './host-management/orcad-migration-params'
+import { RecipeVmWakeParams } from './host-management/recipe-vm-wake-params'
+import { ClientCapabilitiesUpdate } from './host-management/runtime-client-capabilities-params'
+import { StatusGetParams } from './host-management/status-params'
+import { JiraFavouriteFilterParams } from './jira/jira-favourite-filter-params'
+import {
+  AssignableUsers,
+  AttachmentImage,
+  CancelGenerateIssueSummary,
+  Connect,
+  CreateIssue as CreateIssueOfJiraParams,
+  GenerateIssueSummary,
+  IssueComment as IssueCommentOfJiraParams,
+  IssueKey,
+  IssueUpdate,
+  ListIssues,
+  ProjectIssueTypeFields,
+  ProjectIssueTypes,
+  ProjectStatusOrder,
+  SearchIssues,
+  SelectSite,
+  SiteSelection,
+  UserSearch
+} from './jira/jira-params'
+import { JiraQuickFilterStateParam } from './jira/jira-quick-filter-params'
+import { JiraSavedFilterMutationParam } from './jira/jira-saved-filter-params'
+import {
+  AgentIssueContext,
+  AgentSearchIssues,
+  LinearCommentDelete,
+  LinearCommentEdit,
+  LinearCurrentContext,
+  LinearIssueAddComment,
+  LinearIssueAttachLink,
+  LinearIssueCreate,
+  LinearIssueList,
+  LinearIssueRelationWrite,
+  LinearIssueSetState,
+  LinearIssueUpdateTask,
+  LinearProjectList,
+  LinearSaveIssue,
+  LinearTeamLookup,
+  LinearWorkspaceRead
+} from './linear/linear-agent-access-params'
+import {
+  ListIssues as ListIssuesOfLinearIssueListParams,
+  McpListIssues
+} from './linear/linear-issue-list-params'
+import {
+  Connect as ConnectOfLinearParams,
+  CreateIssue as CreateIssueOfLinearParams,
+  CustomViewContents,
+  CustomViewId,
+  IssueComment as IssueCommentOfLinearParams,
+  IssueId,
+  IssueUpdate as IssueUpdateOfLinearParams,
+  LinearIssueCommentsParams,
+  ListCustomViews,
+  ListProjects,
+  ProjectId,
+  ProjectIssues,
+  SearchIssues as SearchIssuesOfLinearParams,
+  SelectWorkspace,
+  TeamId,
+  WorkspaceSelection
+} from './linear/linear-params'
+import { CreateProject } from './linear/linear-project-create-params'
+import { LinkPreviewGetParams } from './link-preview/link-preview-params'
+import { NativeChatSession, NativeChatUnsubscribe } from './native-chat/native-chat-params'
+import {
+  NotificationGetMissedSinceParams,
+  NotificationRegisterPushParams,
+  NotificationReportDesktopPresenceParams,
+  NotificationUnsubscribeParams,
+  NotificationsSubscribeParams
+} from './notifications/notifications-params'
+import { ApprovalAnswerParams } from './orchestration/orchestration-approval-answer-params'
+import {
+  FederationDispatchParams,
+  FederationFleetSnapshotParams,
+  FederationOutputReadParams,
+  FederationReadParams
+} from './orchestration/orchestration-federation-control-params'
+import {
+  FederationAckParams,
+  FederationImportParams,
+  FederationPullParams
+} from './orchestration/orchestration-federation-relay-params'
+import { FederationAttachStartParams } from './orchestration/orchestration-federation-start-params'
+import {
+  GateCreateParams,
+  GateListParams,
+  GateResolveParams,
+  RunParams,
+  RunStopParams
+} from './orchestration/orchestration-gates-params'
+import {
+  AskParams,
+  CheckParams,
+  DispatchParams,
+  DispatchShowParams,
+  InboxParams,
+  PartyLocationParams,
+  ReplyParams,
+  ResetParams,
+  SessionAddressParams,
+  TaskCreateParams,
+  TaskListParams
+} from './orchestration/orchestration-params'
+import {
+  PeerMailAckParams,
+  PeerMailDeliverParams,
+  PeerMailPullParams
+} from './orchestration/orchestration-peer-mail-params'
+import { RequestShowParams } from './orchestration/orchestration-runs-mutation-request-show-params'
+import {
+  RunCreateParams,
+  RunCurrentParams,
+  RunListParams,
+  RunShowParams,
+  RunUseParams
+} from './orchestration/orchestration-runs-params'
+import {
+  WorkerDispatchParams,
+  WorkerReadParams
+} from './orchestration/orchestration-worker-control-params'
+import {
+  OrchestrationWorkerKeepOpenParams,
+  OrchestrationWorkerSubjectParams
+} from './orchestration/orchestration-worker-release-params'
+import {
+  WorkerDispatchParams as WorkerDispatchParamsOfOrchestrationWorkerReleaseSchemasParams,
+  WorkerListParams,
+  WorkerRetainParams
+} from './orchestration/orchestration-worker-release-schemas-params'
+import { WorkerStartParams } from './orchestration/orchestration-worker-start-params'
+import { WorkerDispatchParams as WorkerDispatchParamsOfOrchestrationWorkerStopParams } from './orchestration/orchestration-worker-stop-params'
+import {
+  PluginCatalogAddParams,
+  PluginCatalogRemoveParams,
+  PluginDevEmitParams,
+  PluginDevInspectParams,
+  PluginDevLoadParams,
+  PluginDevRequestParams,
+  PluginDevUnloadParams,
+  PluginGetLogsParams,
+  PluginInstallParams,
+  PluginInvokeCommandParams,
+  PluginOpenParams,
+  PluginReadPanelEntryParams,
+  PluginRestartParams,
+  PluginRpcConsentParams,
+  PluginSetEnabledParams,
+  PluginSetSystemEnabledParams,
+  PluginShotChromeParams,
+  PluginShotEditorParams,
+  PluginShotParams,
+  PluginShotReplayParams,
+  PluginUninstallParams,
+  PluginUpdateParams,
+  PluginsPanelActionParams
+} from './plugins/plugins-params'
+import {
+  PreflightAgentRefresh,
+  PreflightCheck,
+  PreflightDetectRemoteAgents,
+  PreflightDetectRemoteWindowsTerminalCapabilities,
+  PreflightProjectAgentDetection
+} from './preflight/preflight-params'
+import {
+  ProjectHostSetupClone,
+  ProjectHostSetupCreate,
+  ProjectHostSetupDelete,
+  ProjectHostSetupExistingFolder,
+  ProjectHostSetupUpdate,
+  ProjectUpdate
+} from './projects/project-runtime-params'
+import {
+  ProjectGroupCreate,
+  ProjectGroupImportNested,
+  ProjectGroupMoveProject,
+  ProjectGroupScanNested,
+  ProjectGroupSelector,
+  ProjectGroupUpdate,
+  ProjectGroupUpdateMany,
+  RepoClone,
+  RepoCreate,
+  RepoHooksCheck,
+  RepoIssueCommandWrite,
+  RepoList,
+  RepoPath,
+  RepoReorder,
+  RepoSearchRefs,
+  RepoSetBaseRef,
+  RepoSetHidden,
+  RepoSparsePresetSave,
+  RepoUpdate
+} from './projects/repo-params'
+import { ReferenceFind, ReferenceList } from './references/reference-params'
+import { BrowserTarget, ExpectUrlBrowserTarget } from './rpc-param-primitives'
+import { SessionTabsUnsubscribeAllParams } from './session-tabs/session-tabs-params'
+import {
+  ActivateTab,
+  CloseLifecycleTab,
+  CloseTab,
+  CreateTerminalTab,
+  MovePaneToNewTab,
+  MoveTab,
+  SaveMarkdownTab,
+  SessionTabsUnsubscribe,
+  SetTabProps,
+  UpdatePaneLayout,
+  WorktreeTabSelector
+} from './session-tabs/session-tabs-schemas-params'
+import { SessionReadTerminalScrollbackParams } from './session-tabs/session-terminal-scrollback-params'
+import {
+  SkillsCancelInstallParams,
+  SkillsDiscoverParams,
+  SkillsGetInstallProgressParams
+} from './skills/skills-params'
 import {
   GitBranchCompare,
   GitBranchDiff,
@@ -307,66 +603,7 @@ import {
   GitSwitchBranch,
   GitTargetedRemote,
   WorktreeSelector as WorktreeSelectorOfGitParams
-} from './git-params'
-import { BindableAccounts, ValidateAccountBinding } from './github-account-binding-params'
-import { UploadGitHubAttachment } from './github-attachment-params'
-import { CreateIssue, Issue, IssueComment, UpdateIssue } from './github-issue-params'
-import {
-  ClearProjectItemField,
-  GithubProjectListAccessibleParams,
-  ProjectItemField,
-  ProjectRef,
-  ProjectViewTable,
-  ProjectViews,
-  ProjectWorkItemDetailsBySlug,
-  SlugAssignableUsers,
-  SlugIssueComment,
-  SlugIssueCommentDelete,
-  SlugIssueCommentEdit,
-  SlugIssueTypeUpdate,
-  SlugIssueUpdate,
-  SlugPullRequestUpdate
-} from './github-project-params'
-import {
-  PRCommentReaction,
-  PrForBranch,
-  PullRequest,
-  PullRequestCheckDetails,
-  PullRequestChecks,
-  PullRequestFileContents,
-  PullRequestFileViewed,
-  RerunPullRequestChecks,
-  ReviewThread
-} from './github-pull-request-params'
-import {
-  MarkPrDraft,
-  MarkPrReadyForReview,
-  MergePr,
-  PRReviewComment,
-  PRReviewCommentReply,
-  RemovePrReviewers,
-  RequestPrReviewers,
-  SetPrAutoMerge,
-  UpdatePr,
-  UpdatePrState,
-  UpdatePrTitle
-} from './github-pull-request-update-params'
-import {
-  RepoIssueCommandRead,
-  RepoSelector,
-  RepoShow,
-  RepoWithGitHubAccountExpectation,
-  SlugRepo
-} from './github-repo-target-params'
-import {
-  IssuesList,
-  RateLimit,
-  WorkItem,
-  WorkItemByOwnerRepo,
-  WorkItemDetails,
-  WorkItemsCount,
-  WorkItemsList
-} from './github-repo-work-item-params'
+} from './source-control/git-params'
 import {
   AddIssueComment,
   AddMRComment,
@@ -388,242 +625,12 @@ import {
   WorkItemByPath,
   WorkItemDetails as WorkItemDetailsOfGitlabParams,
   WorkItemsList as WorkItemsListOfGitlabParams
-} from './gitlab-params'
+} from './source-control/gitlab-params'
 import {
   HostedReviewCreate,
   HostedReviewCreationEligibility,
   HostedReviewForBranch
-} from './hosted-review-params'
-import { JiraFavouriteFilterParams } from './jira-favourite-filter-params'
-import {
-  AssignableUsers,
-  AttachmentImage,
-  CancelGenerateIssueSummary,
-  Connect,
-  CreateIssue as CreateIssueOfJiraParams,
-  GenerateIssueSummary,
-  IssueComment as IssueCommentOfJiraParams,
-  IssueKey,
-  IssueUpdate,
-  ListIssues,
-  ProjectIssueTypeFields,
-  ProjectIssueTypes,
-  ProjectStatusOrder,
-  SearchIssues,
-  SelectSite,
-  SiteSelection,
-  UserSearch
-} from './jira-params'
-import { JiraQuickFilterStateParam } from './jira-quick-filter-params'
-import { JiraSavedFilterMutationParam } from './jira-saved-filter-params'
-import {
-  AgentIssueContext,
-  AgentSearchIssues,
-  LinearCommentDelete,
-  LinearCommentEdit,
-  LinearCurrentContext,
-  LinearIssueAddComment,
-  LinearIssueAttachLink,
-  LinearIssueCreate,
-  LinearIssueList,
-  LinearIssueRelationWrite,
-  LinearIssueSetState,
-  LinearIssueUpdateTask,
-  LinearProjectList,
-  LinearSaveIssue,
-  LinearTeamLookup,
-  LinearWorkspaceRead
-} from './linear-agent-access-params'
-import {
-  ListIssues as ListIssuesOfLinearIssueListParams,
-  McpListIssues
-} from './linear-issue-list-params'
-import {
-  Connect as ConnectOfLinearParams,
-  CreateIssue as CreateIssueOfLinearParams,
-  CustomViewContents,
-  CustomViewId,
-  IssueComment as IssueCommentOfLinearParams,
-  IssueId,
-  IssueUpdate as IssueUpdateOfLinearParams,
-  LinearIssueCommentsParams,
-  ListCustomViews,
-  ListProjects,
-  ProjectId,
-  ProjectIssues,
-  SearchIssues as SearchIssuesOfLinearParams,
-  SelectWorkspace,
-  TeamId,
-  WorkspaceSelection
-} from './linear-params'
-import { CreateProject } from './linear-project-create-params'
-import { LinkPreviewGetParams } from './link-preview-params'
-import {
-  ManagedRuntimeAgentParams,
-  ManagedRuntimeCancelParams
-} from './managed-runtime-install-params'
-import {
-  ManagedServerRecover,
-  ManagedServerSelector,
-  ManagedServerUpdate
-} from './managed-server-params'
-import { NativeChatSession, NativeChatUnsubscribe } from './native-chat-params'
-import {
-  NotificationGetMissedSinceParams,
-  NotificationRegisterPushParams,
-  NotificationReportDesktopPresenceParams,
-  NotificationUnsubscribeParams,
-  NotificationsSubscribeParams
-} from './notifications-params'
-import {
-  OrcadMigrationCatalogParams,
-  OrcadMigrationCatalogReferenceParams,
-  OrcadMigrationCommitCatalogParams
-} from './orcad-migration-params'
-import { ApprovalAnswerParams } from './orchestration-approval-answer-params'
-import {
-  FederationDispatchParams,
-  FederationFleetSnapshotParams,
-  FederationOutputReadParams,
-  FederationReadParams
-} from './orchestration-federation-control-params'
-import {
-  FederationAckParams,
-  FederationImportParams,
-  FederationPullParams
-} from './orchestration-federation-relay-params'
-import { FederationAttachStartParams } from './orchestration-federation-start-params'
-import {
-  GateCreateParams,
-  GateListParams,
-  GateResolveParams,
-  RunParams,
-  RunStopParams
-} from './orchestration-gates-params'
-import {
-  AskParams,
-  CheckParams,
-  DispatchParams,
-  DispatchShowParams,
-  InboxParams,
-  PartyLocationParams,
-  ReplyParams,
-  ResetParams,
-  SessionAddressParams,
-  TaskCreateParams,
-  TaskListParams
-} from './orchestration-params'
-import {
-  PeerMailAckParams,
-  PeerMailDeliverParams,
-  PeerMailPullParams
-} from './orchestration-peer-mail-params'
-import { RequestShowParams } from './orchestration-runs-mutation-request-show-params'
-import {
-  RunCreateParams,
-  RunCurrentParams,
-  RunListParams,
-  RunShowParams,
-  RunUseParams
-} from './orchestration-runs-params'
-import { WorkerDispatchParams, WorkerReadParams } from './orchestration-worker-control-params'
-import {
-  OrchestrationWorkerKeepOpenParams,
-  OrchestrationWorkerSubjectParams
-} from './orchestration-worker-release-params'
-import {
-  WorkerDispatchParams as WorkerDispatchParamsOfOrchestrationWorkerReleaseSchemasParams,
-  WorkerListParams,
-  WorkerRetainParams
-} from './orchestration-worker-release-schemas-params'
-import { WorkerStartParams } from './orchestration-worker-start-params'
-import { WorkerDispatchParams as WorkerDispatchParamsOfOrchestrationWorkerStopParams } from './orchestration-worker-stop-params'
-import {
-  PluginCatalogAddParams,
-  PluginCatalogRemoveParams,
-  PluginDevEmitParams,
-  PluginDevInspectParams,
-  PluginDevLoadParams,
-  PluginDevRequestParams,
-  PluginDevUnloadParams,
-  PluginGetLogsParams,
-  PluginInstallParams,
-  PluginInvokeCommandParams,
-  PluginOpenParams,
-  PluginReadPanelEntryParams,
-  PluginRestartParams,
-  PluginRpcConsentParams,
-  PluginSetEnabledParams,
-  PluginSetSystemEnabledParams,
-  PluginShotChromeParams,
-  PluginShotEditorParams,
-  PluginShotParams,
-  PluginShotReplayParams,
-  PluginUninstallParams,
-  PluginUpdateParams,
-  PluginsPanelActionParams
-} from './plugins-params'
-import {
-  PreflightAgentRefresh,
-  PreflightCheck,
-  PreflightDetectRemoteAgents,
-  PreflightDetectRemoteWindowsTerminalCapabilities,
-  PreflightProjectAgentDetection
-} from './preflight-params'
-import {
-  ProjectHostSetupClone,
-  ProjectHostSetupCreate,
-  ProjectHostSetupDelete,
-  ProjectHostSetupExistingFolder,
-  ProjectHostSetupUpdate,
-  ProjectUpdate
-} from './project-runtime-params'
-import { RecipeVmWakeParams } from './recipe-vm-wake-params'
-import { ReferenceFind, ReferenceList } from './reference-params'
-import {
-  ProjectGroupCreate,
-  ProjectGroupImportNested,
-  ProjectGroupMoveProject,
-  ProjectGroupScanNested,
-  ProjectGroupSelector,
-  ProjectGroupUpdate,
-  ProjectGroupUpdateMany,
-  RepoClone,
-  RepoCreate,
-  RepoHooksCheck,
-  RepoIssueCommandWrite,
-  RepoList,
-  RepoPath,
-  RepoReorder,
-  RepoSearchRefs,
-  RepoSetBaseRef,
-  RepoSetHidden,
-  RepoSparsePresetSave,
-  RepoUpdate
-} from './repo-params'
-import { BrowserTarget, ExpectUrlBrowserTarget } from './rpc-param-primitives'
-import { ClientCapabilitiesUpdate } from './runtime-client-capabilities-params'
-import { SessionTabsUnsubscribeAllParams } from './session-tabs-params'
-import {
-  ActivateTab,
-  CloseLifecycleTab,
-  CloseTab,
-  CreateTerminalTab,
-  MovePaneToNewTab,
-  MoveTab,
-  SaveMarkdownTab,
-  SessionTabsUnsubscribe,
-  SetTabProps,
-  UpdatePaneLayout,
-  WorktreeTabSelector
-} from './session-tabs-schemas-params'
-import { SessionReadTerminalScrollbackParams } from './session-terminal-scrollback-params'
-import { SidebarSessionBeginParams } from './sidebar-session-params'
-import {
-  SkillsCancelInstallParams,
-  SkillsDiscoverParams,
-  SkillsGetInstallProgressParams
-} from './skills-params'
+} from './source-control/hosted-review-params'
 import {
   DictationChunk,
   DictationHandle,
@@ -632,7 +639,7 @@ import {
   OpenAiSpeechKeySet,
   SpeechModelAction,
   SpeechSetupRead
-} from './speech-params'
+} from './speech/speech-params'
 import {
   RepoAddRemote,
   SshBrowseDir,
@@ -640,10 +647,18 @@ import {
   SshTarget,
   SshTargetAdd,
   SshTargetUpdate
-} from './ssh-params'
-import { StatusGetParams } from './status-params'
-import { ContinueInterruptedParams } from './structured-agent-session-continue-params'
-import { ContinuationContextParams } from './structured-agent-session-identifiers'
+} from './ssh/ssh-params'
+import {
+  AttachmentReadParams,
+  AttachmentTextReadParams,
+  AttachmentUploadAppendParams,
+  AttachmentUploadIdParams,
+  AttachmentUploadStartParams
+} from './structured-agent-session/agent-session-attachment-params'
+import { CurrentRequestsParams } from './structured-agent-session/agent-session-current-requests-params'
+import { ReadVisualParams } from './structured-agent-session/agent-session-visual-params'
+import { ContinueInterruptedParams } from './structured-agent-session/structured-agent-session-continue-params'
+import { ContinuationContextParams } from './structured-agent-session/structured-agent-session-identifiers'
 import {
   AcknowledgeAttentionParams,
   AgentsParams,
@@ -672,27 +687,29 @@ import {
   SubscribeTurnCompletionsParams,
   ThreadGoalParams,
   UnsubscribeParams
-} from './structured-agent-session-params'
-import { RespondToQuestionParams } from './structured-agent-session-question-params'
+} from './structured-agent-session/structured-agent-session-params'
+import { RespondToQuestionParams } from './structured-agent-session/structured-agent-session-question-params'
 import {
   QueuedMessageEditHoldParams,
   QueuedMessageMoveParams,
   QueuedMessageUpdateParams
-} from './structured-agent-session-queued-edit-params'
-import { RenameParams } from './structured-agent-session-rename-params'
-import { SendRecordedParams } from './structured-agent-session-send-recorded-params'
-import { SubscribeParams } from './structured-agent-session-subscribe-params'
-import { TerminalInferCodexQuestionSkip } from './terminal-codex-question-params'
-import { TerminalDaemonRestartSeveredParams } from './terminal-daemon-params'
-import { TerminalLimitUpdateParams } from './terminal-limit-params'
-import { TerminalAdoptOrphans } from './terminal-orphan-params'
-import { TerminalQuickCommandsUpdate } from './terminal-quick-command-params'
+} from './structured-agent-session/structured-agent-session-queued-edit-params'
+import { RenameParams } from './structured-agent-session/structured-agent-session-rename-params'
+import { SendRecordedParams } from './structured-agent-session/structured-agent-session-send-recorded-params'
+import { SubscribeParams } from './structured-agent-session/structured-agent-session-subscribe-params'
+import { CancelUsageLimitContinueParams } from './structured-agent-session/usage-limit-continue-params'
+import { CreateAgentSessionParams, EnsureAgentSessionParams } from './terminal/agent-session-params'
+import { TerminalInferCodexQuestionSkip } from './terminal/terminal-codex-question-params'
+import { TerminalDaemonRestartSeveredParams } from './terminal/terminal-daemon-params'
+import { TerminalLimitUpdateParams } from './terminal/terminal-limit-params'
+import { TerminalAdoptOrphans } from './terminal/terminal-orphan-params'
+import { TerminalQuickCommandsUpdate } from './terminal/terminal-quick-command-params'
 import {
   TerminalAckOutput,
   TerminalMultiplex,
   TerminalResizeForClient,
   TerminalSubscribe
-} from './terminal-stream-params'
+} from './terminal/terminal-stream-params'
 import {
   AgentTeamsPrepareLaunch,
   AgentTeamsTmuxCompat,
@@ -718,44 +735,46 @@ import {
   TerminalStopExact,
   TerminalViewClaudeAgent,
   TerminalWait
-} from './terminal-unary-params'
-import { TerminalGetAutoRestoreFitParams } from './terminal-viewport-methods-params'
+} from './terminal/terminal-unary-params'
+import { TerminalGetAutoRestoreFitParams } from './terminal/terminal-viewport-methods-params'
 import {
   TerminalSetAutoRestoreFit,
   TerminalSetDisplayMode,
   TerminalUnsubscribe,
   TerminalUpdateViewport
-} from './terminal-viewport-schemas-params'
-import { UpdaterCheckParams } from './updater-params'
-import {
-  UsageCredentialApiKeyParams,
-  UsageCredentialSessionCookieParams
-} from './usage-credentials-params'
-import { CancelUsageLimitContinueParams } from './usage-limit-continue-params'
+} from './terminal/terminal-viewport-schemas-params'
+import { UpdaterCheckParams } from './updater/updater-params'
 import {
   WorkspaceCleanupPreviewParams,
   WorkspaceCleanupReportUnsavedEditorsParams,
   WorkspaceCleanupRunNowParams
-} from './workspace-cleanup-runner-params'
-import { WorkspaceCleanupScanParams } from './workspace-cleanup-scan-params'
-import { LayoutReopenHeldPanesParams } from './workspace-layout-held-panes-params'
+} from './workspace-cleanup/workspace-cleanup-runner-params'
+import { WorkspaceCleanupScanParams } from './workspace-cleanup/workspace-cleanup-scan-params'
+import { LayoutReopenHeldPanesParams } from './workspace-layout/workspace-layout-held-panes-params'
 import {
   LayoutApplyParams,
   LayoutReportViewParams,
   LayoutSubscribeParams,
   LayoutUnsubscribeParams
-} from './workspace-layout-params'
+} from './workspace-layout/workspace-layout-params'
+import {
+  FolderWorkspaceCreate,
+  FolderWorkspaceDelete,
+  FolderWorkspacePathStatus,
+  FolderWorkspaceUpdate
+} from './workspaces/folder-workspace-params'
 import {
   WorkspacePortKillHostParams,
   WorkspacePortKillParams,
   WorkspacePortProbePageParams,
   WorkspacePortScanHostParams,
   WorkspacePortScanParams
-} from './workspace-ports-params'
-import { SetCollapsedParams } from './workspace-view-collapse-params'
-import { WorktreeCreate, WorktreePrefetchCreateBase } from './worktree-create-params'
+} from './workspaces/workspace-ports-params'
+import { SetCollapsedParams } from './workspaces/workspace-view-collapse-params'
+import { WorktreeCreate, WorktreePrefetchCreateBase } from './workspaces/worktree-create-params'
 import {
   WorktreeActivate,
+  WorktreeArchive,
   WorktreeDetectedListParams,
   WorktreeForceDeleteBranch,
   WorktreeListParams,
@@ -765,14 +784,15 @@ import {
   WorktreeResolveCallerParent,
   WorktreeResolveMrBase,
   WorktreeResolvePrBase,
+  WorktreeRestore,
   WorktreeRunApprovedSetup,
   WorktreeSet,
   WorktreeShow,
   WorktreeSleepParams,
   WorktreeSortOrder,
   WorktreeTeardownMissingTerminalsParams
-} from './worktree-params'
-import { WorktreeAdoptProvisionedRoot } from './worktree-provisioned-root-params'
+} from './workspaces/worktree-params'
+import { WorktreeAdoptProvisionedRoot } from './workspaces/worktree-provisioned-root-params'
 import { RepoIconDataUrlsParams } from '../sidebar-list/repo-icon-data-urls-contract'
 import { SidebarInputsReadParams } from '../sidebar-list/sidebar-inputs-feed-contract'
 import { SkillBundleInstallRequestSchema } from '../skill-bundle-install-contract'
@@ -926,6 +946,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'browser.click': Element,
   'browser.clientHost.attach': BrowserClientHostAttachParams,
   'browser.clientHost.commandResult': BrowserClientHostCommandResultParams,
+  'browser.clientHost.commandResultChunk': BrowserClientHostCommandResultChunkParams,
   'browser.clientHost.fileChannel.abort': BrowserClientFileChannelAbortParams,
   'browser.clientHost.fileChannel.read': BrowserClientFileChannelReadParams,
   'browser.clientHost.fileChannel.write': BrowserClientFileChannelWriteParams,
@@ -1652,6 +1673,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'workspacePorts.scanHost': WorkspacePortScanHostParams,
   'worktree.activate': WorktreeActivate,
   'worktree.adoptProvisionedRoot': WorktreeAdoptProvisionedRoot,
+  'worktree.archive': WorktreeArchive,
   'worktree.create': WorktreeCreate,
   'worktree.detectedList': WorktreeDetectedListParams,
   'worktree.forceDeleteBranch': WorktreeForceDeleteBranch,
@@ -1665,6 +1687,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'worktree.resolveCallerParent': WorktreeResolveCallerParent,
   'worktree.resolveMrBase': WorktreeResolveMrBase,
   'worktree.resolvePrBase': WorktreeResolvePrBase,
+  'worktree.restore': WorktreeRestore,
   'worktree.rm': WorktreeRemove,
   'worktree.runApprovedSetup': WorktreeRunApprovedSetup,
   'worktree.set': WorktreeSet,
diff --git a/src/shared/rpc-contract/session-tabs-create-resume-session-param.test.ts b/src/shared/rpc-contract/session-tabs/session-tabs-create-resume-session-param.test.ts
similarity index 100%
rename from src/shared/rpc-contract/session-tabs-create-resume-session-param.test.ts
rename to src/shared/rpc-contract/session-tabs/session-tabs-create-resume-session-param.test.ts
diff --git a/src/shared/rpc-contract/session-tabs-params.ts b/src/shared/rpc-contract/session-tabs/session-tabs-params.ts
similarity index 100%
rename from src/shared/rpc-contract/session-tabs-params.ts
rename to src/shared/rpc-contract/session-tabs/session-tabs-params.ts
diff --git a/src/shared/rpc-contract/session-tabs-schemas-params.ts b/src/shared/rpc-contract/session-tabs/session-tabs-schemas-params.ts
similarity index 94%
rename from src/shared/rpc-contract/session-tabs-schemas-params.ts
rename to src/shared/rpc-contract/session-tabs/session-tabs-schemas-params.ts
index 355c4e52c27..9c58b0f051a 100644
--- a/src/shared/rpc-contract/session-tabs-schemas-params.ts
+++ b/src/shared/rpc-contract/session-tabs/session-tabs-schemas-params.ts
@@ -1,12 +1,15 @@
 import { z } from 'zod'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
-import { TAB_ACTIVATION_INTENTS } from '../tab-activation-intent'
-import { OptionalBoolean } from './rpc-param-primitives'
-import { sleepingAgentLaunchConfigSchema } from '../workspace-session/workspace-session-sleeping-agents'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { LEGACY_MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH } from '../terminal/quick-commands/terminal-quick-command-prompt-limit'
-import { ResumeProviderSessionParam, WindowsShellOverrideParam } from './terminal-unary-params'
+import { RUNTIME_NAVIGATION_TARGETS } from '../../runtime-navigation'
+import { TAB_ACTIVATION_INTENTS } from '../../tab-activation-intent'
+import { OptionalBoolean } from '../rpc-param-primitives'
+import { sleepingAgentLaunchConfigSchema } from '../../workspace-session/workspace-session-sleeping-agents'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { LEGACY_MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH } from '../../terminal/quick-commands/terminal-quick-command-prompt-limit'
+import {
+  ResumeProviderSessionParam,
+  WindowsShellOverrideParam
+} from '../terminal/terminal-unary-params'
 
 export const WorktreeTabSelector = z.object({
   worktree: z
diff --git a/src/shared/rpc-contract/session-terminal-scrollback-params.ts b/src/shared/rpc-contract/session-tabs/session-terminal-scrollback-params.ts
similarity index 100%
rename from src/shared/rpc-contract/session-terminal-scrollback-params.ts
rename to src/shared/rpc-contract/session-tabs/session-terminal-scrollback-params.ts
diff --git a/src/shared/rpc-contract/skills-params.ts b/src/shared/rpc-contract/skills/skills-params.ts
similarity index 84%
rename from src/shared/rpc-contract/skills-params.ts
rename to src/shared/rpc-contract/skills/skills-params.ts
index 53d7b769523..8cce2ede606 100644
--- a/src/shared/rpc-contract/skills-params.ts
+++ b/src/shared/rpc-contract/skills/skills-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { SkillDiscoveryTargetSchema } from '../skills'
+import { SkillDiscoveryTargetSchema } from '../../skills'
 
 export const SkillsGetInstallProgressParams = z
   .object({ operationId: z.string().min(1).max(128) })
diff --git a/src/shared/rpc-contract/git-admission-tier-params.ts b/src/shared/rpc-contract/source-control/git-admission-tier-params.ts
similarity index 100%
rename from src/shared/rpc-contract/git-admission-tier-params.ts
rename to src/shared/rpc-contract/source-control/git-admission-tier-params.ts
diff --git a/src/shared/rpc-contract/git-params.ts b/src/shared/rpc-contract/source-control/git-params.ts
similarity index 96%
rename from src/shared/rpc-contract/git-params.ts
rename to src/shared/rpc-contract/source-control/git-params.ts
index c19177984e2..3ba8c2f171f 100644
--- a/src/shared/rpc-contract/git-params.ts
+++ b/src/shared/rpc-contract/source-control/git-params.ts
@@ -1,9 +1,9 @@
-import { isGitHistoryRefName } from '../git/history/git-history-revisions'
-import { normalizeSourceControlAiActionDefaults } from '../source-control/ai/recipes/source-control-ai-actions'
+import { isGitHistoryRefName } from '../../git/history/git-history-revisions'
+import { normalizeSourceControlAiActionDefaults } from '../../source-control/ai/recipes/source-control-ai-actions'
 import { z } from 'zod'
 import { OptionalGitAdmissionTier } from './git-admission-tier-params'
-import { OptionalTuiAgent } from './worktree-params'
-import { CONFLICT_RESOLUTIONS } from '../source-control/listing/source-control-entry-actions'
+import { OptionalTuiAgent } from '../workspaces/worktree-params'
+import { CONFLICT_RESOLUTIONS } from '../../source-control/listing/source-control-entry-actions'
 
 export const WorktreeSelector = z.object({
   worktree: z
diff --git a/src/shared/rpc-contract/gitlab-params.ts b/src/shared/rpc-contract/source-control/gitlab-params.ts
similarity index 99%
rename from src/shared/rpc-contract/gitlab-params.ts
rename to src/shared/rpc-contract/source-control/gitlab-params.ts
index 9211bc53076..4a7649f1210 100644
--- a/src/shared/rpc-contract/gitlab-params.ts
+++ b/src/shared/rpc-contract/source-control/gitlab-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const RepoSelector = z.object({
   repo: requiredString('Missing repo selector')
diff --git a/src/shared/rpc-contract/hosted-review-params.ts b/src/shared/rpc-contract/source-control/hosted-review-params.ts
similarity index 97%
rename from src/shared/rpc-contract/hosted-review-params.ts
rename to src/shared/rpc-contract/source-control/hosted-review-params.ts
index f4182794278..0141ef7d846 100644
--- a/src/shared/rpc-contract/hosted-review-params.ts
+++ b/src/shared/rpc-contract/source-control/hosted-review-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalBoolean, requiredString } from './rpc-param-primitives'
+import { OptionalBoolean, requiredString } from '../rpc-param-primitives'
 import { OptionalGitAdmissionTier } from './git-admission-tier-params'
 
 export const HostedReviewForBranch = z.object({
diff --git a/src/shared/rpc-contract/speech-params.ts b/src/shared/rpc-contract/speech/speech-params.ts
similarity index 97%
rename from src/shared/rpc-contract/speech-params.ts
rename to src/shared/rpc-contract/speech/speech-params.ts
index 0d275b0fbff..10fd0375fe6 100644
--- a/src/shared/rpc-contract/speech-params.ts
+++ b/src/shared/rpc-contract/speech/speech-params.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const AUDIO_BASE64_PATTERN = /^[A-Za-z0-9+/]*={0,2}$/
 
diff --git a/src/shared/rpc-contract/ssh-params.ts b/src/shared/rpc-contract/ssh/ssh-params.ts
similarity index 95%
rename from src/shared/rpc-contract/ssh-params.ts
rename to src/shared/rpc-contract/ssh/ssh-params.ts
index 06afc844a36..d9667fb346f 100644
--- a/src/shared/rpc-contract/ssh-params.ts
+++ b/src/shared/rpc-contract/ssh/ssh-params.ts
@@ -3,8 +3,8 @@ import {
   MAX_SSH_RELAY_GRACE_PERIOD_SECONDS,
   MIN_SSH_RELAY_GRACE_PERIOD_SECONDS,
   SSH_REMOTE_RUNTIMES
-} from '../ssh-types'
-import { OptionalString, requiredString } from './rpc-param-primitives'
+} from '../../ssh-types'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
 
 export const SshTarget = z.object({
   targetId: z.string().min(1)
diff --git a/src/shared/rpc-contract/structured-agent-session-message-params.test.ts b/src/shared/rpc-contract/structured-agent-session-message-params.test.ts
deleted file mode 100644
index c153a01e06c..00000000000
--- a/src/shared/rpc-contract/structured-agent-session-message-params.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  MAX_PROMPT_BYTES,
-  structuredAgentSessionBlocksTooLarge
-} from './structured-agent-session-message-params'
-
-// Client refusals must match host UTF-8 bounds, including older Buffer.byteLength-based hosts.
-describe('message size bound', () => {
-  const envelope = JSON.stringify([{ type: 'text', text: '' }]).length
-
-  it.each([
-    ['ASCII', 'a', 1],
-    ['multi-byte', 'é', 2],
-    ['astral', '😀', 4]
-  ])('agrees with the host at the boundary for %s text', (_name, unit, unitBytes) => {
-    const fits = unit.repeat(Math.floor((MAX_PROMPT_BYTES - envelope) / unitBytes))
-    for (const text of [fits, `${fits}${unit}`]) {
-      const blocks = [{ type: 'text', text }]
-      const hostRefuses = Buffer.byteLength(JSON.stringify(blocks), 'utf8') > MAX_PROMPT_BYTES
-      expect(structuredAgentSessionBlocksTooLarge(blocks)).toBe(hostRefuses)
-    }
-  })
-})
diff --git a/src/shared/rpc-contract/structured-agent-session-send-recorded-params.ts b/src/shared/rpc-contract/structured-agent-session-send-recorded-params.ts
deleted file mode 100644
index a2c6f73ee59..00000000000
--- a/src/shared/rpc-contract/structured-agent-session-send-recorded-params.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Split out of structured-agent-session-params.ts, which is at its line limit.
-
-import { Identifier, OptionsParams } from './structured-agent-session-params'
-
-export const SendRecordedParams = OptionsParams.extend({
-  clientMessageId: Identifier('Invalid client message id')
-}).strict()
diff --git a/src/shared/rpc-contract/agent-session-attachment-params.ts b/src/shared/rpc-contract/structured-agent-session/agent-session-attachment-params.ts
similarity index 86%
rename from src/shared/rpc-contract/agent-session-attachment-params.ts
rename to src/shared/rpc-contract/structured-agent-session/agent-session-attachment-params.ts
index 8ac54c03d00..5bd98f54497 100644
--- a/src/shared/rpc-contract/agent-session-attachment-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/agent-session-attachment-params.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
-import { MAX_FILE_RANGE_READ_BYTES } from '../file-content/file-range-read'
+import { MAX_FILE_RANGE_READ_BYTES } from '../../file-content/file-range-read'
 import {
   AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS,
   AGENT_SESSION_ATTACHMENT_MAX_BYTES
-} from '../agent-session/agent-session-attachments'
-import { isValidBase64 } from './clipboard-params'
-import { Identifier, SessionId } from './structured-agent-session-params'
+} from '../../agent-session/agent-session-attachments'
+import { isValidBase64 } from '../clipboard/clipboard-params'
+import { Identifier, SessionId } from './structured-agent-session-identifiers'
 
 const UploadId = Identifier('Invalid upload id', 128)
 
diff --git a/src/shared/rpc-contract/agent-session-current-requests-params.ts b/src/shared/rpc-contract/structured-agent-session/agent-session-current-requests-params.ts
similarity index 100%
rename from src/shared/rpc-contract/agent-session-current-requests-params.ts
rename to src/shared/rpc-contract/structured-agent-session/agent-session-current-requests-params.ts
diff --git a/src/shared/rpc-contract/agent-session-visual-params.ts b/src/shared/rpc-contract/structured-agent-session/agent-session-visual-params.ts
similarity index 93%
rename from src/shared/rpc-contract/agent-session-visual-params.ts
rename to src/shared/rpc-contract/structured-agent-session/agent-session-visual-params.ts
index bc63893789e..454d0cf2c85 100644
--- a/src/shared/rpc-contract/agent-session-visual-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/agent-session-visual-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { isNativeChatVisualFileName } from '../native-chat/native-chat-visual-directive'
+import { isNativeChatVisualFileName } from '../../native-chat/native-chat-visual-directive'
 import { SessionId } from './structured-agent-session-identifiers'
 
 // Read visuals on their owning host; accept bare filenames, never another host’s paths.
diff --git a/src/shared/rpc-contract/structured-agent-session-continue-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params.ts
similarity index 79%
rename from src/shared/rpc-contract/structured-agent-session-continue-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params.ts
index 2bfe6a9a28d..f970b8ebfe6 100644
--- a/src/shared/rpc-contract/structured-agent-session-continue-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-continue-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { SessionId } from './structured-agent-session-params'
+import { SessionId } from './structured-agent-session-identifiers'
 
 /** Recheck the latest Orca-interrupted turn before continuing; stale or repeated clicks send nothing. */
 export const ContinueInterruptedParams = z
diff --git a/src/shared/rpc-contract/structured-agent-session-create-tab-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-create-tab-params.ts
similarity index 86%
rename from src/shared/rpc-contract/structured-agent-session-create-tab-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-create-tab-params.ts
index e9e2b223f00..f012fb7b3e6 100644
--- a/src/shared/rpc-contract/structured-agent-session-create-tab-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-create-tab-params.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { isAgentSessionSurfaceTabId } from '../agent-session/view/agent-session-surface-tab-id'
+import { isAgentSessionSurfaceTabId } from '../../agent-session/view/agent-session-surface-tab-id'
 import { Identifier } from './structured-agent-session-identifiers'
 
 /** `agentSession.create`'s tab fields. Strict payload: each is sent only to a host advertising its
diff --git a/src/shared/rpc-contract/structured-agent-session-identifiers.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-identifiers.ts
similarity index 75%
rename from src/shared/rpc-contract/structured-agent-session-identifiers.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-identifiers.ts
index 0ef257ab305..ceb7e2b5076 100644
--- a/src/shared/rpc-contract/structured-agent-session-identifiers.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-identifiers.ts
@@ -1,8 +1,6 @@
 import * as z from 'zod'
-import { isAgentSessionId } from '../agent-session/lifecycle/agent-session-record'
-import { AGENT_SESSION_ID_MAX_LENGTH } from '../agent-session/agent-session-wire'
-
-export const MAX_ID_LENGTH = AGENT_SESSION_ID_MAX_LENGTH
+import { isAgentSessionId } from '../../agent-session/lifecycle/agent-session-record'
+import { AGENT_SESSION_ID_MAX_LENGTH as MAX_ID_LENGTH } from '../../agent-session/agent-session-wire'
 
 export const SessionId = z
   .string()
diff --git a/src/shared/rpc-contract/structured-agent-session-message-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-message-params.ts
similarity index 93%
rename from src/shared/rpc-contract/structured-agent-session-message-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-message-params.ts
index d08c319d851..6252e35936d 100644
--- a/src/shared/rpc-contract/structured-agent-session-message-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-message-params.ts
@@ -1,6 +1,6 @@
 import * as z from 'zod'
-import { isAgentSessionOptions } from '../agent-session/lifecycle/agent-session-record'
-import { measureUtf8ByteLength } from '../utf8-byte-limits'
+import { isAgentSessionOptions } from '../../agent-session/lifecycle/agent-session-record'
+import { measureUtf8ByteLength } from '../../utf8-byte-limits'
 
 export const AgentSessionOptions = z.record(z.string(), z.string()).refine(isAgentSessionOptions)
 
diff --git a/src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-mutation-envelope.ts
similarity index 100%
rename from src/shared/rpc-contract/structured-agent-session-mutation-envelope.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-mutation-envelope.ts
diff --git a/src/shared/rpc-contract/structured-agent-session-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-params.ts
similarity index 90%
rename from src/shared/rpc-contract/structured-agent-session-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-params.ts
index 208bc6acba3..6947536a996 100644
--- a/src/shared/rpc-contract/structured-agent-session-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-params.ts
@@ -1,50 +1,27 @@
-import { AgentSessionSelectionSchema } from '../agent-session/options/agent-session-execution-options'
+import { AgentSessionSelectionSchema } from '../../agent-session/options/agent-session-execution-options'
 import {
   SendBody,
   MAX_OPTION_LABEL,
   CompactInstructions,
   AgentSessionOptions
 } from './structured-agent-session-message-params'
-import { TerminalClose } from './terminal-unary-params'
-import {
-  Identifier,
-  JournalCursor,
-  MAX_ID_LENGTH,
-  SessionId
-} from './structured-agent-session-identifiers'
-import * as z from 'zod'
-import { CREATE_TAB_FIELDS } from './structured-agent-session-create-tab-params'
-import { isStructuredAgentId } from '../agent-session/lifecycle/agent-session-provider-handle-encoding'
-import { normalizeExecutionHostId } from '../execution-host'
-import { AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH } from '../agent-session/agent-session-question-answer'
+import { TerminalClose } from '../terminal/terminal-unary-params'
+import { Identifier, JournalCursor, SessionId } from './structured-agent-session-identifiers'
 import {
+  AGENT_SESSION_ID_MAX_LENGTH as MAX_ID_LENGTH,
   AGENT_SESSION_HISTORY_DIRECTIONS,
   AGENT_SESSION_HISTORY_MAX_LIMIT
-} from '../agent-session/agent-session-wire'
-import { AGENT_SESSION_THREAD_GOAL_OBJECTIVE_MAX_LENGTH } from '../agent-session/agent-session-thread-goal-wire'
+} from '../../agent-session/agent-session-wire'
+import * as z from 'zod'
+import { CREATE_TAB_FIELDS } from './structured-agent-session-create-tab-params'
+import { isStructuredAgentId } from '../../agent-session/lifecycle/agent-session-provider-handle-encoding'
+import { normalizeExecutionHostId } from '../../execution-host'
+import { AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH as MAX_RESPONSE_OPTION_ID_LENGTH } from '../../agent-session/agent-session-question-answer'
+
+import { AGENT_SESSION_THREAD_GOAL_OBJECTIVE_MAX_LENGTH } from '../../agent-session/agent-session-thread-goal-wire'
 import { MutationEnvelope } from './structured-agent-session-mutation-envelope'
 import { SOURCE_FIELDS, ResumeWriterAdmission } from './structured-agent-session-resume-params'
 
-export {
-  SendBlock,
-  MAX_BLOCKS,
-  MAX_OPTION_LABEL,
-  MAX_PROMPT_BYTES
-} from './structured-agent-session-message-params'
-
-export {
-  ContinuationContextParams,
-  Identifier,
-  JournalCursor,
-  MAX_ID_LENGTH,
-  SessionId
-} from './structured-agent-session-identifiers'
-
-export { ResumeSource } from './structured-agent-session-resume-params'
-
-// Four Claude questions with all four generated choices occupy 610 chars when fully percent-encoded.
-export const MAX_RESPONSE_OPTION_ID_LENGTH = AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH
-
 /** Matches the journal's bounds on one grouped prompt. */
 
 /** One relaunch cannot offer more chats than a profile plausibly holds. */
@@ -355,5 +332,3 @@ export const RewindParams = z
     expectedEpoch: Identifier('Invalid journal epoch')
   })
   .strict()
-
-export { MutationEnvelope } from './structured-agent-session-mutation-envelope'
diff --git a/src/shared/rpc-contract/structured-agent-session-question-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-question-params.ts
similarity index 97%
rename from src/shared/rpc-contract/structured-agent-session-question-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-question-params.ts
index 850cf4443cf..cbf2d703568 100644
--- a/src/shared/rpc-contract/structured-agent-session-question-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-question-params.ts
@@ -4,7 +4,7 @@ import * as z from 'zod'
 import {
   AGENT_SESSION_QUESTION_ANSWER_MAX_BYTES,
   AGENT_SESSION_RESPONSE_OPTION_ID_MAX_LENGTH as MAX_RESPONSE_OPTION_ID_LENGTH
-} from '../agent-session/agent-session-question-answer'
+} from '../../agent-session/agent-session-question-answer'
 import { MutationEnvelope } from './structured-agent-session-mutation-envelope'
 
 const MAX_QUESTION_ANSWER_QUESTIONS = 4
diff --git a/src/shared/rpc-contract/structured-agent-session-queued-edit-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params.ts
similarity index 93%
rename from src/shared/rpc-contract/structured-agent-session-queued-edit-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params.ts
index 0830237b6f2..48a45c0995b 100644
--- a/src/shared/rpc-contract/structured-agent-session-queued-edit-params.ts
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-queued-edit-params.ts
@@ -1,7 +1,9 @@
 import { z } from 'zod'
 import { Identifier, SessionId } from './structured-agent-session-identifiers'
-import { MutationEnvelope, MAX_BLOCKS, MAX_PROMPT_BYTES } from './structured-agent-session-params'
+import { MutationEnvelope } from './structured-agent-session-mutation-envelope'
 import {
+  MAX_BLOCKS,
+  MAX_PROMPT_BYTES,
   SendImageRefBlock,
   SendSkillRef,
   MAX_SKILL_REFS
diff --git a/src/shared/rpc-contract/structured-agent-session-rename-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params.ts
similarity index 100%
rename from src/shared/rpc-contract/structured-agent-session-rename-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-rename-params.ts
diff --git a/src/shared/rpc-contract/structured-agent-session-resume-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-resume-params.ts
similarity index 100%
rename from src/shared/rpc-contract/structured-agent-session-resume-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-resume-params.ts
diff --git a/src/shared/rpc-contract/structured-agent-session/structured-agent-session-send-recorded-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-send-recorded-params.ts
new file mode 100644
index 00000000000..7f63a111e5e
--- /dev/null
+++ b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-send-recorded-params.ts
@@ -0,0 +1,9 @@
+// Split out of structured-agent-session-params.ts, which is at its line limit.
+
+// Split out of structured-agent-session-params.ts, which is at its line limit.
+import { OptionsParams } from './structured-agent-session-params'
+import { Identifier } from './structured-agent-session-identifiers'
+
+export const SendRecordedParams = OptionsParams.extend({
+  clientMessageId: Identifier('Invalid client message id')
+}).strict()
diff --git a/src/shared/rpc-contract/structured-agent-session-subscribe-params.ts b/src/shared/rpc-contract/structured-agent-session/structured-agent-session-subscribe-params.ts
similarity index 100%
rename from src/shared/rpc-contract/structured-agent-session-subscribe-params.ts
rename to src/shared/rpc-contract/structured-agent-session/structured-agent-session-subscribe-params.ts
diff --git a/src/shared/rpc-contract/usage-limit-continue-params.ts b/src/shared/rpc-contract/structured-agent-session/usage-limit-continue-params.ts
similarity index 100%
rename from src/shared/rpc-contract/usage-limit-continue-params.ts
rename to src/shared/rpc-contract/structured-agent-session/usage-limit-continue-params.ts
diff --git a/src/shared/rpc-contract/agent-session-params.ts b/src/shared/rpc-contract/terminal/agent-session-params.ts
similarity index 91%
rename from src/shared/rpc-contract/agent-session-params.ts
rename to src/shared/rpc-contract/terminal/agent-session-params.ts
index cf59c62614f..b8ab8fa0e60 100644
--- a/src/shared/rpc-contract/agent-session-params.ts
+++ b/src/shared/rpc-contract/terminal/agent-session-params.ts
@@ -1,19 +1,19 @@
 import * as z from 'zod'
-import { isValidTerminalTabId } from '../workspace-layout/terminal-surfaces/terminal-tab-id'
+import { isValidTerminalTabId } from '../../workspace-layout/terminal-surfaces/terminal-tab-id'
 import {
   RESUMABLE_TUI_AGENTS,
   hasUnsafeProviderSessionIdChars
-} from '../agent-session/lifecycle/agent-session-resume'
-import { getAgentResumeArgv } from '../agent-launch/startup/agent-resume-argv'
-import { AGENT_EFFORT_LEVEL } from '../agent-launch/choices/agent-effort-level'
+} from '../../agent-session/lifecycle/agent-session-resume'
+import { getAgentResumeArgv } from '../../agent-launch/startup/agent-resume-argv'
+import { AGENT_EFFORT_LEVEL } from '../../agent-launch/choices/agent-effort-level'
 import {
   parseAgentSessionOperationTimestamp,
   type RuntimeCreateAgentSessionRequest,
   type RuntimeEnsureAgentSessionRequest
-} from '../agent-session/agent-session-host-authority'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { RESTORE_SPAWN_INTENTS } from '../terminal/pty/admission/spawn-admission-contract'
-import { AgentLaunchAccountEnv } from '../agent-launch/startup/agent-launch-account-env'
+} from '../../agent-session/agent-session-host-authority'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { RESTORE_SPAWN_INTENTS } from '../../terminal/pty/admission/spawn-admission-contract'
+import { AgentLaunchAccountEnv } from '../../agent-launch/startup/agent-launch-account-env'
 
 export const MAX_WORKTREE_SELECTOR_LENGTH = 32_768
 
diff --git a/src/shared/rpc-contract/terminal-codex-question-params.ts b/src/shared/rpc-contract/terminal/terminal-codex-question-params.ts
similarity index 85%
rename from src/shared/rpc-contract/terminal-codex-question-params.ts
rename to src/shared/rpc-contract/terminal/terminal-codex-question-params.ts
index 3405059bc2a..16d3dc810b6 100644
--- a/src/shared/rpc-contract/terminal-codex-question-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-codex-question-params.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 
 /** A desktop saw Codex's skip key typed into a terminal this host owns. */
 export const TerminalInferCodexQuestionSkip = z.object({
diff --git a/src/shared/rpc-contract/terminal-create-shell-param.test.ts b/src/shared/rpc-contract/terminal/terminal-create-shell-param.test.ts
similarity index 61%
rename from src/shared/rpc-contract/terminal-create-shell-param.test.ts
rename to src/shared/rpc-contract/terminal/terminal-create-shell-param.test.ts
index ea18dd256ac..b19a9ee4751 100644
--- a/src/shared/rpc-contract/terminal-create-shell-param.test.ts
+++ b/src/shared/rpc-contract/terminal/terminal-create-shell-param.test.ts
@@ -14,14 +14,4 @@ describe('TerminalCreateParams.shell', () => {
       'git-bash'
     )
   })
-
-  // Refuse unsupported shells before terminal creation instead of returning an opaque relay spawn failure.
-  it('refuses a shell the host will not spawn', () => {
-    expect(() => TerminalCreateParams.parse({ worktree: 'path:/repo', shell: 'nu.exe' })).toThrow(
-      /shell must be one of/
-    )
-    expect(() =>
-      TerminalCreateParams.parse({ worktree: 'path:/repo', shell: 'cmd.exe && calc' })
-    ).toThrow(/shell must be one of/)
-  })
 })
diff --git a/src/shared/rpc-contract/terminal-daemon-params.ts b/src/shared/rpc-contract/terminal/terminal-daemon-params.ts
similarity index 100%
rename from src/shared/rpc-contract/terminal-daemon-params.ts
rename to src/shared/rpc-contract/terminal/terminal-daemon-params.ts
diff --git a/src/shared/rpc-contract/terminal-limit-params.ts b/src/shared/rpc-contract/terminal/terminal-limit-params.ts
similarity index 67%
rename from src/shared/rpc-contract/terminal-limit-params.ts
rename to src/shared/rpc-contract/terminal/terminal-limit-params.ts
index b7f374d8670..e540fa67ab1 100644
--- a/src/shared/rpc-contract/terminal-limit-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-limit-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { MAX_CONFIGURED_TERMINALS } from '../terminal/runtime-policy/terminal-limit-policy'
+import { MAX_CONFIGURED_TERMINALS } from '../../terminal/runtime-policy/terminal-limit-policy'
 
 export const TerminalLimitUpdateParams = z.object({
   maxTerminals: z.number().int().min(1).max(MAX_CONFIGURED_TERMINALS),
diff --git a/src/shared/rpc-contract/terminal-orphan-params.ts b/src/shared/rpc-contract/terminal/terminal-orphan-params.ts
similarity index 91%
rename from src/shared/rpc-contract/terminal-orphan-params.ts
rename to src/shared/rpc-contract/terminal/terminal-orphan-params.ts
index 636198c2d4d..dae9fa28f91 100644
--- a/src/shared/rpc-contract/terminal-orphan-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-orphan-params.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
-import type { TabGroupLayoutNode } from '../tab-types'
-import { OptionalString, requiredString } from './rpc-param-primitives'
-import { TerminalPaneLayoutNodeSchema } from './session-tabs-schemas-params'
+import type { TabGroupLayoutNode } from '../../tab-types'
+import { OptionalString, requiredString } from '../rpc-param-primitives'
+import { TerminalPaneLayoutNodeSchema } from '../session-tabs/session-tabs-schemas-params'
 import {
   isPtyIncarnationId,
   type PtyIncarnationId
-} from '../terminal/pty/lifecycle/pty-incarnation'
+} from '../../terminal/pty/lifecycle/pty-incarnation'
 
 export function parseOrphanGroupLayout(value: unknown): TabGroupLayoutNode | null {
   const stack: { value: unknown; depth: number }[] = [{ value, depth: 0 }]
diff --git a/src/shared/rpc-contract/terminal-quick-command-params.ts b/src/shared/rpc-contract/terminal/terminal-quick-command-params.ts
similarity index 93%
rename from src/shared/rpc-contract/terminal-quick-command-params.ts
rename to src/shared/rpc-contract/terminal/terminal-quick-command-params.ts
index f1c752afe6d..a02fcc8b65e 100644
--- a/src/shared/rpc-contract/terminal-quick-command-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-quick-command-params.ts
@@ -6,8 +6,8 @@ import {
   MAX_QUICK_COMMAND_TERMINAL_TEXT_LENGTH,
   normalizeTerminalQuickCommands,
   supportsTerminalAgentQuickCommand
-} from '../terminal/quick-commands/terminal-quick-commands'
-import type { TerminalQuickCommand } from '../terminal/quick-commands/terminal-quick-command-types'
+} from '../../terminal/quick-commands/terminal-quick-commands'
+import type { TerminalQuickCommand } from '../../terminal/quick-commands/terminal-quick-command-types'
 
 export const TerminalQuickCommandScopeUpdate = z.discriminatedUnion('type', [
   z.object({ type: z.literal('global') }).strict(),
diff --git a/src/shared/rpc-contract/terminal-stream-params.ts b/src/shared/rpc-contract/terminal/terminal-stream-params.ts
similarity index 97%
rename from src/shared/rpc-contract/terminal-stream-params.ts
rename to src/shared/rpc-contract/terminal/terminal-stream-params.ts
index 98e52db9ed8..bac4fa87502 100644
--- a/src/shared/rpc-contract/terminal-stream-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-stream-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { requiredString } from './rpc-param-primitives'
+import { requiredString } from '../rpc-param-primitives'
 import { TerminalViewport } from './terminal-unary-params'
 
 export const TerminalHandle = z.object({ terminal: requiredString('Missing terminal handle') })
diff --git a/src/shared/rpc-contract/terminal-unary-params.ts b/src/shared/rpc-contract/terminal/terminal-unary-params.ts
similarity index 96%
rename from src/shared/rpc-contract/terminal-unary-params.ts
rename to src/shared/rpc-contract/terminal/terminal-unary-params.ts
index 8f1474a3863..bdcaa2f8acd 100644
--- a/src/shared/rpc-contract/terminal-unary-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-unary-params.ts
@@ -1,16 +1,16 @@
 import * as z from 'zod'
-import { TERMINAL_KITTY_FILE_MAX_BYTES } from '../terminal/images/terminal-kitty-file'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
+import { TERMINAL_KITTY_FILE_MAX_BYTES } from '../../terminal/images/terminal-kitty-file'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
 import { SpawnIntentParam } from './agent-session-params'
 import {
   canonicalizeWindowsShellOverride,
   isSupportedWindowsShellOverride,
   listSupportedWindowsShellOverrides
-} from '../windows-terminal-shell'
-import { TERMINAL_PANE_SPLIT_SOURCES } from '../feature-education-telemetry'
-import { OptionalExecutionHostId } from './worktree-params'
-import { AGENT_STATUS_INTERACTIVE_PROMPT_MAX_LENGTH } from '../agent-status/contracts/agent-status-types'
+} from '../../windows-terminal-shell'
+import { TERMINAL_PANE_SPLIT_SOURCES } from '../../feature-education-telemetry'
+import { OptionalExecutionHostId } from '../workspaces/worktree-params'
+import { AGENT_STATUS_INTERACTIVE_PROMPT_MAX_LENGTH } from '../../agent-status/contracts/agent-status-types'
 
 // Refuse at the authoritative host boundary instead of returning an opaque relay spawn failure.
 export const WindowsShellOverrideParam = z
diff --git a/src/shared/rpc-contract/terminal-viewport-methods-params.ts b/src/shared/rpc-contract/terminal/terminal-viewport-methods-params.ts
similarity index 100%
rename from src/shared/rpc-contract/terminal-viewport-methods-params.ts
rename to src/shared/rpc-contract/terminal/terminal-viewport-methods-params.ts
diff --git a/src/shared/rpc-contract/terminal-viewport-schemas-params.ts b/src/shared/rpc-contract/terminal/terminal-viewport-schemas-params.ts
similarity index 95%
rename from src/shared/rpc-contract/terminal-viewport-schemas-params.ts
rename to src/shared/rpc-contract/terminal/terminal-viewport-schemas-params.ts
index fb9fb27f659..5caa7a98c1b 100644
--- a/src/shared/rpc-contract/terminal-viewport-schemas-params.ts
+++ b/src/shared/rpc-contract/terminal/terminal-viewport-schemas-params.ts
@@ -4,8 +4,8 @@ import {
   TERMINAL_VIEWPORT_MAX_ROWS,
   TERMINAL_VIEWPORT_MIN_COLS,
   TERMINAL_VIEWPORT_MIN_ROWS
-} from '../terminal/viewport/terminal-viewport'
-import { requiredString } from './rpc-param-primitives'
+} from '../../terminal/viewport/terminal-viewport'
+import { requiredString } from '../rpc-param-primitives'
 
 export const TerminalHandle = z.object({ terminal: requiredString('Missing terminal handle') })
 
diff --git a/src/shared/rpc-contract/updater-params.ts b/src/shared/rpc-contract/updater/updater-params.ts
similarity index 100%
rename from src/shared/rpc-contract/updater-params.ts
rename to src/shared/rpc-contract/updater/updater-params.ts
diff --git a/src/shared/rpc-contract/workspace-cleanup-policy-params.ts b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-policy-params.ts
similarity index 95%
rename from src/shared/rpc-contract/workspace-cleanup-policy-params.ts
rename to src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-policy-params.ts
index fe284c495a5..55d35226d5b 100644
--- a/src/shared/rpc-contract/workspace-cleanup-policy-params.ts
+++ b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-policy-params.ts
@@ -4,7 +4,7 @@ import {
   WORKSPACE_CLEANUP_KEEP_WHEN_VALUES,
   WORKSPACE_CLEANUP_POLICY_MAX_DAYS,
   WORKSPACE_CLEANUP_POLICY_MIN_DAYS
-} from '../workspace-cleanup/workspace-cleanup-policy'
+} from '../../workspace-cleanup/workspace-cleanup-policy'
 
 const CleanupDays = z
   .number()
diff --git a/src/shared/rpc-contract/workspace-cleanup-runner-params.ts b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-runner-params.ts
similarity index 100%
rename from src/shared/rpc-contract/workspace-cleanup-runner-params.ts
rename to src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-runner-params.ts
diff --git a/src/shared/rpc-contract/workspace-cleanup-scan-params.ts b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-scan-params.ts
similarity index 83%
rename from src/shared/rpc-contract/workspace-cleanup-scan-params.ts
rename to src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-scan-params.ts
index 0ffc0e728f3..b219f7f4100 100644
--- a/src/shared/rpc-contract/workspace-cleanup-scan-params.ts
+++ b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-scan-params.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod'
-import { WORKSPACE_CLEANUP_TARGET_BATCH_LIMIT } from '../workspace-cleanup/workspace-cleanup'
+import { WORKSPACE_CLEANUP_TARGET_BATCH_LIMIT } from '../../workspace-cleanup/workspace-cleanup'
 
 const WorktreeIdList = (max: number) => z.array(z.string().min(1).max(4096)).max(max).optional()
 
diff --git a/src/shared/rpc-contract/workspace-cleanup-ui-params.ts b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-ui-params.ts
similarity index 92%
rename from src/shared/rpc-contract/workspace-cleanup-ui-params.ts
rename to src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-ui-params.ts
index 3993a5af6ad..d5971bc6f00 100644
--- a/src/shared/rpc-contract/workspace-cleanup-ui-params.ts
+++ b/src/shared/rpc-contract/workspace-cleanup/workspace-cleanup-ui-params.ts
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import {
   normalizeWorkspaceCleanupBrowseState,
   type WorkspaceCleanupBrowseState
-} from '../workspace-cleanup/workspace-cleanup-browse-state'
+} from '../../workspace-cleanup/workspace-cleanup-browse-state'
 
 export const WorkspaceCleanupDismissal = z.object({
   worktreeId: z.string(),
diff --git a/src/shared/rpc-contract/workspace-layout-editor-file-params.test.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.test.ts
similarity index 100%
rename from src/shared/rpc-contract/workspace-layout-editor-file-params.test.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.test.ts
diff --git a/src/shared/rpc-contract/workspace-layout-editor-file-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.ts
similarity index 94%
rename from src/shared/rpc-contract/workspace-layout-editor-file-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.ts
index 2c4d1bc082d..0ef4418c9c4 100644
--- a/src/shared/rpc-contract/workspace-layout-editor-file-params.ts
+++ b/src/shared/rpc-contract/workspace-layout/workspace-layout-editor-file-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import type { EditorTabView } from '../editor-tab-view-types'
+import type { EditorTabView } from '../../editor-tab-view-types'
 
 /** An edit-mode file's restorable record, as the window saves it. */
 export const EditorFileRecord = z.object({
diff --git a/src/shared/rpc-contract/workspace-layout-held-panes-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-held-panes-params.ts
similarity index 100%
rename from src/shared/rpc-contract/workspace-layout-held-panes-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-held-panes-params.ts
diff --git a/src/shared/rpc-contract/workspace-layout-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-params.ts
similarity index 99%
rename from src/shared/rpc-contract/workspace-layout-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-params.ts
index 4250008e6a0..3d63f67090c 100644
--- a/src/shared/rpc-contract/workspace-layout-params.ts
+++ b/src/shared/rpc-contract/workspace-layout/workspace-layout-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { isTerminalLeafId } from '../workspace-layout/stable-pane-id'
+import { isTerminalLeafId } from '../../workspace-layout/stable-pane-id'
 import { SleepCommand, StartPaneCommand, WakeCommand } from './workspace-layout-sleep-wake-params'
 import { RenameTabsCommand } from './workspace-layout-rename-tabs-params'
 import { EditorFileRecord, EditorViewRecord } from './workspace-layout-editor-file-params'
diff --git a/src/shared/rpc-contract/workspace-layout-ratio-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-ratio-params.ts
similarity index 89%
rename from src/shared/rpc-contract/workspace-layout-ratio-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-ratio-params.ts
index 496bf7ed285..3d68e32b66a 100644
--- a/src/shared/rpc-contract/workspace-layout-ratio-params.ts
+++ b/src/shared/rpc-contract/workspace-layout/workspace-layout-ratio-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { TerminalPaneLayoutNodeSchema } from './session-tabs-schemas-params'
-import { TerminalOrphanGroupLayout } from './terminal-orphan-params'
+import { TerminalPaneLayoutNodeSchema } from '../session-tabs/session-tabs-schemas-params'
+import { TerminalOrphanGroupLayout } from '../terminal/terminal-orphan-params'
 
 /** Divider ratios, each the split it moved by path from the root ("first.second"; "" the root). */
 const SplitRatioIntents = z
diff --git a/src/shared/rpc-contract/workspace-layout-rename-tabs-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-rename-tabs-params.ts
similarity index 100%
rename from src/shared/rpc-contract/workspace-layout-rename-tabs-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-rename-tabs-params.ts
diff --git a/src/shared/rpc-contract/workspace-layout-sleep-wake-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-sleep-wake-params.ts
similarity index 90%
rename from src/shared/rpc-contract/workspace-layout-sleep-wake-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-sleep-wake-params.ts
index fb26e0bb9d0..21944bfbaca 100644
--- a/src/shared/rpc-contract/workspace-layout-sleep-wake-params.ts
+++ b/src/shared/rpc-contract/workspace-layout/workspace-layout-sleep-wake-params.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
-import { parsePaneKey } from '../workspace-layout/stable-pane-id'
-import { sleepingAgentSessionRecordSchema } from '../workspace-session/workspace-session-sleeping-agents'
+import { parsePaneKey } from '../../workspace-layout/stable-pane-id'
+import { sleepingAgentSessionRecordSchema } from '../../workspace-session/workspace-session-sleeping-agents'
 
 // copied, not imported: import cycle
 const OnTab = { workspace: z.string().min(1), tabId: z.string().min(1) }
diff --git a/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts b/src/shared/rpc-contract/workspace-layout/workspace-layout-terminal-tab-params.ts
similarity index 86%
rename from src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts
rename to src/shared/rpc-contract/workspace-layout/workspace-layout-terminal-tab-params.ts
index b025170c0d2..1733da32e82 100644
--- a/src/shared/rpc-contract/workspace-layout-terminal-tab-params.ts
+++ b/src/shared/rpc-contract/workspace-layout/workspace-layout-terminal-tab-params.ts
@@ -1,8 +1,8 @@
 import { z } from 'zod'
-import { isTerminalLeafId } from '../workspace-layout/stable-pane-id'
-import { isValidHostTerminalTabId } from '../workspace-layout/terminal-surfaces/terminal-tab-id'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
+import { isTerminalLeafId } from '../../workspace-layout/stable-pane-id'
+import { isValidHostTerminalTabId } from '../../workspace-layout/terminal-surfaces/terminal-tab-id'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
 
 const workspace = z.string().min(1)
 
diff --git a/src/shared/rpc-contract/cross-store-parent-params.ts b/src/shared/rpc-contract/workspaces/cross-store-parent-params.ts
similarity index 73%
rename from src/shared/rpc-contract/cross-store-parent-params.ts
rename to src/shared/rpc-contract/workspaces/cross-store-parent-params.ts
index 9bba668e61c..0977a3a9fba 100644
--- a/src/shared/rpc-contract/cross-store-parent-params.ts
+++ b/src/shared/rpc-contract/workspaces/cross-store-parent-params.ts
@@ -1,6 +1,6 @@
 import * as z from 'zod'
-import { isWorkspaceKey } from '../workspace-scope'
-import type { CrossStoreParentRef } from '../worktree/lineage-types'
+import { isWorkspaceKey } from '../../workspace-scope'
+import type { CrossStoreParentRef } from '../../worktree/lineage-types'
 
 /** A parent in another Orca store, named by that store's verified installationId. */
 export const CrossStoreParentRefSchema: z.ZodType<CrossStoreParentRef> = z.object({
diff --git a/src/shared/rpc-contract/folder-workspace-params.ts b/src/shared/rpc-contract/workspaces/folder-workspace-params.ts
similarity index 85%
rename from src/shared/rpc-contract/folder-workspace-params.ts
rename to src/shared/rpc-contract/workspaces/folder-workspace-params.ts
index af6b9c36b98..b576918a630 100644
--- a/src/shared/rpc-contract/folder-workspace-params.ts
+++ b/src/shared/rpc-contract/workspaces/folder-workspace-params.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
-import { WorkspaceLinkedItemSchema } from '../workspace-attachments/workspace-linked-item-schema'
-import { WorkspaceAttachmentsSchema } from '../workspace-attachments/workspace-attachment-schema'
-import { TaskSourceContextSchema } from '../work-items/task-source-context-schema'
-import { isWorkspaceLinkedItemSourceContextMatch } from '../workspace-attachments/workspace-linked-item-source-context'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { OptionalFiniteNumber, OptionalString, requiredString } from './rpc-param-primitives'
-import { DiffCommentSchema } from '../diff-comment-schema'
+import { WorkspaceLinkedItemSchema } from '../../workspace-attachments/workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../../workspace-attachments/workspace-attachment-schema'
+import { TaskSourceContextSchema } from '../../work-items/task-source-context-schema'
+import { isWorkspaceLinkedItemSourceContextMatch } from '../../workspace-attachments/workspace-linked-item-source-context'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { OptionalFiniteNumber, OptionalString, requiredString } from '../rpc-param-primitives'
+import { DiffCommentSchema } from '../../diff-comment-schema'
 
 export const FolderWorkspaceLinkedTask = WorkspaceLinkedItemSchema.nullable()
 
diff --git a/src/shared/rpc-contract/workspace-ports-params.ts b/src/shared/rpc-contract/workspaces/workspace-ports-params.ts
similarity index 97%
rename from src/shared/rpc-contract/workspace-ports-params.ts
rename to src/shared/rpc-contract/workspaces/workspace-ports-params.ts
index 604962ab6cd..93d83d568ef 100644
--- a/src/shared/rpc-contract/workspace-ports-params.ts
+++ b/src/shared/rpc-contract/workspaces/workspace-ports-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalString, requiredNumber, requiredString } from './rpc-param-primitives'
+import { OptionalString, requiredNumber, requiredString } from '../rpc-param-primitives'
 
 export const WorkspacePortScanParams = z.object({
   repoId: OptionalString
diff --git a/src/shared/rpc-contract/workspace-view-collapse-params.ts b/src/shared/rpc-contract/workspaces/workspace-view-collapse-params.ts
similarity index 100%
rename from src/shared/rpc-contract/workspace-view-collapse-params.ts
rename to src/shared/rpc-contract/workspaces/workspace-view-collapse-params.ts
diff --git a/src/shared/rpc-contract/worktree-create-params.ts b/src/shared/rpc-contract/workspaces/worktree-create-params.ts
similarity index 90%
rename from src/shared/rpc-contract/worktree-create-params.ts
rename to src/shared/rpc-contract/workspaces/worktree-create-params.ts
index b85be2428c6..c4fdf91304d 100644
--- a/src/shared/rpc-contract/worktree-create-params.ts
+++ b/src/shared/rpc-contract/workspaces/worktree-create-params.ts
@@ -1,20 +1,20 @@
 import { z } from 'zod'
-import { WorkspaceAttachmentsSchema } from '../workspace-attachments/workspace-attachment-schema'
-import { WorkspaceLinkedItemSchema } from '../workspace-attachments/workspace-linked-item-schema'
-import { TaskSourceContextSchema } from '../work-items/task-source-context-schema'
-import { workspaceSourceSchema } from '../telemetry-events'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
-import { sleepingAgentLaunchConfigSchema } from '../workspace-session/workspace-session-sleeping-agents'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { AgentArgs, LaunchPreferences } from './agent-session-params'
-import { LaunchSourceParam } from './launch-source-param'
+import { WorkspaceAttachmentsSchema } from '../../workspace-attachments/workspace-attachment-schema'
+import { WorkspaceLinkedItemSchema } from '../../workspace-attachments/workspace-linked-item-schema'
+import { TaskSourceContextSchema } from '../../work-items/task-source-context-schema'
+import { workspaceSourceSchema } from '../../telemetry-property-schemas'
+import { RUNTIME_NAVIGATION_TARGETS } from '../../runtime-navigation'
+import { sleepingAgentLaunchConfigSchema } from '../../workspace-session/workspace-session-sleeping-agents'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import { AgentArgs, LaunchPreferences } from '../terminal/agent-session-params'
+import { LaunchSourceParam } from '../agent-launch/launch-source-param'
 import { CrossStoreParentRefSchema } from './cross-store-parent-params'
 import {
   OptionalBoolean,
   OptionalFiniteNumber,
   OptionalString,
   TriStateLinkedIssue
-} from './rpc-param-primitives'
+} from '../rpc-param-primitives'
 import {
   AutomationWorkspaceProvenanceRequest,
   CliWorkspaceProvenanceRequest,
diff --git a/src/shared/rpc-contract/worktree-params.ts b/src/shared/rpc-contract/workspaces/worktree-params.ts
similarity index 89%
rename from src/shared/rpc-contract/worktree-params.ts
rename to src/shared/rpc-contract/workspaces/worktree-params.ts
index d26f9f3002e..9b1b60915bc 100644
--- a/src/shared/rpc-contract/worktree-params.ts
+++ b/src/shared/rpc-contract/workspaces/worktree-params.ts
@@ -1,21 +1,21 @@
 import * as z from 'zod'
-import { normalizeExecutionHostId } from '../execution-host'
-import { CLIENT_PROVENANCE_SNAPSHOT_MAX } from '../automations/ownership/automation-workspace-provenance'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import type { TuiAgent } from '../agent-launch/catalog/tui-agent'
+import { normalizeExecutionHostId } from '../../execution-host'
+import { CLIENT_PROVENANCE_SNAPSHOT_MAX } from '../../automations/ownership/automation-workspace-provenance'
+import { isTuiAgent } from '../../agent-launch/catalog/tui-agent-config'
+import type { TuiAgent } from '../../agent-launch/catalog/tui-agent'
 import {
   OptionalBoolean,
   OptionalFiniteNumber,
   OptionalPlainString,
   OptionalString,
   TriStateLinkedIssue
-} from './rpc-param-primitives'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
-import { WorkspaceLinkedItemSchema } from '../workspace-attachments/workspace-linked-item-schema'
-import { WorkspaceAttachmentsSchema } from '../workspace-attachments/workspace-attachment-schema'
-import { DiffCommentSchema, MobileDiffReviewSchema } from '../diff-comment-schema'
-import { TaskSourceContextSchema } from '../work-items/task-source-context-schema'
-import { isWorkspaceLinkedItemSourceContextMatch } from '../workspace-attachments/workspace-linked-item-source-context'
+} from '../rpc-param-primitives'
+import { RUNTIME_NAVIGATION_TARGETS } from '../../runtime-navigation'
+import { WorkspaceLinkedItemSchema } from '../../workspace-attachments/workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../../workspace-attachments/workspace-attachment-schema'
+import { DiffCommentSchema, MobileDiffReviewSchema } from '../../diff-comment-schema'
+import { TaskSourceContextSchema } from '../../work-items/task-source-context-schema'
+import { isWorkspaceLinkedItemSourceContextMatch } from '../../workspace-attachments/workspace-linked-item-source-context'
 import { CrossStoreParentRefSchema } from './cross-store-parent-params'
 
 export const OptionalExecutionHostId = z
@@ -248,6 +248,17 @@ export const WorktreeRemove = WorktreeSelector.extend({
   destroyHost: z.literal(true).optional()
 })
 
+/** Archive: delete the checkout, keep the branch and the workspace. Not exposed to users yet. */
+export const WorktreeArchive = WorktreeSelector.extend({
+  hostId: OptionalExecutionHostId
+})
+
+/** Restore an archived workspace; `worktree` is its `id:` selector, since Git no longer lists it. */
+export const WorktreeRestore = WorktreeSelector.extend({
+  hostId: OptionalExecutionHostId,
+  setupDecision: z.enum(['run', 'skip', 'inherit']).optional()
+})
+
 export const WorktreePreviewNestedRemoval = WorktreeSelector.extend({
   hostId: OptionalExecutionHostId
 })
diff --git a/src/shared/rpc-contract/worktree-provisioned-root-params.ts b/src/shared/rpc-contract/workspaces/worktree-provisioned-root-params.ts
similarity index 96%
rename from src/shared/rpc-contract/worktree-provisioned-root-params.ts
rename to src/shared/rpc-contract/workspaces/worktree-provisioned-root-params.ts
index 30a7b91b9f4..33f789827ae 100644
--- a/src/shared/rpc-contract/worktree-provisioned-root-params.ts
+++ b/src/shared/rpc-contract/workspaces/worktree-provisioned-root-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { OptionalString } from './rpc-param-primitives'
+import { OptionalString } from '../rpc-param-primitives'
 import { WorktreeCreate } from './worktree-create-params'
 
 const create = WorktreeCreate.shape
diff --git a/src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts b/src/shared/rpc-contract/workspaces/worktree-review-metadata-compatibility.test.ts
similarity index 52%
rename from src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts
rename to src/shared/rpc-contract/workspaces/worktree-review-metadata-compatibility.test.ts
index 1be2bab7ef8..4dbb98f79fc 100644
--- a/src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts
+++ b/src/shared/rpc-contract/workspaces/worktree-review-metadata-compatibility.test.ts
@@ -12,24 +12,4 @@ describe('optional review metadata wire compatibility', () => {
     expect(parsed.diffComments).toBeUndefined()
     expect(parsed.mobileDiffReview).toBeUndefined()
   })
-
-  it('preserves supported review metadata and explicit empty clears', () => {
-    const diffComments = [
-      {
-        id: 'note',
-        worktreeId: 'wt',
-        filePath: 'app.ts',
-        lineNumber: 1,
-        body: 'Review this',
-        createdAt: 1,
-        side: 'modified'
-      }
-    ]
-    const mobileDiffReview = { version: 1, files: {} }
-    expect(WorktreeSet.parse({ worktree: 'wt', diffComments, mobileDiffReview })).toMatchObject({
-      diffComments,
-      mobileDiffReview
-    })
-    expect(WorktreeSet.parse({ worktree: 'wt', diffComments: [] }).diffComments).toEqual([])
-  })
 })
diff --git a/src/shared/rpc-contract/worktree-visibility-defaults-params.ts b/src/shared/rpc-contract/workspaces/worktree-visibility-defaults-params.ts
similarity index 92%
rename from src/shared/rpc-contract/worktree-visibility-defaults-params.ts
rename to src/shared/rpc-contract/workspaces/worktree-visibility-defaults-params.ts
index c03199d78db..a0ab3bb511e 100644
--- a/src/shared/rpc-contract/worktree-visibility-defaults-params.ts
+++ b/src/shared/rpc-contract/workspaces/worktree-visibility-defaults-params.ts
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import {
   normalizeCustomWorktreeVisibilitySources,
   normalizeWorktreeVisibilitySourcePreferences
-} from '../worktree/visibility-sources'
+} from '../../worktree/visibility-sources'
 
 export const WorktreeVisibilityDefaultsUpdate = z
   .object({
diff --git a/src/shared/rpc-contract/worktree-create-params.pre-observation.test-fixture.ts b/src/shared/rpc-contract/worktree-create-params.pre-observation.test-fixture.ts
deleted file mode 100644
index 7531a1f66e6..00000000000
--- a/src/shared/rpc-contract/worktree-create-params.pre-observation.test-fixture.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-// Frozen schema from 3bfcda1bf043af8d83371b2f131a65f2056f7970; original SHA256 cf787898b4d3bfe154c97637c71e2d47b6032cefd7e90956c14f2a72a968fe4d.
-import { z } from 'zod'
-import { WorkspaceAttachmentsSchema } from '../workspace-attachments/workspace-attachment-schema'
-import { WorkspaceLinkedItemSchema } from '../workspace-attachments/workspace-linked-item-schema'
-import { TaskSourceContextSchema } from '../work-items/task-source-context-schema'
-import { workspaceSourceSchema } from '../telemetry-events'
-import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
-import { sleepingAgentLaunchConfigSchema } from '../workspace-session/workspace-session-sleeping-agents'
-import { isTuiAgent } from '../agent-launch/catalog/tui-agent-config'
-import { LaunchSourceParam } from './launch-source-param'
-import {
-  OptionalBoolean,
-  OptionalFiniteNumber,
-  OptionalString,
-  TriStateLinkedIssue
-} from './rpc-param-primitives'
-import {
-  AutomationWorkspaceProvenanceRequest,
-  CliWorkspaceProvenanceRequest,
-  OptionalExecutionHostId,
-  OptionalTuiAgent,
-  assertLinkedWorkItemSourceContextMatch
-} from './worktree-params'
-
-export const WorktreeCreate = z
-  .object({
-    repo: z
-      .unknown()
-      .transform((v) => (typeof v === 'string' ? v : ''))
-      .pipe(z.string().min(1, 'Missing repo selector')),
-    /** Scope same-ID repo copies by host; absent retains legacy selector lookup, which refuses ambiguous IDs. */
-    repoHostId: OptionalExecutionHostId,
-    name: OptionalString,
-    /** Generated names may skip/retire candidates; absent means user-typed and bypasses that policy. */
-    nameWasGenerated: z.boolean().optional(),
-    baseBranch: OptionalString,
-    compareBaseRef: OptionalString,
-    branchNameOverride: OptionalString,
-    branchIntent: z.enum(['open-existing', 'open-existing-v2', 'create-new']).optional(),
-    linkedIssue: TriStateLinkedIssue,
-    linkedPR: TriStateLinkedIssue,
-    linkedLinearIssue: z.string().optional(),
-    linkedLinearIssueWorkspaceId: z.union([z.string(), z.null()]).optional(),
-    linkedLinearIssueOrganizationUrlKey: z.union([z.string(), z.null()]).optional(),
-    linkedGitLabMR: TriStateLinkedIssue,
-    linkedGitLabIssue: TriStateLinkedIssue,
-    linkedBitbucketPR: TriStateLinkedIssue,
-    linkedAzureDevOpsPR: TriStateLinkedIssue,
-    linkedGiteaPR: TriStateLinkedIssue,
-    linkedWorkItem: WorkspaceLinkedItemSchema.nullable().optional(),
-    linkedItems: WorkspaceAttachmentsSchema.optional(),
-    linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
-    comment: OptionalString,
-    displayName: OptionalString,
-    displayNameKind: z.enum(['generated', 'user']).optional(),
-    telemetrySource: z
-      .unknown()
-      .transform((value) => {
-        const parsed = workspaceSourceSchema.safeParse(value)
-        return parsed.success ? parsed.data : undefined
-      })
-      .optional(),
-    workspaceStatus: OptionalString,
-    manualOrder: OptionalFiniteNumber,
-    // Why: the client's "Nest Workspaces" choice; absent (older clients) keeps the host's own setting.
-    nestWorkspaces: z.boolean().optional(),
-    // Why: the client's Keep Local Main Up to Date choice; absent (older clients) keeps the host's.
-    refreshLocalBaseRefOnWorktreeCreate: z.boolean().optional(),
-    localBaseRefSuggestionDismissed: z.boolean().optional(),
-    sparseCheckout: z
-      .object({
-        directories: z.array(z.string()),
-        presetId: OptionalString
-      })
-      .optional(),
-    pushTarget: z
-      .object({
-        remoteName: z.string(),
-        branchName: z.string(),
-        remoteUrl: OptionalString
-      })
-      .optional(),
-    runHooks: OptionalBoolean,
-    activate: OptionalBoolean,
-    // Paired desktop/web defaults to caller navigation with no activation event; reveal from the result’s setup/startup/defaultTabs.
-    // Explicit targets opt into all-surface reveal.
-    navigation: z.enum(RUNTIME_NAVIGATION_TARGETS).optional(),
-    parentWorkspace: OptionalString,
-    // App-selected parents are manual; absent retains older clients’ CLI provenance.
-    parentWorkspaceOrigin: z.literal('manual').optional(),
-    envParentWorkspace: OptionalString,
-    parentWorktree: OptionalString,
-    cwdParentWorktree: OptionalString,
-    noParent: OptionalBoolean,
-    callerTerminalHandle: OptionalString,
-    orchestrationContext: z
-      .object({
-        parentWorktreeId: OptionalString,
-        orchestrationRunId: OptionalString,
-        taskId: OptionalString,
-        coordinatorHandle: OptionalString
-      })
-      .optional(),
-    setupOnly: z.boolean().optional(),
-    setupDecision: z
-      .unknown()
-      .transform((v) =>
-        typeof v === 'string' && (v === 'run' || v === 'skip' || v === 'inherit') ? v : undefined
-      )
-      .pipe(z.union([z.enum(['run', 'skip', 'inherit']), z.undefined()]))
-      .optional(),
-    // Desktop can prequote startup commands; clients unable to quote for the host send startupAgent.
-    startupCommand: OptionalString,
-    startupEnv: z.record(z.string(), z.string()).optional(),
-    startupLaunchConfig: sleepingAgentLaunchConfigSchema,
-    startupCommandDelivery: z.enum(['fast', 'shell-ready']).optional(),
-    // Quote agent launches on the execution host because SSH shells can differ from the client’s.
-    startupAgent: OptionalTuiAgent,
-    startupPrompt: OptionalString,
-    // Which surface asked for the agent the host launches from `startupAgent` or `startupDraft`.
-    launchSource: LaunchSourceParam.optional(),
-    // Task-driven mobile creation uses desktop-equivalent host defaults and linked issue/PR draft URLs.
-    startupDraft: OptionalString,
-    createdWithAgent: z
-      .unknown()
-      .transform((value) => (isTuiAgent(value) ? value : undefined))
-      .optional(),
-    // Reuse the mutation key after connection migration so retries cannot create duplicate worktrees.
-    clientMutationId: z.string().min(1).max(128).optional(),
-    /** The requesting window's pending creation, so the host's in-progress entry shares its id. */
-    creationId: z.string().min(1).max(128).optional(),
-    automationProvenanceRequest: AutomationWorkspaceProvenanceRequest.optional(),
-    cliProvenanceRequest: CliWorkspaceProvenanceRequest.optional()
-  })
-  .superRefine((params, ctx) => {
-    assertLinkedWorkItemSourceContextMatch(params, ctx)
-    if ((params.parentWorkspace || params.parentWorktree) && params.noParent === true) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Choose either one parent selector or --no-parent.'
-      })
-    }
-    if (params.parentWorkspace && params.parentWorktree) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Choose either one parent selector or --no-parent.'
-      })
-    }
-    if (params.startupPrompt !== undefined && params.startupAgent === undefined) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'startupPrompt requires startupAgent'
-      })
-    }
-  })
-
-export const WorktreePrefetchCreateBase = z.object({
-  repo: z
-    .unknown()
-    .transform((v) => (typeof v === 'string' ? v : ''))
-    .pipe(z.string().min(1, 'Missing repo selector')),
-  baseBranch: OptionalString
-})
diff --git a/src/shared/structured-conversation-command-hold.ts b/src/shared/structured-conversation-command-hold.ts
index f49d457a3bb..92863bf945f 100644
--- a/src/shared/structured-conversation-command-hold.ts
+++ b/src/shared/structured-conversation-command-hold.ts
@@ -27,15 +27,19 @@ export type StructuredConversationCommandHold =
 
 /** Queued commands wait only for earlier unaccepted sends; ordinary commands wait for all in-flight agent work. */
 export function structuredConversationCommandHold(input: {
+  command: AgentSessionConversationCommand
   /** A /compact the host can hold as a card behind the turn or prompt. */
   waitsInLine: boolean
   /** A turn runs, or the chat shows the agent working on a message it has not answered. */
   agentWorking: boolean
   promptPending: boolean
+  /** Holds /clear only; the host knows whether the agent can compact beside them. */
   backgroundTasksRunning: boolean
+  /** A rewind on its way holds any command, in background work's words. */
+  rewindInFlight?: boolean
   sendPending: boolean
 }): StructuredConversationCommandHold | null {
-  if (input.backgroundTasksRunning) {
+  if (input.rewindInFlight || (input.backgroundTasksRunning && input.command === 'clear')) {
     return 'background'
   }
   if (input.waitsInLine) {
diff --git a/src/shared/telemetry-events-feature-education.spec.ts b/src/shared/telemetry-events-feature-education.spec.ts
deleted file mode 100644
index c8def20c9d5..00000000000
--- a/src/shared/telemetry-events-feature-education.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { eventSchemas } from './telemetry-events'
-
-describe('feature education telemetry event schemas', () => {
-  it('accepts contextual tour outcome payloads with bounded step counts', () => {
-    const parsed = eventSchemas.contextual_tour_outcome.safeParse({
-      tour_id: 'tasks',
-      source: 'tasks_open',
-      outcome: 'completed',
-      steps_seen: 2,
-      total_steps: 3
-    })
-
-    expect(parsed.success).toBe(true)
-  })
-
-  it('rejects contextual tour outcome payloads with impossible progress', () => {
-    const parsed = eventSchemas.contextual_tour_outcome.safeParse({
-      tour_id: 'tasks',
-      source: 'tasks_open',
-      outcome: 'completed',
-      steps_seen: 4,
-      total_steps: 3
-    })
-
-    expect(parsed.success).toBe(false)
-  })
-
-  it('rejects raw contextual tour sources', () => {
-    const parsed = eventSchemas.contextual_tour_shown.safeParse({
-      tour_id: 'browser',
-      source: 'http://localhost:3000/private',
-      was_feature_previously_interacted: false
-    })
-
-    expect(parsed.success).toBe(false)
-  })
-})
diff --git a/src/shared/telemetry-feature-wall-events.spec.ts b/src/shared/telemetry-feature-wall-events.spec.ts
deleted file mode 100644
index 9935070b4af..00000000000
--- a/src/shared/telemetry-feature-wall-events.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { eventSchemas } from './telemetry-events'
-
-describe('feature wall schemas', () => {
-  it('rejects invalid close depth fields', () => {
-    expect(
-      eventSchemas.feature_wall_closed.safeParse({
-        dwell_ms: 1200,
-        source: 'help_menu',
-        exit_action: 'left',
-        furthest_step: 'review_raw_url'
-      }).success
-    ).toBe(false)
-    expect(
-      eventSchemas.feature_wall_closed.safeParse({
-        dwell_ms: 1200,
-        visited_workflow_count: 6
-      }).success
-    ).toBe(false)
-    expect(
-      eventSchemas.feature_wall_closed.safeParse({
-        dwell_ms: 1200,
-        repo_path: '/Users/alice/project'
-      }).success
-    ).toBe(false)
-  })
-})
diff --git a/src/shared/telemetry-orca-cli-feature-tip.spec.ts b/src/shared/telemetry-orca-cli-feature-tip.spec.ts
deleted file mode 100644
index 51cb5bed010..00000000000
--- a/src/shared/telemetry-orca-cli-feature-tip.spec.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { eventSchemas } from './telemetry-events'
-
-describe('orca cli feature tip schemas', () => {
-  it('rejects raw CLI details and unknown result values', () => {
-    expect(
-      eventSchemas.orca_cli_feature_tip_setup_result.safeParse({
-        source: 'app_open',
-        result: 'installed',
-        command_path: '/Users/alice/bin/orca'
-      }).success
-    ).toBe(false)
-    expect(
-      eventSchemas.orca_cli_feature_tip_setup_result.safeParse({
-        source: 'app_open',
-        result: 'installed_after_retry'
-      }).success
-    ).toBe(false)
-  })
-})
diff --git a/src/shared/telemetry-payload-contracts.test.ts b/src/shared/telemetry-payload-contracts.test.ts
deleted file mode 100644
index 9a4cf8ea3e8..00000000000
--- a/src/shared/telemetry-payload-contracts.test.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import './telemetry-orca-cli-feature-tip.spec'
-import './telemetry-events-feature-education.spec'
-import './telemetry-feature-wall-events.spec'
-import './profile-state-telemetry-schema.spec'
diff --git a/src/shared/terminal/pty/lifecycle/terminal-attachment-launch-result.ts b/src/shared/terminal/pty/lifecycle/terminal-attachment-launch-result.ts
index ed9d317dc66..07e2cac28c2 100644
--- a/src/shared/terminal/pty/lifecycle/terminal-attachment-launch-result.ts
+++ b/src/shared/terminal/pty/lifecycle/terminal-attachment-launch-result.ts
@@ -5,7 +5,7 @@ import type {
 } from '../../../agent-session/lifecycle/agent-session-resume'
 import { isTuiAgent } from '../../../agent-launch/catalog/tui-agent-config'
 import type { TuiAgent } from '../../../agent-launch/catalog/tui-agent'
-import { ResumeProviderSessionParam } from '../../../rpc-contract/terminal-unary-params'
+import { ResumeProviderSessionParam } from '../../../rpc-contract/terminal/terminal-unary-params'
 import { sleepingAgentLaunchConfigBaseSchema } from '../../../workspace-session/workspace-session-sleeping-agents'
 
 /** A launch recipe for a pane the window was not shown; the reveal otherwise carries it. */
diff --git a/src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit.ts b/src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit.ts
index 1b0378f9b70..d65c43d5378 100644
--- a/src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit.ts
+++ b/src/shared/terminal/quick-commands/terminal-quick-command-prompt-limit.ts
@@ -1,5 +1,5 @@
 import { getTerminalInputByteLength } from '../input/terminal-input'
-import { structuredAgentSessionBlocksByteLength } from '../../rpc-contract/structured-agent-session-message-params'
+import { structuredAgentSessionBlocksByteLength } from '../../rpc-contract/structured-agent-session/structured-agent-session-message-params'
 import { TERMINAL_QUICK_COMMAND_LONG_PROMPTS_RUNTIME_CAPABILITY } from './terminal-quick-command-capabilities'
 import type {
   TerminalQuickCommand,
diff --git a/src/shared/workspace-attachments/workspace-attachments.test.ts b/src/shared/workspace-attachments/workspace-attachments.test.ts
index 807dcd5ae94..91e8968f49d 100644
--- a/src/shared/workspace-attachments/workspace-attachments.test.ts
+++ b/src/shared/workspace-attachments/workspace-attachments.test.ts
@@ -4,12 +4,8 @@ import {
   getWorkspaceAttachments,
   normalizeWorkspaceAttachmentUpdate
 } from './workspace-attachments'
-import {
-  getWorkspaceAttachmentKey,
-  normalizeWorkspaceAttachments
-} from './workspace-attachment-normalization'
-import { WorktreeSet } from '../rpc-contract/worktree-params'
-import { FolderWorkspaceUpdate } from '../rpc-contract/folder-workspace-params'
+import { normalizeWorkspaceAttachments } from './workspace-attachment-normalization'
+
 import { CLEARED_HOSTED_REVIEW_SELECTION_UPDATES } from '../worktree/hosted-review-links'
 
 const pr = (number: number): WorkspaceAttachment => ({ provider: 'github', type: 'pr', number })
@@ -73,7 +69,7 @@ describe('workspace attachments', () => {
         two
       ])
     ).toEqual([one, two])
-    expect(getWorkspaceAttachmentKey(one)).not.toBe(getWorkspaceAttachmentKey(two))
+
     expect(normalizeWorkspaceAttachments([pr(7), one])).toEqual([one])
   })
 
@@ -94,32 +90,6 @@ describe('workspace attachments', () => {
     expect(getWorkspaceAttachments({ ...existing, ...genericRemoved })).toEqual([])
   })
 
-  it('accepts optional collections on RPC contracts and rejects invalid collection writes', () => {
-    expect(WorktreeSet.parse({ worktree: 'wt' }).linkedItems).toBeUndefined()
-    expect(
-      WorktreeSet.parse({ worktree: 'wt', linkedItems: [pr(7), pr(8)] }).linkedItems
-    ).toHaveLength(2)
-    expect(
-      WorktreeSet.safeParse({
-        worktree: 'wt',
-        linkedItems: [{ provider: 'github', type: 'pr', number: -2 }]
-      }).success
-    ).toBe(false)
-    expect(
-      WorktreeSet.safeParse({
-        worktree: 'wt',
-        linkedItems: [
-          { ...pr(7), taskSourceContext: { provider: 'jira', projectId: 'wrong', hostId: 'local' } }
-        ]
-      }).success
-    ).toBe(false)
-    expect(
-      FolderWorkspaceUpdate.parse({
-        folderWorkspaceId: 'folder',
-        updates: { linkedItems: [pr(7)] }
-      }).updates.linkedItems
-    ).toEqual([pr(7)])
-  })
   it('selects a legacy review exclusively without losing other provider references', () => {
     const mr: WorkspaceAttachment = { provider: 'gitlab', type: 'mr', number: 20 }
     const updated = normalizeWorkspaceAttachmentUpdate(
@@ -172,15 +142,6 @@ describe('workspace attachments', () => {
     )
     expect(result.linkedItems).toEqual([pr(3), pr(4)])
     expect(result).not.toHaveProperty('linkedItemsBase')
-    expect(
-      WorktreeSet.parse({ worktree: 'wt', linkedItems: [pr(4)], linkedItemsBase: [pr(1)] })
-    ).toHaveProperty('linkedItemsBase', [pr(1)])
-    expect(
-      FolderWorkspaceUpdate.parse({
-        folderWorkspaceId: 'f',
-        updates: { linkedItems: [pr(4)], linkedItemsBase: [pr(1)] }
-      }).updates
-    ).toHaveProperty('linkedItemsBase', [pr(1)])
   })
 
   it('merges concurrent origin edits including explicit removal', () => {
diff --git a/src/shared/workspace-disk-space/workspace-space-entry-traversal.test.ts b/src/shared/workspace-disk-space/workspace-space-entry-traversal.test.ts
index 2e81ae91584..f2eb7b823f8 100644
--- a/src/shared/workspace-disk-space/workspace-space-entry-traversal.test.ts
+++ b/src/shared/workspace-disk-space/workspace-space-entry-traversal.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import { scanWorkspaceSpaceEntryTree } from './workspace-space-entry-traversal'
-import { WorkspaceSpaceScanCapacityError } from './workspace-space-scan-budget'
 
 type Entry = { name: string }
 
@@ -85,29 +84,6 @@ describe('scanWorkspaceSpaceEntryTree', () => {
     expect(result.sizeBytes).toBe(3)
   })
 
-  it('aggregates a deep chain exactly at the entry cap without recursive unwinding', async () => {
-    const depth = 256
-    const directories = new Map<string, readonly Entry[]>()
-    let path = '/root'
-    for (let index = 0; index < depth; index += 1) {
-      const name = `directory-${index}`
-      directories.set(path, [{ name }])
-      path = `${path}/${name}`
-    }
-    directories.set(path, [])
-
-    const result = await makeTraversal(
-      directories,
-      async () => ({ kind: 'directory', sizeBytes: 1 }),
-      { maxEntries: depth }
-    )
-
-    expect(result.sizeBytes).toBe(depth + 1)
-    expect(result.children).toEqual([
-      expect.objectContaining({ name: 'directory-0', sizeBytes: depth })
-    ])
-  })
-
   it('scans a chain far longer than the cap because listings are released', async () => {
     const depth = 50
     const directories = new Map<string, readonly Entry[]>()
@@ -127,100 +103,4 @@ describe('scanWorkspaceSpaceEntryTree', () => {
 
     expect(result.sizeBytes).toBe(depth + 1)
   })
-
-  // Per-worker entry caps make capacity depend on concurrency (docs/workspace-space-scan-resource-bounds.md).
-  describe('capacity depends on directory shape, not tree size or concurrency', () => {
-    function buildWideTree(dirCount: number, filesPerDir: number) {
-      const directories = new Map<string, readonly Entry[]>()
-      directories.set(
-        '/root',
-        Array.from({ length: dirCount }, (_, index) => ({ name: `dir-${index}` }))
-      )
-      for (let index = 0; index < dirCount; index += 1) {
-        directories.set(
-          `/root/dir-${index}`,
-          Array.from({ length: filesPerDir }, (_, file) => ({ name: `file-${file}` }))
-        )
-      }
-      return directories
-    }
-
-    function scanWideTree(dirCount: number, filesPerDir: number, concurrency: number) {
-      const directories = buildWideTree(dirCount, filesPerDir)
-      return makeTraversal(
-        directories,
-        async (path) => ({
-          kind: directories.has(path) ? 'directory' : 'file',
-          sizeBytes: 1
-        }),
-        { maxEntries: 100_000, maxRetainedBytes: Number.MAX_SAFE_INTEGER },
-        concurrency
-      )
-    }
-
-    it('still rejects a single directory above the cap', async () => {
-      await expect(scanWideTree(1, 100_001, 48)).rejects.toBeInstanceOf(
-        WorkspaceSpaceScanCapacityError
-      )
-    }, 30_000)
-  })
-
-  // Unlike the tests above, these exercise the production byte cap across checkout depths.
-  describe('capacity at the production default limits', () => {
-    // The regression appeared for checkout paths longer than about 58 characters.
-    const DEEP_ROOT = '/Users/octocat/projects/orca/.claude/worktrees/wf_d39acf3c-e7d-2'
-
-    function scanAtDefaults(
-      rootPath: string,
-      dirCount: number,
-      filesPerDir: number,
-      concurrency: number
-    ) {
-      const directories = new Map<string, readonly Entry[]>()
-      directories.set(
-        rootPath,
-        Array.from({ length: dirCount }, (_, index) => ({ name: `dir-${index}` }))
-      )
-      for (let index = 0; index < dirCount; index += 1) {
-        directories.set(
-          `${rootPath}/dir-${index}`,
-          Array.from({ length: filesPerDir }, (_, file) => ({ name: `file-${file}.ts` }))
-        )
-      }
-      return scanWorkspaceSpaceEntryTree({
-        rootPath,
-        rootName: 'root',
-        concurrency,
-        entryName: (entry: Entry) => entry.name,
-        joinPath: (parent, child) => `${parent}/${child}`,
-        classifyEntry: async (path) => ({
-          kind: directories.has(path) ? ('directory' as const) : ('file' as const),
-          sizeBytes: 1
-        }),
-        readDirectory: async (path) => {
-          const entries = directories.get(path)
-          if (!entries) {
-            throw new Error(`unreadable ${path}`)
-          }
-          return entries
-        },
-        checkCancelled: () => undefined,
-        createCancellationError: () => new Error('cancelled'),
-        isCancellationError: (error) => error instanceof Error && error.message === 'cancelled'
-      })
-    }
-
-    it.each([
-      { dirCount: 48, filesPerDir: 2_100, concurrency: 48 },
-      { dirCount: 10, filesPerDir: 10_001, concurrency: 10 },
-      { dirCount: 40, filesPerDir: 2_500, concurrency: 48 }
-    ])(
-      'scans $dirCount x $filesPerDir at concurrency $concurrency under a deep root',
-      async ({ dirCount, filesPerDir, concurrency }) => {
-        const result = await scanAtDefaults(DEEP_ROOT, dirCount, filesPerDir, concurrency)
-        expect(result.sizeBytes).toBe(dirCount * filesPerDir + dirCount + 1)
-      },
-      30_000
-    )
-  })
 })
diff --git a/src/shared/workspace-disk-space/workspace-space-scan-budget.test.ts b/src/shared/workspace-disk-space/workspace-space-scan-budget.test.ts
index 8cb82b8d327..5651c3366bd 100644
--- a/src/shared/workspace-disk-space/workspace-space-scan-budget.test.ts
+++ b/src/shared/workspace-disk-space/workspace-space-scan-budget.test.ts
@@ -2,9 +2,6 @@ import { describe, expect, it } from 'vitest'
 import {
   collectWorkspaceSpaceDirectoryEntries,
   createWorkspaceSpaceScanBudget,
-  estimateWorkspaceSpaceEntryRetainedBytes,
-  estimateWorkspaceSpaceListingRetainedBytes,
-  releaseWorkspaceSpaceScanEntries,
   WorkspaceSpaceScanCapacityError
 } from './workspace-space-scan-budget'
 
@@ -28,36 +25,6 @@ describe('workspace space scan budget', () => {
     expect(budget).toMatchObject({ retainedBytes: 0 })
   })
 
-  it('frees capacity for later directories once a listing is released', async () => {
-    const parentPath = '/workspace'
-    const entries = [{ name: 'first' }, { name: 'second' }]
-    const exactBytes = entries.reduce(
-      (total, entry) => total + estimateWorkspaceSpaceEntryRetainedBytes(entry.name),
-      estimateWorkspaceSpaceListingRetainedBytes(parentPath)
-    )
-    const budget = createWorkspaceSpaceScanBudget({ maxRetainedBytes: exactBytes })
-
-    const first = await collectWorkspaceSpaceDirectoryEntries(
-      entries,
-      parentPath,
-      (entry) => entry.name,
-      budget,
-      () => undefined
-    )
-    // Why: a cumulative counter would reject the identical second listing here.
-    releaseWorkspaceSpaceScanEntries(budget, first.retainedBytes)
-
-    await expect(
-      collectWorkspaceSpaceDirectoryEntries(
-        entries,
-        parentPath,
-        (entry) => entry.name,
-        budget,
-        () => undefined
-      )
-    ).resolves.toMatchObject({ retainedBytes: exactBytes })
-  })
-
   it('closes an async directory iterator when the next entry exceeds the budget', async () => {
     let closed = false
     async function* directory() {
diff --git a/src/shared/workspace-layout/old-client/old-client-method-translation.test.ts b/src/shared/workspace-layout/old-client/old-client-method-translation.test.ts
index 3a7c4cdeee3..33ae07992a7 100644
--- a/src/shared/workspace-layout/old-client/old-client-method-translation.test.ts
+++ b/src/shared/workspace-layout/old-client/old-client-method-translation.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { MoveTab } from '../../rpc-contract/session-tabs-schemas-params'
-import { TerminalCreateParams } from '../../rpc-contract/terminal-unary-params'
+import { MoveTab } from '../../rpc-contract/session-tabs/session-tabs-schemas-params'
+import { TerminalCreateParams } from '../../rpc-contract/terminal/terminal-unary-params'
 import { translateSessionTabMove, translateTerminalCreate } from './old-client-method-translation'
 import './old-client-pane-layout-translation'
 import './old-client-session-row-ids'
diff --git a/src/shared/workspace-layout/old-client/old-client-pane-layout-translation.test.ts b/src/shared/workspace-layout/old-client/old-client-pane-layout-translation.test.ts
index 9c393715155..01386cb6d4c 100644
--- a/src/shared/workspace-layout/old-client/old-client-pane-layout-translation.test.ts
+++ b/src/shared/workspace-layout/old-client/old-client-pane-layout-translation.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { UpdatePaneLayout } from '../../rpc-contract/session-tabs-schemas-params'
+import { UpdatePaneLayout } from '../../rpc-contract/session-tabs/session-tabs-schemas-params'
 import type { TerminalPaneLayoutNode } from '../terminal-tab-types'
 import { translateUpdatePaneLayout } from './old-client-pane-layout-translation'
 import {
diff --git a/src/shared/worktree/meta-types.ts b/src/shared/worktree/meta-types.ts
index e6923e51648..d75ba955cc8 100644
--- a/src/shared/worktree/meta-types.ts
+++ b/src/shared/worktree/meta-types.ts
@@ -16,6 +16,13 @@ import type { DiffComment, MobileDiffReviewState } from '../diff-comment-types'
 import type { SmartTier } from '../sidebar-list/sort-stamps'
 import type { ExternalConversationLink } from '../external-conversation-link'
 
+export type ArchivedCheckout = {
+  branch: string
+  archivedAt: number
+  /** isArchived before the archive, so a refused archive puts it back. */
+  wasArchived?: boolean
+}
+
 export type WorktreeMeta = {
   /** Immutable per-workspace-instance ID used to reject stale lineage after path reuse. */
   instanceId?: string
@@ -54,6 +61,8 @@ export type WorktreeMeta = {
   linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   isArchived: boolean
+  /** Set while archived with the checkout removed from disk; restore recreates it from this branch. */
+  archivedCheckout?: ArchivedCheckout
   isUnread: boolean
   isPinned: boolean
   sortOrder: number
diff --git a/src/wsl-guest/agent-hooks/results/agent-hook-result-retry-scheduler.ts b/src/wsl-guest/agent-hooks/results/agent-hook-result-retry-scheduler.ts
index fd52f7bdf72..0f1b5743d2b 100644
--- a/src/wsl-guest/agent-hooks/results/agent-hook-result-retry-scheduler.ts
+++ b/src/wsl-guest/agent-hooks/results/agent-hook-result-retry-scheduler.ts
@@ -1,5 +1,5 @@
-import { ClaudeHelperKillPoller } from '../../../shared/agent-hook-listener/providers/claude-helper-kill-poller'
-import { pollCodexTranscriptStatus } from '../../../shared/agent-hook-listener/providers/codex-transcript-poll'
+import { ClaudeHelperKillPoller } from '../../../shared/agent-hook-listener/providers/claude/transcripts/claude-helper-kill-poller'
+import { pollCodexTranscriptStatus } from '../../../shared/agent-hook-listener/providers/codex/codex-transcript-poll'
 // Retry late transcript results against the same cached event; one owner cancels both timer families before cache teardown.
 import {
   hasPendingAgentResultText,
@@ -19,7 +19,7 @@ import {
   transcriptPollUpdate
 } from '../../../shared/agent-hook-listener/transcript-poll-policy'
 import { AgentTranscriptPollScheduler } from '../../../shared/agent-hook-listener/transcripts/agent-transcript-poll-scheduler'
-import { ClaudeOwedNotificationExpiryTimers } from '../../../shared/agent-hook-listener/providers/claude-owed-notification-expiry-timers'
+import { ClaudeOwedNotificationExpiryTimers } from '../../../shared/agent-hook-listener/providers/claude/background-tasks/claude-owed-notification-expiry-timers'
 
 const ASSISTANT_MESSAGE_RETRY_ATTEMPTS = 5
 const ASSISTANT_MESSAGE_RETRY_MS = 50
diff --git a/src/wsl-guest/agent-hooks/results/agent-hook-server-claude-owed-notification-expiry.test.ts b/src/wsl-guest/agent-hooks/results/agent-hook-server-claude-owed-notification-expiry.test.ts
deleted file mode 100644
index da65dec02e0..00000000000
--- a/src/wsl-guest/agent-hooks/results/agent-hook-server-claude-owed-notification-expiry.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// The relay owns remote Claude records and must restate status when an owed task notification never arrives.
-import { mkdtempSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentHookRelayEnvelope } from '../../../shared/agent-hook-listener/transport/agent-hook-relay'
-import { CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS } from '../../../shared/agent-hook-listener/providers/claude-owed-task-notifications'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { RelayAgentHookServer } from '../server/agent-hook-server'
-
-const PANE_KEY = makePaneKey('tab-1', '11111111-1111-4111-8111-111111111111')
-const SHELL = { id: 'b1', type: 'shell', status: 'running' }
-
-describe('Claude owed task notification expiry on the relay', () => {
-  let dir: string
-  beforeEach(() => {
-    dir = mkdtempSync(join(tmpdir(), 'relay-hook-expiry-'))
-    // Why shouldAdvanceTime: the hooks are real loopback POSTs, which need the clock to move.
-    vi.useFakeTimers({
-      shouldAdvanceTime: true,
-      toFake: ['setTimeout', 'clearTimeout', 'Date', 'performance']
-    })
-  })
-  afterEach(() => {
-    vi.useRealTimers()
-    rmSync(dir, { recursive: true, force: true })
-  })
-
-  it.each(['Stop', 'Escape'])(
-    'forwards the settled row after %s when a launched shell vanished without a notification',
-    async (ending) => {
-      const forward = vi.fn<(envelope: AgentHookRelayEnvelope) => void>()
-      const server = new RelayAgentHookServer({ endpointDir: dir, forward })
-      await server.start()
-      const { port, token } = server.getCoordinates()
-      const post = (payload: Record<string, unknown>) =>
-        fetch(`http://127.0.0.1:${port}/hook/claude`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json', 'X-Orca-Agent-Hook-Token': token },
-          body: JSON.stringify({
-            paneKey: PANE_KEY,
-            tabId: 'tab-1',
-            worktreeId: 'wt-1',
-            payload: { session_id: 'session-1', ...payload }
-          })
-        })
-      try {
-        await post({ hook_event_name: 'UserPromptSubmit', prompt: 'start the dev server' })
-        await post({
-          hook_event_name: 'PostToolUse',
-          tool_name: 'Bash',
-          tool_response: { backgroundTaskId: SHELL.id }
-        })
-        await post({ hook_event_name: 'Stop', background_tasks: [SHELL] })
-        if (ending === 'Escape') {
-          await post({ hook_event_name: 'Stop', background_tasks: [] })
-        }
-        await post({ hook_event_name: 'UserPromptSubmit', prompt: 'thanks' })
-        if (ending === 'Stop') {
-          await post({ hook_event_name: 'Stop', background_tasks: [] })
-        } else {
-          server.claudeTerminalInterrupts.observe(PANE_KEY, { kind: 'title', title: '◐ Thanks' })
-          server.claudeTerminalInterrupts.observe(PANE_KEY, { kind: 'input', data: '\x1b[27u' })
-          server.claudeTerminalInterrupts.observe(PANE_KEY, { kind: 'title', title: '✳ Thanks' })
-          expect(forward.mock.lastCall?.[0].payload).toMatchObject({
-            mainAgent: { state: 'done', outcome: 'cancellation' },
-            claudeTaskWakeupPending: 'notification'
-          })
-        }
-        expect(forward.mock.lastCall?.[0].payload.state).toBe('working')
-
-        vi.advanceTimersByTime(CLAUDE_OWED_TASK_NOTIFICATION_LEASE_MS)
-
-        expect(forward.mock.lastCall?.[0]).toMatchObject({
-          paneKey: PANE_KEY,
-          claudeRunningNonAgentTask: false,
-          payload: { state: 'done' }
-        })
-      } finally {
-        server.stop()
-      }
-    }
-  )
-})
diff --git a/src/wsl-guest/agent-hooks/status/agent-hook-event-admission.ts b/src/wsl-guest/agent-hooks/status/agent-hook-event-admission.ts
index 984efd78cbd..8db4f3f9b2a 100644
--- a/src/wsl-guest/agent-hooks/status/agent-hook-event-admission.ts
+++ b/src/wsl-guest/agent-hooks/status/agent-hook-event-admission.ts
@@ -16,7 +16,7 @@ import type { AgentHookEventPayload } from '../../../shared/agent-hook-listener/
 import type { AgentHookSource } from '../../../shared/agent-hook-listener/transport/agent-hook-relay'
 import { retainClaudeSettledRequests } from '../../../shared/agent-hook-listener/claude-settled-permission-requests'
 import { reduceHostTurnEnd } from '../../../shared/agent-hook-listener/state/agent-hook-turn-end-timing'
-import { previousCodexTurnContext } from '../../../shared/agent-hook-listener/providers/codex-session-start'
+import { previousCodexTurnContext } from '../../../shared/agent-hook-listener/providers/codex/codex-session-start'
 import { buildRelayHookEnvelope } from '../publication/agent-hook-envelope-build'
 import type { RelayHookForward } from '../server/agent-hook-server-contract'
 import { MAX_CACHED_PANES, type CachedPaneEnvelopeMeta } from './agent-hook-cached-pane-status'
diff --git a/src/wsl-guest/agent-hooks/status/agent-hook-interrupt-reconciliation.ts b/src/wsl-guest/agent-hooks/status/agent-hook-interrupt-reconciliation.ts
index 94a1bdb7b89..fe6201aa322 100644
--- a/src/wsl-guest/agent-hooks/status/agent-hook-interrupt-reconciliation.ts
+++ b/src/wsl-guest/agent-hooks/status/agent-hook-interrupt-reconciliation.ts
@@ -12,8 +12,8 @@ import {
 import {
   markClaudeLeadTurnInterrupted,
   setClaudeMainAgentTurnState
-} from '../../../shared/agent-hook-listener/providers/claude-roster-state'
-import { claudeRowHasUnlistedLiveWork } from '../../../shared/agent-hook-listener/providers/claude-pane-hold-evidence'
+} from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-roster-state'
+import { claudeRowHasUnlistedLiveWork } from '../../../shared/agent-hook-listener/providers/claude/lifecycle/claude-pane-hold-evidence'
 import type { HookListenerState } from '../../../shared/agent-hook-listener/listener-state'
 import type { AgentHookEventPayload } from '../../../shared/agent-hook-listener/listener-event'
 import type { AgentHookSource } from '../../../shared/agent-hook-listener/transport/agent-hook-relay'
diff --git a/tests/e2e/__mocks__/structured-attention-read-surfaces.ts b/tests/e2e/__mocks__/structured-attention-read-surfaces.ts
index 6f36f6f1348..c3f100cb8f6 100644
--- a/tests/e2e/__mocks__/structured-attention-read-surfaces.ts
+++ b/tests/e2e/__mocks__/structured-attention-read-surfaces.ts
@@ -1,6 +1,6 @@
 import { vi } from 'vitest'
 import { RUNTIME_CAPABILITIES } from '../../../src/shared/protocol-version'
-import type { NotificationsApi } from '../../../src/preload/api/os-permission-api'
+import type { NotificationsApi } from '../../../src/preload/api/desktop-permissions/os-permission-api'
 
 const transport = vi.hoisted(() => ({
   call: vi.fn(),
diff --git a/tests/e2e/computer-linux.e2e.ts b/tests/e2e/computer-linux.e2e.ts
index 8da3c487d04..e001eefd01a 100644
--- a/tests/e2e/computer-linux.e2e.ts
+++ b/tests/e2e/computer-linux.e2e.ts
@@ -76,29 +76,6 @@ describe.skipIf(!isLinux || !e2eOptIn)('computer-use Linux e2e (gedit)', () => {
     await killGedit()
   })
 
-  test('click and type-text insert into the focused document through AT-SPI', async () => {
-    await focusGeditDocument()
-
-    const marker = ` orca-linux-type-${Date.now()}-élan-🚀`
-    const typed = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'type-text',
-          '--app',
-          'gedit',
-          '--text',
-          marker,
-          '--restore-window',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(typed.result.action?.path).toBe('accessibility')
-    expect(typed.result.snapshot.treeText).toContain(marker.trim())
-  })
-
   test('paste-text mutates the test-owned document', async () => {
     await focusGeditDocument()
 
diff --git a/tests/e2e/computer-mac.e2e.ts b/tests/e2e/computer-mac.e2e.ts
index 15781119242..2f289b1845a 100644
--- a/tests/e2e/computer-mac.e2e.ts
+++ b/tests/e2e/computer-mac.e2e.ts
@@ -74,78 +74,6 @@ describe.skipIf(!isMac || !e2eOptIn)('computer-use macOS e2e (TextEdit)', () =>
     })
   })
 
-  test('paste-text and hotkey verify TextEdit text replacement', async () => {
-    const first = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'paste-text',
-          '--app',
-          'TextEdit',
-          '--text',
-          'orca paste first',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(first.result.action?.path).toBe('accessibility')
-    expect(first.result.action?.verification?.state).toBe('verified')
-
-    const selectAll = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'hotkey',
-          '--app',
-          'TextEdit',
-          '--key',
-          'CmdOrCtrl+A',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(selectAll.result.action?.actionName).toBe('AXSelectAll')
-    expect(selectAll.result.action?.verification?.state).toBe('verified')
-
-    const marker = `orca paste final ${Date.now()}`
-    const second = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'paste-text',
-          '--app',
-          'TextEdit',
-          '--text',
-          marker,
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(second.result.action?.actionName).toBe('AXReplaceSelection')
-    expect(second.result.action?.verification).toEqual({
-      state: 'verified',
-      property: 'focusedText'
-    })
-
-    const after = parseJsonOutput<{ result: ComputerSnapshotResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'get-app-state',
-          '--app',
-          'TextEdit',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(after.result.snapshot.treeText).toContain(marker)
-    expect(after.result.snapshot.treeText).not.toContain('orca paste first')
-  })
-
   test('accessibility text actions work when TextEdit is not frontmost', async () => {
     const before = parseJsonOutput<{ result: ComputerSnapshotResult }>(
       (
diff --git a/tests/e2e/computer-windows-store.e2e.ts b/tests/e2e/computer-windows-store.e2e.ts
deleted file mode 100644
index 0c13828021e..00000000000
--- a/tests/e2e/computer-windows-store.e2e.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { describe, expect, test } from 'vitest'
-import type { ComputerListAppsResult, ComputerSnapshotResult } from '../../src/shared/runtime-types'
-import {
-  ensureOrcaRuntimeLaunched,
-  findRoleIndex,
-  parseJsonOutput,
-  runOrcaCli,
-  stopOrcaRuntime
-} from './helpers/computer-driver'
-
-const isWindows = process.platform === 'win32'
-const e2eOptIn = process.env.ORCA_COMPUTER_E2E === '1'
-
-describe.skipIf(!isWindows || !e2eOptIn)('computer-use Windows e2e (Calculator)', () => {
-  test('Calculator windows are discoverable by title and clickable', async () => {
-    await ensureOrcaRuntimeLaunched()
-    await launchCalculator()
-    try {
-      const apps = parseJsonOutput<{ result: ComputerListAppsResult }>(
-        (await runOrcaCli(['computer', 'list-apps', '--json'])).stdout
-      )
-      // Windows 2025 hosts Calculator as win32calc; older images use ApplicationFrameHost.
-      const calculatorApp = apps.result.apps.find(
-        (app) =>
-          (app.name === 'Calculator' && app.bundleId === 'ApplicationFrameHost') ||
-          (app.name === 'win32calc' && app.bundleId === 'win32calc')
-      )
-      expect(calculatorApp).toMatchObject({ isRunning: true })
-
-      const state = parseJsonOutput<{ result: ComputerSnapshotResult }>(
-        (
-          await runOrcaCli([
-            'computer',
-            'get-app-state',
-            '--app',
-            'Calculator',
-            '--no-screenshot',
-            '--json'
-          ])
-        ).stdout
-      )
-      const buttonIndex = findRoleIndex(
-        state.result.snapshot.treeText,
-        /^\s*(\d+)\s+button(?:\s|$)/m
-      )
-      // Classic Calculator exposes only pane nodes; clicking one still proves title routing.
-      const clickIndex =
-        buttonIndex >= 0
-          ? buttonIndex
-          : findRoleIndex(state.result.snapshot.treeText, /^\s*(\d+)\s+pane(?:\s|$)/m)
-      expect(clickIndex, state.result.snapshot.treeText).toBeGreaterThanOrEqual(0)
-      const clicked = parseJsonOutput<{ result: ComputerSnapshotResult }>(
-        (
-          await runOrcaCli([
-            'computer',
-            'click',
-            '--app',
-            'Calculator',
-            '--element-index',
-            String(clickIndex),
-            '--no-screenshot',
-            '--json'
-          ])
-        ).stdout
-      )
-      expect(clicked.result.snapshot.elementCount).toBeGreaterThan(0)
-    } finally {
-      await killCalculator()
-      await stopOrcaRuntime()
-    }
-  })
-})
-
-async function launchCalculator(): Promise<void> {
-  await runPowerShell('Start-Process calc.exe')
-  await runPowerShell(
-    [
-      '$deadline = (Get-Date).AddSeconds(15)',
-      '$target = $null',
-      'while ((Get-Date) -lt $deadline -and $null -eq $target) {',
-      '  Start-Sleep -Milliseconds 250',
-      '  $target = Get-Process |',
-      '    Where-Object { $_.MainWindowHandle -ne 0 -and $_.MainWindowTitle -eq "Calculator" } |',
-      '    Select-Object -First 1',
-      '}',
-      'if ($null -eq $target) { throw "No visible Calculator window found" }'
-    ].join('\n')
-  )
-}
-
-async function killCalculator(): Promise<void> {
-  // Why: teardown is best-effort so cleanup noise cannot mask assertion signal.
-  await runPowerShell(
-    [
-      '$processes = @()',
-      '$processes += Get-Process -Name CalculatorApp -ErrorAction SilentlyContinue',
-      '$processes += Get-Process -Name win32calc -ErrorAction SilentlyContinue',
-      '$processes += Get-Process -Name ApplicationFrameHost -ErrorAction SilentlyContinue |',
-      '  Where-Object { $_.MainWindowTitle -eq "Calculator" }',
-      'foreach ($process in $processes) {',
-      '  try { Stop-Process -Id $process.Id -Force -ErrorAction Stop } catch { }',
-      '}',
-      'exit 0'
-    ].join('\n')
-  ).catch(() => undefined)
-}
-
-async function runPowerShell(script: string): Promise<void> {
-  const { execFile } = await import('node:child_process')
-  await new Promise<void>((resolve, reject) => {
-    execFile('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], (error) => {
-      if (error) {
-        reject(error)
-        return
-      }
-      resolve()
-    })
-  })
-}
diff --git a/tests/e2e/computer-windows.e2e.ts b/tests/e2e/computer-windows.e2e.ts
index 1ab45b697cf..88ac6293d68 100644
--- a/tests/e2e/computer-windows.e2e.ts
+++ b/tests/e2e/computer-windows.e2e.ts
@@ -15,11 +15,7 @@ import {
   runOrcaCli,
   stopOrcaRuntime
 } from './helpers/computer-driver'
-import {
-  editableRolePattern,
-  focusNotepadDocument,
-  waitForNotepadText
-} from './helpers/notepad-document'
+import { editableRolePattern, focusNotepadDocument } from './helpers/notepad-document'
 import {
   closeWindowFixture,
   countMagentaPixelRatio,
@@ -40,83 +36,6 @@ describe.skipIf(!isWindows || !e2eOptIn)('computer-use Windows e2e (Notepad)', (
     await stopOrcaRuntime()
   })
 
-  test('list-apps includes the test-owned Notepad process', async () => {
-    const result = await runOrcaCli(['computer', 'list-apps', '--json'])
-    const envelope = parseJsonOutput<{ result: ComputerListAppsResult }>(result.stdout)
-    const pid = Number.parseInt(getNotepadAppSelector().slice(4), 10)
-    const notepadApp = envelope.result.apps.find((app) => app.pid === pid)
-
-    expect(notepadApp).toMatchObject({ pid, bundleId: 'notepad' })
-    expect(notepadApp?.name.toLowerCase()).toBe('notepad')
-  })
-
-  test('list-windows returns a targetable Notepad window', async () => {
-    const app = getNotepadAppSelector()
-    const result = await runOrcaCli(['computer', 'list-windows', '--app', app, '--json'])
-    const envelope = parseJsonOutput<{ result: ComputerListWindowsResult }>(result.stdout)
-
-    expect(envelope.result.windows).toHaveLength(1)
-    expect(envelope.result.windows[0]).toMatchObject({
-      index: 0,
-      app: expect.objectContaining({ pid: Number.parseInt(app.slice(4), 10) }),
-      id: expect.any(Number),
-      title: expect.stringContaining('Notepad'),
-      width: expect.any(Number),
-      height: expect.any(Number)
-    })
-  })
-
-  test('Notepad exposes a basic accessibility tree', async () => {
-    const result = await runOrcaCli([
-      'computer',
-      'get-app-state',
-      '--app',
-      getNotepadAppSelector(),
-      '--json'
-    ])
-    const envelope = parseJsonOutput<{ result: ComputerSnapshotResult }>(result.stdout)
-
-    expect(envelope.result.snapshot.app.name.toLowerCase()).toBe('notepad')
-    expect(envelope.result.snapshot.window.title).toContain('Notepad')
-    expect(envelope.result.snapshot.elementCount).toBeGreaterThan(0)
-    expect(envelope.result.snapshot.coordinateSpace).toBe('window')
-    expect(envelope.result.snapshot.truncation?.truncated).toBe(false)
-    expect(envelope.result.screenshotStatus.state).toBe('captured')
-    expect(envelope.result.screenshot?.format).toBe('png')
-    expect(envelope.result.screenshot?.data).toBeUndefined()
-    expect(envelope.result.screenshot?.dataOmitted).toBe(true)
-    expect(envelope.result.screenshot?.path).toContain('orca-computer-use')
-  })
-
-  test('paste-text mutates the test-owned document', async () => {
-    const app = getNotepadAppSelector()
-    const marker = `orca-windows-paste-${Date.now()}`
-    await focusNotepadDocument(app)
-    const action = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'paste-text',
-          '--app',
-          app,
-          '--text',
-          marker,
-          '--restore-window',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(action.result.action?.path).toBe('clipboard')
-    expect(action.result.action?.verification).toMatchObject({
-      state: 'unverified',
-      reason: 'clipboard_paste'
-    })
-
-    const after = await waitForNotepadText(app, marker)
-    expect(after.snapshot.treeText).toContain(marker)
-  })
-
   test('Unicode payloads survive paste-text', async () => {
     const app = getNotepadAppSelector()
     const unicode = `orca unicode café Ω 漢字 ${Date.now()}`
@@ -155,22 +74,17 @@ describe.skipIf(!isWindows || !e2eOptIn)('computer-use Windows e2e (Notepad)', (
       '--json'
     ])
 
-    const selectAll = parseJsonOutput<{ result: ComputerActionResult }>(
-      (
-        await runOrcaCli([
-          'computer',
-          'hotkey',
-          '--app',
-          app,
-          '--key',
-          'CmdOrCtrl+A',
-          '--restore-window',
-          '--no-screenshot',
-          '--json'
-        ])
-      ).stdout
-    )
-    expect(selectAll.result.action?.actionName).toBe('hotkey')
+    await runOrcaCli([
+      'computer',
+      'hotkey',
+      '--app',
+      app,
+      '--key',
+      'CmdOrCtrl+A',
+      '--restore-window',
+      '--no-screenshot',
+      '--json'
+    ])
 
     const marker = `orca-windows-replaced-${Date.now()}`
     const second = parseJsonOutput<{ result: ComputerActionResult }>(
@@ -272,10 +186,9 @@ describe.skipIf(!isWindows || !e2eOptIn)('computer-use Windows e2e (Notepad)', (
     }
   })
 
-  test('a hung window fails fast with a timeout error and does not stall later calls', async () => {
+  test('a hung window reports a timeout error and later calls still succeed', async () => {
     const hung = await launchHungWindowFixture()
     try {
-      const started = Date.now()
       const failure = await runOrcaCli([
         'computer',
         'get-app-state',
@@ -289,8 +202,6 @@ describe.skipIf(!isWindows || !e2eOptIn)('computer-use Windows e2e (Notepad)', (
       )
       expect(failure).toMatch(/window_not_responding/)
       expect(failure).toMatch(/"code":\s*"action_timeout"/)
-      // The provider request timeout is 30 s; the hang probe answers within its 5 s bound.
-      expect(Date.now() - started).toBeLessThan(15_000)
 
       const apps = parseJsonOutput<{ result: ComputerListAppsResult }>(
         (await runOrcaCli(['computer', 'list-apps', '--json'])).stdout
diff --git a/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts b/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts
index 4a483ba849c..655b92c92a7 100644
--- a/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts
+++ b/tests/e2e/cross-version-wire/cross-version-stop-note-scenarios.ts
@@ -17,40 +17,36 @@ export function describeReleasedStopNoteProjection(port: ScenarioPort): void {
       const rig = createReleasedStopNoteRig(port, ref)
       const { page, subscribe, events, reduce, render, turn, note, seed } = rig
 
-      it.each([false, true])(
-        'renders the same-revision note with a live turn end (lifecycle batch=%s)',
-        async (batch) => {
-          const before = await seed()
-          expect(render(before)).toMatchObject({ failure: { kind: 'cancelUnconfirmed' } })
-          const prior = before.items.find((item) => item.itemId === noteId)!
-          const replies = await subscribe()
-          replies.length = 0
-          await turn('interrupted', batch)
-          const event = events(replies).find(
-            (event) =>
-              event.type === 'batch' && event.batch.items.some((item) => item.itemId === noteId)
-          )
-          expect(event).toMatchObject({
-            type: 'batch',
-            batch: {
-              items: expect.arrayContaining([
-                expect.objectContaining({ itemId: turnItemId }),
-                expect.objectContaining({ ...prior, body: ordinary })
-              ]),
-              removedItemIds: []
-            }
-          })
-          const after = reduce(before, replies)
-          expect(render(after)).toEqual({ type: 'text', text: ordinary.text })
-          expect(rig.journal.itemBody(noteId)).toEqual(unconfirmed)
-          // The turn end is one saved sequence that touches only the turn, whichever writer made it.
-          const since = rig.journal.readSince(before.cursor!)
-          expect(since).toMatchObject({
-            ok: true,
-            rows: [expect.objectContaining({ kind: 'outcome', itemIds: [turnItemId] })]
-          })
-        }
-      )
+      it('renders the same-revision note with a live turn end', async () => {
+        const before = await seed()
+        expect(render(before)).toMatchObject({ failure: { kind: 'cancelUnconfirmed' } })
+        const prior = before.items.find((item) => item.itemId === noteId)!
+        const replies = await subscribe()
+        replies.length = 0
+        await turn('interrupted', true)
+        const event = events(replies).find(
+          (event) =>
+            event.type === 'batch' && event.batch.items.some((item) => item.itemId === noteId)
+        )
+        expect(event).toMatchObject({
+          type: 'batch',
+          batch: {
+            items: expect.arrayContaining([
+              expect.objectContaining({ itemId: turnItemId }),
+              expect.objectContaining({ ...prior, body: ordinary })
+            ]),
+            removedItemIds: []
+          }
+        })
+        const after = reduce(before, replies)
+        expect(render(after)).toEqual({ type: 'text', text: ordinary.text })
+        expect(rig.journal.itemBody(noteId)).toEqual(unconfirmed)
+        const since = rig.journal.readSince(before.cursor!)
+        expect(since).toMatchObject({
+          ok: true,
+          rows: [expect.objectContaining({ kind: 'outcome', itemIds: [turnItemId] })]
+        })
+      })
       it('refreshes a non-upgrade stale page after an out-of-window live correction at the terminal cursor', async () => {
         await turn('running')
         await note()
diff --git a/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts
index 005e1469423..1eb107060e6 100644
--- a/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts
+++ b/tests/e2e/cross-version-wire/qoder-registration-downgrade.unit.test.ts
@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest'
-import { EnsureAgentSessionParams } from '../../../src/shared/rpc-contract/agent-session-params'
+import { EnsureAgentSessionParams } from '../../../src/shared/rpc-contract/terminal/agent-session-params'
 import { normalizeAgentStatusPayload } from '../../../src/shared/agent-status/contracts/agent-status-types'
 import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout'
 
diff --git a/tests/e2e/helpers/automation-chat-renderer-test-harness.ts b/tests/e2e/helpers/automation-chat-renderer-test-harness.ts
deleted file mode 100644
index dbb079d5899..00000000000
--- a/tests/e2e/helpers/automation-chat-renderer-test-harness.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { unwrapRuntimeRpcResult } from '../../../src/renderer/src/runtime/rpc/calls/runtime-rpc-result'
-import type { AutomationRun } from '../../../src/shared/automations/history/automation-run'
-import { createAutomationRunWorkspaceAction } from '../../../src/renderer/src/components/automations/runs/automation-run-workspace-action'
-import { getAutomationRunViewState } from '../../../src/renderer/src/components/automations/runs/automation-run-view-state'
-import { expect, vi } from 'vitest'
-import type { RuntimeClientTarget } from '../../../src/shared/runtime-client-target'
-import type { RuntimeMobileSessionTabsResult } from '../../../src/shared/runtime-types'
-import { RuntimeRpcEnvelopeSchema } from '../../../src/shared/runtime-rpc-envelope'
-import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../src/shared/electron-remote-runtime-client-capabilities'
-import { decodeSessionTabsDeltaEvents } from '../../../src/main/ipc/runtime-environments/runtime-environment-session-tabs-delta-decoding'
-import { RpcDispatcher } from '../../../src/main/runtime/rpc/dispatcher'
-import { STRUCTURED_AGENT_SESSION_METHODS } from '../../../src/main/runtime/rpc/methods/structured-sessions/structured-agent-session'
-import { SESSION_TAB_METHODS } from '../../../src/main/runtime/rpc/methods/session-tabs/session-tabs'
-import { OrcaRuntimeService } from '../../../src/main/runtime/orca-runtime'
-import { createTestStore } from '../../../src/renderer/src/store/testing/app-store-test-fixture'
-import { makeWorktree } from '../../../src/renderer/src/store/slices/worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../../../src/renderer/src/store/repos/repo.test-fixture'
-import type { SessionTabsStreamEvent } from '../../../src/renderer/src/runtime/web-session-tabs-sync/state'
-import { applyStructuredSessionTabSnapshots } from '../../../src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { applyWebSessionTabsSnapshot } from '../../../src/renderer/src/runtime/web-session-tabs-sync/snapshot-api'
-import { decideWebSessionTabsSnapshot } from '../../../src/renderer/src/runtime/web-session-tabs-sync/tracking-decisions'
-
-export class ChatOpenTestRuntime extends OrcaRuntimeService {
-  protected override async refreshMobileSessionPtyRecords() {
-    return new Set<string>()
-  }
-}
-
-/** Only transport and PTY census are bridged; record reveal, publication, mirror and selection stay real. */
-export async function createChatRendererBridge(
-  runtime: OrcaRuntimeService,
-  workspace: string,
-  target: RuntimeClientTarget,
-  store: ReturnType<typeof createTestStore> = createTestStore()
-) {
-  const paired = target.kind === 'environment'
-  const dispatcher = new RpcDispatcher({
-    runtime,
-    methods: [
-      ...STRUCTURED_AGENT_SESSION_METHODS.filter((method) =>
-        ['agentSession.close', 'agentSession.history', 'agentSession.reveal'].includes(method.name)
-      ),
-      ...SESSION_TAB_METHODS.filter((method) =>
-        [
-          'session.tabs.list',
-          'session.tabs.close',
-          'session.tabs.activate',
-          'session.tabs.subscribe'
-        ].includes(method.name)
-      )
-    ]
-  })
-  let request = 0
-  const options = {
-    clientKind: 'runtime' as const,
-    clientCapabilities: [...ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES]
-  }
-  const calls: { target: RuntimeClientTarget; method: string; params: unknown }[] = []
-  const call = async (recipient: RuntimeClientTarget, method: string, params: unknown) => {
-    expect(recipient).toEqual(target)
-    calls.push({ target: recipient, method, params })
-    const reply = await dispatcher.dispatch(
-      { id: `reopen-${++request}`, authToken: 'fixture', method, params },
-      options
-    )
-    if (!reply.ok) {
-      console.info('D1 transport refusal', method, JSON.stringify(reply.error))
-    }
-    return unwrapRuntimeRpcResult(reply)
-  }
-  const apply = (snapshot: RuntimeMobileSessionTabsResult) => {
-    if (paired) {
-      if (
-        decideWebSessionTabsSnapshot(
-          snapshot,
-          target.kind === 'environment' ? target.environmentId : ''
-        ).apply
-      ) {
-        store.setState((state) =>
-          applyWebSessionTabsSnapshot(
-            state,
-            snapshot,
-            target.kind === 'environment' ? target.environmentId : ''
-          )
-        )
-      }
-    } else {
-      applyStructuredSessionTabSnapshots([snapshot])
-    }
-  }
-  const inventory = async () => {
-    const snapshot = await runtime.listMobileSessionTabs(`id:${workspace}`)
-    apply(snapshot)
-    return snapshot
-  }
-  // Only the transport is bridged: paired mirrors receive the actual production subscription.
-  const subscription = new AbortController()
-  if (paired) {
-    const decode = decodeSessionTabsDeltaEvents('session.tabs.subscribe', (payload) => {
-      if (payload.type !== 'response' || !payload.response.ok) {
-        return
-      }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real subscription handler emitted this frame and the production decoder reconstructed its tab deltas.
-      const event = payload.response.result as SessionTabsStreamEvent
-      if (event.type === 'snapshot' || event.type === 'updated') {
-        apply(event)
-      }
-    })
-    await dispatcher.dispatchStreaming(
-      {
-        id: 'reopen-stream',
-        authToken: 'fixture',
-        method: 'session.tabs.subscribe',
-        params: { worktree: `id:${workspace}` }
-      },
-      (json) => {
-        const response = RuntimeRpcEnvelopeSchema.parse(JSON.parse(json))
-        if ('ok' in response) {
-          decode({ type: 'response', response })
-        }
-      },
-      { ...options, signal: subscription.signal }
-    )
-  }
-  const selected = () => {
-    const state = store.getState()
-    const group = state.groupsByWorktree[workspace]?.find(
-      (candidate) => candidate.id === state.activeGroupIdByWorktree[workspace]
-    )
-    return state.unifiedTabsByWorktree[workspace]?.find((tab) => tab.id === group?.activeTabId)
-  }
-  return { store, calls, call, inventory, apply, selected, dispose: () => subscription.abort() }
-}
-
-export async function exerciseRecordedChatOpen(
-  runtime: OrcaRuntimeService,
-  run: AutomationRun,
-  bind: (renderer: Awaited<ReturnType<typeof createChatRendererBridge>> | null) => void
-) {
-  if (!run.workspaceId || !run.chatSessionId) {
-    throw new Error('a recorded Chat is required')
-  }
-  const workspaceId = run.workspaceId
-  const renderer = await createChatRendererBridge(runtime, workspaceId, { kind: 'local' })
-  renderer.store.setState({ activeWorktreeId: run.workspaceId })
-  const context = {
-    list: {
-      runTargetFor: (recorded) => ({
-        worktree: makeWorktree({ id: workspaceId, repoId: TEST_REPO.id, hostId: 'local' }),
-        ownerEnvironmentId: null,
-        expectedPairingRevision: undefined,
-        terminalTarget: null,
-        viewState: getAutomationRunViewState({
-          run: recorded,
-          workspaceExists: true,
-          terminalTargetExists: false
-        })
-      })
-    }
-  } satisfies Parameters<typeof createAutomationRunWorkspaceAction>[0]
-  bind(renderer)
-  try {
-    createAutomationRunWorkspaceAction(context)(run)
-    await vi.waitFor(() =>
-      expect(renderer.selected()).toMatchObject({
-        entityId: run.chatSessionId,
-        executionHostId: 'local'
-      })
-    )
-    await renderer.inventory()
-    expect(renderer.selected()?.entityId).toBe(run.chatSessionId)
-  } finally {
-    renderer.dispose()
-    bind(null)
-  }
-}
diff --git a/tests/e2e/helpers/automation-chat-reopen-test-harness.ts b/tests/e2e/helpers/automation-chat-reopen-test-harness.ts
deleted file mode 100644
index 3af4f3e74ed..00000000000
--- a/tests/e2e/helpers/automation-chat-reopen-test-harness.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { createChatRendererBridge } from './automation-chat-renderer-test-harness'
-import { expect, vi } from 'vitest'
-import type { RuntimeClientTarget } from '../../../src/shared/runtime-client-target'
-import {
-  authorityProfile,
-  openAuthorityRuntime,
-  root
-} from '../../../src/main/runtime/agent-session/lifecycle/structured-agent-session-tab-authority.test-support'
-import { editPersistedTestAgentSessionStore } from '../../../src/main/runtime/agent-session/records/agent-session-record-store-test-harness'
-import {
-  codexProviderHandle,
-  encodePersistedAgentSessionProviderHandle
-} from '../../../src/shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
-import { createTestStore } from '../../../src/renderer/src/store/testing/app-store-test-fixture'
-import { makeUnifiedTab } from '../../../src/renderer/src/store/slices/tabs/tab-group.test-fixture'
-import { makeWorktree } from '../../../src/renderer/src/store/slices/worktrees/worktree.test-fixture'
-import { makeFolderWorkspace } from '../../../src/renderer/src/store/folder-workspaces/folder-workspace.test-fixture'
-import { createAutomationRunWorkspaceAction } from '../../../src/renderer/src/components/automations/runs/automation-run-workspace-action'
-import { getAutomationRunViewState } from '../../../src/renderer/src/components/automations/runs/automation-run-view-state'
-import { createAutomationRunWriter } from '../../../src/main/automations/run-history/run-writer'
-import { makeRepo } from '../../../src/main/persistence/persistence-test-harness'
-import { structuredAgentSessionTabId } from '../../../src/shared/agent-session/view/structured-agent-session-projection'
-import '../../../src/renderer/src/runtime/native-chat/tab-retirement/structured-agent-session-tab-retirement'
-import { retireStructuredAgentSessionTab } from '../../../src/renderer/src/runtime/native-chat/tab-retirement/structured-agent-session-host-tab-retirement'
-
-export const CHAT = 'claude_saved_reopen',
-  SURVIVOR = 'codex_surviving_chat'
-
-export async function createReopenRig(
-  paired: boolean,
-  bind: (store: ReturnType<typeof createTestStore>) => void
-) {
-  const profile = await authorityProfile([], {
-    records: [CHAT, SURVIVOR],
-    visible: [CHAT, SURVIVOR]
-  })
-  await editPersistedTestAgentSessionStore(root, (state) => {
-    state.sessionTabs = [CHAT, SURVIVOR].map((sessionId) => ({
-      sessionId,
-      tabId: `agent-session:${sessionId}`
-    }))
-    const other = state.records[SURVIVOR]!
-    other.provider = 'codex'
-    other.accountHome = { variable: 'CODEX_HOME', path: `${root}/fixture-codex` }
-    other.providerHandleChain[0]!.handle = encodePersistedAgentSessionProviderHandle(
-      codexProviderHandle('survivor-thread')
-    )
-  })
-  const rig = await openAuthorityRuntime(profile)
-  const store = createTestStore()
-  bind(store)
-  const target: RuntimeClientTarget = paired
-    ? { kind: 'environment', environmentId: 'reopen-host' }
-    : { kind: 'local' }
-  const hostId = paired ? 'runtime:reopen-host' : 'local'
-  store.setState({
-    folderWorkspaces: [
-      makeFolderWorkspace({
-        id: rig.folderId,
-        projectGroupId: rig.groupId,
-        folderPath: root,
-        executionHostId: hostId
-      })
-    ],
-    projectGroups: [],
-    activeWorktreeId: rig.workspace,
-    activeWorkspaceExecutionHostId: hostId
-  })
-  const renderer = await createChatRendererBridge(rig.runtime, rig.workspace, target, store)
-  const { calls, inventory } = renderer
-  await rig.runtime.restoreStructuredAgentSessionTabs()
-  await rig.runtime.publishStructuredAgentSessionTab({
-    workspaceId: rig.workspace,
-    sessionId: CHAT,
-    agent: 'claude',
-    activate: true
-  })
-  await rig.runtime.publishStructuredAgentSessionTab({
-    workspaceId: rig.workspace,
-    sessionId: SURVIVOR,
-    agent: 'codex',
-    activate: false
-  })
-  await inventory()
-  const repo = makeRepo({ id: 'reopen-repo', path: root })
-  rig.profile.addRepo(repo)
-  const automation = rig.profile.createAutomation({
-    projectId: repo.id,
-    name: 'Saved reopen',
-    rrule: 'FREQ=DAILY',
-    dtstart: Date.now(),
-    prompt: 'Preserved prompt',
-    agentId: 'claude',
-    workspaceMode: 'new_per_run',
-    timezone: 'UTC',
-    enabled: false,
-    launchSetupPatch: { surface: 'chat' }
-  })
-  const writer = createAutomationRunWriter(rig.profile, null)
-  const created = await writer.createRun(automation, Date.now(), 'manual')
-  const run = await writer.updateRun({
-    runId: created.id,
-    status: 'completed',
-    sessionKind: 'chat',
-    chatSessionId: CHAT,
-    workspaceId: rig.workspace,
-    outputSnapshot: {
-      format: 'plain_text',
-      content: 'Exact saved output',
-      truncated: false,
-      capturedAt: Date.now()
-    }
-  })
-  const beforeJournal = await rig.host.journalSnapshot(CHAT)
-  const beforeRecord = rig.store.getConversation(CHAT)
-  const send = vi.spyOn(rig.host, 'send'),
-    create = vi.spyOn(rig.host, 'create')
-  const context = {
-    list: {
-      runTargetFor: (recorded) => ({
-        worktree: makeWorktree({ id: rig.workspace, repoId: repo.id, hostId }),
-        ownerEnvironmentId: paired ? 'reopen-host' : null,
-        expectedPairingRevision: undefined,
-        terminalTarget: null,
-        viewState: getAutomationRunViewState({
-          run: recorded,
-          workspaceExists: true,
-          terminalTargetExists: false
-        })
-      })
-    }
-  } satisfies Parameters<typeof createAutomationRunWorkspaceAction>[0]
-  const action = createAutomationRunWorkspaceAction(context)
-  const close = async () => {
-    store.getState().closeUnifiedTab(structuredAgentSessionTabId(CHAT))
-    await retireStructuredAgentSessionTab({ target, worktreeId: rig.workspace, sessionId: CHAT })
-    await inventory()
-    expect(rig.host.isSessionTabVisible(CHAT)).toBe(false)
-  }
-  const unchanged = async () => {
-    expect(rig.profile.listAutomationRuns(automation.id)).toEqual([run])
-    expect(await rig.host.journalSnapshot(CHAT)).toEqual(beforeJournal)
-    expect(rig.store.getConversation(CHAT)).toEqual(beforeRecord)
-    expect(send).not.toHaveBeenCalled()
-    expect(create).not.toHaveBeenCalled()
-    expect(rig.acquire).not.toHaveBeenCalled()
-    expect(calls.every(({ method }) => !/create|send|launch/.test(method))).toBe(true)
-  }
-  const decoy = () => {
-    store.setState((state) => ({
-      unifiedTabsByWorktree: {
-        ...state.unifiedTabsByWorktree,
-        [rig.workspace]: [
-          makeUnifiedTab({
-            id: 'wrong-owner',
-            entityId: CHAT,
-            worktreeId: rig.workspace,
-            contentType: 'agent-session',
-            executionHostId: 'local',
-            groupId: 'decoy'
-          }),
-          ...(state.unifiedTabsByWorktree[rig.workspace] ?? [])
-        ]
-      }
-    }))
-  }
-  return { ...rig, ...renderer, target, action: () => action(run), close, unchanged, decoy }
-}
diff --git a/tests/e2e/helpers/notepad-document.ts b/tests/e2e/helpers/notepad-document.ts
index 3b734cecf1b..b3f1b31c9de 100644
--- a/tests/e2e/helpers/notepad-document.ts
+++ b/tests/e2e/helpers/notepad-document.ts
@@ -1,28 +1,8 @@
-import { expect, vi } from 'vitest'
+import { expect } from 'vitest'
 import type { ComputerSnapshotResult } from '../../../src/shared/runtime-types'
 import { findRoleIndex, parseJsonOutput, runOrcaCli } from './computer-driver'
 
 export const editableRolePattern = /^\s*(\d+)\s+(document|edit|text|pane)(?:\s|$)/im
-const pasteMutationTimeoutMs = 5_000
-
-// Poll after clipboard paste because Notepad’s accessibility snapshot can lag the visible change.
-export async function waitForNotepadText(
-  app: string,
-  marker: string
-): Promise<ComputerSnapshotResult> {
-  return vi.waitFor(
-    async () => {
-      const snapshot = parseJsonOutput<{ result: ComputerSnapshotResult }>(
-        (await runOrcaCli(['computer', 'get-app-state', '--app', app, '--no-screenshot', '--json']))
-          .stdout
-      ).result
-      expect(snapshot.snapshot.treeText).toContain(marker)
-      return snapshot
-    },
-    { timeout: pasteMutationTimeoutMs, interval: 150 }
-  )
-}
-
 export async function focusNotepadDocument(app: string): Promise<void> {
   const snapshot = parseJsonOutput<{ result: ComputerSnapshotResult }>(
     (
diff --git a/tests/e2e/helpers/phone-feed-list.ts b/tests/e2e/helpers/phone-feed-list.ts
index db1a1b49fa4..0e3ab4537d2 100644
--- a/tests/e2e/helpers/phone-feed-list.ts
+++ b/tests/e2e/helpers/phone-feed-list.ts
@@ -2,15 +2,15 @@ import { expect } from '@stablyai/playwright-test'
 import type { Page } from '@stablyai/playwright-test'
 import { buildSidebarFeedRows } from '../../../src/shared/sidebar-list/sidebar-feed-rows'
 import { buildSidebarFeedCatalog } from '../../../src/shared/sidebar-list/sidebar-feed-catalog'
-import { buildHostFeedView } from '../../../mobile/src/host-screen/host-sidebar-feed-inputs'
-import { buildHostFeedSections } from '../../../mobile/src/host-screen/host-sidebar-feed-sections'
+import { buildHostFeedView } from '../../../mobile/src/host-screen/sidebar-feed/host-sidebar-feed-inputs'
+import { buildHostFeedSections } from '../../../mobile/src/host-screen/sidebar-feed/host-sidebar-feed-sections'
 import { NO_WORKTREE_HOST_CONTEXT } from '../../../mobile/src/worktree/worktree-host-context-labels'
 import {
   readHostSidebarFeed,
   type HostSidebarFeedRead
-} from '../../../mobile/src/host-screen/use-host-sidebar-feed'
-import { createHostSidebarFeedReader } from '../../../mobile/src/host-screen/host-sidebar-feed-connection'
-import { readHostMethodReply } from '../../../mobile/src/host-screen/host-sidebar-feed-operations'
+} from '../../../mobile/src/host-screen/sidebar-feed/use-host-sidebar-feed'
+import { createHostSidebarFeedReader } from '../../../mobile/src/host-screen/sidebar-feed/host-sidebar-feed-connection'
+import { readHostMethodReply } from '../../../mobile/src/host-screen/sidebar-feed/host-sidebar-feed-operations'
 import type { SharedClientEventsClient } from '../../../mobile/src/transport/connection/shared-client-events'
 import {
   hostPlatformRead,
diff --git a/tests/e2e/native-chat-ssh-transcript.unit.test.ts b/tests/e2e/native-chat-ssh-transcript.unit.test.ts
index 0eb33172f16..5f406779e42 100644
--- a/tests/e2e/native-chat-ssh-transcript.unit.test.ts
+++ b/tests/e2e/native-chat-ssh-transcript.unit.test.ts
@@ -1,4 +1,4 @@
-import { appendFileSync, mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
@@ -103,117 +103,9 @@ describe('native chat for an agent whose transcript lives on an SSH host (#26057
     rmSync(localDir, { recursive: true, force: true })
   })
 
-  it.each([false, true])(
-    'negotiates reader and every stream representation before slicing (modern=%s)',
-    async (modern) => {
-      const { NativeChatSession } = await import('../../src/shared/rpc-contract/native-chat-params')
-      const { compareNativeChatTranscriptMessages } =
-        await import('../../src/shared/native-chat/transcript/native-chat-transcript-projection')
-      const { parseRuntimeNativeChatReadSessionResult } =
-        await import('../../src/renderer/src/components/native-chat/session/terminal/read/native-chat-runtime-contract')
-      const { createNativeChatMessageListProjection } =
-        await import('../../src/renderer/src/components/native-chat/conversation/projection/native-chat-message-list-projection')
-      const { commandMarkersAsMessages } =
-        await import('../../src/renderer/src/components/native-chat/session/terminal/delivery/native-chat-command-marker')
-      hookRows = [{ ...sshHookRow(transcriptPath), connectionId: null }]
-      const line = (id: string, seconds: number) =>
-        `${JSON.stringify({
-          type: 'assistant',
-          uuid: id,
-          timestamp: `2026-06-01T10:00:${String(seconds).padStart(2, '0')}.000Z`,
-          message: { role: 'assistant', content: id }
-        })}\n`
-      writeFileSync(transcriptPath, line('z-first', 30) + line('a-second', 10))
-      const params = NativeChatSession.parse({
-        agent: 'claude',
-        sessionId: SESSION_ID,
-        transcriptPath,
-        limit: 2,
-        ...(modern ? { capabilities: { transcriptSourceOrder: 1 } } : {})
-      })
-      const read = method('nativeChat.readSession')
-      const subscribe = method('nativeChat.subscribe')
-      if ('stream' in read || !('stream' in subscribe)) {
-        throw new Error('Unexpected RPC method kind')
-      }
-      const parse = (payload: unknown) => {
-        const result = parseRuntimeNativeChatReadSessionResult(payload)
-        if (!('messages' in result)) {
-          throw new Error(result.error)
-        }
-        return result.messages
-      }
-      const rows = parse(await read.handler(params, phoneContext({})))
-      const time = Date.parse('2026-06-01T10:00:00Z')
-      expect(rows.map((row) => row.timestamp)).toEqual(
-        modern ? [time + 30000, time + 10000] : [time + 30000, time + 30001]
-      )
-      expect(rows.map((row) => row.transcriptOrder)).toEqual(
-        modern ? [0, Buffer.byteLength(line('z-first', 30))] : [undefined, undefined]
-      )
-      const marker = commandMarkersAsMessages([
-        { id: 'compact', command: '/compact', sentAt: time + 20000 }
-      ])[0]
-      const ordered = modern
-        ? createNativeChatMessageListProjection()([...rows, marker]).conversation
-        : [...rows, marker].sort(compareNativeChatTranscriptMessages)
-      expect(ordered.map((row) => row.id)).toEqual([marker.id, 'z-first', 'a-second'])
-      // The previous nested schema strips the unknown semantic on a new-client/old-host request.
-      const oldSchema = NativeChatSession.extend({
-        capabilities: NativeChatSession.shape.capabilities
-          .unwrap()
-          .omit({ transcriptSourceOrder: true })
-          .optional()
-      })
-      const oldParams = oldSchema.parse({ ...params, capabilities: { transcriptSourceOrder: 1 } })
-      expect(oldParams.capabilities).toEqual({})
-      expect(
-        parse(await read.handler(oldParams, phoneContext({}))).map((row) => row.transcriptOrder)
-      ).toEqual([undefined, undefined])
-      let cleanup = () => {}
-      const context = phoneContext({
-        registerSubscriptionCleanup: (_key, stop) => {
-          cleanup = stop
-        }
-      })
-      const frames: { type: unknown; messages: NativeChatMessage[] }[] = []
-      await subscribe.handler(params, context, (frame) => {
-        if (frame && typeof frame === 'object' && 'type' in frame && 'messages' in frame) {
-          frames.push({ type: frame.type, messages: parse(frame) })
-        }
-      })
-      try {
-        await expect.poll(() => frames.length, { timeout: 5000 }).toBe(1)
-        expect(frames[0]).toMatchObject({ type: 'snapshot', messages: rows })
-        appendFileSync(transcriptPath, line('next', 5))
-        await expect.poll(() => frames.length, { timeout: 5000 }).toBe(2)
-        expect(frames[1]).toMatchObject({
-          type: 'appended',
-          messages: [{ id: 'next', timestamp: modern ? time + 5000 : time + 30002 }]
-        })
-        expect(frames[1].messages[0].transcriptOrder).toBe(
-          modern ? Buffer.byteLength(line('z-first', 30) + line('a-second', 10)) : undefined
-        )
-        writeFileSync(transcriptPath, line('replacement', 1))
-        await expect.poll(() => frames.length, { timeout: 5000 }).toBe(3)
-        expect(frames[2]).toMatchObject({
-          type: 'replacement',
-          messages: [{ id: 'replacement', timestamp: time + 1000 }]
-        })
-        expect(frames[2].messages[0].transcriptOrder).toBe(modern ? 0 : undefined)
-        appendFileSync(transcriptPath, line('after-replacement', 0))
-        await expect.poll(() => frames.length, { timeout: 5000 }).toBe(4)
-        expect(frames[3].messages[0].timestamp).toBe(modern ? time : time + 1001)
-      } finally {
-        cleanup()
-      }
-    }
-  )
-
   it('never answers from this machine for an SSH-hosted transcript', async () => {
     const page = await readSession(transcriptPath)
 
     expect(page.texts).toEqual([])
-    expect(page.error).toBeDefined()
   })
 })
diff --git a/tests/e2e/paired-client-hosted-browser-popups.spec.ts b/tests/e2e/paired-client-hosted-browser-popups.spec.ts
new file mode 100644
index 00000000000..43d84a80902
--- /dev/null
+++ b/tests/e2e/paired-client-hosted-browser-popups.spec.ts
@@ -0,0 +1,182 @@
+import { createServer, type Server } from 'node:http'
+import type { Page } from '@stablyai/playwright-test'
+import { expect, test } from './helpers/orca-app'
+import { launchHeadlessPairedRuntimeHost } from './helpers/headless-paired-runtime-host'
+import {
+  launchPairedElectronClient,
+  type PairedElectronClient
+} from './helpers/paired-electron-client'
+import { waitForPairedClientWorktree } from './helpers/paired-client-host-session'
+import { readHostBrowserPageUrls } from './helpers/host-session-tabs'
+
+// A This-device page opens target=_blank links as This-device tabs and keeps OAuth popups attached to their opener.
+
+const OPENER_HTML = `<!doctype html><title>Opener</title>
+<style>body{margin:0}a,button{display:block;width:300px;height:60px;margin:10px}</style>
+<a id="blank" href="/destination" target="_blank">blank link</a>
+<button id="oauth" onclick="startOauth()">sign in</button>
+<script>
+window.__oauthMessages = []
+addEventListener('message', (event) => window.__oauthMessages.push(String(event.data)))
+function startOauth() {
+  const redirect = encodeURIComponent(location.origin + '/callback')
+  window.__oauthPopup = window.open('/authorize?client_id=e2e&redirect_uri=' + redirect + '&response_type=code', 'oauth', 'popup,width=480,height=640')
+}
+</script>`
+
+const CALLBACK_HTML = `<!doctype html><title>Callback</title><script>
+window.opener.postMessage('code=abc', '*')
+setTimeout(() => window.close(), 100)
+</script>`
+
+async function startFixture(): Promise<{ server: Server; origin: string }> {
+  const server = createServer((request, response) => {
+    const path = new URL(request.url ?? '/', 'http://127.0.0.1').pathname
+    response.writeHead(200, { 'content-type': 'text/html; charset=utf-8' })
+    if (path === '/opener') {
+      response.end(OPENER_HTML)
+    } else if (path === '/authorize') {
+      response.end(`<script>location.replace('/callback?code=abc')</script>`)
+    } else if (path === '/callback') {
+      response.end(CALLBACK_HTML)
+    } else {
+      response.end('<!doctype html><title>Destination</title>')
+    }
+  })
+  await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const address = server.address()
+  if (!address || typeof address === 'string') {
+    throw new Error('fixture server has no port')
+  }
+  return { server, origin: `http://127.0.0.1:${address.port}` }
+}
+
+function readPagePlacements(page: Page, worktreeId: string): Promise<Record<string, string>> {
+  return page.evaluate((worktreeId) => {
+    const state = window.__store!.getState()
+    const placements: Record<string, string> = {}
+    for (const workspace of state.browserTabsByWorktree[worktreeId] ?? []) {
+      for (const browserPage of state.browserPagesByWorkspace[workspace.id] ?? []) {
+        const kind = state.remoteBrowserPageHandlesByPageId[browserPage.id]?.placement?.kind
+        placements[new URL(browserPage.url).pathname] = kind ?? 'none'
+      }
+    }
+    return placements
+  }, worktreeId)
+}
+
+async function showPage(page: Page, worktreeId: string, path: string): Promise<void> {
+  await page.evaluate(
+    ({ worktreeId, path }) => {
+      const state = window.__store!.getState()
+      for (const workspace of state.browserTabsByWorktree[worktreeId] ?? []) {
+        for (const browserPage of state.browserPagesByWorkspace[workspace.id] ?? []) {
+          if (new URL(browserPage.url).pathname === path) {
+            state.focusBrowserTabInWorktree(worktreeId, browserPage.id, { surfacePane: true })
+          }
+        }
+      }
+    },
+    { worktreeId, path }
+  )
+}
+
+function guestEval(client: PairedElectronClient, url: string, code: string): Promise<unknown> {
+  return client.app.evaluate(
+    ({ webContents }, { url, code }) =>
+      webContents
+        .getAllWebContents()
+        .find((contents) => contents.getType() === 'webview' && contents.getURL() === url)
+        ?.executeJavaScript(code) ?? null,
+    { url, code }
+  )
+}
+
+// A real mouse click, so main sees the user's gesture as it would on a desktop.
+async function clickInGuest(
+  client: PairedElectronClient,
+  url: string,
+  selector: string
+): Promise<void> {
+  await expect
+    .poll(() => guestEval(client, url, 'innerWidth > 320 && innerHeight > 200'), {
+      timeout: 30_000
+    })
+    .toBe(true)
+  await client.app.evaluate(
+    async ({ webContents }, { url, selector }) => {
+      const guest = webContents
+        .getAllWebContents()
+        .find((contents) => contents.getType() === 'webview' && contents.getURL() === url)!
+      const { x, y }: { x: number; y: number } = await guest.executeJavaScript(
+        `(() => { const r = document.querySelector(${JSON.stringify(selector)}).getBoundingClientRect(); return { x: Math.round(r.x + r.width / 2), y: Math.round(r.y + r.height / 2) } })()`
+      )
+      guest.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount: 1 })
+      guest.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount: 1 })
+    },
+    { url, selector }
+  )
+}
+
+test('a This-device page opens new tabs on this device and keeps OAuth popups working', async ({
+  testRepoPath
+}, testInfo) => {
+  // Boots a headless host and a paired client, then waits on two tab creations and a popup round trip.
+  test.setTimeout(300_000)
+  const { server, origin } = await startFixture()
+  const host = await launchHeadlessPairedRuntimeHost()
+  let client: PairedElectronClient | null = null
+  try {
+    await host.client.call('repo.add', { path: testRepoPath, kind: 'git' })
+    client = await launchPairedElectronClient(host.offer, testInfo, 'This-device popups')
+    const page = client.page
+    const worktreeId = await waitForPairedClientWorktree(page)
+    await page.evaluate(
+      ({ environmentId, worktreeId }) =>
+        window.__store!.getState().setActiveWorktree(worktreeId, `runtime:${environmentId}`),
+      { environmentId: client.environmentId, worktreeId }
+    )
+    const openerUrl = `${origin}/opener`
+    await page.evaluate(async (url) => {
+      const state = window.__store!.getState()
+      state.setBrowserDefaultUrl(url)
+      await state.openNewBrowserTabInActiveWorkspace(
+        state.activeGroupIdByWorktree[state.activeWorktreeId!]!
+      )
+    }, openerUrl)
+    await expect
+      .poll(() => readPagePlacements(page, worktreeId), { timeout: 60_000 })
+      .toEqual({ '/opener': 'client' })
+    await expect
+      .poll(() => guestEval(client!, openerUrl, 'document.readyState'), { timeout: 60_000 })
+      .toBe('complete')
+
+    await showPage(page, worktreeId, '/opener')
+    await clickInGuest(client, openerUrl, '#blank')
+    await expect
+      .poll(() => readPagePlacements(page, worktreeId), {
+        timeout: 30_000,
+        message: 'the target=_blank link did not open a This-device tab'
+      })
+      .toEqual({ '/opener': 'client', '/destination': 'client' })
+    await expect
+      .poll(() => readHostBrowserPageUrls(host.client, `path:${testRepoPath}`), { timeout: 30_000 })
+      .toContain(`${origin}/destination`)
+
+    await showPage(page, worktreeId, '/opener')
+    await clickInGuest(client, openerUrl, '#oauth')
+    await expect
+      .poll(() => guestEval(client!, openerUrl, 'window.__oauthMessages.join()'), {
+        timeout: 30_000,
+        message: 'the OAuth popup never reached its opener'
+      })
+      .toBe('code=abc')
+    await expect
+      .poll(() => guestEval(client!, openerUrl, 'window.__oauthPopup.closed'), { timeout: 10_000 })
+      .toBe(true)
+  } finally {
+    await client?.dispose()
+    await host.dispose()
+    server.close()
+  }
+})
diff --git a/tests/e2e/paired-mobile-desktop-tab-composition.spec.ts b/tests/e2e/paired-mobile-desktop-tab-composition.spec.ts
index 7388ff81ebe..f5b550c0b06 100644
--- a/tests/e2e/paired-mobile-desktop-tab-composition.spec.ts
+++ b/tests/e2e/paired-mobile-desktop-tab-composition.spec.ts
@@ -164,7 +164,9 @@ test('phone shows the desktop tab strip of a server workspace, also with the win
       await host.client.call<{ browserPageId: string }>('browser.tabCreate', {
         worktree,
         url: 'about:blank',
-        activate: false
+        activate: false,
+        // Unplaced, a server-side create would go to the paired desktop.
+        placement: { kind: 'server' }
       })
     ).result
     const phoneStrip = async (): Promise<Strip> =>
diff --git a/tests/e2e/paired-remote-browser-blank-link.spec.ts b/tests/e2e/paired-remote-browser-blank-link.spec.ts
index 5d0beff2d29..f3ee0c26881 100644
--- a/tests/e2e/paired-remote-browser-blank-link.spec.ts
+++ b/tests/e2e/paired-remote-browser-blank-link.spec.ts
@@ -58,7 +58,9 @@ test('a target=_blank click in a streamed server page opens a new Orca tab', asy
     const created = (
       await host.client.call<{ browserPageId: string }>('browser.tabCreate', {
         worktree: `id:${worktreeId}`,
-        url: `${origin}/`
+        url: `${origin}/`,
+        // Unplaced, this create would go to the paired desktop; the test drives a streamed page.
+        placement: { kind: 'server' }
       })
     ).result
     await focusMaterializedRemoteBrowserPane(page, {
diff --git a/tests/e2e/paired-remote-browser-in-page-address.spec.ts b/tests/e2e/paired-remote-browser-in-page-address.spec.ts
index 4de2cfea2ac..b3ce28f9a9f 100644
--- a/tests/e2e/paired-remote-browser-in-page-address.spec.ts
+++ b/tests/e2e/paired-remote-browser-in-page-address.spec.ts
@@ -45,7 +45,9 @@ test('history updates and hash links in a server page reach the paired address b
     const created = (
       await host.client.call<{ browserPageId: string }>('browser.tabCreate', {
         worktree,
-        url: `${origin}/`
+        url: `${origin}/`,
+        // Unplaced server-side creates go to the paired desktop; this test drives a streamed page.
+        placement: { kind: 'server' }
       })
     ).result
     await focusMaterializedRemoteBrowserPane(page, {
diff --git a/tests/e2e/paired-remote-browser-link-open-routing.spec.ts b/tests/e2e/paired-remote-browser-link-open-routing.spec.ts
index 508a5177004..75a761571a4 100644
--- a/tests/e2e/paired-remote-browser-link-open-routing.spec.ts
+++ b/tests/e2e/paired-remote-browser-link-open-routing.spec.ts
@@ -352,7 +352,13 @@ test('opens a remote pane link on the pane runtime and refuses to fall back to t
 
     await host.client.call(
       'browser.tabCreate',
-      { worktree: `id:${worktreeId}`, url: fixture.paneUrl, activate: true },
+      // Unplaced server-side creates go to the paired desktop; this pane is a streamed page.
+      {
+        worktree: `id:${worktreeId}`,
+        url: fixture.paneUrl,
+        activate: true,
+        placement: { kind: 'server' }
+      },
       { timeoutMs: 30_000 }
     )
     await expect
diff --git a/tests/e2e/paired-server-agent-tab-placement.spec.ts b/tests/e2e/paired-server-agent-tab-placement.spec.ts
new file mode 100644
index 00000000000..cedd46f65e4
--- /dev/null
+++ b/tests/e2e/paired-server-agent-tab-placement.spec.ts
@@ -0,0 +1,95 @@
+import { createServer, type Server } from 'node:http'
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { launchHeadlessPairedRuntimeHost } from './helpers/headless-paired-runtime-host'
+import { expect, test } from './helpers/orca-app'
+import { launchPairedElectronClient } from './helpers/paired-electron-client'
+import {
+  callPairedRuntime,
+  waitForPairedClientWorktree
+} from './helpers/paired-client-host-session'
+
+// #41682: a tab the server's own agent opens goes on a paired "This device" desktop, else it streams.
+
+async function startPageServer(): Promise<{ server: Server; origin: string }> {
+  const server = createServer((request, response) => {
+    response.writeHead(200, { 'content-type': 'text/html; charset=utf-8' })
+    response.end(`<!doctype html><title>${request.url}</title><h1>${request.url}</h1>`)
+  })
+  await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const address = server.address()
+  if (!address || typeof address === 'string') {
+    throw new Error('page server has no port')
+  }
+  return { server, origin: `http://127.0.0.1:${address.port}` }
+}
+
+async function rendersUrl(app: ElectronApplication, url: string): Promise<boolean> {
+  return app.evaluate(
+    ({ webContents }, url) => webContents.getAllWebContents().some((c) => c.getURL() === url),
+    url
+  )
+}
+
+async function sessionRowPlacement(
+  page: Page,
+  environmentId: string,
+  worktreeId: string,
+  browserPageId: string
+): Promise<string | null> {
+  const listed = await callPairedRuntime<{
+    tabs: { browserPageId?: string; placement?: { kind: string } }[]
+  }>(page, environmentId, 'session.tabs.list', { worktree: `id:${worktreeId}` })
+  const row = listed.tabs.find((tab) => tab.browserPageId === browserPageId)
+  return row ? (row.placement?.kind ?? 'server') : null
+}
+
+test('a server agent tab opens on a This-device desktop and streams for a streamed one', async ({
+  testRepoPath
+}, testInfo) => {
+  // Boots a headless host and a paired desktop, then waits on two real page loads.
+  test.setTimeout(300_000)
+  const { server, origin } = await startPageServer()
+  const host = await launchHeadlessPairedRuntimeHost()
+  let client: Awaited<ReturnType<typeof launchPairedElectronClient>> | null = null
+  try {
+    await host.client.call('repo.add', { path: testRepoPath, kind: 'git' })
+    client = await launchPairedElectronClient(host.offer, testInfo, 'Server agent tab placement')
+    const { page, app, environmentId } = client
+    const worktreeId = await waitForPairedClientWorktree(page)
+    // Server-side calls carry no paired client, like an agent's `orca tab create`.
+    const agentCreate = async (url: string): Promise<string> =>
+      (
+        await host.client.call<{ browserPageId: string }>(
+          'browser.tabCreate',
+          { worktree: `id:${worktreeId}`, url },
+          { timeoutMs: 60_000 }
+        )
+      ).result.browserPageId
+
+    const onDesktop = await agentCreate(`${origin}/this-device`)
+    await expect
+      .poll(() => rendersUrl(app, `${origin}/this-device`), { timeout: 60_000 })
+      .toBe(true)
+    expect(await rendersUrl(host.app, `${origin}/this-device`)).toBe(false)
+    await expect
+      .poll(() => sessionRowPlacement(page, environmentId, worktreeId, onDesktop))
+      .toBe('client')
+
+    // The desktop is asked again even while it hosts, so switching to streamed applies at once.
+    await page.evaluate(() =>
+      window.__store?.getState().updateSettings({ browserClientHostedRemoteEnabled: false })
+    )
+    const streamed = await agentCreate(`${origin}/streamed`)
+    await expect
+      .poll(() => rendersUrl(host.app, `${origin}/streamed`), { timeout: 60_000 })
+      .toBe(true)
+    expect(await rendersUrl(app, `${origin}/streamed`)).toBe(false)
+    await expect
+      .poll(() => sessionRowPlacement(page, environmentId, worktreeId, streamed))
+      .toBe('server')
+  } finally {
+    await client?.dispose()
+    await host.dispose()
+    server.close()
+  }
+})
diff --git a/tests/e2e/paired-worktree-agent-command-owner.unit.test.ts b/tests/e2e/paired-worktree-agent-command-owner.unit.test.ts
deleted file mode 100644
index af373384098..00000000000
--- a/tests/e2e/paired-worktree-agent-command-owner.unit.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { WorktreeCreate } from '../../src/shared/rpc-contract/worktree-create-params'
-import { buildManagedWorktreeCreateArgs } from '../../src/main/runtime/rpc/methods/workspaces/worktree-create-args'
-import { resolveManagedWorktreeCreateStartup } from '../../src/main/runtime/workspaces/startup/managed-worktree-create-startup'
-import { buildWorktreeStartupForAgent } from '../../src/main/runtime/workspaces/startup/runtime-worktree-agent-startup'
-import { getDefaultSettings } from '../../src/shared/constants'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  createCompatibleRuntimeStatusResponse,
-  type RuntimeEnvironmentCallRequest
-} from '../../src/renderer/src/runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { TEST_REPO } from '../../src/renderer/src/store/repos/repo.test-fixture'
-import { makeWorktree } from '../../src/renderer/src/store/slices/worktrees/worktree.test-fixture'
-import {
-  createTestStore,
-  resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall,
-  runtimeEnvironmentTransportCall
-} from '../../src/renderer/src/store/slices/worktrees/worktrees-slice-test-harness'
-
-vi.mock('sonner', () => ({
-  toast: { warning: vi.fn(), info: vi.fn(), success: vi.fn(), error: vi.fn(), dismiss: vi.fn() }
-}))
-
-beforeEach(() => {
-  resetWorktreeSliceModuleMemory()
-  vi.clearAllMocks()
-  resetRemoteRuntimeMocks()
-})
-
-describe('paired workspace agent startup ownership', () => {
-  it.each(['modern', 'prompt', 'older', 'probe-failure', 'predates-agent', 'custom'] as const)(
-    'preserves launch command ownership for %s paired creation',
-    async (scenario) => {
-      const supported = scenario === 'modern' || scenario === 'prompt'
-      const status = createCompatibleRuntimeStatusResponse('runtime-remote')
-      if (status.ok && scenario === 'older') {
-        status.result.capabilities = status.result.capabilities?.filter(
-          (capability) => capability !== 'agent.launch.v2'
-        )
-      }
-      let failedProbe = false
-      runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-        if (args.method !== 'status.get') {
-          return runtimeEnvironmentCall(args)
-        }
-        if (scenario === 'probe-failure' && !failedProbe) {
-          failedProbe = true
-          throw new Error('temporary status read failure')
-        }
-        return status
-      })
-      const hostSettings = {
-        ...getDefaultSettings('/host'),
-        agentCmdOverrides: { claude: '/host/claude-wrapper' },
-        agentDefaultArgs: { claude: '--host-only' },
-        agentDefaultEnv: { claude: { LAUNCH_OWNER: 'host' } }
-      }
-      const store = createTestStore()
-      store.setState({ repos: [{ ...TEST_REPO, executionHostId: 'runtime:env-1' }] })
-      let launchedCommand = ''
-      let launchedEnv: Record<string, string> | undefined
-      let delivered = ''
-      runtimeEnvironmentCall.mockImplementation(async (call) => {
-        expect(call.method).toBe('worktree.create')
-        if (scenario === 'predates-agent' && call.params && 'startupAgent' in call.params) {
-          // What a host older than the agent answers while validating its name.
-          return {
-            id: 'host-create',
-            ok: false,
-            error: { code: 'invalid_argument', message: 'Unknown TUI agent' },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-        }
-        const params = WorktreeCreate.parse(call.params)
-        const args = buildManagedWorktreeCreateArgs(params, {})
-        const resolved = await resolveManagedWorktreeCreateStartup(args, [], {
-          agent: (agent, prompt) =>
-            buildWorktreeStartupForAgent({
-              agent,
-              prompt,
-              repo: TEST_REPO,
-              settings: hostSettings,
-              getLaunchRuntime: () => ({
-                platform: 'linux',
-                shell: 'posix',
-                launchRuntime: {
-                  platform: 'linux',
-                  pty: { shellOverride: undefined, terminalWindowsWslDistro: null }
-                }
-              }),
-              toSessionOptions: () => undefined
-            }),
-          draft: async () => null
-        })
-        delivered = [resolved.effectiveStartup?.command, resolved.effectiveStartupFollowup?.prompt]
-          .filter(Boolean)
-          .join('\n')
-        launchedCommand = resolved.effectiveStartup?.command ?? ''
-        launchedEnv = resolved.effectiveStartup?.env
-        return {
-          id: 'host-create',
-          ok: true,
-          result: {
-            worktree: makeWorktree({ id: 'repo1::/path/host-agent', repoId: 'repo1' }),
-            startupTerminal: { spawned: true, tabId: 'host-tab' }
-          },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      })
-      const createWorktree = store.getState().createWorktree
-      const args: Parameters<typeof createWorktree> = ['repo1', 'host-agent']
-      args[10] = 'claude'
-      args[16] = {
-        command: '/client/claude --client-only',
-        env: { LAUNCH_OWNER: 'client' },
-        launchAgent: 'claude'
-      }
-      args[25] = {
-        ...(scenario === 'custom'
-          ? {}
-          : {
-              hostAgentLaunch: {
-                agent: 'claude' as const,
-                ...(scenario === 'prompt' ? { prompt: 'prompt-text' } : {})
-              }
-            }),
-        executionHostId: 'runtime:env-1'
-      }
-
-      await createWorktree(...args)
-
-      expect(launchedCommand).toContain(supported ? '/host/claude-wrapper' : '/client/claude')
-      expect(launchedCommand).toContain(supported ? '--host-only' : '--client-only')
-      expect(launchedEnv?.LAUNCH_OWNER).toBe(supported ? 'host' : 'client')
-      if (scenario === 'prompt') {
-        // Exactly once, through whichever channel the host's planner picked.
-        expect(delivered.split('prompt-text')).toHaveLength(2)
-      }
-      expect(runtimeEnvironmentCall).toHaveBeenCalledTimes(scenario === 'predates-agent' ? 2 : 1)
-    }
-  )
-})
diff --git a/tests/e2e/runtime-environment-selection-affinity.unit.test.ts b/tests/e2e/runtime-environment-selection-affinity.unit.test.ts
deleted file mode 100644
index 665cbe0f651..00000000000
--- a/tests/e2e/runtime-environment-selection-affinity.unit.test.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { mkdtempSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import * as environmentStore from '../../src/shared/remote-runtime/host-store/runtime-environment-store'
-import {
-  RUNTIME_PROTOCOL_VERSION,
-  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-} from '../../src/shared/protocol-version'
-import { callRuntimeEnvironment } from '../../src/main/ipc/runtime-environments/runtime-environment-transport-routing'
-import {
-  structuredSessionSelectionController,
-  forgetStructuredSessionSelection,
-  registerStructuredSelectionCatalogStore
-} from '@/lib/agent-session/options/structured-agent-session-selection-controller'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import { resetRuntimeEnvironmentStatusOwners } from '../../src/main/ipc/runtime-environments/runtime-environment-request-connections'
-import { pairingCode } from '../../src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness'
-
-const { sendRemoteRuntimeRequestMock, getPathMock } = vi.hoisted(() => ({
-  sendRemoteRuntimeRequestMock: vi.fn(),
-  getPathMock: vi.fn()
-}))
-
-vi.mock('electron', () => ({
-  BrowserWindow: { getAllWindows: () => [] },
-  app: { getPath: getPathMock },
-  ipcMain: { handle: vi.fn(), on: vi.fn(), removeHandler: vi.fn(), removeAllListeners: vi.fn() }
-}))
-vi.mock('../../src/shared/remote-runtime/requests/remote-runtime-request-socket', () => ({
-  sendRemoteRuntimeRequestOnSocket: sendRemoteRuntimeRequestMock
-}))
-vi.mock('../../src/shared/remote-runtime/requests/remote-runtime-subscription-transport', () => ({
-  subscribeRemoteRuntimeTransport: vi.fn()
-}))
-vi.mock(
-  '../../src/main/ipc/runtime-environments/runtime-environment-request-connections',
-  async () => {
-    const { withRuntimeStatusOwners } =
-      await import('../../src/main/ipc/runtime-environments/runtime-environments-ipc-test-harness')
-    return withRuntimeStatusOwners({
-      sendRemoteRuntimeConnectionRequest: vi.fn(),
-      sendRemoteRuntimeSharedControlRequest: vi.fn(),
-      subscribeRemoteRuntimeSharedControlRequest: vi.fn(),
-      getRemoteRuntimeSharedControlDiagnostics: vi.fn(() => null),
-      reconnectRemoteRuntimeSharedControlConnection: vi.fn(),
-      retryRemoteRuntimeSharedControlConnectionsNow: vi.fn(),
-      ensureRemoteRuntimeSharedControlConnection: vi.fn(),
-      pauseRemoteRuntimeSharedControlRetry: vi.fn(),
-      closeRemoteRuntimeRequestConnection: vi.fn()
-    })
-  }
-)
-
-let userDataPath: string
-beforeEach(() => {
-  userDataPath = mkdtempSync(join(tmpdir(), 'orca-selection-affinity-'))
-  getPathMock.mockReturnValue(userDataPath)
-})
-afterEach(() => {
-  vi.restoreAllMocks()
-  resetRuntimeEnvironmentStatusOwners()
-  vi.unstubAllGlobals()
-  rmSync(userDataPath, { recursive: true, force: true })
-})
-
-it('fences deferred selection at the real queue and follows only proved pairing continuity, including late memory', async () => {
-  const original = environmentStore.addEnvironmentFromPairingCode(userDataPath, {
-    name: 'selection-owner',
-    pairingCode: pairingCode(),
-    now: 1
-  })
-  const target = { kind: 'environment', environmentId: original.id } as const
-  replaceRuntimeEnvironmentRevisions([original])
-  vi.stubGlobal('window', {
-    api: {
-      runtimeEnvironments: {
-        call: (args: {
-          selector: string
-          method: string
-          params?: unknown
-          expectedEnvironmentPairingRevision?: number
-        }) =>
-          callRuntimeEnvironment(
-            userDataPath,
-            args.selector,
-            args.method,
-            args.params,
-            undefined,
-            args.expectedEnvironmentPairingRevision
-          )
-      }
-    }
-  })
-  const restoreCatalog = registerStructuredSelectionCatalogStore({
-    read: () => ({ runtimeEnvironmentCatalogHydrated: true }),
-    subscribe: () => () => {}
-  })
-  try {
-    const owner = structuredSessionSelectionController(target, 'selection-queue', 'codex')
-    const release = Promise.withResolvers<void>()
-    sendRemoteRuntimeRequestMock.mockImplementation(async (_connection, method) => {
-      if (method === 'files.read') {
-        await release.promise
-      }
-      return {
-        id: method,
-        ok: true,
-        result:
-          method === 'status.get'
-            ? {
-                runtimeId: 'host',
-                runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-                minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-              }
-            : {},
-        _meta: { runtimeId: 'host' }
-      }
-    })
-    const occupying = Array.from({ length: 8 }, () =>
-      callRuntimeEnvironment(userDataPath, original.id, 'files.read', {})
-    )
-    await vi.waitFor(() =>
-      expect(
-        sendRemoteRuntimeRequestMock.mock.calls.filter(([, method]) => method === 'files.read')
-      ).toHaveLength(8)
-    )
-    const sendPick = (options: { expectedEnvironmentPairingRevision?: number }) =>
-      callRuntimeRpc(
-        target,
-        'agentSession.setOption',
-        {},
-        { ...options, skipCompatibilityCheck: true }
-      )
-    const queued = owner.request(sendPick)
-    const changed = environmentStore.updateEnvironmentFromPairingCode(userDataPath, original.id, {
-      pairingCode: pairingCode(),
-      now: 2
-    })
-    replaceRuntimeEnvironmentRevisions([changed], {
-      retired: [],
-      sameHost: [],
-      pending: [{ id: original.id, fromRevision: 1 }]
-    })
-    release.resolve()
-    await Promise.all(occupying)
-    await expect(queued).rejects.toMatchObject({ code: 'runtime_environment_changed' })
-    expect(
-      sendRemoteRuntimeRequestMock.mock.calls.some(
-        ([, method]) => method === 'agentSession.setOption'
-      )
-    ).toBe(false)
-    expect(structuredSessionSelectionController(target, 'selection-queue', 'codex')).toBe(owner)
-    const accepted = owner.issue('model', 'gpt-5.4', null)
-    owner.settle(accepted, { kind: 'accepted', options: { model: 'gpt-5.4' } })
-    // Memory starts with the original revision too; the pending replacement cannot receive it.
-    await Promise.resolve()
-    expect(
-      sendRemoteRuntimeRequestMock.mock.calls.some(
-        ([, method]) => method === 'settings.mutateNativeChatSessionOptions'
-      )
-    ).toBe(false)
-    replaceRuntimeEnvironmentRevisions([changed], {
-      retired: [],
-      sameHost: [{ id: original.id, fromRevision: 1, toRevision: changed.pairingRevision! }]
-    })
-    await owner.request(sendPick)
-    const later = owner.issue('model', 'gpt-5.3-codex', null)
-    owner.settle(later, { kind: 'accepted', options: { model: 'gpt-5.3-codex' } })
-    await vi.waitFor(() =>
-      expect(
-        sendRemoteRuntimeRequestMock.mock.calls.filter(
-          ([, method]) => method === 'settings.mutateNativeChatSessionOptions'
-        )
-      ).toHaveLength(1)
-    )
-    forgetStructuredSessionSelection('selection-queue', target)
-    const count = sendRemoteRuntimeRequestMock.mock.calls.length
-    await expect(
-      owner.request((options) => callRuntimeRpc(target, 'agentSession.setOption', {}, options))
-    ).rejects.toThrow('retired')
-    expect(sendRemoteRuntimeRequestMock).toHaveBeenCalledTimes(count)
-  } finally {
-    forgetStructuredSessionSelection('selection-queue', target)
-    replaceRuntimeEnvironmentRevisions([])
-    restoreCatalog()
-  }
-})
diff --git a/tests/e2e/session-tabs/mobile-session-legacy-navigation.unit.test.ts b/tests/e2e/session-tabs/mobile-session-legacy-navigation.unit.test.ts
index 1eb38585496..d585b24dde5 100644
--- a/tests/e2e/session-tabs/mobile-session-legacy-navigation.unit.test.ts
+++ b/tests/e2e/session-tabs/mobile-session-legacy-navigation.unit.test.ts
@@ -54,6 +54,7 @@ describe('legacy host navigation through inventory reconstruction', () => {
         }))
       }),
       getRemoteTabFaviconUrl: () => null,
+      getPageNavigationState: () => null,
       tabSwitch: vi.fn(async () => ({ switched: 1, browserPageId: 'page-b' })),
       getRegisteredTabs: () =>
         new Map([
diff --git a/tests/e2e/task-page-linear-refresh-authority.test.tsx b/tests/e2e/task-page-linear-refresh-authority.test.tsx
deleted file mode 100644
index 45545c6a58e..00000000000
--- a/tests/e2e/task-page-linear-refresh-authority.test.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state'
-// @vitest-environment happy-dom
-import {
-  reads,
-  task,
-  store,
-  fixture,
-  source
-} from '../../src/renderer/src/components/task-page/linear/task-page-linear-refresh-test-fixtures'
-
-import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
-
-import type { LinearIssue } from '../../src/shared/linear/issue-types'
-
-import { useTaskPageLinearInOrcaEffects } from '../../src/renderer/src/components/task-page/linear/use-task-page-linear-in-orca-effects'
-import { useTaskPageDetailRouting } from '../../src/renderer/src/components/task-page/use-task-page-detail-routing'
-import { useLinearIssueWorkspaceDetail } from '../../src/renderer/src/components/linear-issue-workspace-detail-state'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, renderHook, waitFor } from '@testing-library/react'
-
-import { getTaskSourceCacheScope } from '../../src/shared/work-items/task-source-context'
-
-const cacheTime = Date.parse('2026-01-01T00:00:00Z')
-beforeEach(() => {
-  vi.useFakeTimers({ toFake: ['Date'] })
-  vi.setSystemTime(cacheTime)
-})
-afterEach(() => vi.useRealTimers())
-
-it('retains ordered linked source provenance when two hosts return the same UUID', async () => {
-  const s = store()
-  const first = source('local'),
-    second = source('runtime:other')
-  const refs = [
-    { identifier: 'DAT-124', workspaceId: 'w', sourceContext: first },
-    { identifier: 'DAT-124', workspaceId: 'w', sourceContext: second }
-  ]
-  // Real detail actions create the requested source/identifier keys.
-  reads.detail.mockResolvedValueOnce(task()).mockResolvedValueOnce(task('Done'))
-  const base = {
-    ...fixture(s, []),
-    ...s.getState(),
-    taskResumeApplied: true,
-    taskSource: 'linear',
-    linearMode: 'in-orca',
-    linearConnected: true,
-    linearRefreshNonce: 0,
-    lastLinearRequestRef: { current: null },
-    inOrcaLinkedLinearRefsRef: { current: refs },
-    inOrcaLinkedLinearRefsSignature: 'two-hosts',
-    setLinearLoading: vi.fn(),
-    setLinearError: vi.fn(),
-    setLinearIssuesHasMore: vi.fn()
-  }
-  const hook = renderHook(() => {
-    const result = useLinearIssueResult<LinearIssue[]>(
-      'two-hosts',
-      [],
-      getLinearSourceScope(defaultScopeSource(null))
-    )
-    // SAFETY: fixture supplies the linked loader fields.
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    useTaskPageLinearInOrcaEffects({
-      ...base,
-      linearIssueResult: result,
-      setLinearIssues: result.setData
-    } as never)
-    return result.data
-  })
-  await waitFor(() => expect(hook.result.current).toHaveLength(2))
-  act(() =>
-    s
-      .getState()
-      .patchLinearIssue('same-uuid', { state: task('Blocked').state }, { sourceContext: first })
-  )
-  expect(hook.result.current.map((item) => item.state.name)).toEqual(['Blocked', 'Done'])
-  act(() =>
-    s.getState().patchLinearIssue('same-uuid', { state: task().state }, { sourceContext: first })
-  )
-  expect(hook.result.current.map((item) => item.state.name)).toEqual(['In Review', 'Done'])
-})
-
-it('opens the fresh row on its origin source despite stale aliases and failed detail hydration', async () => {
-  const s = store(),
-    origin = source('runtime:origin'),
-    foreign = source('local')
-  s.setState({
-    jiraIssueCache: {},
-    jiraSearchCache: {},
-    linearIssueCache: {
-      [`${getTaskSourceCacheScope(origin)}::w::DAT-124`]: { data: task(), fetchedAt: 1 },
-      [`${getTaskSourceCacheScope(foreign)}::w::same-uuid`]: { data: task(), fetchedAt: cacheTime }
-    }
-  })
-  reads.detail.mockRejectedValue(new Error('raw detail failure'))
-  const hook = renderHook(() => {
-    // SAFETY: routing fixture only opens Linear; Jira and callbacks are inert.
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the real consumer's exercised fields and actions; unrelated full-page/provider services are intentionally absent.
-    const route = useTaskPageDetailRouting({
-      pageData: { openLinearIssue: task('Done'), openLinearSourceContext: origin },
-      linearTaskSourceContext: foreign,
-      setDialogWorkItem: vi.fn(),
-      openTaskPage: vi.fn()
-    } as never)
-    if (!route.linearDetailSourceContext) {
-      throw new Error('Expected the routed detail source')
-    }
-    const detail = useLinearIssueWorkspaceDetail({
-      issue: route.selectedLinearIssue ?? task(),
-      providerSettings: route.linearDetailSourceContext,
-      requestKey: 'origin:uuid'
-    })
-    return { route, detail }
-  })
-  await waitFor(() => expect(hook.result.current.detail.issueLoading).toBe(false))
-  expect(hook.result.current.detail.displayed.state.name).toBe('Done')
-  expect(reads.detail).toHaveBeenCalledWith(origin, 'same-uuid', 'w')
-})
diff --git a/tests/e2e/task-page-linear-refresh-authority.unit.test.ts b/tests/e2e/task-page-linear-refresh-authority.unit.test.ts
deleted file mode 100644
index 6ba3133ffcc..00000000000
--- a/tests/e2e/task-page-linear-refresh-authority.unit.test.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @vitest-environment happy-dom
-import './task-page-linear-refresh-authority.test'